Merge branch 'xjchen' into 'develop'

固有风险编辑和现有风险编辑详情和删除接口20230719

See merge request !15

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

@@ -11,6 +11,7 @@ import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysUploadFileService;
@@ -345,6 +346,9 @@ public class RiskPlanAppController extends BaseController {
                     .filter(multipartFile -> !multipartFile.isEmpty())
                     .map(multipartFile -> uploadFileService.upload(multipartFile, RuoYiConfig.getUploadPath(), userId, serverAddress).toString())
                     .collect(Collectors.joining(","));
+            if (StringUtils.isNotEmpty(saveDto.getPictureFileIds())) {//编辑信息附件存在拼接
+             pictureFileIds=saveDto.getPictureFileIds()+","+pictureFileIds;
+            }
             saveDto.setPictureFileIds(pictureFileIds);
         }
 
@@ -354,6 +358,9 @@ public class RiskPlanAppController extends BaseController {
                     .filter(multipartFile -> !multipartFile.isEmpty())
                     .map(multipartFile -> uploadFileService.upload(multipartFile, RuoYiConfig.getUploadPath(), userId, serverAddress).toString())
                     .collect(Collectors.joining(","));
+            if (StringUtils.isNotEmpty(saveDto.getMeasuresProjectFileIds())) {//编辑信息附件存在拼接
+                measuresProjectFileIds=saveDto.getMeasuresProjectFileIds()+","+measuresProjectFileIds;
+            }
             saveDto.setMeasuresProjectFileIds(measuresProjectFileIds);
         }
 
@@ -363,6 +370,9 @@ public class RiskPlanAppController extends BaseController {
                     .filter(multipartFile -> !multipartFile.isEmpty())
                     .map(multipartFile -> uploadFileService.upload(multipartFile, RuoYiConfig.getUploadPath(), userId, serverAddress).toString())
                     .collect(Collectors.joining(","));
+            if (StringUtils.isNotEmpty(saveDto.getMeasuresAdministrationFileIds())) {//编辑信息附件存在拼接
+                measuresAdministrationFileIds=saveDto.getMeasuresAdministrationFileIds()+","+measuresAdministrationFileIds;
+            }
             saveDto.setMeasuresAdministrationFileIds(measuresAdministrationFileIds);
         }
 
@@ -372,6 +382,9 @@ public class RiskPlanAppController extends BaseController {
                     .filter(multipartFile -> !multipartFile.isEmpty())
                     .map(multipartFile -> uploadFileService.upload(multipartFile, RuoYiConfig.getUploadPath(), userId, serverAddress).toString())
                     .collect(Collectors.joining(","));
+            if (StringUtils.isNotEmpty(saveDto.getMeasuresEmergencyFileIds())) {//编辑信息附件存在拼接
+                measuresEmergencyFileIds=saveDto.getMeasuresEmergencyFileIds()+","+measuresEmergencyFileIds;
+            }
             saveDto.setMeasuresEmergencyFileIds(measuresEmergencyFileIds);
         }
 
@@ -433,6 +446,9 @@ public class RiskPlanAppController extends BaseController {
                     .filter(multipartFile -> !multipartFile.isEmpty())
                     .map(multipartFile -> uploadFileService.upload(multipartFile, RuoYiConfig.getUploadPath(), userId, serverAddress).toString())
                     .collect(Collectors.joining(","));
+            if (StringUtils.isNotEmpty(saveDto.getPictureFileIds())) {//编辑信息附件存在拼接
+                pictureFileIds=saveDto.getPictureFileIds()+","+pictureFileIds;
+            }
             saveDto.setPictureFileIds(pictureFileIds);
         }
 
@@ -442,6 +458,9 @@ public class RiskPlanAppController extends BaseController {
                     .filter(multipartFile -> !multipartFile.isEmpty())
                     .map(multipartFile -> uploadFileService.upload(multipartFile, RuoYiConfig.getUploadPath(), userId, serverAddress).toString())
                     .collect(Collectors.joining(","));
+            if (StringUtils.isNotEmpty(saveDto.getMeasuresProjectFileIds())) {//编辑信息附件存在拼接
+                measuresProjectFileIds=saveDto.getMeasuresProjectFileIds()+","+measuresProjectFileIds;
+            }
             saveDto.setMeasuresProjectFileIds(measuresProjectFileIds);
         }
 
