Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.3/soc/soc.sql

@@ -792,7 +792,7 @@ ALTER TABLE `core_protection_log`
 MODIFY COLUMN `status_updator_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '上报人姓名' AFTER `status_updator_id`;
 -- 修改安全指数机构分数表机构path字段长度
 alter table core_safe_month_score modify org_path varchar(225) null comment '机构path';
-DELETE FROM sys_menu WHERE id IN(01719287834364436482,01719288533101928450,01719892877586239490,01720000571298115585,1722135552494403586,01722523915868221442);
+DELETE FROM sys_menu WHERE id IN(01723993298998222849,01719287834364436482,01719288533101928450,01719892877586239490,01720000571298115585,1722135552494403586,01722523915868221442);
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES (01719287834364436482, '统计报表', 0, 1, 'reportForms', NULL, NULL, 1, 0, 'M', '0', '0', null, '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
@@ -803,12 +803,19 @@ INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `co
 VALUES (01720000571298115585, '监控调阅统计报表', 1719287834364436482, 3, 'core', 'core/reportForms/monitorAccessReport', NULL, 1, 1, 'C', '0', '0', 'core:monitorAccessReport:list', '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES (01722523915868221442, '每日营业前中后的履职报表', 1719287834364436482, 3, '/core/resumptionReport', 'core/reportForms/resumptionReport', NULL, 1, 1, 'C', '0', '0', 'core:resumptionReport:list', '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
+INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+VALUES (01723993298998222849, '报警测试报表', 1719287834364436482, 3, '/resumptionReport/intrusionTest', 'core/reportForms/intrusionTestReport', NULL, 1, 1, 'C', '0', '0', 'core:resumptionReport:list', '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 
 
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark)
 VALUES (1722135552494403586, '登记簿批量导出', 1719287834364436482, 10, 'code/registerbook', 'registerBook/index', null, 1, 0, 'C', '0', '0', 'core:registerBook:list', '1', 'education', null, null, now(), null, now(), null);
 
-delete from sys_role_menu where menu_id IN(01722523915868221442,01719287834364436482,01719288533101928450,01719892877586239490,01720000571298115585);
+delete from sys_role_menu where menu_id IN(01723993298998222849,01722523915868221442,01719287834364436482,01719288533101928450,01719892877586239490,01720000571298115585);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01723993298998222849);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01723993298998222849);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01723993298998222849);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (122, 01723993298998222849);
+
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01720000571298115585);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01720000571298115585);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01720000571298115585);
@@ -1110,4 +1117,8 @@ DELETE FROM `sys_role_menu` WHERE menu_id IN(01721714556507549698,01724017221941
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01721714556507549698);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01724017221941936130);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01724017294985740290);
-INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01724017404872310786);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 01724017404872310786);
+
+-- 删除检查登记授权按钮权限
+DELETE from sys_menu WHERE perms='core:safetycheck:grant'  and menu_type='F';
+DELETE from sys_role_menu WHERE menu_id not in (SELECT id from sys_menu);

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/vo/CoreMonitoringRetrievalTaskExcelVo.java

@@ -103,7 +103,7 @@ public class CoreMonitoringRetrievalTaskExcelVo {
     @ExcelProperty("调阅结束时间")
     private Date endTime;
 
-    @ExcelIgnore
+
     @ExcelProperty("异常数量")
     private Integer exceptionCount;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/controller/ResumptionReportController.java

@@ -60,4 +60,10 @@ public class ResumptionReportController {
         ajaxResult.put("title", "报警测试报表(" + resumptionDTO.getSearchTime() + ")");
         return ajaxResult;
     }
+//    @ApiOperation(value = "备用电源维护报表")
+//    @RequiresPermissions("core:resumptionReport:list")
+//    @GetMapping("/standbyPower")
+//    public AjaxResult standbyPower(ResumptionDTO resumptionDTO) {
+//
+//    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/mapper/ResumptionReportMapper.java

@@ -25,4 +25,6 @@ public interface ResumptionReportMapper {
     Integer planRectification(@Param("taskId")Long taskId);
 
     IntrusionTestReportVO selectIntrusionTestReport( @Param("date") String date,@Param("orgPath")String orgPath);
+
+    IntrusionTestReportVO  selectStandbyPower( @Param("date") String date,@Param("orgPath")String orgPath);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/service/ResumptionReportService.java

@@ -14,4 +14,6 @@ public interface ResumptionReportService {
     List<ResumptionDayVO> report(ResumptionDTO resumptionDTO);
 
   List<IntrusionTestReportVO>  intrusionTest(ResumptionDTO resumptionDTO);
+
+  List<IntrusionTestReportVO>standbyPower(ResumptionDTO resumptionDTO);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/service/impl/ResumptionReportServiceImpl.java

@@ -139,4 +139,32 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
         });
         return intrusionTestReportVOList;
     }
