代码整理

yezhu-api/src/main/java/com/kioor/room/controller/ApiHousingEstateController.java

@@ -116,6 +116,13 @@ public class ApiHousingEstateController {
         //效验数据
         ValidatorUtils.validateEntity(housingEstateInitDTOList, AddGroup.class, DefaultGroup.class);
 
+        //先清空房号
+        if(housingEstateInitDTOList.size() > 0){
+            housingEstateInitDTOList.forEach(housingEstateInitDTO -> {
+                housingEstateService.cleanAll(housingEstateInitDTO.getHousingEstateId());
+            });
+        }
+
         housingEstateService.housingEstateInit(housingEstateInitDTOList);
 
         return new Result();

yezhu-api/src/main/java/com/kioor/user/controller/ApiRegisterController.java

@@ -45,30 +45,6 @@ public class ApiRegisterController {
 
     private final RedisUtils redisUtils;
 
-    @PostMapping("register")
-    @Operation(summary = "注册")
-    public Result register(@RequestBody RegisterDTO dto) {
-        //表单校验
-        ValidatorUtils.validateEntity(dto);
-        //校验验证码
-        Object codeObj = redisUtils.hGet(RedisKeys.getSmsCaptchaKey(),dto.getMobile());
-        if (codeObj == null || !codeObj.toString().equals(dto.getCode())) {
-            return new Result().error("验证码不正确");
-        }
-        //保存用户信息
-        UserEntity user = new UserEntity();
-        user.setMobile(dto.getMobile());
-        user.setUsername(dto.getMobile());
-        user.setPassword(DigestUtil.sha256Hex(dto.getPassword()));
-        user.setCreateDate(new Date());
-        user.setLevel(0);
-        user.setOpenFlag(1);
-        user.setProhibitionFlag(0);
-        userService.insert(user);
-
-        return new Result();
-    }
-
     /**
      * 发送验证码
      */
@@ -105,4 +81,28 @@ public class ApiRegisterController {
         }
         return new Result();
     }
+
+    @PostMapping("register")
+    @Operation(summary = "注册")
+    public Result register(@RequestBody RegisterDTO dto) {
+        //表单校验
+        ValidatorUtils.validateEntity(dto);
+        //校验验证码
+        Object codeObj = redisUtils.hGet(RedisKeys.getSmsCaptchaKey(),dto.getMobile());
+        if (codeObj == null || !codeObj.toString().equals(dto.getCode())) {
+            return new Result().error("验证码不正确");
+        }
+        //保存用户信息
+        UserEntity user = new UserEntity();
+        user.setMobile(dto.getMobile());
+        user.setUsername(dto.getMobile());
+        user.setPassword(DigestUtil.sha256Hex(dto.getPassword()));
+        user.setCreateDate(new Date());
+        user.setLevel(0);
+        user.setOpenFlag(1);
+        user.setProhibitionFlag(0);
+        userService.insert(user);
+
+        return new Result();
+    }
 }

yezhu-api/src/main/java/com/kioor/user/controller/ApiUserController.java

@@ -12,8 +12,6 @@ package com.kioor.user.controller;
 import com.kioor.annotation.Login;
 import com.kioor.common.utils.Result;
 import com.kioor.common.validator.ValidatorUtils;
-import com.kioor.room.service.RoomService;
-import com.kioor.room.service.UserHousingEstateService;
 import com.kioor.user.dto.UserDTO;
 import com.kioor.user.entity.UserEntity;
 import com.kioor.user.service.UserService;
@@ -37,10 +35,6 @@ import java.util.Map;
 public class ApiUserController {
     private final UserService userService;
 
-    private final RoomService roomService;
-
-    private final UserHousingEstateService userHousingEstateService;
-
     @Login
     @PutMapping
     @Operation(summary = "修改用户信息")