@@ -451,6 +470,9 @@ public class RiskPlanAppController extends BaseController {
                     .filter(multipartFile -> !multipartFile.isEmpty())
                     .map(multipartFile -> uploadFileService.upload(multipartFile, RuoYiConfig.getUploadPath(), userId, serverAddress).toString())
                     .collect(Collectors.joining(","));
+            if (StringUtils.isNotEmpty(saveDto.getMeasuresAdministrationFileIds())) {//编辑信息附件存在拼接
+                measuresAdministrationFileIds=saveDto.getMeasuresAdministrationFileIds()+","+measuresAdministrationFileIds;
+            }
             saveDto.setMeasuresAdministrationFileIds(measuresAdministrationFileIds);
         }
 
@@ -460,12 +482,38 @@ public class RiskPlanAppController extends BaseController {
                     .filter(multipartFile -> !multipartFile.isEmpty())
                     .map(multipartFile -> uploadFileService.upload(multipartFile, RuoYiConfig.getUploadPath(), userId, serverAddress).toString())
                     .collect(Collectors.joining(","));
+            if (StringUtils.isNotEmpty(saveDto.getMeasuresEmergencyFileIds())) {//编辑信息附件存在拼接
+                measuresEmergencyFileIds=saveDto.getMeasuresEmergencyFileIds()+","+measuresEmergencyFileIds;
+            }
             saveDto.setMeasuresEmergencyFileIds(measuresEmergencyFileIds);
         }
 
         return R.ok(riskPlanExistingListService.saveRiskExistingListSaveDto(saveDto));
     }
 
+
+    /**
+     * 获取现有风险详情
+     *
+     * @param existingId 现有风险风id
+     * @real_return {@link R<RiskPlanAppExistingListDetailsDto>}
+     */
+    @GetMapping("/existing/details/{existingId}")
+    public R<RiskPlanAppExistingListDetailsDto> getRiskPlanAppExistingListDetailsDtoByExistingId(@PathVariable("existingId") Long existingId) {
+        return R.ok(riskPlanExistingListService.getRiskPlanAppExistingListDetailsDtoByExistingId(existingId));
+    }
+
+    /**
+     * 获取现有风险删除
+     *
+     * @param existingId 现有风险id
+     * @real_return {@link R<Boolean>}
+     */
+    @GetMapping("/existing/delete/{existingId}")
+    public R<Boolean>   deleteRiskPlanAppExistingByExistingId(@PathVariable("existingId") Long existingId) {
+        return R.ok(riskPlanExistingListService.removeById(existingId));
+    }
+
     /**
      * 风险评估-任务完成
      *

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

+package com.censoft.censoftrongtong.domain.dto;
+
+
+import com.ruoyi.system.domain.SysUploadFile;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author cxj
+ * @desc ...
+ * @date 2023-07-219 14:45:45
+ */
+@Data
+public class RiskPlanAppExistingListDetailsDto {
+    /** id */
+    private Long id;
+
+    /** 评估人id */
+    private Long userId;
+
+    /** 评估人名称 */
+    private String userName;
+
+    /**固定风险ID */
+    private String inherentId;
+
+    /** 计划id */
+    private Long planId;
+
+    /** 项目id */
+    private Long projectId;
+
+    /** 项目名称 */
+    private String projectName;
+
+    /** 楼栋ids */
+    private String buildingId;
+
+    /** 楼栋名称 */
+    private String buildingName;
+
+    /** 楼层id */
+    private Long floorId;
+
+    /** 楼层名称 */
+    private String floorName;
+
+    /** 房间id */
+    private Long roomId;
+
+    /** 房间名称 */
+    private String roomName;
+
+    /** 风险源名称 */
+    private String name;
+
+
+    /** 风险因素 */
+    private String factor;
+
+    /** 准事故类型 */
+    private String type;
+
+    /** 风险等级 */
+    private String level;
+
+    /** 存在部位 */
+    private String presenceLocation;
+
+    /** 风险源照片id */
+    private String pictureFileIds;
+
+    /** 风险源照片 */
+    private List<SysUploadFile> pictureFile;
+
+    /** 工程技术措施 */
+    private String measuresProject;
+
+    /** 工程技术措施附件 */
+    private String measuresProjectFileIds;
+
+    /** 工程技术措施附件 */
+    private List<SysUploadFile> measuresProjectFile;
+
+    /** 应采取的管理措施 */
+    private String measuresAdministration;
+
+    /**
+     * 管控责任单位id
+     */
+    private Long measuresDeptId;
+
+    /**
+     * 管控责任单位
+     */
+    private String measuresDeptName;
+
+    /**
+     * 管控责任人id
+     */
+    private Long measuresUserId;
+
+    /**
+     * 管控责任人
+     */
+    private String measuresUserName;
+
+    /** 管理措施附件 */
+    private String measuresAdministrationFileIds;
+
+    /** 管理措施附件 */
+    private List<SysUploadFile> measuresAdministrationFile;
+
+
+    /** 应急处置措施 */
+    private String measuresEmergency;
+
+    /** 应急处置措施附件 */
+    private String measuresEmergencyFileIds;
+
+    /** 应急处置措施附件 */
+    private List<SysUploadFile> measuresEmergencyFile;
+
+    /** 参考依据 */
+    private String referenceBasis;
+}

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

