完善隐患管理功能并新增菜单权限控制

web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java

@@ -67,11 +67,12 @@ public class HiddenQueryExe {
             StringBuffer userNames = new StringBuffer();
             StringBuffer departmentNames = new StringBuffer();
             hiddenFindUserDOs.stream().forEach(hiddenFindUserDO -> {
-                userNames.append(hiddenFindUserDO.getFindUserName()).append(",");
+                userNames.append(hiddenFindUserDO.getFindUserName());
-                departmentNames.append(hiddenFindUserDO.getFindDepartmentName()).append(",");
+                departmentNames.append(hiddenFindUserDO.getFindDepartmentName());
+            });
             hiddenCO.setFindUserName(userNames.toString());
             hiddenCO.setFindDepartmentName(departmentNames.toString());
-            });
+            hiddenCO.setFindUserList(hiddenFindUserCoConvertor.converDOsToCOs(hiddenFindUserDOs));
         }
         List<HiddenRectificationRecordDO> hiddenRectificationRecordDOs = hiddenRectificationRecordRepository.listAll(params);
         List<HiddenAcceptRecordDO> hiddenAcceptRecordDOs = hiddenAcceptRecordRepository.listAll(params);

web-client/src/main/java/com/zcloud/key/project/dto/ai/AiAlarmPageQry.java

@@ -27,5 +27,8 @@ public class AiAlarmPageQry extends PageQuery {
     private String videoName;
     private String keyProjectName;
     private Integer state;
+
+
+    private String menuPath;
 }
 

web-client/src/main/java/com/zcloud/key/project/dto/ai/AlgorithmPageQry.java

@@ -25,5 +25,7 @@ public class AlgorithmPageQry extends PageQuery {
      */
     private String likeAlgorithmId;
     private String likeName;
+
+    private String menuPath;
 }
 

web-client/src/main/java/com/zcloud/key/project/dto/ai/KeyProjectAlgorithmPageQry.java

@@ -28,5 +28,7 @@ public class KeyProjectAlgorithmPageQry extends PageQuery {
     private String xgfCorpName;
     private Long jurisdictionCorpinfoId;
     private Integer applyStatus;
+
+    private String menuPath;
 }
 

web-client/src/main/java/com/zcloud/key/project/dto/clientobject/hidden/HiddenCO.java

