|
|
@@ -41,6 +41,7 @@ import com.xunmei.common.security.utils.SecurityUtils;
|
|
|
import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
|
|
|
import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
|
|
|
import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper;
|
|
|
+import com.xunmei.core.access.mapper.TMonitoringRetrievalPlanMapper;
|
|
|
import com.xunmei.core.access.service.ITMonitoringRetrievalPlanService;
|
|
|
import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
|
|
|
import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskBuilderService;
|
|
|
@@ -99,7 +100,9 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
|
|
|
@Autowired
|
|
|
CoreSafetyExceptionDataMapper exceptionDataMapper;
|
|
|
@Autowired
|
|
|
- ICoreMonitoringRetrievalTaskBuilderService coreMonitoringRetrievalTaskBuilderService;
|
|
|
+ ICoreMonitoringRetrievalTaskBuilderService coreMonitoringRetrievalTskBuilderService;
|
|
|
+ @Autowired
|
|
|
+ TMonitoringRetrievalPlanMapper tMonitoringRetrievalPlanMapper;
|
|
|
private static final Integer ZERO = 0;
|
|
|
private static final String PARENT_ID = "parent_id";
|
|
|
|
|
|
@@ -333,11 +336,11 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
|
|
|
@Override
|
|
|
public void updateComplete(boolean isComplete, TMonitoringRetrievalPlan tMonitoringRetrievalPlan, TMonitoringRetrievalPlan plan) {
|
|
|
if (isComplete) {
|
|
|
- coreMonitoringRetrievalTaskBuilderService.deleteWaitTaskByPlanId(tMonitoringRetrievalPlan.getId());
|
|
|
+ coreMonitoringRetrievalTskBuilderService.deleteWaitTaskByPlanId(tMonitoringRetrievalPlan.getId());
|
|
|
try {
|
|
|
QueryWrapper queryWrapper = new QueryWrapper();
|
|
|
queryWrapper.eq(PARENT_ID, plan.getId());
|
|
|
- baseMapper.delete(queryWrapper);
|
|
|
+ tMonitoringRetrievalPlanMapper.delete(queryWrapper);
|
|
|
SysOrg sysOrg1 = orgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
|
|
|
List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
|
|
|
if (sysOrg1.getType() == 1 && plan.getIsDistribute().equals("1")) {
|
|
|
@@ -407,7 +410,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
|
|
|
}
|
|
|
if ((tMonitoringRetrievalPlan.getImmediately().equals(Boolean.TRUE) || tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString())) && CollectionUtils.isNotEmpty(tMonitoringRetrievalPlans) && tMonitoringRetrievalPlan.getIsDistribute().equals("1")) {
|
|
|
try {
|
|
|
- coreMonitoringRetrievalTaskBuilderService.noCycleTask(tMonitoringRetrievalPlans);
|
|
|
+ coreMonitoringRetrievalTskBuilderService.noCycleTask(tMonitoringRetrievalPlans);
|
|
|
} catch (Exception e) {
|
|
|
throw new ServiceException("下发任务异常，请联系管理员");
|
|
|
}
|
luowei