@@ -2,6 +2,9 @@ package com.censoft.censoftrongtong.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 现有风险清单库Mapper接口
@@ -11,4 +14,6 @@ import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
  */
 public interface RiskPlanExistingListMapper extends BaseMapper<RiskPlanExistingList> {
 
+    RiskPlanAppExistingListDetailsDto getRiskPlanAppExistingListDetailsDtoByExistingId(@Param("existingId") Long existingId);
+
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
 import com.censoft.censoftrongtong.domain.dto.RiskExistingListSaveDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
 
 import java.util.List;
 
@@ -16,4 +18,5 @@ import java.util.List;
 public interface IRiskPlanExistingListService  extends IService<RiskPlanExistingList>
 {
     Boolean saveRiskExistingListSaveDto(RiskExistingListSaveDto saveDto);
+    RiskPlanAppExistingListDetailsDto getRiskPlanAppExistingListDetailsDtoByExistingId(Long existingId);
 }

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

 package com.censoft.censoftrongtong.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
 import com.censoft.censoftrongtong.domain.dto.RiskExistingListSaveDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
 import com.censoft.censoftrongtong.mapper.RiskPlanExistingListMapper;
 import com.censoft.censoftrongtong.service.IRiskPlanExistingListService;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.service.ISysUploadFileService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 现有风险清单库Service业务层处理
@@ -25,10 +33,48 @@ public class RiskPlanExistingListServiceImpl
     @Autowired
     private RiskPlanExistingListMapper riskPlanExistingListMapper;
 
+    @Resource
+    private ISysUploadFileService uploadFileService;
+
+    @Override
+    public RiskPlanAppExistingListDetailsDto getRiskPlanAppExistingListDetailsDtoByExistingId(Long existingId) {
+        RiskPlanAppExistingListDetailsDto dto =  riskPlanExistingListMapper.getRiskPlanAppExistingListDetailsDtoByInherentId(existingId);
+
+        //风险源照片
+        if (!StrUtil.hasEmpty(dto.getPictureFileIds())) {
+            List<Long> fileIds = Arrays.stream(dto.getPictureFileIds().split(","))
+                    .map(Long::parseLong)
+                    .collect(Collectors.toList());
+            dto.setPictureFile(uploadFileService.selectSysFileByFileIds(fileIds));
+        }
+        //工程技术措施附件
+        if (!StrUtil.hasEmpty(dto.getMeasuresProjectFileIds())) {
+            List<Long> fileIds = Arrays.stream(dto.getMeasuresProjectFileIds().split(","))
+                    .map(Long::parseLong)
+                    .collect(Collectors.toList());
+            dto.setMeasuresProjectFile(uploadFileService.selectSysFileByFileIds(fileIds));
+        }
+        //管理措施附件
+        if (!StrUtil.hasEmpty(dto.getMeasuresAdministrationFileIds())) {
+            List<Long> fileIds = Arrays.stream(dto.getMeasuresAdministrationFileIds().split(","))
+                    .map(Long::parseLong)
+                    .collect(Collectors.toList());
+            dto.setMeasuresAdministrationFile(uploadFileService.selectSysFileByFileIds(fileIds));
+        }
+        //应急处置措施附件
+        if (!StrUtil.hasEmpty(dto.getMeasuresEmergencyFileIds())) {
+            List<Long> fileIds = Arrays.stream(dto.getMeasuresEmergencyFileIds().split(","))
+                    .map(Long::parseLong)
+                    .collect(Collectors.toList());
+            dto.setMeasuresEmergencyFile(uploadFileService.selectSysFileByFileIds(fileIds));
+        }
+        return dto;
+    }
+
     @Override
     public Boolean saveRiskExistingListSaveDto(RiskExistingListSaveDto saveDto) {
         RiskPlanExistingList existingList = new RiskPlanExistingList();
         BeanUtils.copyProperties(saveDto, existingList);
-        return save(existingList);
+        return saveOrUpdate(existingList);
     }
 }

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

