修改四色图添加房间

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

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.censoft.censoftrongtong.domain.LedgerRoom;
 import com.censoft.censoftrongtong.service.ILedgerRoomService;
 import com.ruoyi.common.core.domain.R;
@@ -27,14 +28,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 基础数据-楼层Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-06-26
  */
 @RestController
-@RequestMapping(value={"/app-api/ledger/room","/system/ledger/room"})
-public class LedgerRoomController extends BaseController
-{
+@RequestMapping(value = {"/app-api/ledger/room", "/system/ledger/room"})
+public class LedgerRoomController extends BaseController {
     @Autowired
     private ILedgerRoomService ledgerRoomService;
 
@@ -42,10 +42,9 @@ public class LedgerRoomController extends BaseController
      * 查询基础数据-楼层列表
      */
     @GetMapping("/list")
-    public AjaxResult list(LedgerRoom ledgerRoom)
-    {
+    public AjaxResult list(LedgerRoom ledgerRoom) {
         ledgerRoom.setDelFlag("0");
-        List<LedgerRoom> list =ledgerRoomService.selectLedgerRoomList(ledgerRoom);
+        List<LedgerRoom> list = ledgerRoomService.selectLedgerRoomList(ledgerRoom);
         return success(list);
     }
 
@@ -53,13 +52,13 @@ public class LedgerRoomController extends BaseController
      * 查询基础数据-楼层列表
      */
     @GetMapping("/listPc")
-    public TableDataInfo listPc(LedgerRoom ledgerRoom)
-    {
+    public TableDataInfo listPc(LedgerRoom ledgerRoom) {
         startPage();
         ledgerRoom.setDelFlag("0");
-        List<LedgerRoom> list =ledgerRoomService.selectLedgerRoomList(ledgerRoom);
+        List<LedgerRoom> list = ledgerRoomService.selectLedgerRoomList(ledgerRoom);
         return getDataTable(list);
     }
+
     /**
      * 根据楼层id获取房间列表
      *
@@ -76,8 +75,7 @@ public class LedgerRoomController extends BaseController
      */
     @Log(title = "基础数据-楼层", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, LedgerRoom ledgerRoom)
-    {
+    public void export(HttpServletResponse response, LedgerRoom ledgerRoom) {
         QueryWrapper<LedgerRoom> queryWrapper = new QueryWrapper<>();
         List<LedgerRoom> list = ledgerRoomService.list(queryWrapper);
         ExcelUtil<LedgerRoom> util = new ExcelUtil<LedgerRoom>(LedgerRoom.class);
@@ -88,8 +86,7 @@ public class LedgerRoomController extends BaseController
      * 获取基础数据-楼层详细信息
      */
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(ledgerRoomService.getById(id));
     }
 
@@ -98,8 +95,7 @@ public class LedgerRoomController extends BaseController
      */
     @Log(title = "基础数据-楼层", businessType = BusinessType.INSERT)
     @PostMapping(value = "/save")
-    public AjaxResult add(@RequestBody LedgerRoom ledgerRoom)
-    {
+    public AjaxResult add(@RequestBody LedgerRoom ledgerRoom) {
         return toAjax(ledgerRoomService.save(ledgerRoom));
     }
 
@@ -108,8 +104,7 @@ public class LedgerRoomController extends BaseController
      */
     @Log(title = "基础数据-楼层", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
-    public AjaxResult edit(@RequestBody LedgerRoom ledgerRoom)
-    {
+    public AjaxResult edit(@RequestBody LedgerRoom ledgerRoom) {
         return toAjax(ledgerRoomService.updateById(ledgerRoom));
     }
 
@@ -118,18 +113,18 @@ public class LedgerRoomController extends BaseController
      */
     @Log(title = "基础数据-楼层", businessType = BusinessType.UPDATE)
     @PostMapping("/update/batch")
-    public AjaxResult edit(@RequestBody List<LedgerRoom> ledgerRooms)
-    {
-        return toAjax(ledgerRoomService.updateBatchById(ledgerRooms));
+    public AjaxResult edit(@RequestBody List<LedgerRoom> ledgerRooms) {
+        ledgerRoomService.remove(Wrappers.<LedgerRoom>lambdaUpdate().eq(LedgerRoom::getFloorId, ledgerRooms.get(0).getFloorId()));
+        ledgerRooms.forEach(item -> item.setId(null));
+        return toAjax(ledgerRoomService.saveBatch(ledgerRooms));
     }
 
     /**
      * 删除基础数据-楼层
      */
     @Log(title = "基础数据-楼层", businessType = BusinessType.DELETE)
-	@PostMapping("/delete/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @PostMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         QueryWrapper<LedgerRoom> queryWrapper = new QueryWrapper<>();
         queryWrapper.in("id", Arrays.asList(ids));
         ledgerRoomService.remove(queryWrapper);