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

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/drill/DrillPlanCycleEnum.java

@@ -29,7 +29,7 @@ public enum DrillPlanCycleEnum {
         return desc;
     }
 
-    public static CycleCommonEnum toCommmonEnum(Integer code) {
+    public static CycleCommonEnum toCommonEnum(Integer code) {
         switch (code) {
             case 0:
                 return CycleCommonEnum.NONE;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/edu/EduTrainingPlanCycleEnum.java

@@ -36,7 +36,7 @@ public enum EduTrainingPlanCycleEnum
         return desc;
     }
 
-    public static CycleCommonEnum toCommmonEnum(Integer code){
+    public static CycleCommonEnum toCommonEnum(Integer code){
         switch (code){
             case  0:
                 return CycleCommonEnum.NONE;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/dto/CoreMonitoringTaskRegistrationDTO.java

@@ -106,4 +106,5 @@ public class CoreMonitoringTaskRegistrationDTO  extends PageRequest {
     /** 异常数 */
     @ApiModelProperty(value = "异常数")
     private Integer exceptionCount;
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -133,13 +133,23 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             TMonitoringRetrievalPlan plan1 = tMonitoringRetrievalPlanMapper.selectById(plan.getParentId());
             tMonitoringRetrievalPlanVO.setParentFrequency(plan1.getPlanFrequency());
         }
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("is_deleted",0);
+        queryWrapper.eq("parent_id",id);
+        List<TMonitoringRetrievalPlan> list = tMonitoringRetrievalPlanMapper.selectList(queryWrapper);
+        list.add(plan);
+        List<Long> collect = list.stream().map(TMonitoringRetrievalPlan::getId).collect(Collectors.toList());
         boolean isEdit = false;
         boolean isComplete = false;
         if (plan.getParentId() != null) {
             isEdit = true;
         }
         tMonitoringRetrievalPlanVO.setIsEdit(isEdit);
-        List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectComplete(id);
+        List<String>status=new ArrayList<>();
+        status.add("2");
+        status.add("3");
+        List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(collect, status);
+
         if (CollectionUtils.isNotEmpty(coreMonitoringRetrievalTasks) && plan.getParentId() == null) {
             isComplete = true;
         }

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

@@ -362,7 +362,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     public void createTaskForNow(CoreDrillPlanDataVo plan, Date start, Date end) {
         if (plan.getPlanCycle() != 0) {
             //如果不是无周期的计划，那么需要查询出他的时间范围，且需要判断作息时间是否存在
-            DateRange dateRange = DateUtils.getStartAndEnd(new Date(), EduTrainingPlanCycleEnum.toCommmonEnum(plan.getPlanCycle()));
+            DateRange dateRange = DateUtils.getStartAndEnd(new Date(), EduTrainingPlanCycleEnum.toCommonEnum(plan.getPlanCycle()));
             start = dateRange.getStartTime();
             end = dateRange.getEndTime();
         } else {
@@ -400,7 +400,9 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         }
         List<Long> workOrgIdList = workTimeList.stream().filter(time -> ObjectUtil.equal(time.getIsEnable(), WORK))
                 .map(SysWorkTime::getOrgId).collect(Collectors.toList());
-        return orgList.stream().filter(org -> workOrgIdList.contains(org.getId())).collect(Collectors.toList());
+        return orgList.stream()
+                .filter(org -> workOrgIdList.contains(org.getId())||!OrgTypeEnum.YINGYE_WANGDIAN.getCode().equals(org.getType()))
+                .collect(Collectors.toList());
         // return orgList;
 
     }
@@ -421,19 +423,11 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 .eq(CoreDrillTask::getPlanId, plan.getId())
                 .select(CoreDrillTask::getId, CoreDrillTask::getOrgId, CoreDrillTask::getStartDate, CoreDrillTask::getEndDate, CoreDrillTask::getPlanId)
         );
-        //生成任务时,只有特定类型的机构类型才需要判断作息
-        final List<Integer> orgTypeList = Arrays.asList(
-                OrgTypeEnum.YINGYE_WANGDIAN.getCode()
-//                OrgTypeEnum.LIHANG_ZIZHU_YINGHANG.getCode(),
-//                OrgTypeEnum.ZHONGXIN_YEWUKU.getCode(),
-//                OrgTypeEnum.BAOGUAN_XAINGKU.getCode(),
-//                OrgTypeEnum.WANGDIAN_YEWUKU.getCode()
-        );
         for (SysOrg org : orgList) {
             int x = 0;
             for (int i = 1; i <= plan.getExecTimes(); i++) {
                 final LocalDateTime time = DateUtils.toLocalDateTime(DateUtils.getPreciseTime(dateRangeMap.get(i).getEndTime()));
-                if (time.isBefore(LocalDateTime.now()) && orgTypeList.contains(org.getType())) {
+                if (time.isBefore(LocalDateTime.now())) {
                     //如果任务的结束时间 已经小于当前时间则没必要生成任务了,
                     //用于处理周期中生成多次任务,周期初的任务一经生成就无法执行(预期)的问题,
                     log.warn("生成任务时，任务的结束时间已经小于当前时间,本次任务跳过,任务id:{},任务执行机构id:{},任务时间范围:{}-{}", plan.getId(), org.getId(), dateRangeMap.get(i).getStartTime(), dateRangeMap.get(i).getEndTime());
@@ -731,7 +725,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 //此处因为planService会导致循环依赖
                 final CoreDrillPlanDataVo detailPlanData = coreDrillPlanMapper.getDetailPlanData(plan.getId());
                 detailPlanData.setFileList(ObjectUtil.isNotEmpty(detailPlanData.getFile()) ? JSON.parseArray(detailPlanData.getFile(), String.class) : null);
-                DateRange range = DateUtils.getStartAndEnd(finalDate, EduTrainingPlanCycleEnum.toCommmonEnum(plan.getPlanCycle()));
+                DateRange range = DateUtils.getStartAndEnd(finalDate, DrillPlanCycleEnum.toCommonEnum(plan.getPlanCycle()));
                 this.createTaskForNow(detailPlanData, range.getStartTime(), range.getEndTime());
             }, threadPoolTaskExecutor);
         }

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

@@ -414,7 +414,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
 
         if (plan.getPlanCycle() != 0) {
             //如果不是无周期的计划，那么需要查询出他的时间范围
-            DateRange dateRange = DateUtils.getStartAndEnd(new Date(), EduTrainingPlanCycleEnum.toCommmonEnum(plan.getPlanCycle()));
+            DateRange dateRange = DateUtils.getStartAndEnd(new Date(), EduTrainingPlanCycleEnum.toCommonEnum(plan.getPlanCycle()));
             start = dateRange.getStartTime();
             end = dateRange.getEndTime();
         } else {
@@ -457,7 +457,9 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         }
         List<Long> workOrgIdList = workTimeList.stream().filter(time -> ObjectUtil.equal(time.getIsEnable(), WORK))
                 .map(SysWorkTime::getOrgId).collect(Collectors.toList());
-        return orgList.stream().filter(org -> workOrgIdList.contains(org.getId())).collect(Collectors.toList());
+        return orgList.stream()
+                .filter(org -> workOrgIdList.contains(org.getId())||!OrgTypeEnum.YINGYE_WANGDIAN.getCode().equals(org.getType()))
+                .collect(Collectors.toList());
         // return orgList;
 
     }
@@ -479,19 +481,12 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
                 .eq(CoreEduTrainingTask::getPlanId, plan.getId())
                 .select(CoreEduTrainingTask::getId, CoreEduTrainingTask::getOrgId, CoreEduTrainingTask::getStartDate, CoreEduTrainingTask::getEndDate, CoreEduTrainingTask::getPlanId)
         );
-        //生成任务时,只有特定类型的机构类型才需要判断作息
-        final List<Integer> orgTypeList = Arrays.asList(
-                OrgTypeEnum.YINGYE_WANGDIAN.getCode()
-//                OrgTypeEnum.LIHANG_ZIZHU_YINGHANG.getCode(),
-//                OrgTypeEnum.ZHONGXIN_YEWUKU.getCode(),
-//                OrgTypeEnum.BAOGUAN_XAINGKU.getCode(),
-//                OrgTypeEnum.WANGDIAN_YEWUKU.getCode()
-        );
+
         for (SysOrg org : orgList) {
             int x = 0;
             for (int i = 1; i <= plan.getExecTimes(); i++) {
                 final LocalDateTime time = DateUtils.toLocalDateTime(DateUtils.getPreciseTime(dateRangeMap.get(i).getEndTime()));
-                if (time.isBefore(LocalDateTime.now()) && orgTypeList.contains(org.getType())) {
+                if (time.isBefore(LocalDateTime.now())) {
                     //如果任务的结束时间 已经小于当前时间则没必要生成任务了,
                     //用于处理周期中生成多次任务,周期初的任务一经生成就无法执行(预期)的问题,
                     log.warn("生成任务时，任务的结束时间已经小于当前时间,本次任务跳过,任务id:{},任务执行机构id:{},任务时间范围:{}-{}", plan.getId(), org.getId(), dateRangeMap.get(i).getStartTime(), dateRangeMap.get(i).getEndTime());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluatePlanController.java

@@ -1,6 +1,7 @@
 package com.xunmei.core.evaluate.controller;
 
 
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -8,10 +9,14 @@ import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.InnerAuth;
 import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.evaluate.domain.CoreEvaluatePlan;
 import com.xunmei.core.evaluate.dto.CoreEvaluatePlanDTO;
 import com.xunmei.core.evaluate.dto.EvaluateQueryDTO;
 import com.xunmei.core.evaluate.service.ICoreEvaluatePlanService;
+import com.xunmei.core.evaluate.vo.CoreEvaluatePlanListVO;
+import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,15 +37,21 @@ import java.util.List;
 public class CoreEvaluatePlanController extends BaseController {
     @Autowired
     private ICoreEvaluatePlanService coreEvaluatePlanService;
-
+    @Autowired
+    private RemoteOrgService remoteOrgService;
     /**
      * 查询外包评价计划列表
      */
     @ApiOperation(value = "查询CoreEvaluatePlan列表分页")
     @RequiresPermissions("core:evaluatePlan:list")
     @GetMapping("/list")
-    public TableDataInfo list(EvaluateQueryDTO coreEvaluatePlan) {
-        return coreEvaluatePlanService.selectPage(coreEvaluatePlan);
+    public AjaxResult list(EvaluateQueryDTO coreEvaluatePlan) {
+        AjaxResult ajax = AjaxResult.success();
+        SysOrg sysOrg = remoteOrgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
+        TableDataInfo<CoreEvaluatePlanListVO> coreEvaluatePlanListVOTableDataInfo = coreEvaluatePlanService.selectPage(coreEvaluatePlan);
+        ajax.put("data", coreEvaluatePlanListVOTableDataInfo);
+        ajax.put("isEdit", sysOrg.getId());
+        return ajax;
     }
 
     @ApiOperation(value = "查询CoreEvaluatePlan列表全部")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -164,6 +164,7 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
      */
     List<CoreMonitoringRetrievalTask> selectCompleteByPlanId(Long planId);
 
+
     void deleteWaitTaskByPlanId(@Param("planId") Long planId);
 
     void updateDeleteTaskByPlanId(@Param("planId") Long planId, @Param("isDeleted") Integer isDeleted);

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

@@ -385,7 +385,7 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
             dateRange = new DateRange(DateUtil.beginOfDay(plan.getStartTime()).setField(DateField.MILLISECOND, 0), DateUtil.endOfDay(plan.getEndTime()).setField(DateField.MILLISECOND, 0));
         } else {
             //周期任务获取计划时间
-            dateRange = DateUtils.getStartAndEnd(dateTime, EduTrainingPlanCycleEnum.toCommmonEnum(Integer.parseInt(plan.getPlanCycle())));
+            dateRange = DateUtils.getStartAndEnd(dateTime, EduTrainingPlanCycleEnum.toCommonEnum(Integer.parseInt(plan.getPlanCycle())));
         }
         Map<Integer, DateRange> dateRanges = DateUtils.splitDateRange(dateRange.getStartTime(), dateRange.getEndTime(), plan.getPlanFrequency().intValue());
         //判断作息（无周期排开）

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

@@ -149,16 +149,12 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     @Override
     public TableDataInfo selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
+        coreMonitoringTaskRegistrationDTO.setRetrievalUser(SecurityUtils.getUserId());
         if (null == coreMonitoringTaskRegistrationDTO.getOrgId()) {
             coreMonitoringTaskRegistrationDTO.setOrgId(loginUser.getOrgId());
         }
         Page<AppCoreMonitoringRetrievalTaskVO> coreMonitoringRetrievalTaskPage = baseMapper.selectListApp(coreMonitoringTaskRegistrationDTO.getPageRequest(), coreMonitoringTaskRegistrationDTO);
-        TableDataInfo<AppCoreMonitoringRetrievalTaskVO> tableDataInfo = new TableDataInfo();
-        tableDataInfo.setMsg("操作成功");
-        tableDataInfo.setCode(200);
-        tableDataInfo.setTotal(coreMonitoringRetrievalTaskPage.getTotal());
-        tableDataInfo.setRows(coreMonitoringRetrievalTaskPage.getRecords());
-        return tableDataInfo;
+        return TableDataInfo.build(coreMonitoringRetrievalTaskPage);
     }
 
 
@@ -175,7 +171,6 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public List<CoreMonitoringRetrievalTask> selectComplete(Long planId) {
-
         return coreMonitoringRetrievalTaskMapper.selectCompleteByPlanId(planId);
     }
 

soc-modules/soc-modules-core/src/main/resources/mapper/access/TMonitoringRetrievalPlanMapper.xml

@@ -79,7 +79,7 @@
     <select id="selectPageList" resultType="com.xunmei.core.access.vo.TMonitoringRetrievalPlanVO">
         SELECT
         IFNULL( b.org_id, a.org_id ) AS parentOrgId,
-        a.id,
+        a.id as id,
         a.plan_name,
         a.org_id,
         a.org_name,

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluatePlanMapper.xml

@@ -60,6 +60,7 @@
         a.id,
         a.org_name,
         a.evaluate_name,
+               a.org_id,
                a.build_task_now,
         d.dict_label AS orgType,
         GROUP_CONCAT( c.role_name ) AS roleName,

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -158,6 +158,7 @@
         <if test="request.moth !=null">
             and a.ymd_date like concat('%', #{request.moth}, '%')
         </if>
+        AND a.role_id IN (SELECT role_id FROM sys_user_role WHERE user_id=#{request.retrievalUser})
         GROUP BY
         a.id
         ORDER BY FIELD(a.`status`,'1','0','2','3'),