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

censoft-rongtong/pom.xml

@@ -34,6 +34,13 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
+        <!-- hutool 常用工具类包 -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.5</version>
+        </dependency>
+
     </dependencies>
 
 </project>

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

+package com.censoft.censoftrongtong.domain.dto;
+
+import lombok.Data;
+
+/**
+ * 固有风险清单库对象 risk_inherent_list
+ * 
+ * @author ruoyi
+ * @date 2023-06-26
+ */
+@Data
+public class RiskExistingListSaveDto {
+
+    /** id */
+    private Long id;
+
+    /** 评估人id */
+    private Long userId;
+
+    /** 房间id */
+    private Long roomId;
+
+    /** 计划id */
+    private Long planId;
+
+    /** 风险源名称 */
+    private String name;
+
+    /** 风险因素 */
+    private String factor;
+
+    /** 事故类型 */
+    private String type;
+
+    /** 风险等级 */
+    private String level;
+
+    /** 风险描述 */
+    private String describe;
+
+    /** 风险源照片id */
+    private String pictureFileIds;
+
+    /** 工程技术措施 */
+    private String measuresProject;
+
+    /** 工程技术措施附件 */
+    private String measuresProjectFileIds;
+
+    /** 管理措施 */
+    private String measuresAdministration;
+
+    /** 管理措施附件 */
+    private String measuresAdministrationFileIds;
+
+    /** 应急处置措施 */
+    private String measuresEmergency;
+
+    /** 应急处置措施附件 */
+    private String measuresEmergencyFileIds;
+
+    /** 参考依据 */
+    private String referenceBasis;
+}

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

+package com.censoft.censoftrongtong.domain.dto;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 固有风险清单库对象 risk_inherent_list
+ * 
+ * @author ruoyi
+ * @date 2023-06-26
+ */
+@Data
+public class RiskInherentListSaveDto{
+
+    /** id */
+    private Long id;
+
+    /** 评估人id */
+    private Long userId;
+
+    /** 房间id */
+    private Long roomId;
+
+    /** 计划id */
+    private Long planId;
+
+    /** 风险源名称 */
+    private String name;
+
+    /** 风险因素 */
+    private String factor;
+
+    /** 事故类型 */
+    private String type;
+
+    /** 风险等级 */
+    private String level;
+
+    /** 存在部位 */
+    private String presenceLocation;
+
+    /** 风险源照片id */
+    private String pictureFileIds;
+
+    /** 工程技术措施 */
+    private String measuresProject;
+
+    /** 工程技术措施附件 */
+    private String measuresProjectFileIds;
+
+    /** 管理措施 */
+    private String measuresAdministration;
+
+    /** 管理措施附件 */
+    private String measuresAdministrationFileIds;
+
+    /** 应急处置措施 */
+    private String measuresEmergency;
+
+    /** 应急处置措施附件 */
+    private String measuresEmergencyFileIds;
+
+    /** 参考依据 */
+    private String referenceBasis;
+}

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

+package com.censoft.censoftrongtong.domain.dto;
+
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+
+/**
+ * @author 周昊
+ * @desc ...
+ * @date 2023-06-27 14:45:45
+ */
+@Data
+public class RiskPlanAppApproveDto {
+    /** id */
+    private Long id;
+
+    /** 经办结果 */
+    private String taskResult;
+
+    /** 经办意见 */
+    private String taskOpinion;
+}

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

+package com.censoft.censoftrongtong.domain.dto;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author 周昊
+ * @desc ...
+ * @date 2023-06-27 14:45:45
+ */
+@Data
+public class RiskPlanAppExistingListDto {
+    /** id */
+    private Long id;
+
+    /** 风险源名称 */
+    private String name;
+
+    /** 风险系数 */
+    private String coefficient;
+
+    /** 创建时间 */
+    private Date createTime;
+
+    /** 风险描述 */
+    private String describe;
+
+    /** 评估人id */
+    private Long userId;
+
+    /** 评估人名称 */
+    private String userName;
+
+    /** 评估人头像 */
+    private String avatar;
+}

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