@@ -57,8 +57,7 @@ public class RiskPlanInherentListServiceImpl
      * @param riskPlanInherentList 固有风险清单库
      * @return 结果
      */
-    @Override
-    public boolean save(RiskPlanInherentList riskPlanInherentList) {
+    public boolean saveInherent(RiskPlanInherentList riskPlanInherentList) {
         /**
          * 解题思路
          * 1.判断当前任务状态是否待执行状态
@@ -184,7 +183,7 @@ public class RiskPlanInherentListServiceImpl
     public Boolean saveRiskInherentListSaveDto(RiskInherentListSaveDto saveDto) {
         RiskPlanInherentList inherentList = new RiskPlanInherentList();
         BeanUtils.copyProperties(saveDto, inherentList);
-        return save(inherentList);
+        return saveInherent(inherentList);
     }
 
     @Override

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

@@ -3,6 +3,56 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.censoft.censoftrongtong.mapper.RiskPlanExistingListMapper">
+
+    <select id="getRiskPlanAppExistingListDetailsDtoByExistingId"
+            resultType="com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDetailsDto">
+        SELECT
+        rpil.id,
+        su.user_id AS userId,
+        su.nick_name AS userName,
+        rpil.inherent_id AS inherentId,
+        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.id AS roomId,
+        lr.`name` AS roomName,
+        rpil.plan_id AS planId,
+        rpil.`name`,
+        rpil.point_type as pointType,
+        rpil.factor,
+        rpil.type,
+        rpil.`level`,
+        rpil.`risk_likelihood`,
+        rpil.`risk_severity`,
+        rpil.presence_location AS presenceLocation,
+        rpil.picture_file_ids AS pictureFileIds,
+        rpil.measures_project AS measuresProject,
+        rpil.measures_project_file_ids AS measuresProjectFileIds,
+        rpil.measures_administration AS measuresAdministration,
+        sd.dept_id as measuresDeptId,
+        sd.dept_name as measuresDeptName,
+        su2.user_id AS measuresUserId,
+        su2.nick_name AS measuresUserName,
+        rpil.measures_administration_file_ids AS measuresAdministrationFileIds,
+        rpil.measures_emergency AS measuresEmergency,
+        rpil.measures_emergency_file_ids AS measuresEmergencyFileIds,
+        rpil.reference_basis AS referenceBasis
+        FROM
+        risk_plan_existing_list rpil
+        LEFT JOIN sys_user su ON su.user_id = rpil.user_id
+        LEFT JOIN risk_plan rp ON rp.id = rpil.plan_id
+        LEFT JOIN ledger_project lp ON lp.id = rp.project_id
+        LEFT JOIN ledger_room lr ON lr.id = rpil.room_id
+        LEFT JOIN ledger_floor lf ON lf.id = lr.floor_id
+        LEFT JOIN ledger_building lb ON lb.id = lf.building_id
+        LEFT JOIN sys_dept sd ON sd.dept_id = rpil.measures_dept_id
+        LEFT JOIN sys_user su2 ON su2.user_id = rpil.measures_user_id
+        WHERE
+        rpil.id = #{existingId}
+    </select>
     
 
 </mapper>
\ No newline at end of file