1、修改pc端房间管理页面接口

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

@@ -9,23 +9,14 @@ 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.domain.dto.LedgerRoomDto;
 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;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -62,10 +53,12 @@ public class LedgerRoomController extends BaseController {
      * 查询基础数据-楼层列表
      */
     @GetMapping("/listPc")
-    public TableDataInfo listPc(LedgerRoom ledgerRoom) {
+    public TableDataInfo listPc(LedgerRoomDto ledgerRoomDto) {
         startPage();
-        ledgerRoom.setDelFlag("0");
-        List<LedgerRoom> list = ledgerRoomService.selectLedgerRoomList(ledgerRoom);
+        if (ledgerRoomDto.getDeptId() == null){
+            ledgerRoomDto.setDeptId(getDeptId());
+        }
+        List<LedgerRoomDto> list = ledgerRoomService.selectLedgerRoomDtoList(ledgerRoomDto);
         return getDataTable(list);
     }
 
@@ -85,10 +78,12 @@ public class LedgerRoomController extends BaseController {
      */
     @Log(title = "基础数据-楼层", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    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);
+    public void export(HttpServletResponse response, LedgerRoomDto ledgerRoomDto) {
+        if (ledgerRoomDto.getDeptId() == null){
+            ledgerRoomDto.setDeptId(getDeptId());
+        }
+        List<LedgerRoomDto> list = ledgerRoomService.selectLedgerRoomDtoList(ledgerRoomDto);
+        ExcelUtil<LedgerRoomDto> util = new ExcelUtil<LedgerRoomDto>(LedgerRoomDto.class);
         util.exportExcel(response, list, "基础数据-楼层数据");
     }
 
@@ -157,4 +152,15 @@ public class LedgerRoomController extends BaseController {
         ledgerRoomService.remove(queryWrapper);
         return AjaxResult.success();
     }
+
+    /**
+     * 删除基础数据-楼层
+     */
+    @Log(title = "基础数据-楼层", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult removeIds(@PathVariable Long[] ids)
+    {
+        ledgerRoomService.deleteRoomByRoomIds(Arrays.asList(ids));
+        return AjaxResult.success();
+    }
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/LedgerRoomDto.java

+package com.censoft.censoftrongtong.domain.dto;
+
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 基础数据-楼层对象 ledger_floor
+ *
+ * @author ruoyi
+ * @date 2023-06-26
+ */
+@Data
+public class LedgerRoomDto {
+
+    private Long id;
+
+    /** 所属区域id */
+    private Long deptId;
+
+    /** 所属区域名称 */
+    @Excel(name = "所属区域",sort = 1)
+    private String deptName;
+
+    /** 项目id */
+    private Long projectId;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称",sort = 2)
+    private String projectName;
+
+    /** 楼宇id */
+    private Long buildingId;
+
+    /** 楼宇名称 */
+    @Excel(name = "楼宇名称",sort = 3)
+    private String buildingName;
+
+    /** 楼层id */
+    private Long floorId;
+
+    /** 楼层名称 */
+    @Excel(name = "楼层名称",sort = 4)
+    private String floorName;
+
+    /** 房间名称 */
+    @Excel(name = "房间名称",sort = 5)
+    private String name;
+
+    /** 房屋类型 */
+    @Excel(name = "房屋类型",sort = 6)
+    private String roomType;
+
+    /** 状态（0正常 1停用） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用",sort = 7)
+    private String status;
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerRoomMapper.java

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.LedgerRoom;
+import com.censoft.censoftrongtong.domain.dto.LedgerRoomDto;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,4 +32,6 @@ public interface LedgerRoomMapper extends MPJBaseMapper<LedgerRoom>
     String getLevelColorByRoomId(@Param("roomId") Long roomId);
 
     void deleteRoomByRoomIds(@Param("targetRoomIds") List<Long> targetRoomIds);
+
+    List<LedgerRoomDto> selectLedgerRoomDtoList(LedgerRoomDto ledgerRoomDto);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerRoomService.java

 package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.LedgerRoom;
+import com.censoft.censoftrongtong.domain.dto.LedgerRoomDto;
 import com.github.yulichang.base.MPJBaseService;
 import com.ruoyi.common.core.domain.model.LoginUser;
 
@@ -33,4 +34,6 @@ public interface ILedgerRoomService extends MPJBaseService<LedgerRoom>
     void deleteRoomByRoomIds(List<Long> targetRoomIds);
 
     Long copyRoom(LedgerRoom ledgerRoom, LoginUser loginUser, Long planId);
+
+    List<LedgerRoomDto> selectLedgerRoomDtoList(LedgerRoomDto ledgerRoomDto);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerRoomServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.censoft.censoftrongtong.domain.LedgerRoom;
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.censoft.censoftrongtong.domain.dto.LedgerRoomDto;
 import com.censoft.censoftrongtong.mapper.LedgerRoomMapper;
 import com.censoft.censoftrongtong.service.ILedgerRoomService;
 import com.censoft.censoftrongtong.service.IRiskPlanExistingListService;
@@ -101,6 +102,11 @@ public class LedgerRoomServiceImpl extends MPJBaseServiceImpl<LedgerRoomMapper,
         return ledgerRoom.getId();
     }
 
+    @Override
+    public List<LedgerRoomDto> selectLedgerRoomDtoList(LedgerRoomDto ledgerRoomDto) {
+        return ledgerRoomMapper.selectLedgerRoomDtoList(ledgerRoomDto);
+    }
+
     private String getLevelColorByRoomId(Long roomId) {
         String level = ledgerRoomMapper.getLevelColorByRoomId(roomId);
         if (StrUtil.isBlank(level)) {return "#F0F1F5";}

censoft-rongtong/src/main/resources/mapper/system/LedgerRoomMapper.xml

@@ -56,14 +56,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sdd.dict_sort DESC
             LIMIT 1
     </select>
+    <select id="selectLedgerRoomDtoList" resultType="com.censoft.censoftrongtong.domain.dto.LedgerRoomDto">
+        SELECT
+            lr.id,
+            sd.dept_id AS deptId,
+            sd.dept_name AS deptName,
+            lp.id AS projectId,
+            lp.`name` AS projectName,
+            lb.id AS buildingId,
+            lb.`name` AS buildingName,
+            lf.id AS floorId,
+            lf.`name` AS floorName,
+            lr.`name`,
+            lr.room_type AS roomType,
+            lr.`status` AS `status`
+        FROM
+            ledger_room lr
+                LEFT JOIN ledger_floor lf ON lf.id = lr.floor_id
+                LEFT JOIN ledger_building lb ON lb.id = lf.building_id
+                LEFT JOIN ledger_project lp ON lp.id = lb.project_id
+                LEFT JOIN sys_dept sd ON sd.dept_id = lp.dept_id
+        <where>
+            <if test="projectName != null "> and lp.name like concat('%', #{projectName}, '%') </if>
+            <if test="buildingName != null "> and lb.name like concat('%', #{buildingName}, '%') </if>
+            <if test="floorName != null "> and lf.name like concat('%', #{floorName}, '%') </if>
+            <if test="name != null  and name != ''"> and lr.name like concat('%', #{name}, '%')</if>
+            <if test="roomType != null  and roomType != ''"> and lr.room_type like concat('%', #{roomType}, '%')</if>
+            <if test="deptId != null "> and ( sd.dept_id = #{deptId} or find_in_set(#{deptId},sd.ancestors) )</if>
+            <if test="status != null  and status != ''"> and lr.status = #{status}</if>
+            and lr.del_flag = '0'
+        </where>
+    </select>
 
 
     <delete id="deleteLedgerRoomById" parameterType="Long">
-        delete from ledger_room where id = #{id}
+        update ledger_room set del_flag = '1' where id = #{id}
     </delete>
 
     <delete id="deleteLedgerRoomByIds" parameterType="String">
-        delete from ledger_room where id in
+        update ledger_room set del_flag = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>