1、修改app端添加房间逻辑

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/LedgerRoomController.java

@@ -2,12 +2,19 @@ package com.censoft.censoftrongtong.controller;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.censoft.censoftrongtong.domain.LedgerFloor;
 import com.censoft.censoftrongtong.domain.LedgerRoom;
+import com.censoft.censoftrongtong.service.ILedgerFloorService;
 import com.censoft.censoftrongtong.service.ILedgerRoomService;
+import com.censoft.censoftrongtong.service.IRiskPlanInherentListService;
 import com.ruoyi.common.core.domain.R;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +45,9 @@ public class LedgerRoomController extends BaseController {
     @Autowired
     private ILedgerRoomService ledgerRoomService;
 
+    @Resource
+    private IRiskPlanInherentListService riskPlanInherentListService;
+
     /**
      * 查询基础数据-楼层列表
      */
@@ -114,12 +124,22 @@ public class LedgerRoomController extends BaseController {
     @Log(title = "基础数据-楼层", businessType = BusinessType.UPDATE)
     @PostMapping("/update/batch")
     public AjaxResult edit(@RequestBody List<LedgerRoom> ledgerRooms,Long floorId) {
-        ledgerRoomService.remove(Wrappers.<LedgerRoom>lambdaUpdate().eq(LedgerRoom::getFloorId, floorId));
-        ledgerRooms.forEach(item -> item.setId(null));
-        if(ledgerRooms==null || ledgerRooms.size()<=0){
-            return AjaxResult.success("保存成功");
+        //1、先把id不在ledgerRooms中的设置为删除
+        List<Long> ids = ledgerRooms.stream()
+                .map(LedgerRoom::getId)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+        LambdaQueryWrapper<LedgerRoom> wrapper = new LambdaQueryWrapper();
+        wrapper = wrapper.eq(LedgerRoom::getFloorId,floorId);
+        if (!ids.isEmpty()){
+            wrapper = wrapper.notIn(LedgerRoom::getId, ids);
         }
-        return toAjax(ledgerRoomService.saveBatch(ledgerRooms));
+        ledgerRoomService.remove(wrapper);
+
+        //2、更新或插入ledgerRooms中的数据
+        ledgerRooms.forEach(ledgerRoom -> ledgerRoom.setFloorId(floorId));
+        ledgerRoomService.saveOrUpdateBatch(ledgerRooms);
+        return toAjax(1);
     }
 
     /**