+
+    @Override
+    public List<IntrusionTestReportVO> standbyPower(ResumptionDTO resumptionDTO) {
+        if (null == resumptionDTO.getOrgId()) {
+            resumptionDTO.setOrgId(SecurityUtils.getLoginUser().getOrgId());
+        }
+        //判断机构类型,如果机构类型大于行社，都展示行社数据
+        SysOrg sysOrg = orgService.selectSysOrgById(resumptionDTO.getOrgId(), SecurityConstants.INNER);
+        List<SysOrg> sysOrgs;
+        if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
+            sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
+        } else if (sysOrg.getType() == 3) {
+            sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
+        } else {
+            return null;
+        }
+        List<IntrusionTestReportVO> intrusionTestReportVOList = new ArrayList<>(16);
+        sysOrgs.forEach(o->{
+            IntrusionTestReportVO intrusionTestReportVO = new IntrusionTestReportVO();
+            SysOrg sysOrg1;
+            if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
+                sysOrg1 = orgService.selectOrgById(o.getParentId(), SecurityConstants.INNER);
+            } else {
+                sysOrg1 = orgService.selectOrgById(orgService.selectOrgById(o.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
+            }
+        });
+        return null;
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafetyTaskController.java

@@ -65,12 +65,12 @@ public class CoreSafetyTaskController extends BaseController {
         return success(b);
     }
 
-    @ApiOperation(value = "履职计划下拉框")
-    @GetMapping("/plan")
-    public AjaxResult plan(Long orgId) {
-        List<CoreSafecheckPlan> list = planService.list(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getCheckOrg, orgId));
-        return success(list);
-    }
+//    @ApiOperation(value = "履职计划下拉框")
+//    @GetMapping("/plan")
+//    public AjaxResult plan(Long orgId) {
+//        List<CoreSafecheckPlan> list = planService.list(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getCheckOrg, orgId));
+//        return success(list);
+//    }
 
     /**
      * 获取【请填写功能名称】详细信息

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/SafetyCheckRegisterController.java

@@ -29,7 +29,7 @@ public class SafetyCheckRegisterController extends BaseController {
     @PostMapping("page")
     @RequiresPermissions("core:safetycheck:appregister")
     public TableDataInfo getAppPage(@RequestBody AppPageDto query) {
-      Long[] roleIds=  SecurityUtils.getLoginUser().getSysUser().getRoleIds();
+//      Long[] roleIds=  SecurityUtils.getLoginUser().getSysUser().getRoleIds();
 
         TableDataInfo appRulePage = safetyCheckRegisterSerice.appList(query);
         return appRulePage;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/CoreSafecheckPlan.java

@@ -146,11 +146,11 @@ public class CoreSafecheckPlan extends BaseEntity {
     /**
      * 受检机构类型
      */
-    @ApiModelProperty(value = "受检机构类型")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long checkOrgType;
-    @ApiModelProperty(value = "受检机构")
-    private String checkOrg;
+//    @ApiModelProperty(value = "受检机构类型")
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long checkOrgType;
+//    @ApiModelProperty(value = "受检机构")
+//    private String checkOrg;
 
     @TableField(exist = false)
     private List<CoreSafecheckPlanToCheckOrgType> checkOrgTypeList;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -205,7 +205,10 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
         List<PlanTaskBuildVo> list = new ArrayList<>();
         Integer execOrgType = Math.toIntExact(plan.getExecOrgType());
 //        Integer checkOrgType = Math.toIntExact(plan.getCheckOrgType());
-        List<Integer> checkOrgTypes = coreSafecheckPlanToCheckOrgTypeMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToCheckOrgType>().eq(CoreSafecheckPlanToCheckOrgType::getPlanId, plan.getId())).stream().map(CoreSafecheckPlanToCheckOrgType::getTypeId).collect(Collectors.toList());
+        List<Integer> checkOrgTypes = coreSafecheckPlanToCheckOrgTypeMapper
+                .selectList(new LambdaQueryWrapper<CoreSafecheckPlanToCheckOrgType>()
+                        .eq(CoreSafecheckPlanToCheckOrgType::getPlanId, plan.getId()))
+                .stream().map(CoreSafecheckPlanToCheckOrgType::getTypeId).collect(Collectors.toList());
         //获取具体执行检查的机构
         QueryWrapper<CoreSafecheckPlanToExecOrg> eos = new QueryWrapper<>();
         eos.lambda().eq(CoreSafecheckPlanToExecOrg::getPlanId, plan.getId());