@@ -90,7 +90,20 @@ public class HiddenCO extends ClientObject {
 
     @ApiModelProperty(value = "隐患发现人", name="findUserList")
     private List<HiddenFindUserCO> findUserList;
+    //整改人姓名
+    @ApiModelProperty(value = "整改人姓名")
+    private String rectificationUserName;
 
+    @ApiModelProperty(value = "整改人部门名称")
+    private String rectificationDepartmentName;
+
+
+    @ApiModelProperty(value = "验收人企业名称")
+    private String acceptCorpName;
+    @ApiModelProperty(value = "验收人部门名称")
+    private String acceptDepartmentName;
+    @ApiModelProperty(value = "验收人名称")
+    private String acceptUserName;
     //重点作业名称
     @ApiModelProperty(value = "重点作业名称")
     private String projectName;

web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPageQry.java

@@ -35,5 +35,8 @@ public class HiddenPageQry extends PageQuery {
 
     private List<Integer> stateList;
 
+
+    private String menuPath;
+
 }
 

web-client/src/main/java/com/zcloud/key/project/dto/inspection/SafetyEnvironmentalInspectionPageQry.java

@@ -37,6 +37,7 @@ public class SafetyEnvironmentalInspectionPageQry extends PageQuery {
     private List<Integer> statusList;
 
     private String year;
+    private String menuPath;
 
 
 

web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectStatisticsPageQry.java

@@ -27,5 +27,7 @@ public class KeyProjectStatisticsPageQry extends PageQuery {
     @ApiModelProperty(value = "重点作业名称")
     private String projectName;
 
+    private String menuPath;
+
 }
 

web-client/src/main/java/com/zcloud/key/project/dto/project/XgfCorpStatisticsPageQry.java

@@ -29,5 +29,7 @@ public class XgfCorpStatisticsPageQry implements Serializable {
     @ApiModelProperty(value = "企业id列表")
     private List<Long> jurisdictionCorpinfoIdList;
 
+    private String menuPath;
+
 }
 

web-domain/src/main/java/com/zcloud/key/project/domain/enums/MenuEnum.java

@@ -12,29 +12,60 @@ import java.util.stream.Collectors;
  */
 @Getter
 public enum MenuEnum {
-    //监管端
     // 重点作业情况统计
-    JGDZDZYQKTJ("/keyProject/container/supervision/keyStats/list", "jgd-zdzyqktj"),
+    jgdzdzyqktj("/keyProject/container/supervision/keyStats/list", "jgd-zdzyqktj"),
     // 重点作业管理
-    JGDZDZYGL("/keyProject/container/supervision/keyProjectManage/keyProjectManage/list", "jgd-zdzygl"),
+    jgdzdzygl("/keyProject/container/supervision/keyProjectManage/keyProjectManage/list", "jgd-zdzygl"),
     // 重点作业确认
-    JGDZDZYQR("/keyProject/container/supervision/keyProjectManage/keyProjectConfirm/list", "jgd-zdzyqr"),
+    jgdzdzyqr("/keyProject/container/supervision/keyProjectManage/keyProjectConfirm/list", "jgd-zdzyqr"),
-
-
-
-    //企业端
     // 重点作业情况统计
-    QYDZDZYQKTJ("/keyProject/container/branchCompany/keyStats/list", "qyd-zdzyqktj"),
+    qydzdzyqktj("/keyProject/container/branchCompany/keyStats/list", "qyd-zdzyqktj"),
     // 重点作业管理
-    QYDZDZYGL("/keyProject/container/branchCompany/keyProjectManage/keyProjectManage/list", "qyd-zdzygl"),
+    qydzdzygl("/keyProject/container/branchCompany/keyProjectManage/keyProjectManage/list", "qyd-zdzygl"),
     // 重点作业确认
-    QYDZDZYQR("/keyProject/container/branchCompany/keyProjectManage/keyProjectConfirm/list", "qyd-zdzyqr"),
+    qydzdzyqr("/keyProject/container/branchCompany/keyProjectManage/keyProjectConfirm/list", "qyd-zdzyqr"),
-
-    //相关方
     // 重点作业情况统计
-    XGFZDZYQKTJ("/keyProject/container/stakeholder/keyStats/list", "xgf-zdzyqktj"),
+    xgfzdzyqktj("/keyProject/container/stakeholder/keyStats/list", "xgf-zdzyqktj"),
-    XGFZDZYSQ("/keyProject/container/stakeholder/keyProjectApple/list", "xgf-zdzysq"),
+    // 重点作业申请
-    ;
+    xgfzdzysq("/keyProject/container/stakeholder/keyProjectApple/list", "xgf-zdzysq"),
+    // 检查发起
+    gfdaqjcgljcfq("/keyProject/container/supervision/safetyInspectionManage/checkInitiated/list", "gfd-aqjcgl-jcfq"),
+    // 检查核实
+    gfdaqjcgljchs("/keyProject/container/supervision/safetyInspectionManage/checkVerify/list", "gfd-aqjcgl-jchs"),
+    // 申辩处理
+    gfdaqjcglsbcl("/keyProject/container/supervision/safetyInspectionManage/defenseHandling/list", "gfd-aqjcgl-sbcl"),
+    // 检查记录
+    gfdaqjcgljcjl("/keyProject/container/supervision/safetyInspectionManage/inspectionRecord/list", "gfd-aqjcgl-jcjl"),
+    // 隐患验收
+    gfdyhglyhys("/keyProject/container/supervision/hiddenManage/hiddenAcceptance/list", "gfd-yhgl-yhys"),
+    // 隐患记录
+    gfdyhglyhjl("/keyProject/container/supervision/hiddenManage/hiddenRecode/list", "gfd-yhgl-yhjl"),
+    // AI报警处置
+    gfdaibjglaibjcz("/keyProject/container/supervision/aiAlarmManage/aiAiArmHandle/list", "gfd-aibjgl-aibjcz"),
+    // 作业算法配置
+    gfdaibjglzysfpz("/keyProject/container/supervision/aiAlarmManage/algorithmConfig/list", "gfd-aibjgl-zysfpz"),
+    // 算法类型管理
+    gfdaibjglsflxgl("/keyProject/container/supervision/aiAlarmManage/algorithmTypeManage/list", "gfd-aibjgl-sflxgl"),
+    // 检查发起
+    fgsdaqhbjc("/keyProject/container/branchCompany/safetyInspectionManage/checkInitiated/list", "fgsd-aqhbjc"),
+    // 检查核实
+    fgsdaqhbjcjchs("/keyProject/container/branchCompany/safetyInspectionManage/checkVerify/list", "fgsd-aqhbjc-jchs"),
+    // 申辩处理
+    fgsdaqhbjcsbcl("/keyProject/container/branchCompany/safetyInspectionManage/defenseHandling/list", "fgsd-aqhbjc-sbcl"),
+    // 检查记录
+    fgsdaqhbjcjcjl("/keyProject/container/branchCompany/safetyInspectionManage/inspectionRecord/list", "fgsd-aqhbjc-jcjl"),
+    // 隐患验收
+    fgsdyhglyhys("/keyProject/container/branchCompany/hiddenManage/hiddenAcceptance/list", "fgsd-yhgl-yhys"),
+    // 隐患记录
+    fgsdyhglyhjl("/keyProject/container/branchCompany/hiddenManage/hiddenRecode/list", "fgsd-yhgl-yhjl"),
+    // AI报警处置
+    fgsdaibjcz("/keyProject/container/branchCompany/aiAiArmHandle/list", "fgsd-aibjcz"),
+    // 被检查人确认
+    xgfdbjcrqr("/keyProject/container/stakeholder/confirmedByInspection/list", "xgfd-bjcrqr"),
+    // 隐患整改
+    xgfdyhzg("/keyProject/container/stakeholder/hiddenRectification/list", "xgfd-yhzg"),
+    // 隐患记录
+    xgfdyhjl("/keyProject/container/stakeholder/hiddenRecode/list", "xgfd-yhjl");
 
     private final String path;
     private final String menuKey;

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/hidden/HiddenDO.java

@@ -94,16 +94,30 @@ public class HiddenDO extends BaseDO {
 
     @ApiModelProperty(value = "验收人id", name = "acceptUserId")
     private Long acceptUserId;
-
+    @ApiModelProperty(value = "验收人企业名称")
+    @TableField(exist = false)
+    private String acceptCorpName;
+    @ApiModelProperty(value = "验收人部门名称")
+    @TableField(exist = false)
+    private String acceptDepartmentName;
+    @ApiModelProperty(value = "验收人名称")
+    @TableField(exist = false)
+    private String acceptUserName;
     //整改人姓名
     @ApiModelProperty(value = "整改人姓名")
     @TableField(exist = false)
     private String rectificationUserName;
 
+    @ApiModelProperty(value = "整改人部门名称")
+    @TableField(exist = false)
+    private String rectificationDepartmentName;
     //发现人姓名
     @ApiModelProperty(value = "发现人姓名")
     @TableField(exist = false)
-    private String hiddenFindUserName;
+    private String findUserName;
+    @ApiModelProperty(value = "隐患发现人部门名称")
+    @TableField(exist = false)
+    private String findDepartmentName;
 
     //重点作业名称
     @ApiModelProperty(value = "重点作业名称")

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/ai/AiAlarmRepositoryImpl.java

@@ -7,6 +7,7 @@ import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.gbscommon.utils.Query;
+import com.zcloud.key.project.domain.enums.MenuEnum;
 import com.zcloud.key.project.persistence.dataobject.ai.AiAlarmDO;
 import com.zcloud.key.project.persistence.mapper.ai.AiAlarmMapper;
 import com.zcloud.key.project.persistence.repository.ai.AiAlarmRepository;
@@ -29,7 +30,12 @@ public class AiAlarmRepositoryImpl extends BaseRepositoryImpl<AiAlarmMapper, AiA
     @Override
     public PageResponse<AiAlarmDO> listPage(Map<String, Object> params) {
         IPage<AiAlarmDO> iPage = new Query<AiAlarmDO>().getPage(params);
-        IPage<AiAlarmDO> result = aiAlarmMapper.selectListPage(iPage, params, null);
+
+        String menuPerms = "";
+        if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
+            menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
+        }
+        IPage<AiAlarmDO> result = aiAlarmMapper.selectListPage(iPage, params, menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/ai/KeyProjectAlgorithmRepositoryImpl.java

@@ -7,6 +7,7 @@ import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.gbscommon.utils.Query;
+import com.zcloud.key.project.domain.enums.MenuEnum;
 import com.zcloud.key.project.persistence.dataobject.ai.KeyProjectAlgorithmDO;
 import com.zcloud.key.project.persistence.mapper.ai.KeyProjectAlgorithmMapper;
 import com.zcloud.key.project.persistence.repository.ai.KeyProjectAlgorithmRepository;
@@ -29,7 +30,11 @@ public class KeyProjectAlgorithmRepositoryImpl extends BaseRepositoryImpl<KeyPro
     @Override
     public PageResponse<KeyProjectAlgorithmDO> listPage(Map<String, Object> params) {
         IPage<KeyProjectAlgorithmDO> iPage = new Query<KeyProjectAlgorithmDO>().getPage(params);
-        IPage<KeyProjectAlgorithmDO> result = keyProjectAlgorithmMapper.selectListPage(iPage, params, null);
+        String menuPerms = "";
+        if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
+            menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
+        }
+        IPage<KeyProjectAlgorithmDO> result = keyProjectAlgorithmMapper.selectListPage(iPage, params, menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 }

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenRepositoryImpl.java

@@ -9,6 +9,7 @@ import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.gbscommon.utils.Query;
+import com.zcloud.key.project.domain.enums.MenuEnum;
 import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO;
 import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO;
 import com.zcloud.key.project.persistence.mapper.HiddenMapper;
@@ -34,7 +35,11 @@ public class HiddenRepositoryImpl extends BaseRepositoryImpl<HiddenMapper, Hidde
     @Override
     public PageResponse<HiddenDO> listPage(Map<String, Object> params) {
         IPage<HiddenDO> iPage = new Query<HiddenDO>().getPage(params);
-        IPage<HiddenDO> result = hiddenMapper.selectListPage(iPage, params, null);
+        String menuPerms = "";
+        if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
+            menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
+        }
+        IPage<HiddenDO> result = hiddenMapper.selectListPage(iPage, params, menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 

web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/inspection/SafetyEnvironmentalInspectionRepositoryImpl.java

@@ -8,6 +8,7 @@ import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.zcloud.gbscommon.utils.Query;
+import com.zcloud.key.project.domain.enums.MenuEnum;
 import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionDO;
 import com.zcloud.key.project.persistence.mapper.inspection.SafetyEnvironmentalInspectionMapper;
 import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionRepository;
@@ -31,7 +32,12 @@ public class SafetyEnvironmentalInspectionRepositoryImpl extends BaseRepositoryI
     @Override
     public PageResponse<SafetyEnvironmentalInspectionDO> listPage(Map<String, Object> params) {
         IPage<SafetyEnvironmentalInspectionDO> iPage = new Query<SafetyEnvironmentalInspectionDO>().getPage(params);
-        IPage<SafetyEnvironmentalInspectionDO> result = safetyEnvironmentalInspectionMapper.selectListPage(iPage, params, null);
+        String menuPerms = "";
+        if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
+            menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
+        }
+
+        IPage<SafetyEnvironmentalInspectionDO> result = safetyEnvironmentalInspectionMapper.selectListPage(iPage, params, menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 

web-infrastructure/src/main/resources/mapper/HiddenMapper.xml

@@ -8,7 +8,9 @@
         select
             h.*,
             ru.name as rectification_user_name,
+            au.name as accept_user_name,
             GROUP_CONCAT(DISTINCT hfu.name) hidden_find_user_name,
+            GROUP_CONCAT(DISTINCT hfd.name) find_department_name,
             kp.project_name,
             MAX(hrr.rectification_time) as rectification_time
         from
@@ -16,6 +18,9 @@
         left join user ru on h.rectification_user_id = ru.id
         left join hidden_find_user hf on hf.hidden_id = h.hidden_id and hf.delete_enum = 'FALSE'
         left join user hfu on hfu.id = hf.find_user_id
+        left join department hfd on hfd.id = hfu.department_id
+        left join user au on au.id = h.accept_user_id
+
         left join safety_environmental_inspection i on i.inspection_id = h.foreign_key
         left join key_project kp on kp.key_project_id = i.key_project_id
         left join hidden_rectification_record hrr on hrr.hidden_id = h.hidden_id and hrr.delete_enum = 'FALSE'
@@ -59,13 +64,30 @@
         h.*,
         kp.project_name,
         rci.corp_name as rectification_corp_name,
-        ru.name as rectification_user_name
+        ru.name as rectification_user_name,
+        rd.name as rectification_department_name
+
+
+--         aci.corp_name as accept_corp_name,
+--         au.name as accept_user_name,
+--         ad.name as accept_department_name,
+--         GROUP_CONCAT(DISTINCT hfu.name) find_user_name,
+--         GROUP_CONCAT(DISTINCT hfd.name) find_department_name
         from
         hidden h
         left join safety_environmental_inspection i on i.inspection_id = h.foreign_key
         left join key_project kp on kp.key_project_id = i.key_project_id
         left join corp_info rci on rci.id = h.rectification_corp_id
         left join user ru on ru.id = h.rectification_user_id
+        left join department rd on rd.id = h.rectification_department_id
+
+--         left join corp_info aci on aci.id = h.accept_corp_id
+--         left join user au on au.id = h.accept_user_id
+--         left join department ad on ad.id = h.accept_department_id
+
+--         left join hidden_find_user hf on hf.hidden_id = h.hidden_id and hf.delete_enum = 'FALSE'
+--         left join user hfu on hfu.id = hf.find_user_id
+--         left join department hfd on hfd.id = hfu.department_id
         <where>
             h.id = #{id}
         </where>

web-infrastructure/src/main/resources/mapper/inspection/SafetyEnvironmentalInspectionMapper.xml

@@ -32,6 +32,7 @@
             left join user iuu on iuu.id = iu.user_id
             left join corp_info indc on indc.id = i.inspected_corpinfo_id
             left join user xmu on xmu.id = i.xgf_master_user_id
+--             left join safety_environmental_inspection_user seiu on seiu.inspection_id = i.inspection_id
         where i.delete_enum = 'FALSE'
         <if test="params.place != null and params.place != ''">
             and i.place LIKE CONCAT('%', #{params.place}, '%')