+package com.censoft.censoftrongtong.domain.dto;
+
+
+import com.ruoyi.system.domain.SysUploadFile;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 周昊
+ * @desc ...
+ * @date 2023-06-27 14:45:45
+ */
+@Data
+public class RiskPlanAppInherentListDetailsDto {
+    /** id */
+    private Long id;
+
+    /** 评估人id */
+    private Long userId;
+
+    /** 评估人名称 */
+    private String userName;
+
+    /** 项目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;
+
+    /** 管理措施附件 */
+    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/RiskPlanInherentListMapper.java

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
 import org.apache.ibatis.annotations.Param;
 
@@ -63,4 +65,8 @@ public interface RiskPlanInherentListMapper
     public int deleteRiskPlanInherentListByIds(Long[] ids);
 
     List<RiskPlanAppInherentListDto> getInherentListByPlanId(@Param("planId") Long planId, @Param("buildingId") Long buildingId, @Param("floorId") Long floorId, @Param("roomId") Long roomId);
+
+    RiskPlanAppInherentListDetailsDto getRiskPlanAppInherentListDetailsDtoByInherentId(@Param("inherentId") Long inherentId);
+
+    List<RiskPlanAppExistingListDto> getExistingListByInherentId(@Param("inherentId") Long inherentId);
 }

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

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.RiskPlanTask;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -59,4 +60,6 @@ public interface RiskPlanTaskMapper
      * @return 结果
      */
     public int deleteRiskPlanTaskByIds(Long[] ids);
+
+    RiskPlanTask getLastRiskPlanTaskByPlanId(@Param("id") Long id);
 }

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

 package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
+import com.censoft.censoftrongtong.domain.dto.RiskExistingListSaveDto;
 
 import java.util.List;
 
@@ -59,4 +60,6 @@ public interface IRiskPlanExistingListService
      * @return 结果
      */
     public int deleteRiskPlanExistingListById(Long id);
+
+    int saveRiskExistingListSaveDto(RiskExistingListSaveDto saveDto);
 }

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.RiskInherentListSaveDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
 
 import java.util.List;
@@ -62,4 +65,10 @@ public interface IRiskPlanInherentListService
     public int deleteRiskPlanInherentListById(Long id);
 
     List<RiskPlanAppInherentListDto> getInherentListByPlanId(Long planId, Long buildingId, Long floorId, Long roomId);
+
+    Integer saveRiskInherentListSaveDto(RiskInherentListSaveDto saveDto);
+
+    RiskPlanAppInherentListDetailsDto getRiskPlanAppInherentListDetailsDtoByInherentId(Long inherentId);
+
+    List<RiskPlanAppExistingListDto> getExistingListByInherentId(Long inherentId);
 }

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

@@ -2,6 +2,7 @@ package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppApproveDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
@@ -71,4 +72,8 @@ public interface IRiskPlanService
     RiskPlanAppDetailsDto getRiskPlanAppDetailsDtoByPlanId(Long planId);
 
     List<LedgerBuilding> getBuildingListByPlanId(Long planId);
+
+    int approveAppApproveDto(RiskPlanAppApproveDto appApproveDto);
+
+    int revokeByPlanId(Long planId, Long userId);
 }

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

@@ -59,4 +59,6 @@ public interface IRiskPlanTaskService
      * @return 结果
      */
     public int deleteRiskPlanTaskById(Long id);
+
+    RiskPlanTask getLastRiskPlanTaskByPlanId(Long id);
 }

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

@@ -3,9 +3,12 @@ package com.censoft.censoftrongtong.service.impl;
 import java.util.List;
 
 import com.censoft.censoftrongtong.domain.RiskPlanExistingList;
+import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.censoft.censoftrongtong.domain.dto.RiskExistingListSaveDto;
 import com.censoft.censoftrongtong.mapper.RiskPlanExistingListMapper;
 import com.censoft.censoftrongtong.service.IRiskPlanExistingListService;
 import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -94,4 +97,11 @@ public class RiskPlanExistingListServiceImpl implements IRiskPlanExistingListSer
     {
         return riskPlanExistingListMapper.deleteRiskPlanExistingListById(id);
     }
+
+    @Override
+    public int saveRiskExistingListSaveDto(RiskExistingListSaveDto saveDto) {
+        RiskPlanExistingList existingList = new RiskPlanExistingList();
+        BeanUtils.copyProperties(saveDto, existingList);
+        return insertRiskPlanExistingList(existingList);
+    }
 }

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

 package com.censoft.censoftrongtong.service.impl;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.util.StrUtil;
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.censoft.censoftrongtong.domain.dto.RiskInherentListSaveDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
 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;
+import com.ruoyi.system.service.ISysUploadFileService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import cn.hutool.core.date.DateUnit;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
 
 /**
  * 固有风险清单库Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2023-06-26
  */
 @Service
