监控调阅任务

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

@@ -81,4 +81,6 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
     CoreMonitoringRetrievalTaskOneVo selectOneById(@Param("taskId") Long id);
 
     void updateTaskStart(@Param("dateTimeNew") Date dateTimeNew);
+
+    void deleteTaskByPlanId(@Param("planId") Long planId);
 }

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

@@ -89,4 +89,6 @@ public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonito
     CoreMonitoringRetrievalTaskOneVo selectCoreMonitoringRetrievalTaskOneVoById(Long id);
 
     void updateTaskStart();
+
+    void deleteTaskByPlanId(Long planId);
 }

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

@@ -84,7 +84,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         }
         //下穿
         if (request.getCheckSub()) {
-            SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+            SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectSysOrgById(request.getOrgId(),SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
             request.setOrgPath(sysOrg.getPath());
             request.setOrgId(null);
         }
@@ -99,7 +99,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         //不分页
         request.setPageSize(null);
         request.setPageNum(null);
-        SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectSysOrgById(request.getOrgId(),SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         List<SysDictData> listDict = RemoteCallHandlerExecutor.executeRemoteCall(() -> dictDataService.selectDictByeType("retrieval_task_status", SecurityConstants.INNER), ErrorMsgConstants.QUERY_DICT_DATA_ERROR);
         final TableDataInfo tableDataInfo = this.selectPage(request);
         if (ObjectUtil.isEmpty(tableDataInfo.getRows())) {
@@ -351,6 +351,11 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         coreMonitoringRetrievalTaskMapper.updateTaskStart(dateTimeNew);
     }
 
+    @Override
+    public void deleteTaskByPlanId(Long planId) {
+        coreMonitoringRetrievalTaskMapper.deleteTaskByPlanId(planId);
+    }
+
     /**
      * @param cycle    周期
      * @param taskTime 日期

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

@@ -369,4 +369,7 @@
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteTaskByPlanId">
+        delete from core_monitoring_retrieval_task where plan_id = #{planId} and status  in (0,3)
+    </delete>
 </mapper>