From fbd15ca3534803b77ba887fdb4ad7baf21bfe9de Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Tue, 3 Sep 2024 19:22:39 +0800
Subject: [PATCH] =?UTF-8?q?APP=E7=94=A8=E6=88=B7=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/oss/constant/OssPath.java   |  5 +++++
 .../com/njcn/redis/pojo/enums/AppRedisKey.java     | 14 ++++++++++++++
 .../njcn/user/service/impl/AppUserServiceImpl.java |  9 ++++++---
 .../njcn/user/service/impl/UserServiceImpl.java    |  1 +
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/pqs-common/common-oss/src/main/java/com/njcn/oss/constant/OssPath.java b/pqs-common/common-oss/src/main/java/com/njcn/oss/constant/OssPath.java
index 6762ae20c..af786e421 100644
--- a/pqs-common/common-oss/src/main/java/com/njcn/oss/constant/OssPath.java
+++ b/pqs-common/common-oss/src/main/java/com/njcn/oss/constant/OssPath.java
@@ -12,6 +12,11 @@ public interface OssPath {
      */
     String WAVE_DIR="comtrade/";
 
+    /***
+     * 下载文件
+     */
+    String DOWNLOAD_DIR="download/";
+
     /***
      * 稳态报表
      */
diff --git a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java
index 46f78b75d..6997016f9 100644
--- a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java
+++ b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java
@@ -74,4 +74,18 @@ public interface AppRedisKey {
      */
     String FILE_WAITING="fileWaitingKey:";
 
+    /**
+     * 工程信息
+     */
+    String PROJECT_INFO="projectInfoKey:";
+
+    String FILE_INFO="fileInfoKey:";
+
+    String DEVICE_ROOT_PATH="deviceRootPathKey:";
+
+    String DEVICE_MID="deviceMidKey:";
+
+    String UPLOAD = "uploadKey:";
+
+    String DOWNLOAD = "downloadKey:";
 }
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java
index b3fc94e6c..51213fa64 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java
@@ -125,7 +125,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, User> impleme
         String password = null;
         SendSmsResponse sendSmsResponse = null;
         //先根据手机号查询是否已被注册
-        User user = this.lambdaQuery().eq(User::getPhone,phone).one();
+        User user = this.lambdaQuery().eq(User::getPhone,phone).ne(User::getState,0).one();
         if (!Objects.isNull(user)){
             throw new BusinessException(UserResponseEnum.REGISTER_PHONE_REPEAT);
         } else {
@@ -254,10 +254,13 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, User> impleme
         LambdaUpdateWrapper<User> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         lambdaUpdateWrapper.set(User::getDevCode,null).eq(User::getDevCode,devCode);
         this.update(lambdaUpdateWrapper);
-        lambdaUpdateWrapper.set(User::getDevCode,devCode).eq(User::getId,userId);
-        this.update(lambdaUpdateWrapper);
+
+        LambdaUpdateWrapper<User> lambdaUpdateWrapper2 = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper2.set(User::getDevCode,devCode).eq(User::getId,userId);
+        this.update(lambdaUpdateWrapper2);
     }
 
+
     @Override
     public List<User> getAdminInfo() {
         //这边先排除掉dev_code不存在的业务管理员
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
index 6db37ba62..95ee2bc9a 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
@@ -243,6 +243,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     public boolean deleteUser(String id) {
         return this.lambdaUpdate()
                 .set(User::getState, UserState.DELETE)
+                .set(User::getPhone,null)
                 .in(User::getId, id)
                 .update();
     }