Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.5

 Conflicts:
	project_data/sql/0.0.5/soc/soc.sql

project_data/sql/0.0.5/soc/soc.sql

@@ -146,6 +146,10 @@ INSERT INTO `sys_dict_data` ( `dict_sort`, `dict_label`, `dict_value`, `dict_typ
 DELETE from sys_dict_data where dict_type='sign_level' and dict_label='其他' limit 1;
 INSERT INTO  `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (0, '其他', '3', 'sign_level', NULL, 'default', 'N', '0', null, NOW(), null
                                                                                                                                                                                                                 , NOW(), NULL);
+-- 增加演练范本详情菜单权限
+set @id =  ( SELECT id FROM `sys_menu` where menu_name='演练范本详情' and perms='core:drillDictionary:query');
+DELETE from sys_role_menu where menu_id=@id;
+insert into sys_role_menu select DISTINCT id,@id from sys_role;
 -- 仅仅给超级管理员用，标记为删除状态,通过脚本维护了一条管理员与角色的关联数据，防止首页等依赖于登录用户角色信息的页面查询报错
 DELETE FROM `sys_role` WHERE `role_name`='超级管理员';
 INSERT INTO `sys_role` (`org_type`, `role_name`, `role_key`, `role_sort`, `data_scope`, `menu_check_strictly`, `dept_check_strictly`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('1', '超级管理员', 'default', 0, 1, 1, 1, '0', 2, '超级管理员', '2023-12-07 17:14:07', '', NULL, '仅仅给超级管理员用，标记为删除状态,通过脚本维护了一条管理员与角色的关联数据，防止首页等依赖于登录用户角色信息的页面查询报错');

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/controller/CoreDrillDictionaryController.java

@@ -47,7 +47,7 @@ public class CoreDrillDictionaryController extends BaseController {
      * 获取预案演练库详细信息
      */
     @ApiOperation(value = "获取CoreDrillDictionary详细信息")
-    @RequiresPermissions("core:drillDictionary:edit")
+    @RequiresPermissions("core:drillDictionary:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(coreDrillDictionaryService.selectCoreDrillDictionaryById(id));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/panel/service/impl/PanelServiceImpl.java

@@ -99,14 +99,16 @@ public class PanelServiceImpl implements PanelService {
 
     @Override
     public List<PanelResultVo> selectPage() throws ExecutionException, InterruptedException, TimeoutException {
-        Long userId=SecurityUtils.getUserId();
+        Long userId = SecurityUtils.getUserId();
         List<Long> roles = RemoteCallHandlerExecutor.executeRemoteCall(
                 () -> roleService.getUserRoleId(userId, SecurityConstants.FROM_SOURCE),
                 ErrorMsgConstants.QUERY_USER_ROLE_ERROR);
 
         PanelListDto panelListDto = PanelAdapter.getMapperSelectParam(SecurityUtils.getLoginUser().getOrgId(),
                 roles, userId);
-
+        if (ObjectUtil.isEmpty(panelListDto.getRoleIdList())) {
+            return new ArrayList<>();
+        }
 
         //履职任务
         CompletableFuture<List<PanelListVo>> resumptionTaskFuture = CompletableFuture.supplyAsync(() ->
@@ -203,6 +205,9 @@ public class PanelServiceImpl implements PanelService {
         PanelListDto req = PanelAdapter.getMapperSelectParam(SecurityUtils.getLoginUser().getOrgId(),
                 roles, SecurityUtils.getUserId());
         req.setPermList(permList);
+        if (ObjectUtil.isEmpty(req.getRoleIdList()) || ObjectUtil.isEmpty(permList)) {
+            return new ArrayList<>();
+        }
         List<CompletableFuture<WebPanelResult>> list = new ArrayList<>();
         //教育培训
         CompletableFuture<WebPanelResult> eduTrainingTaskFuture = CompletableFuture.supplyAsync(() ->

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafeLevelServiceImpl.java

@@ -87,6 +87,12 @@ public class CoreSafeLevelServiceImpl extends ServiceImpl<CoreSafeLevelMapper, C
      */
     @Override
     public int updateCoreSafeLevel(CoreSafeLevel coreSafeLevel) {
+        if (coreSafeLevel.getMaxValue().intValue() < 0 || coreSafeLevel.getMinValue().intValue() < 0) {
+            throw new RuntimeException("区间最大值或最小值不能小于0!");
+        }
+        if (ObjectUtil.equals(coreSafeLevel.getMaxValue(), coreSafeLevel.getMinValue())) {
+            throw new RuntimeException("区间最大值或最小值不能小于相等!");
+        }
         final List<CoreSafeLevel> list = coreSafeLevelMapper.selectList(null);
         list.removeIf(item -> ObjectUtil.equal(item.getId(), coreSafeLevel.getId()));
         for (CoreSafeLevel level : list) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafetyIndexCalculateRuleServiceImpl.java

@@ -52,6 +52,7 @@ public class CoreSafetyIndexCalculateRuleServiceImpl extends ServiceImpl<CoreSaf
     private ICoreSafetyIndexCalculateRuleItemService ruleItemService;
     @Autowired
     private CoreSafetyIndexCalculateRuleItemMapper ruleItemMapper;
+
     @Override
     public TableDataInfo<CoreSafetyIndexCalculateRulePageVo> selectPage(CoreSafetyIndexCalculateRulePageDto request) {
 
@@ -61,7 +62,7 @@ public class CoreSafetyIndexCalculateRuleServiceImpl extends ServiceImpl<CoreSaf
         if (ObjectUtil.isEmpty(records)) {
             return TableDataInfo.build(page);
         }
-        Map<String, String> map =getCoreSafetyDictMap();
+        Map<String, String> map = getCoreSafetyDictMap();
         for (CoreSafetyIndexCalculateRulePageVo record : page.getRecords()) {
             //设置组织名称
             record.setOrgTypeText(OrgTypeEnum.getName(record.getOrgType()));
@@ -74,7 +75,7 @@ public class CoreSafetyIndexCalculateRuleServiceImpl extends ServiceImpl<CoreSaf
         return TableDataInfo.build(page);
     }
 
-    private Map<String, String>  getCoreSafetyDictMap(){
+    private Map<String, String> getCoreSafetyDictMap() {
         List<CoreSafetyDict> dictList = safetyDictService.selectCoreSafetyDictList(null);
         return dictList.stream().collect(Collectors.toMap(CoreSafetyDict::getCode, CoreSafetyDict::getName));
     }
@@ -88,7 +89,7 @@ public class CoreSafetyIndexCalculateRuleServiceImpl extends ServiceImpl<CoreSaf
     @Override
     public CoreSafetyIndexCalculateRuleDetailVo selectCoreSafetyIndexCalculateRuleById(Long id) {
         CoreSafetyIndexCalculateRule calculateRule = coreSafetyIndexCalculateRuleMapper.selectById(id);
-        if (calculateRule==null){
+        if (calculateRule == null) {
             throw new SystemException("安全指标配置不存在");
         }
         CoreSafetyIndexCalculateRuleDetailVo record = new CoreSafetyIndexCalculateRuleDetailVo();
@@ -101,7 +102,7 @@ public class CoreSafetyIndexCalculateRuleServiceImpl extends ServiceImpl<CoreSaf
         List<CoreSafetyIndexCalculateRuleItem> list = ruleItemService.list(new LambdaQueryWrapper<CoreSafetyIndexCalculateRuleItem>()
                 .eq(CoreSafetyIndexCalculateRuleItem::getRuleId, id));
         List<CoreSafetyIndexCalculateRuleItemVo> properties = BeanHelper.copyProperties(list, CoreSafetyIndexCalculateRuleItemVo.class);
-        properties.forEach(r->{
+        properties.forEach(r -> {
             r.setCalculateTypeText(CalculateTypeEnums.getName(r.getCalculateType()));
         });
         record.setItemList(properties);
@@ -137,7 +138,7 @@ public class CoreSafetyIndexCalculateRuleServiceImpl extends ServiceImpl<CoreSaf
         calculateRule.setId(IdWorker.getId());
         List<CoreSafetyIndexCalculateRuleItemInsertDto> itemList = coreSafetyIndexCalculateRule.getItemList();
         List<CoreSafetyIndexCalculateRuleItem> properties = BeanHelper.copyProperties(itemList, CoreSafetyIndexCalculateRuleItem.class);
-        properties.forEach(r->{
+        properties.forEach(r -> {
             r.setRuleId(calculateRule.getId());
             r.setCreateBy(SecurityUtils.getUserId().toString());
             r.setUpdateBy(SecurityUtils.getUserId().toString());
@@ -157,6 +158,9 @@ public class CoreSafetyIndexCalculateRuleServiceImpl extends ServiceImpl<CoreSaf
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int updateCoreSafetyIndexCalculateRule(CoreSafetyIndexCalculateRuleUpdateDto request) {
+        if (request.getScore() < 0) {
+            throw new RuntimeException("分值不能小于0!");
+        }
         CoreSafetyIndexCalculateRule coreSafetyIndexCalculateRule = new CoreSafetyIndexCalculateRule();
         BeanUtils.copyProperties(request, coreSafetyIndexCalculateRule);
         coreSafetyIndexCalculateRule.setUpdateBy(SecurityUtils.getUserId().toString());
@@ -164,10 +168,16 @@ public class CoreSafetyIndexCalculateRuleServiceImpl extends ServiceImpl<CoreSaf
         ruleItemMapper.delete(new LambdaQueryWrapper<CoreSafetyIndexCalculateRuleItem>().eq(CoreSafetyIndexCalculateRuleItem::getRuleId, request.getId()));
         List<CoreSafetyIndexCalculateRuleItemUpdateDto> itemList = request.getItemList();
         List<CoreSafetyIndexCalculateRuleItem> properties = BeanHelper.copyProperties(itemList, CoreSafetyIndexCalculateRuleItem.class);
-        properties.forEach(r->{
+        properties.forEach(r -> {
+            if (ObjectUtil.isNull(r.getIndicatorDays()) || r.getIndicatorDays() < 0) {
+                throw new RuntimeException("连续数不能小于0!");
+            }
+            if (ObjectUtil.isNull(r.getItemValue()) || r.getItemValue() < 0) {
+                throw new RuntimeException("系数不能小于0!");
+            }
             r.setUpdateBy(SecurityUtils.getUserId().toString());
             r.setUpdateTime(new Date());
-            if (r.getId()==null){
+            if (r.getId() == null) {
                 r.setCreateBy(SecurityUtils.getUserId().toString());
                 r.setCreateTime(new Date());
             }