@@ -237,14 +240,17 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
 //        execOrgs = execOrgs.stream().filter(o -> ObjectUtil.equal(o.getIsLock(), false)).collect(Collectors.toList());
         //此处循环所有执行检查的机构
         for (SysOrg org : execOrgs) {
-            List<SysOrg> checkOrgs = null;
+            List<SysOrg> checkOrgs = new ArrayList<>();
             if (ObjectUtil.isEmpty(checkOrg)) {
                 //如果没有选择具体受检的机构，则根据受检机构类型查询
-                if (checkOrgTypes.contains(execOrgType) && checkOrgTypes.size() == 1) {
-                    //如果检查机构类型与被检机构类型一致，则表示查自己
-                    checkOrgs = Arrays.asList(org);
-                } else {
-                    checkOrgs = orgService.findByOrgTypesAndParent(new FindOrgTypes(checkOrgTypes, org.getPath()), SecurityConstants.INNER);
+                if (checkOrgTypes.contains(execOrgType)) {
+                    checkOrgs.add(org);
+                }
+
+                List<Integer> orgTypes = checkOrgTypes.stream().filter(t -> ObjectUtil.notEqual(t,execOrgType)).collect(Collectors.toList());
+                if(CollectionUtil.isNotEmpty(orgTypes)){
+                    List<SysOrg>  checkOrgsTmp = orgService.findByOrgTypesAndParent(new FindOrgTypes(orgTypes, org.getPath()), SecurityConstants.INNER);
+                    checkOrgs.addAll(checkOrgsTmp);
                 }
             } else {
                 //选择了具体的受检机构

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -189,6 +189,16 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
 
                     }
                 }
+                //再处理受检机构类型
+                List<CoreSafecheckPlanToCheckOrgType> checkOrgTypes = coreSafecheckPlanToCheckOrgTypeMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToCheckOrgType>().eq(CoreSafecheckPlanToCheckOrgType::getPlanId, dto.getId()));
+                if(checkOrgTypes!=null){
+                    //删除当前计划的受检机构类型
+                    coreSafecheckPlanToCheckOrgTypeMapper.delete(new LambdaQueryWrapper<CoreSafecheckPlanToCheckOrgType>().eq(CoreSafecheckPlanToCheckOrgType::getPlanId, coreSafecheckPlan.getId()));
+                    for (CoreSafecheckPlanToCheckOrgType type :
+                            checkOrgTypes) {
+                        coreSafecheckPlanToCheckOrgTypeMapper.insert(new CoreSafecheckPlanToCheckOrgType(coreSafecheckPlan.getId(),type.getTypeId()));
+                    }
+                }
                 //再处理检查要点关系
 
                 //查询父计划的所有检查要点

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -222,6 +222,13 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         if (ObjectUtil.isNotNull(task.getPlanId())) {
             plan = coreSafecheckPlanMapper.selectById(task.getPlanId());
         }
+        SysOrg beCheckedOrg= remoteOrgService.selectOrgById(task.getOrgId(),SecurityConstants.INNER);
+        if(ObjectUtil.isNull(beCheckedOrg)){
+            throw new ServiceException("受检机构不存在");
+        }
+        if(ObjectUtil.isNull(beCheckedOrg.getType())){
+            throw new ServiceException("受检机构没有机构类型");
+        }
 
         /**
          * 已经完成任务的信息应该从任务信息中获取
@@ -249,9 +256,11 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             taskImgs = imgs.stream().collect(Collectors.groupingBy(CoreSafetyTaskDataRemarkimg::getTaskDataId));
         }
 
+        TaskRegisterVo<AppTaskRegisterPointVo> vo = TaskRegisterVo.of(task, beCheckedOrg.getType().toString(), roleNames);
+        if(ObjectUtil.isNotNull(plan)){
+            vo.setPlanType(plan.getCheckType().intValue());
+        }
 
-        TaskRegisterVo<AppTaskRegisterPointVo> vo = TaskRegisterVo.of(task, plan != null ? plan.getCheckOrgType().toString() : "", roleNames);
-//        vo.setPlanType(plan.getCheckType().intValue());
         Set<Long> usedNfcId = new HashSet<>();
         for (AppTaskRegisterPointVo point : points) {
             List<CoreSafetyTaskDataRemarkimg> dataImgs = taskImgs.get(point.getPointDataId());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/regsiter/TaskRegisterVo.java

@@ -32,9 +32,8 @@ public class TaskRegisterVo<T> {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long planId;
 
-//    @ApiModelProperty(value = "计划类型")
-//
-//    private Integer planType;
+    @ApiModelProperty(value = "计划类型")
+    private Integer planType;
 
     @ApiModelProperty(value = "计划开始时间")
     private Date planStartTime;

soc-modules/soc-modules-core/src/main/resources/mapper/board/AppCockpitMapper.xml

@@ -63,7 +63,7 @@
                sum(if(t.ymd_date < #{date}, 1, 0))                        as prevcount,
                sum(if(t.ymd_date < #{date}, (if(t.`status` = 3, 1, 0)), 0)) as prevcompleted
         FROM core_safety_task t
-        INNER JOIN core_safecheck_plan p on t.plan_id=p.id and p.check_type=1
+        INNER JOIN core_safecheck_plan p on t.plan_id=p.id and p.check_type=3
         WHERE ymd_date >= #{prevdate}
           and org_path like concat(#{orgPath}, '%')
     </select>

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/ResumptionReportMapper.xml

@@ -81,4 +81,8 @@
             and a.org_path  like concat(#{orgPath},'%')
         </if>
     </select>
+    <select id="selectStandbyPower"
+            resultType="com.xunmei.core.reportForms.resumption.vo.IntrusionTestReportVO">
+
+    </select>
 </mapper>