修改问题

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

@@ -30,6 +30,7 @@ import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -155,6 +156,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
         for (SysOrg l : list) {
             TMonitoringRetrievalPlan monitoringRetrievalPlan = new TMonitoringRetrievalPlan();
+            BeanUtils.copyProperties(tMonitoringRetrievalPlan,monitoringRetrievalPlan);
             monitoringRetrievalPlan.setPlanName(tMonitoringRetrievalPlan.getPlanName());
             monitoringRetrievalPlan.setOrgId(l.getId());
             monitoringRetrievalPlan.setOrgName(l.getName());
@@ -222,7 +224,6 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
 
             tMonitoringRetrievalPlan.setCreateType(ZERO);
         } else {
-
             tMonitoringRetrievalPlan.setCreateType(1);
             //无周期调用
             if (tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString())) {

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

@@ -141,7 +141,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public TableDataInfo selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO) {
-        Page<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTaskPage = baseMapper.selectListApp(coreMonitoringTaskRegistrationDTO.getPageRequest(),coreMonitoringTaskRegistrationDTO);
+        Page<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTaskPage = baseMapper.selectListApp(coreMonitoringTaskRegistrationDTO.getPageRequest(), coreMonitoringTaskRegistrationDTO);
         TableDataInfo<CoreMonitoringRetrievalTask> tableDataInfo = new TableDataInfo();
         tableDataInfo.setMsg("操作成功");
         tableDataInfo.setCode(200);
@@ -170,8 +170,8 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
      */
     @Override
     public List<CoreMonitoringRetrievalTask> selectCoreMonitoringRetrievalTaskList(CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask) {
-       // return coreMonitoringRetrievalTaskMapper.selectList(new QueryWrapper<>(CoreMonitoringRetrievalTask));
-        return coreMonitoringRetrievalTaskMapper. selectCoreMonitoringRetrievalTaskList(CoreMonitoringRetrievalTask);
+        // return coreMonitoringRetrievalTaskMapper.selectList(new QueryWrapper<>(CoreMonitoringRetrievalTask));
+        return coreMonitoringRetrievalTaskMapper.selectCoreMonitoringRetrievalTaskList(CoreMonitoringRetrievalTask);
     }
 
     /**
@@ -225,10 +225,9 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         List<SysOrg> orgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.findAllOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         List<CoreMonitoringRetrievalTask> taskList = new ArrayList<>();
         LocalDate taskTime = planList.get(0).getStartTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-        ;
         for (TMonitoringRetrievalPlan plan : planList) {
             //获取计划关联的机构
-            List<SysOrg> listByType = orgList.stream().filter(r -> r.getId().equals(plan.getOrgId()) && r.getDeleted() == 0 && r.getIsLock().equals("0")).collect(Collectors.toList());
+            List<SysOrg> listByType = orgList.stream().filter(r -> r.getId().equals(plan.getOrgId()) && r.getDeleted() == 0 && r.getIsLock().equals(0)).collect(Collectors.toList());
             if (CollectionUtil.isNotEmpty(listByType)) {
                 List<CoreMonitoringRetrievalTask> list = this.buildCoreMonitoringRetrievalTask(plan, taskTime, listByType.get(0));
                 if (CollectionUtil.isNotEmpty(list)) {
@@ -340,14 +339,14 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     @Override
     public CoreMonitoringRetrievalTaskOneVo selectCoreMonitoringRetrievalTaskOneVoById(Long id) {
         CoreMonitoringRetrievalTaskOneVo retrievalTaskOneVo = coreMonitoringRetrievalTaskMapper.selectOneById(id);
-        List<TaskDataVo>  taskDataVoList = coreMonitoringRetrievalTaskMapper.selectTaskDataVoListByRetrievalTaskId(id);
+        List<TaskDataVo> taskDataVoList = coreMonitoringRetrievalTaskMapper.selectTaskDataVoListByRetrievalTaskId(id);
         retrievalTaskOneVo.setTaskDataVoList(taskDataVoList);
         return retrievalTaskOneVo;
     }
 
     @Override
     public void updateTaskStart() {
-        LocalDate dateTime =  LocalDate.now();
+        LocalDate dateTime = LocalDate.now();
         Date dateTimeNew = DateUtil.endOfDay(Date.from(dateTime.atStartOfDay(ZoneId.systemDefault()).toInstant())).setField(DateField.MILLISECOND, 0);
         coreMonitoringRetrievalTaskMapper.updateTaskStart(dateTimeNew);
     }
@@ -414,7 +413,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         DateRange dateRange = null;
         if (Integer.parseInt(plan.getPlanCycle()) == RetrievalTaskCycle.NOCYCLE.getCode()) {
             //无周期任务获取计划时间//重计划中获取
-            dateRange = new  DateRange(DateUtil.beginOfDay(plan.getStartTime()).setField(DateField.MILLISECOND, 0), DateUtil.endOfDay(plan.getEndTime()).setField(DateField.MILLISECOND, 0));
+            dateRange = new DateRange(DateUtil.beginOfDay(plan.getStartTime()).setField(DateField.MILLISECOND, 0), DateUtil.endOfDay(plan.getEndTime()).setField(DateField.MILLISECOND, 0));
         } else {
             //周期任务获取计划时间
             dateRange = DateUtils.getStartAndEnd(dateTime, Integer.parseInt(plan.getPlanCycle()));

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

@@ -75,7 +75,7 @@
             and a.org_id = #{request.orgId}
         </if>
         <if test="request.orgPath != null  and request.orgPath != ''">
-            and a.org_path = #{request.orgPath}
+            and a.org_path   like concat( #{request.orgPath}, '%')
         </if>
         <if test="request.taskName != null  and request.taskName != ''">
             and a.task_name like concat('%', #{request.taskName}, '%')