Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-vue-master into xjchen

censoft-rongtong/pom.xml

@@ -29,6 +29,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-framework</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
 
     </dependencies>
 

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

 package com.censoft.censoftrongtong.controller;
 
-import com.censoft.censoftrongtong.domain.LedgerBuilding;
-import com.censoft.censoftrongtong.domain.LedgerProject;
-import com.censoft.censoftrongtong.domain.RiskPlan;
+import com.censoft.censoftrongtong.domain.*;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
-import com.censoft.censoftrongtong.service.ILedgerBuildingService;
-import com.censoft.censoftrongtong.service.ILedgerProjectService;
-import com.censoft.censoftrongtong.service.IRiskPlanService;
+import com.censoft.censoftrongtong.service.*;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.R;
@@ -37,9 +34,18 @@ public class RiskPlanAppController extends BaseController {
     @Resource
     private ILedgerBuildingService ledgerBuildingService;
 
+    @Resource
+    private ILedgerFloorService ledgerFloorService;
+
+    @Resource
+    private ILedgerRoomService ledgerRoomService;
+
     @Resource
     private IRiskPlanService riskPlanService;
 
+    @Resource
+    private IRiskPlanInherentListService riskPlanInherentListService;
+
     /**
      * 获取自身部门及以下的项目
      *
@@ -57,11 +63,12 @@ public class RiskPlanAppController extends BaseController {
      * 获取项目下的楼宇
      *
      * @param projectId 项目id
+     * @param type 类型 地上、地下
      * @real_return {@link R<List<LedgerBuilding>>}
      */
     @GetMapping("/building/list/{projectId}")
-    public R<List<LedgerBuilding>> getBuildingListByProjectId(@PathVariable Long projectId){
-        return R.ok(ledgerBuildingService.getBuildingListByProjectId(projectId));
+    public R<List<LedgerBuilding>> getBuildingListByProjectId(@PathVariable("projectId") Long projectId,String type){
+        return R.ok(ledgerBuildingService.getBuildingListByProjectId(projectId,type));
     }
 
     /**
@@ -71,7 +78,7 @@ public class RiskPlanAppController extends BaseController {
      * @real_return {@link R<List<SysUser>>}
      */
     @GetMapping("/user/list/{projectId}")
-    public R<List<SysUser>> getUserListByProjectId(@PathVariable Long projectId){
+    public R<List<SysUser>> getUserListByProjectId(@PathVariable("projectId") Long projectId){
         return R.ok(ledgerProjectService.getUserListByProjectId(projectId));
     }
 
@@ -126,4 +133,52 @@ public class RiskPlanAppController extends BaseController {
     public R<RiskPlanAppDetailsDto> getRiskPlanAppDetailsDtoByPlanId(@PathVariable("planId") Long planId){
         return R.ok(riskPlanService.getRiskPlanAppDetailsDtoByPlanId(planId));
     }
+
+    /**
+     * 获取计划下的楼宇
+     *
+     * @param planId 项目id
+     * @real_return {@link R<List<LedgerBuilding>>}
+     */
+    @GetMapping("/plan/building/list/{planId}")
+    public R<List<LedgerBuilding>> getBuildingListByPlanId(@PathVariable("planId") Long planId){
+        return R.ok(riskPlanService.getBuildingListByPlanId(planId));
+    }
+
+    /**
+     * 根据楼宇id获取楼层列表
+     *
+     * @param buildingId 楼宇id
+     * @real_return {@link R<List<LedgerFloor>>}
+     */
+    @GetMapping("/floor/list/{buildingId}")
+    public R<List<LedgerFloor>> getFloorListByBuildingId(@PathVariable("buildingId") Long buildingId){
+        return R.ok(ledgerFloorService.getFloorListByBuildingId(buildingId));
+    }
+
+    /**
+     * 根据楼层id获取房间列表
+     *
+     * @param floorId 楼宇id
+     * @real_return {@link R<List<LedgerRoom>>}
+     */
+    @GetMapping("/room/list/{floorId}")
+    public R<List<LedgerRoom>> getRoomListByBuildingId(@PathVariable("floorId") Long floorId){
+        return R.ok(ledgerRoomService.getRoomListByBuildingId(floorId));
+    }
+
+    /**
+     * 根据计划id、楼宇id、楼层id、房间id获取房间列表
+     *
+     * @param planId 计划id
+     * @param buildingId 楼宇id
+     * @param floorId 楼层id
+     * @param roomId 房间id
+     * @real_return {@link R<List<LedgerRoom>>}
+     */
+    @GetMapping("/inherent/list/{planId}/{buildingId}")
+    public R<List<RiskPlanAppInherentListDto>> getInherentListByPlanId(@PathVariable("planId") Long planId
+            ,@PathVariable("buildingId") Long buildingId,Long floorId,Long roomId){
+        return R.ok(riskPlanInherentListService.getInherentListByPlanId(planId,buildingId, floorId, roomId));
+    }
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerRoom.java

 package com.censoft.censoftrongtong.domain;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -12,34 +14,43 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-06-26
  */
+@TableName("ledger_room")
 public class LedgerRoom extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 楼层id */
     @Excel(name = "楼层id")
+    @TableField("floor_id")
     private Long floorId;
 
     /** 房间名称 */
     @Excel(name = "房间名称")
+    @TableField("name")
     private String name;
 
     /** 房间编号 */
     @Excel(name = "房间编号")
+    @TableField("number")
     private String number;
 
     /** 房间面积 */
     @Excel(name = "房间面积")
+    @TableField("area")
     private BigDecimal area;
 
     /** 状态（0正常 1停用） */
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    @TableField("status")
     private String status;
 
     /** 删除标志（0代表存在 1代表删除） */
+    @TableField("del_flag")
+    @TableLogic
     private String delFlag;
 
     public void setId(Long id) 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanInherentList.java

 package com.censoft.censoftrongtong.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;

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

+package com.censoft.censoftrongtong.domain.dto;
+
+
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author 周昊
+ * @desc ...
+ * @date 2023-06-27 14:45:45
+ */
+@Data
+public class RiskPlanAppInherentListDto {
+    /** id */
+    private Long id;
+
+    /** 风险源名称 */
+    private String name;
+
+    /** 楼层id */
+    private Long floorId;
+
+    /** 楼层名称 */
+    private String floorName;
+
+    /** 房间id */
+    private Long roomId;
+
+    /** 房间名称 */
+    private String roomName;
+
+    /** 评估人id */
+    private Long userId;
+
+    /** 评估人名称 */
+    private String userName;
+
+    /** 评估人头像 */
+    private String avatar;
+}

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

 package com.censoft.censoftrongtong.domain.dto;
 
+
 import lombok.Data;
 
 import java.util.Date;

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

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -59,4 +60,6 @@ public interface LedgerBuildingMapper
      * @return 结果
      */
     public int deleteLedgerBuildingByIds(Long[] ids);
+
+    List<LedgerBuilding> getBuildingListByIds(@Param("ids") List<String> ids);
 }

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

 package com.censoft.censoftrongtong.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.censoft.censoftrongtong.domain.LedgerRoom;
 
 import java.util.List;
@@ -10,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface LedgerRoomMapper 
+public interface LedgerRoomMapper extends BaseMapper<LedgerRoom>
 {
     /**
      * 查询基础数据-楼层

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

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -59,4 +61,6 @@ public interface RiskPlanInherentListMapper
      * @return 结果
      */
     public int deleteRiskPlanInherentListByIds(Long[] ids);
+
+    List<RiskPlanAppInherentListDto> getInherentListByPlanId(@Param("planId") Long planId, @Param("buildingId") Long buildingId, @Param("floorId") Long floorId, @Param("roomId") Long roomId);
 }

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

@@ -60,5 +60,7 @@ public interface ILedgerBuildingService
      */
     public int deleteLedgerBuildingById(Long id);
 
-    List<LedgerBuilding> getBuildingListByProjectId(Long projectId);
+    List<LedgerBuilding> getBuildingListByProjectId(Long projectId,String type);
+
+    List<LedgerBuilding> getBuildingListByIds(List<String> ids);
 }

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

@@ -59,4 +59,6 @@ public interface ILedgerFloorService
      * @return 结果
      */
     public int deleteLedgerFloorById(Long id);
+
+    List<LedgerFloor> getFloorListByBuildingId(Long buildingId);
 }

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

 package com.censoft.censoftrongtong.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.censoft.censoftrongtong.domain.LedgerRoom;
 
 import java.util.List;
@@ -10,7 +11,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-06-26
  */
-public interface ILedgerRoomService 
+public interface ILedgerRoomService extends IService<LedgerRoom>
 {
     /**
      * 查询基础数据-楼层
@@ -59,4 +60,6 @@ public interface ILedgerRoomService
      * @return 结果
      */
     public int deleteLedgerRoomById(Long id);
+
+    List<LedgerRoom> getRoomListByBuildingId(Long floorId);
 }

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

 package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
 
 import java.util.List;
 
@@ -59,4 +60,6 @@ public interface IRiskPlanInherentListService
      * @return 结果
      */
     public int deleteRiskPlanInherentListById(Long id);
+
+    List<RiskPlanAppInherentListDto> getInherentListByPlanId(Long planId, Long buildingId, Long floorId, Long roomId);
 }

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

 package com.censoft.censoftrongtong.service;
 
