监控调阅修改缺陷

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

@@ -7,6 +7,7 @@ import java.util.List;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
@@ -17,6 +18,7 @@ import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMonitorMapper
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
+import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
 import com.xunmei.system.api.RemoteDeviceService;
 import com.xunmei.system.api.domain.SysDevice;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +45,8 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
     private RemoteDeviceService remoteDeviceService;
     @Autowired
     private CoreMonitoringTaskRegistrationMapper coreMonitoringTaskRegistrationMapper;
+    @Autowired
+    private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
 
     /**
      * 查询调阅任务登记监控
@@ -114,6 +118,11 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
 
     @Override
     public CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationList(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        //查询任务状态
+        CoreMonitoringRetrievalTask retrievalTask = coreMonitoringRetrievalTaskMapper.selectById(coreMonitoringTaskRegistration.getTaskId());
+        if (null != retrievalTask) {
+            coreMonitoringTaskRegistration.setStatus(Integer.valueOf(retrievalTask.getStatus()));
+        }
         //查询任务
         CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO = coreMonitoringTaskRegistrationMonitorMapper.selectTaskName(coreMonitoringTaskRegistration.getTaskId(),coreMonitoringTaskRegistration.getStatus());
         if (null != coreMonitoringTaskRegistrationVO) {