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

project_data/sql/0.0.5/soc/soc.sql

@@ -170,12 +170,12 @@ INSERT INTO `sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`
 
 -- 整改期限增加60天、180天内，360天内
 DELETE from sys_dict_data WHERE dict_type='rectification_deadline';
-INSERT INTO `sys_dict_data` (`dict_code`, `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 (269, 1, '15天内', '15', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-09-01 16:58:56', 'jwx', '2023-12-26 16:36:34', NULL);
-INSERT INTO `sys_dict_data` (`dict_code`, `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 (270, 2, '30天内', '30', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-09-01 17:00:07', 'jwx', '2023-12-26 16:36:40', NULL);
-INSERT INTO `sys_dict_data` (`dict_code`, `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 (271, 4, '90天内', '90', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-09-01 17:00:17', 'jwx', '2023-12-26 16:37:04', NULL);
-INSERT INTO `sys_dict_data` (`dict_code`, `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 (20231114968, 3, '60天内', '60', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-12-26 16:36:57', 'jwx', '2023-12-26 16:37:08', NULL);
-INSERT INTO `sys_dict_data` (`dict_code`, `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 (20231114970, 5, '180天内', '180', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-12-26 16:37:23', '', NULL, NULL);
-INSERT INTO `sys_dict_data` (`dict_code`, `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 (20231114972, 6, '360天内', '360', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-12-26 16:37:39', '', NULL, NULL);
+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 ( 1, '15天内', '15', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-09-01 16:58:56', 'jwx', '2023-12-26 16:36:34', NULL);
+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 ( 2, '30天内', '30', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-09-01 17:00:07', 'jwx', '2023-12-26 16:36:40', NULL);
+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 ( 4, '90天内', '90', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-09-01 17:00:17', 'jwx', '2023-12-26 16:37:04', NULL);
+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 ( 3, '60天内', '60', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-12-26 16:36:57', 'jwx', '2023-12-26 16:37:08', NULL);
+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 ( 5, '180天内', '180', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-12-26 16:37:23', '', NULL, NULL);
+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 ( 6, '360天内', '360', 'rectification_deadline', NULL, 'default', 'N', '0', '超级管理员', '2023-12-26 16:37:39', '', NULL, NULL);
 
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -299,9 +299,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             coreDrillTask.setPlanCycle(DrillPlanCycleEnum.NONE.getCode());
             coreDrillTask.setCreateBy(SecurityUtils.getUserId().toString());
             coreDrillTask.setCreateTime(new Date());
-            coreDrillTask.setStartDate(DateUtils.toDate(request.getDrillStartTime()));
-            coreDrillTask.setEndDate(DateUtils.toDate(request.getDrillEndTime()));
-
+            coreDrillTask.setStartDate(DateUtil.beginOfDay(new Date()));
+            coreDrillTask.setEndDate(DateUtil.endOfDay(new Date()));
         }
         taskToUserMapper.deleteByMap(MapUtil.of("drill_task_id", request.getId()));
         coreDrillTask.setType(request.getType());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -275,6 +275,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         task.setOrgName(sysOrg.getName());
         task.setOrgPath(sysOrg.getPath());
         BeanUtils.copyProperties(request, task);
+        task.setStartDate(DateUtil.beginOfDay(new Date()));
+        task.setEndDate(DateUtil.endOfDay(new Date()));
         task.setCreateTime(DateUtils.getNowDate());
         task.setUpdateTime(DateUtils.getNowDate());
         task.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -180,6 +180,9 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
 
     @Override
     public Map statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
+        if (null==evaluateTaskStatisticsDTO.getPlanId()||null==evaluateTaskStatisticsDTO.getOrgId()){
+            return null;
+        }
         Map map = new HashMap();
         List<SysOrg> sysOrgs = remoteOrgService.selectSysOrgByParentId(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
         List<LinkedHashMap> rows = new ArrayList<>();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/ICoreMessageCenterService.java

@@ -35,7 +35,7 @@ public interface ICoreMessageCenterService extends IService<CoreMessageCenter> {
 
 
     TableDataInfo selectByPage(CoreMessageCenterDTO coreMessageCenterDTO);
-    Boolean isRead();
+    Integer isRead();
     /**
      * 新增消息中心
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/impl/CoreMessageCenterServiceImpl.java

@@ -92,7 +92,7 @@ public class CoreMessageCenterServiceImpl extends ServiceImpl<CoreMessageCenterM
     }
 
     @Override
-    public Boolean isRead() {
+    public Integer isRead() {
         Long userId = SecurityUtils.getUserId();
         Integer integer1 = baseMapper.selectNoRead(userId);
         //通知
@@ -111,12 +111,12 @@ public class CoreMessageCenterServiceImpl extends ServiceImpl<CoreMessageCenterM
         List<Long> collect1 = messageAppPageVos.stream().map(MessageAppPageVo::getId).collect(Collectors.toList());
         Integer i = 0;
         if (CollectionUtils.isNotEmpty(collect1) && CollectionUtils.isNotEmpty(longs) && longs.size() != collect1.size()) {
-            i = 1;
+            i = collect1.size() - longs.size();
         }
-        if (i + integer1 == 0) {
-            return false;
+        if (i + integer1 <= 0) {
+            return 0;
         }
-        return true;
+        return i + integer1;
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskBuilderServiceImpl.java

@@ -8,11 +8,14 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.domain.retrieval.vo.*;
+import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
+import com.xunmei.common.core.domain.worktime.dto.WorkTimeDto;
 import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.enums.RetrievalTaskCycle;
 import com.xunmei.common.core.enums.edu.EduTrainingPlanCycleEnum;
@@ -20,6 +23,7 @@ import com.xunmei.common.core.event.WorkTimeChangeEvent;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.Ymd;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.TaskCreatingServiceImplBase;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper;
 import com.xunmei.core.access.service.ITMonitoringRetrievalPlanService;
@@ -407,14 +411,18 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
             //周期任务获取计划时间
             dateRange = DateUtils.getStartAndEnd(dateTime, EduTrainingPlanCycleEnum.toCommonEnum(Integer.parseInt(plan.getPlanCycle())));
         }
-        Map<Integer, DateRange> dateRanges = DateUtils.splitDateRange(dateRange.getStartTime(), dateRange.getEndTime(), plan.getPlanFrequency().intValue());
+        List<SysOrg> orgList = new ArrayList<>();
+        orgList.add(sysOrg);
+        final List<SysWorkTime> workTimeList = getWorkTimeList(orgList, dateRange.getStartTime(), dateRange.getEndTime());
+        //Map<Integer, DateRange> dateRanges = DateUtils.splitDateRange(dateRange.getStartTime(), dateRange.getEndTime(), plan.getPlanFrequency().intValue());
+        Map<Short, DateRange> dateRanges = TaskCreatingServiceImplBase.splitTaskTime((short)plan.getPlanFrequency().intValue(), EduTrainingPlanCycleEnum.toCommonEnum(Integer.parseInt(plan.getPlanCycle())), dateRange.getStartTime(), dateRange.getEndTime(), workTimeList);
         //判断作息（无周期排开）
 //        if (!plan.getPlanCycle().equals(RetrievalTaskCycle.NOCYCLE.getCode().toString())) {
-        int idx = 1;
+/*        int idx = 1;
         Map<Integer, DateRange> workingDateRanges = new HashMap<>();
 
 
-        for (Map.Entry<Integer, DateRange> entry : dateRanges.entrySet()) {
+        for (Map.Entry<Short, DateRange> entry : dateRanges.entrySet()) {
             DateRange dateRange1 = entry.getValue();
             boolean flag = true;
             if (ObjectUtil.equal(sysOrg.getType(), OrgTypeEnum.YINGYE_WANGDIAN.getCode())) {
@@ -425,13 +433,13 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
                 workingDateRanges.put(idx, dateRange1);
                 idx++;
             }
-        }
+        }*/
 
-        for (Map.Entry<Integer, DateRange> entry : workingDateRanges.entrySet()) {
-            Integer key = entry.getKey();
+        for (Map.Entry<Short, DateRange> entry : dateRanges.entrySet()) {
+            Integer key = entry.getKey().intValue();
             DateRange dateRange1 = entry.getValue();
             CoreMonitoringRetrievalTask task = this.buildCoreMonitoringRetrievalTask(batchNum, key, plan, sysOrg,
-                    dateRange1, ymd, workingDateRanges.size());
+                    dateRange1, ymd, dateRanges.size());
             taskList.add(task);
         }
         return taskList;
@@ -748,6 +756,18 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
         }
     }
 
+    private List<SysWorkTime> getWorkTimeList(List<SysOrg> orgList, Date start, Date end) {
+        List<Long> orgIdList = orgList.stream().map(SysOrg::getId).collect(Collectors.toList());
+        String startTime = DateUtil.format(start, Constants.DAILY_FORMAT);
+        String endTime = DateUtil.format(end, Constants.DAILY_FORMAT);
+        WorkTimeDto workTimeDto = new WorkTimeDto();
+        workTimeDto.setOrgIdList(orgIdList);
+        workTimeDto.setStartTime(startTime);
+        workTimeDto.setEndTime(endTime);
+        return RemoteCallHandlerExecutor.executeRemoteCall(() ->
+                        workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.FROM_SOURCE).getData(),
+                ErrorMsgConstants.QUERY_ORG_WORK_TIME_ERROR);
+    }
 //    private List<SysWorkTime> selectWorkTimeList(Date now, CycleCommonEnum cycle, WorkTimeChangeEvent event) {
 //        DateRange range = DateUtils.getStartAndEnd(now, cycle);
 //        String startTime = DateUtil.format(range.getStartTime(), Constants.DAILY_FORMAT);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysNfcBindController.java

@@ -53,7 +53,6 @@ public class SysNfcBindController extends BaseController {
      * 获取【请填写功能名称】详细信息
      */
     @ApiOperation(value = "app获取SysNfcBind详细信息,传入code")
-    @RequiresPermissions("system:bind:query")
     @GetMapping(value = {"/appGetInfo/{code}"})
     public AjaxResult appGetInfo(@PathVariable String code) {
         AjaxResult ajax = AjaxResult.success();