APP用户相关接口调整

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/";
+
     /***
      * 稳态报表
      */

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:";
 }

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不存在的业务管理员

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();
     }