-public class RiskPlanInherentListServiceImpl implements IRiskPlanInherentListService
-{
+public class RiskPlanInherentListServiceImpl implements IRiskPlanInherentListService {
     @Autowired
     private RiskPlanInherentListMapper riskPlanInherentListMapper;
 
+    @Resource
+    private ISysUploadFileService uploadFileService;
+
     /**
      * 查询固有风险清单库
-     * 
+     *
      * @param id 固有风险清单库主键
      * @return 固有风险清单库
      */
     @Override
-    public RiskPlanInherentList selectRiskPlanInherentListById(Long id)
-    {
+    public RiskPlanInherentList selectRiskPlanInherentListById(Long id) {
         return riskPlanInherentListMapper.selectRiskPlanInherentListById(id);
     }
 
     /**
      * 查询固有风险清单库列表
-     * 
+     *
      * @param riskPlanInherentList 固有风险清单库
      * @return 固有风险清单库
      */
     @Override
-    public List<RiskPlanInherentList> selectRiskPlanInherentListList(RiskPlanInherentList riskPlanInherentList)
-    {
+    public List<RiskPlanInherentList> selectRiskPlanInherentListList(RiskPlanInherentList riskPlanInherentList) {
         return riskPlanInherentListMapper.selectRiskPlanInherentListList(riskPlanInherentList);
     }
 
     /**
      * 新增固有风险清单库
-     * 
+     *
      * @param riskPlanInherentList 固有风险清单库
      * @return 结果
      */
     @Override
-    public int insertRiskPlanInherentList(RiskPlanInherentList riskPlanInherentList)
-    {
+    public int insertRiskPlanInherentList(RiskPlanInherentList riskPlanInherentList) {
         riskPlanInherentList.setCreateTime(DateUtils.getNowDate());
         return riskPlanInherentListMapper.insertRiskPlanInherentList(riskPlanInherentList);
     }
 
     /**
      * 修改固有风险清单库
-     * 
+     *
      * @param riskPlanInherentList 固有风险清单库
      * @return 结果
      */
     @Override
-    public int updateRiskPlanInherentList(RiskPlanInherentList riskPlanInherentList)
-    {
+    public int updateRiskPlanInherentList(RiskPlanInherentList riskPlanInherentList) {
         riskPlanInherentList.setUpdateTime(DateUtils.getNowDate());
         return riskPlanInherentListMapper.updateRiskPlanInherentList(riskPlanInherentList);
     }
 
     /**
      * 批量删除固有风险清单库
-     * 
+     *
      * @param ids 需要删除的固有风险清单库主键
      * @return 结果
      */
     @Override
-    public int deleteRiskPlanInherentListByIds(Long[] ids)
-    {
+    public int deleteRiskPlanInherentListByIds(Long[] ids) {
         return riskPlanInherentListMapper.deleteRiskPlanInherentListByIds(ids);
     }
 
     /**
      * 删除固有风险清单库信息
-     * 
+     *
      * @param id 固有风险清单库主键
      * @return 结果
      */
     @Override
-    public int deleteRiskPlanInherentListById(Long id)
-    {
+    public int deleteRiskPlanInherentListById(Long id) {
         return riskPlanInherentListMapper.deleteRiskPlanInherentListById(id);
     }
 
@@ -100,4 +108,51 @@ public class RiskPlanInherentListServiceImpl implements IRiskPlanInherentListSer
     public List<RiskPlanAppInherentListDto> getInherentListByPlanId(Long planId, Long buildingId, Long floorId, Long roomId) {
         return riskPlanInherentListMapper.getInherentListByPlanId(planId, buildingId, floorId, roomId);
     }
+
+    @Override
+    public Integer saveRiskInherentListSaveDto(RiskInherentListSaveDto saveDto) {
+        RiskPlanInherentList inherentList = new RiskPlanInherentList();
+        BeanUtils.copyProperties(saveDto, inherentList);
+        return insertRiskPlanInherentList(inherentList);
+    }
+
+    @Override
+    public RiskPlanAppInherentListDetailsDto getRiskPlanAppInherentListDetailsDtoByInherentId(Long inherentId) {
+        RiskPlanAppInherentListDetailsDto dto = riskPlanInherentListMapper.getRiskPlanAppInherentListDetailsDtoByInherentId(inherentId);
+
+        //风险源照片
+        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 List<RiskPlanAppExistingListDto> getExistingListByInherentId(Long inherentId) {
+        return riskPlanInherentListMapper.getExistingListByInherentId(inherentId);
+    }
 }

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

@@ -7,6 +7,7 @@ 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.RiskPlanAppApproveDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
@@ -179,6 +180,69 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
         return ledgerBuildingService.getBuildingListByIds(Arrays.asList(riskPlan.getBuildingIds().split(",")));
     }
 
+    @Override
+    public int approveAppApproveDto(RiskPlanAppApproveDto appApproveDto) {
+        //获取最新的task
+        RiskPlanTask lastRiskPlanTask = riskPlanTaskService.getLastRiskPlanTaskByPlanId(appApproveDto.getId());
+        lastRiskPlanTask.setTaskResult(appApproveDto.getTaskResult());
+        lastRiskPlanTask.setTaskOpinion(appApproveDto.getTaskOpinion());
+        lastRiskPlanTask.setStatus("completed");
+        lastRiskPlanTask.setCompletedTime(new Date());
+        riskPlanTaskService.updateRiskPlanTask(lastRiskPlanTask);
+
+        //计划
+        RiskPlan riskPlan = selectRiskPlanById(lastRiskPlanTask.getPlanId());
+
+        if ("0".equals(appApproveDto.getTaskResult())) {
+            //退回
+            //插入任务表 已退回风险评估
+            RiskPlanTask riskPlanTask1 = new RiskPlanTask();
+            riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
+            riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
+            riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_ADJUST.getStatus());
+            riskPlanTask1.setTaskName(RiskPlanStatusType.getTitleByStatus(RiskPlanStatusType.WAIT_ADJUST.getStatus()));
+            riskPlanTask1.setStatus("running");
+            riskPlanTask1.setStartTime(new Date());
+            riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
+
+            //修改计划状态
+            riskPlan.setStatus(RiskPlanStatusType.WAIT_ADJUST.getStatus());
+            updateRiskPlan(riskPlan);
+        } else {
+            //修改计划状态
+            riskPlan.setStatus(RiskPlanStatusType.FINISH.getStatus());
+            updateRiskPlan(riskPlan);
+        }
+        return 1;
+    }
+
+    @Override
+    public int revokeByPlanId(Long planId, Long userId) {
+        //计划
+        RiskPlan riskPlan = selectRiskPlanById(planId);
+
+        //获取最新的task
+        RiskPlanTask lastRiskPlanTask = riskPlanTaskService.getLastRiskPlanTaskByPlanId(planId);
+        lastRiskPlanTask.setStatus("completed");
+        lastRiskPlanTask.setCompletedTime(new Date());
+        riskPlanTaskService.updateRiskPlanTask(lastRiskPlanTask);
+
+        //插入任务表 已撤销风险评估
+        RiskPlanTask riskPlanTask1 = new RiskPlanTask();
+        riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
+        riskPlanTask1.setTaskKey(RiskPlanStatusType.REVOKE.getStatus());
+        riskPlanTask1.setTaskName(RiskPlanStatusType.getTitleByStatus(RiskPlanStatusType.REVOKE.getStatus()));
+        riskPlanTask1.setStatus("completed");
+        riskPlanTask1.setStartTime(new Date());
+        riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
+
+        //修改计划状态
+        riskPlan.setStatus(RiskPlanStatusType.REVOKE.getStatus());
+        updateRiskPlan(riskPlan);
+
+        return 1;
+    }
+
     private String getNo() {
         Random random = new Random();
         int randomNumber = random.nextInt(1000); // 生成0到999之间的随机数

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

@@ -91,4 +91,9 @@ public class RiskPlanTaskServiceImpl implements IRiskPlanTaskService
     {
         return riskPlanTaskMapper.deleteRiskPlanTaskById(id);
     }
+
+    @Override
+    public RiskPlanTask getLastRiskPlanTaskByPlanId(Long id) {
+        return riskPlanTaskMapper.getLastRiskPlanTaskByPlanId(id);
+    }
 }

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

@@ -78,9 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planId != null">plan_id,</if>
             <if test="roomId != null">room_id,</if>
             <if test="code != null">code,</if>
-            <if test="name != null">name,</if>
-            <if test="type != null">type,</if>
-            <if test="describe != null">describe,</if>
+            <if test="name != null">`name`,</if>
+            <if test="type != null">`type`,</if>
+            <if test="describe != null">`describe`,</if>
             <if test="evaluationModel != null">evaluation_model,</if>
             <if test="evaluationRange != null">evaluation_range,</if>
             <if test="level != null">level,</if>

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

@@ -91,6 +91,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="roomId != null"> AND lr.id = #{roomId}</if>
         </where>
     </select>
+    <select id="getRiskPlanAppInherentListDetailsDtoByInherentId"
+            resultType="com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto">
+        SELECT
+            rpil.id,
+            su.user_id AS userId,
+            su.nick_name AS userName,
+            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.`name`,
+            rpil.factor,
+            rpil.type,
+            rpil.`level`,
+            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,
+            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_inherent_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
+        WHERE
+            rpil.id = #{inherentId}
+    </select>
+    <select id="getExistingListByInherentId"
+            resultType="com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDto">
+        SELECT
+            reil.id,
+            reil.`name`,
+            reil.create_time AS createTime,
+            reil.`describe`,
+            su.user_id AS userId,
+            su.nick_name AS userName,
+            su.avatar
+        FROM
+            risk_plan_existing_list reil
+                LEFT JOIN sys_user su ON su.user_id = reil.user_id
+        WHERE
+            reil.inherent_id = #{inherentId}
+    </select>
 
     <insert id="insertRiskPlanInherentList" parameterType="com.censoft.censoftrongtong.domain.RiskPlanInherentList" useGeneratedKeys="true" keyProperty="id">
         insert into risk_plan_inherent_list

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

@@ -40,7 +40,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRiskPlanTaskVo"/>
         where id = #{id}
     </select>
-        
+    <select id="getLastRiskPlanTaskByPlanId" resultMap="RiskPlanTaskResult">
+        <include refid="selectRiskPlanTaskVo"/>
+        where plan_id = #{id}
+        order BY start_time desc
+        limit 1
+    </select>
+
     <insert id="insertRiskPlanTask" parameterType="com.censoft.censoftrongtong.domain.RiskPlanTask" useGeneratedKeys="true" keyProperty="id">
         insert into risk_plan_task
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -41,8 +41,24 @@ public class SysLoginController
      * @return 结果
      */
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody)
+    public AjaxResult pcLogin(@RequestBody LoginBody loginBody)
     {
+        return login(loginBody);
+    }
+
+    /**
+     * app登录方法
+     *
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/app-api/login")
+    public AjaxResult appLogin(@RequestBody LoginBody loginBody)
+    {
+        return login(loginBody);
+    }
+
+    private AjaxResult login(LoginBody loginBody){
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
@@ -57,8 +73,23 @@ public class SysLoginController
      * @return 用户信息
      */
     @GetMapping("getInfo")
-    public AjaxResult getInfo()
+    public AjaxResult getPcInfo()
     {
+        return getInfo();
+    }
+
+    /**
+     * 获取app用户信息
+     *
+     * @return 用户信息
+     */
+    @GetMapping("/app-api/getInfo")
+    public AjaxResult getAppInfo()
+    {
+        return getInfo();
+    }
+
+    private AjaxResult getInfo(){
         SysUser user = SecurityUtils.getLoginUser().getUser();
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);

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

@@ -14,6 +14,8 @@ ruoyi:
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
   captchaType: math
+  # 服务器地址
+  serverAddress: http://192.168.4.232/dev-api
 
 # 开发环境配置
 server:

ruoyi-framework/src/main/java/com/ruoyi/framework/config/FileUploadConfig.java

+package com.ruoyi.framework.config;
+
+import org.springframework.boot.web.servlet.MultipartConfigFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.unit.DataSize;
+
+import javax.servlet.MultipartConfigElement;
+
+/**
+ * @author 周昊
+ * @desc ...
+ * @date 2023-06-28 14:54:58
+ */
+@Configuration
+public class FileUploadConfig {
+
+    @Bean
+    public MultipartConfigElement multipartConfigElement() {
+        MultipartConfigFactory factory = new MultipartConfigFactory();
+        factory.setMaxFileSize(DataSize.ofMegabytes(10)); // 设置最大文件大小为10MB
+        factory.setMaxRequestSize(DataSize.ofMegabytes(20)); // 设置最大请求大小为10MB
+        return factory.createMultipartConfig();
+    }
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage").permitAll()
+                .antMatchers("/login","/app-api/login", "/register", "/captchaImage").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()