+import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
@@ -68,4 +69,6 @@ public interface IRiskPlanService
     List<RiskPlanAppListDto> getRiskPlanAppListDtoList(List<RiskPlanStatusType> statusList, Long createUserId, Long leaderUserId);
 
     RiskPlanAppDetailsDto getRiskPlanAppDetailsDtoByPlanId(Long planId);
+
+    List<LedgerBuilding> getBuildingListByPlanId(Long planId);
 }

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

@@ -96,10 +96,16 @@ public class LedgerBuildingServiceImpl implements ILedgerBuildingService
     }
 
     @Override
-    public List<LedgerBuilding> getBuildingListByProjectId(Long projectId) {
+    public List<LedgerBuilding> getBuildingListByProjectId(Long projectId,String type) {
         LedgerBuilding query = new LedgerBuilding();
         query.setProjectId(projectId);
+        query.setType(type);
         query.setStatus("0");
         return selectLedgerBuildingList(query);
     }
+
+    @Override
+    public List<LedgerBuilding> getBuildingListByIds(List<String> ids) {
+        return ledgerBuildingMapper.getBuildingListByIds(ids);
+    }
 }

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

@@ -94,4 +94,12 @@ public class LedgerFloorServiceImpl implements ILedgerFloorService
     {
         return ledgerFloorMapper.deleteLedgerFloorById(id);
     }
