|
@@ -20,8 +20,10 @@ import com.kioor.common.validator.ValidatorUtils;
|
|
import com.kioor.common.validator.group.AddGroup;
|
|
import com.kioor.common.validator.group.AddGroup;
|
|
import com.kioor.common.validator.group.DefaultGroup;
|
|
import com.kioor.common.validator.group.DefaultGroup;
|
|
import com.kioor.common.validator.group.UpdateGroup;
|
|
import com.kioor.common.validator.group.UpdateGroup;
|
|
-import com.kioor.room.dto.HousingEstateDTO;
|
|
|
|
|
|
+import com.kioor.messageboard.dto.MessageBoardDTO;
|
|
|
|
+import com.kioor.messageboard.service.MessageBoardService;
|
|
import com.kioor.room.dto.BuildingInitDTO;
|
|
import com.kioor.room.dto.BuildingInitDTO;
|
|
|
|
+import com.kioor.room.dto.HousingEstateDTO;
|
|
import com.kioor.room.enums.HousingEstateStatus;
|
|
import com.kioor.room.enums.HousingEstateStatus;
|
|
import com.kioor.room.service.HousingEstateService;
|
|
import com.kioor.room.service.HousingEstateService;
|
|
import com.kioor.user.entity.UserEntity;
|
|
import com.kioor.user.entity.UserEntity;
|
|
@@ -50,6 +52,8 @@ public class ApiHousingEstateController {
|
|
|
|
|
|
private final HousingEstateService housingEstateService;
|
|
private final HousingEstateService housingEstateService;
|
|
|
|
|
|
|
|
+ private final MessageBoardService messageBoardService;
|
|
|
|
+
|
|
@Login
|
|
@Login
|
|
@GetMapping("page")
|
|
@GetMapping("page")
|
|
@Operation(summary = "分页")
|
|
@Operation(summary = "分页")
|
|
@@ -166,10 +170,16 @@ public class ApiHousingEstateController {
|
|
if(!housingEstateService.checkInit(buildingInitDTOList.get(0).getHousingEstateId())){
|
|
if(!housingEstateService.checkInit(buildingInitDTOList.get(0).getHousingEstateId())){
|
|
return new Result().error(ErrorCode.INTERNAL_SERVER_ERROR,"操作非法,小区已有数据,请联系管理员重置");
|
|
return new Result().error(ErrorCode.INTERNAL_SERVER_ERROR,"操作非法,小区已有数据,请联系管理员重置");
|
|
}
|
|
}
|
|
|
|
+ HousingEstateDTO housingEstateDTO = housingEstateService.get(buildingInitDTOList.get(0).getHousingEstateId());
|
|
//先清空房号
|
|
//先清空房号
|
|
if(!buildingInitDTOList.isEmpty()){
|
|
if(!buildingInitDTOList.isEmpty()){
|
|
buildingInitDTOList.forEach(buildingInitDTO -> {
|
|
buildingInitDTOList.forEach(buildingInitDTO -> {
|
|
housingEstateService.cleanAll(buildingInitDTO.getHousingEstateId());
|
|
housingEstateService.cleanAll(buildingInitDTO.getHousingEstateId());
|
|
|
|
+ //删除小区留言板
|
|
|
|
+ MessageBoardDTO messageBoardDTO = messageBoardService.infoByHousingEstate(buildingInitDTO.getHousingEstateId());
|
|
|
|
+ if(messageBoardDTO != null ){
|
|
|
|
+ messageBoardService.deleteById(messageBoardDTO.getId());
|
|
|
|
+ }
|
|
});
|
|
});
|
|
}
|
|
}
|
|
//更新小区初始化状态为1
|
|
//更新小区初始化状态为1
|
|
@@ -177,6 +187,15 @@ public class ApiHousingEstateController {
|
|
//初始化小区信息
|
|
//初始化小区信息
|
|
housingEstateService.buildingInit(buildingInitDTOList);
|
|
housingEstateService.buildingInit(buildingInitDTOList);
|
|
|
|
|
|
|
|
+ //初始化小区留言板
|
|
|
|
+ MessageBoardDTO messageBoardDTO = messageBoardService.infoByHousingEstate(buildingInitDTOList.get(0).getHousingEstateId());
|
|
|
|
+ if(messageBoardDTO == null ){
|
|
|
|
+ messageBoardDTO = new MessageBoardDTO();
|
|
|
|
+ messageBoardDTO.setHousingEstateId(buildingInitDTOList.get(0).getHousingEstateId());
|
|
|
|
+ messageBoardDTO.setName(housingEstateDTO==null?"小区留言板":housingEstateDTO.getName()+"-小区留言板");
|
|
|
|
+ messageBoardService.save(messageBoardDTO);
|
|
|
|
+ }
|
|
|
|
+
|
|
return new Result();
|
|
return new Result();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -186,6 +205,11 @@ public class ApiHousingEstateController {
|
|
public Result cleanAll(@RequestBody Long housingEstateId) {
|
|
public Result cleanAll(@RequestBody Long housingEstateId) {
|
|
|
|
|
|
housingEstateService.cleanAll(housingEstateId);
|
|
housingEstateService.cleanAll(housingEstateId);
|
|
|
|
+ //删除小区留言板
|
|
|
|
+ MessageBoardDTO messageBoardDTO = messageBoardService.infoByHousingEstate(housingEstateId);
|
|
|
|
+ if(messageBoardDTO != null ){
|
|
|
|
+ messageBoardService.deleteById(messageBoardDTO.getId());
|
|
|
|
+ }
|
|
|
|
|
|
return new Result();
|
|
return new Result();
|
|
}
|
|
}
|