+
+    @Override
+    public List<LedgerFloor> getFloorListByBuildingId(Long buildingId) {
+        LedgerFloor query = new LedgerFloor();
+        query.setBuildingId(buildingId);
+        query.setStatus("0");
+        return selectLedgerFloorList(query);
+    }
 }

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

@@ -2,6 +2,9 @@ package com.censoft.censoftrongtong.service.impl;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.LedgerRoom;
 import com.censoft.censoftrongtong.mapper.LedgerRoomMapper;
 import com.censoft.censoftrongtong.service.ILedgerRoomService;
@@ -16,8 +19,7 @@ import org.springframework.stereotype.Service;
  * @date 2023-06-26
  */
 @Service
-public class LedgerRoomServiceImpl implements ILedgerRoomService
-{
+public class LedgerRoomServiceImpl extends ServiceImpl<LedgerRoomMapper, LedgerRoom> implements ILedgerRoomService {
     @Autowired
     private LedgerRoomMapper ledgerRoomMapper;
 
@@ -94,4 +96,12 @@ public class LedgerRoomServiceImpl implements ILedgerRoomService
     {
         return ledgerRoomMapper.deleteLedgerRoomById(id);
     }
+
+    @Override
+    public List<LedgerRoom> getRoomListByBuildingId(Long floorId) {
+        LambdaQueryWrapper<LedgerRoom> wrapper = new LambdaQueryWrapper<LedgerRoom>()
+                .eq(LedgerRoom::getFloorId, floorId)
+                .eq(LedgerRoom::getStatus, "0");
+        return list(wrapper);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.censoft.censoftrongtong.service.impl;
 import java.util.List;
 
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
 import com.censoft.censoftrongtong.mapper.RiskPlanInherentListMapper;
 import com.censoft.censoftrongtong.service.IRiskPlanInherentListService;
 import com.ruoyi.common.utils.DateUtils;
@@ -94,4 +95,9 @@ public class RiskPlanInherentListServiceImpl implements IRiskPlanInherentListSer
     {
         return riskPlanInherentListMapper.deleteRiskPlanInherentListById(id);
     }
+
+    @Override
+    public List<RiskPlanAppInherentListDto> getInherentListByPlanId(Long planId, Long buildingId, Long floorId, Long roomId) {
+        return riskPlanInherentListMapper.getInherentListByPlanId(planId, buildingId, floorId, roomId);
+    }
 }

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

 package com.censoft.censoftrongtong.service.impl;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.RiskPlanTask;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
 import com.censoft.censoftrongtong.mapper.RiskPlanMapper;
+import com.censoft.censoftrongtong.service.ILedgerBuildingService;
 import com.censoft.censoftrongtong.service.IRiskPlanService;
 import com.censoft.censoftrongtong.service.IRiskPlanTaskService;
 import com.ruoyi.common.utils.DateUtils;
@@ -35,6 +34,9 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
     @Resource
     private IRiskPlanTaskService riskPlanTaskService;
 
+    @Resource
+    private ILedgerBuildingService ledgerBuildingService;
+
     /**
      * 查询风险计划
      *
@@ -171,6 +173,12 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
         return dto;
     }
 
+    @Override
+    public List<LedgerBuilding> getBuildingListByPlanId(Long planId) {
+        RiskPlan riskPlan = selectRiskPlanById(planId);
+        return ledgerBuildingService.getBuildingListByIds(Arrays.asList(riskPlan.getBuildingIds().split(",")));
+    }
+
     private String getNo() {
         Random random = new Random();
         int randomNumber = random.nextInt(1000); // 生成0到999之间的随机数

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

@@ -48,6 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectLedgerBuildingVo"/>
         where id = #{id}
     </select>
+    <select id="getBuildingListByIds"  resultMap="LedgerBuildingResult">
+        <include refid="selectLedgerBuildingVo"/>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 
     <insert id="insertLedgerBuilding" parameterType="com.censoft.censoftrongtong.domain.LedgerBuilding" useGeneratedKeys="true" keyProperty="id">
         insert into ledger_building

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

@@ -67,6 +67,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRiskPlanInherentListVo"/>
         where id = #{id}
     </select>
+    <select id="getInherentListByPlanId"
+            resultType="com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto">
+        SELECT
+            rpil.id,
+            rpil.`name`,
+            lf.id AS floorId,
+            lf.`name` AS floorName,
+            lr.id AS roomId,
+            lr.`name` AS roomName,
+            su.user_id AS userId,
+            su.nick_name AS userName,
+            su.avatar
+        FROM
+            risk_plan_inherent_list rpil
+                LEFT JOIN ledger_room lr ON lr.id = rpil.room_id
+                LEFT JOIN ledger_floor lf ON lf.id = floor_id
+                LEFT JOIN sys_user su ON su.user_id = rpil.user_id
+        <where>
+            <if test="planId != null"> AND rpil.plan_id = #{planId}</if>
+            <if test="buildingId != null"> AND lf.building_id = #{buildingId}</if>
+            <if test="floorId != null"> AND lf.id = #{floorId}</if>
+            <if test="roomId != null"> AND lr.id = #{roomId}</if>
+        </where>
+    </select>
 
     <insert id="insertRiskPlanInherentList" parameterType="com.censoft.censoftrongtong.domain.RiskPlanInherentList" useGeneratedKeys="true" keyProperty="id">
         insert into risk_plan_inherent_list

ruoyi-admin/src/main/resources/application.yml

@@ -116,6 +116,8 @@ mybatis-plus:
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件
 #  configLocation: classpath:mybatis/mybatis-config.xml
+  logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+  logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
 
 # PageHelper分页插件
 pagehelper: 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -19,27 +21,34 @@ public class BaseEntity implements Serializable
 
     /** 搜索值 */
     @JsonIgnore
+    @TableField(exist = false)
     private String searchValue;
 
     /** 创建者 */
+    @TableField("create_by")
     private String createBy;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("create_time")
     private Date createTime;
 
     /** 更新者 */
+    @TableField("update_by")
     private String updateBy;
 
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("update_time")
     private Date updateTime;
 
     /** 备注 */
+    @TableField("remark")
     private String remark;
 
     /** 请求参数 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
     private Map<String, Object> params;
 
     public String getSearchValue()