修改bug，调阅接口完成

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationController.java

@@ -7,6 +7,7 @@ import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationService;
+import com.xunmei.core.access.service.impl.CoreMonitoringTaskRegistrationServiceImpl;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,9 +39,9 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/registration")
 public class CoreMonitoringTaskRegistrationController extends BaseController {
     @Autowired
-    private ICoreMonitoringTaskRegistrationService coreMonitoringTaskRegistrationService;
+    private CoreMonitoringTaskRegistrationServiceImpl coreMonitoringTaskRegistrationService;
     @Autowired
-    private ICoreMonitoringTaskRegistrationMonitorService coreMonitoringTaskRegistrationMonitorService;
+    private ICoreMonitoringTaskRegistrationMonitorService iCoreMonitoringTaskRegistrationMonitorService;
 
     /**
      * 查询【请填写功能名称】列表
@@ -49,7 +50,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
     @RequiresPermissions("system:registration:list")
     @GetMapping("/list")
     public AjaxResult list(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
-        return success(coreMonitoringTaskRegistrationMonitorService.selectCoreMonitoringTaskRegistrationList(coreMonitoringTaskRegistration.getTaskId()));
+        return success(iCoreMonitoringTaskRegistrationMonitorService.selectCoreMonitoringTaskRegistrationList(coreMonitoringTaskRegistration.getTaskId()));
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/CoreMonitoringTaskMonitorInfo.java

@@ -1,5 +1,8 @@
 package com.xunmei.core.access.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -28,10 +31,13 @@ public class CoreMonitoringTaskMonitorInfo extends BaseEntity
 private static final long serialVersionUID=1L;
 
     /** 主键 */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 监控id */
             @ApiModelProperty(value = "监控id")
+            @JsonSerialize(using = ToStringSerializer.class)
     private Long taskMonitorId;
 
     /** 项目 */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/CoreMonitoringTaskRegistration.java

@@ -1,7 +1,11 @@
 package com.xunmei.core.access.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -30,10 +34,13 @@ public class CoreMonitoringTaskRegistration extends BaseEntity
 private static final long serialVersionUID=1L;
 
     /** $column.columnComment */
+    @TableId(type = IdType.AUTO)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 任务id */
             @ApiModelProperty(value = "任务id")
+            @JsonSerialize(using = ToStringSerializer.class)
     private Long taskId;
 
     /** 调阅任务填报开始时间 */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/CoreMonitoringTaskRegistrationMonitor.java

@@ -1,5 +1,8 @@
 package com.xunmei.core.access.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -28,19 +31,24 @@ public class CoreMonitoringTaskRegistrationMonitor extends BaseEntity
 private static final long serialVersionUID=1L;
 
     /** 主键 */
+    @TableId(type = IdType.AUTO)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 调阅任务扫描主键 */
             @ApiModelProperty(value = "调阅任务扫描主键")
+            @JsonSerialize(using = ToStringSerializer.class)
     private Long taskRegistrationId;
 
     /** 监控主机id */
             @ApiModelProperty(value = "监控主机id")
+            @JsonSerialize(using = ToStringSerializer.class)
     private Long host;
 
     /** 视频通道 */
             @ApiModelProperty(value = "视频通道")
-    private String videoChannel;
+            @JsonSerialize(using = ToStringSerializer.class)
+    private Long videoChannel;
 
     /** 0未删除2已删除 */
     private String delFlag;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/TMonitoringRetrievalPlan.java

@@ -1,5 +1,7 @@
 package com.xunmei.core.access.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -32,6 +34,7 @@ public class TMonitoringRetrievalPlan extends BaseEntity {
      * 主键
      */
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/mapper/CoreMonitoringTaskMonitorInfoMapper.java

@@ -23,6 +23,7 @@ public interface CoreMonitoringTaskMonitorInfoMapper extends BaseMapper<CoreMoni
      */
     CoreMonitoringTaskMonitorInfo selectCoreMonitoringTaskMonitorInfoById(Long id);
 
+    long selectAbnormalByTaskId(Long taskId);
     /**
      * 查询调阅任务登记检查情况列表
      *

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

@@ -2,6 +2,7 @@ package com.xunmei.core.access.service.impl;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
@@ -106,7 +107,7 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
         coreMonitoringTaskMonitorInfo.setTaskRegistrationId(coreMonitoringTaskRegistrationMonitorDTO.getTaskRegistrationId());
         coreMonitoringTaskMonitorInfo.setCreateTime(DateUtils.getNowDate());
         coreMonitoringTaskMonitorInfo.setCreateBy(SecurityUtils.getUsername());
-     //   coreMonitoringTaskRegistrationMonitorMapper.insertCoreMonitoringTaskRegistrationMonitor(coreMonitoringTaskMonitorInfo);
+        coreMonitoringTaskMonitorInfo.setId(IdWorker.getId());
         coreMonitoringTaskRegistrationMonitorMapper.insert(coreMonitoringTaskMonitorInfo);
         //新增项目
         List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfoList = coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList();
@@ -114,8 +115,9 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
         for (CoreMonitoringTaskMonitorInfo c : coreMonitoringTaskMonitorInfoList) {
             c.setCreateTime(DateUtils.getNowDate());
             c.setCreateBy(SecurityUtils.getUsername());
-          //  i = coreMonitoringTaskMonitorInfoMapper.insertCoreMonitoringTaskMonitorInfo(c);
-          i=  coreMonitoringTaskMonitorInfoMapper.insert(c);
+            c.setId(IdWorker.getId());
+            c.setTaskMonitorId(coreMonitoringTaskMonitorInfo.getId());
+            i = coreMonitoringTaskMonitorInfoMapper.insert(c);
             if (i < 1) {
                 return i;
             }
@@ -138,11 +140,19 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
         coreMonitoringTaskRegistrationMonitor.setUpdateTime(DateUtils.getNowDate());
         coreMonitoringTaskRegistrationMonitor.setUpdateBy(SecurityUtils.getUsername());
         coreMonitoringTaskRegistrationMonitorMapper.updateById(coreMonitoringTaskRegistrationMonitor);
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("task_monitor_id",coreMonitoringTaskRegistrationMonitor.getId());
+        coreMonitoringTaskMonitorInfoMapper.delete(queryWrapper);
         int i = 0;
         for (CoreMonitoringTaskMonitorInfo c : coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList()) {
             c.setUpdateTime(DateUtils.getNowDate());
             c.setUpdateBy(SecurityUtils.getUsername());
-            i = coreMonitoringTaskMonitorInfoMapper.updateById(c);
+            c.setId(IdWorker.getId());
+            c.setCreateTime(DateUtils.getNowDate());
+            c.setCreateBy(SecurityUtils.getUsername());
+            c.setDelFlag("0");
+            c.setTaskMonitorId(coreMonitoringTaskRegistrationMonitorDTO.getId());
+            i = coreMonitoringTaskMonitorInfoMapper.insert(c);
             if (i < 1) {
                 return i;
             }

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

@@ -1,22 +1,25 @@
 package com.xunmei.core.access.service.impl;
 
-import java.util.Arrays;
-import java.util.List;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.bean.BeanUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
+import com.xunmei.core.access.mapper.CoreMonitoringTaskMonitorInfoMapper;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper;
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationService;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
-import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 【请填写功能名称】Service业务层处理
@@ -26,14 +29,16 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreMonitoringTaskRegistrationMapper, CoreMonitoringTaskRegistration> implements ICoreMonitoringTaskRegistrationService {
-  private static  final Integer ONE=1;
-  private static final Integer TWO=2;
+    private static final Integer ONE = 1;
+    private static final Integer TWO = 2;
     @Autowired
     private CoreMonitoringTaskRegistrationMapper coreMonitoringTaskRegistrationMapper;
+    @Autowired
+    private ICoreMonitoringRetrievalTaskService coreMonitoringRetrievalTaskService;
+    @Autowired
+    private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
 @Autowired
-private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;
-@Autowired
-private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
+private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;
   /*  @Override
     public TableDataInfo<CoreMonitoringTaskRegistration> selectPage(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         //未删除
@@ -75,10 +80,10 @@ private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
      */
     @Override
     public CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationById(Long id) {
-        CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO=new CoreMonitoringTaskRegistrationVO();
+        CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO = new CoreMonitoringTaskRegistrationVO();
         CoreMonitoringTaskRegistration coreMonitoringTaskRegistration = coreMonitoringTaskRegistrationMapper.selectById(id);
-        BeanUtils.copyProperties(coreMonitoringTaskRegistration,coreMonitoringTaskRegistrationVO);
-        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = iCoreMonitoringRetrievalTaskService.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
+        BeanUtils.copyProperties(coreMonitoringTaskRegistration, coreMonitoringTaskRegistrationVO);
+        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = coreMonitoringRetrievalTaskService.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
         coreMonitoringTaskRegistrationVO.setTaskName(coreMonitoringRetrievalTask.getTaskName());
         return coreMonitoringTaskRegistrationVO;
     }
@@ -108,8 +113,10 @@ private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
         coreMonitoringTaskRegistration.setCreateBy(SecurityUtils.getUsername());
         //修改任务状态为进行中
         CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = coreMonitoringRetrievalTaskMapper.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
-        coreMonitoringRetrievalTask.setStatus(ONE);
+        coreMonitoringRetrievalTask.setStatus(1);
+        coreMonitoringRetrievalTask.setStartTime(DateUtils.getNowDate());
         coreMonitoringRetrievalTaskMapper.updateById(coreMonitoringRetrievalTask);
+        coreMonitoringTaskRegistration.setId(IdWorker.getId());
         return coreMonitoringTaskRegistrationMapper.insert(coreMonitoringTaskRegistration);
     }
 
@@ -124,11 +131,16 @@ private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
         coreMonitoringTaskRegistration.setUpdateTime(DateUtils.getNowDate());
         coreMonitoringTaskRegistration.setUpdateBy(SecurityUtils.getUsername());
         //修改任务状态已完成
-        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = coreMonitoringRetrievalTaskMapper.selectById(coreMonitoringTaskRegistration.getTaskId());
-        coreMonitoringRetrievalTask.setStatus(TWO);
+        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = coreMonitoringRetrievalTaskMapper.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
+        coreMonitoringRetrievalTask.setStatus(2);
+        coreMonitoringRetrievalTask.setEndTime(DateUtils.getNowDate());
         coreMonitoringRetrievalTask.setUpdateBy(SecurityUtils.getUsername());
         coreMonitoringRetrievalTask.setUpdateTime(DateUtils.getNowDate());
-        coreMonitoringRetrievalTaskMapper.updateById(coreMonitoringRetrievalTask);
+        coreMonitoringRetrievalTask.setSubmitTime(DateUtils.getNowDate());
+        coreMonitoringRetrievalTask.setRetrievalUser(SecurityUtils.getUserId());
+        Long i = coreMonitoringTaskMonitorInfoMapper.selectAbnormalByTaskId(coreMonitoringTaskRegistration.getTaskId());
+           coreMonitoringRetrievalTask.setExceptionCount(i);
+        coreMonitoringRetrievalTaskMapper.updateCoreMonitoringRetrievalTask(coreMonitoringRetrievalTask);
         return coreMonitoringTaskRegistrationMapper.updateById(coreMonitoringTaskRegistration);
     }
 

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

@@ -14,6 +14,7 @@ import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.mapper.TMonitoringRetrievalPlanMapper;
 import com.xunmei.core.access.service.ITMonitoringRetrievalPlanService;
+import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteRoleService;
 import com.xunmei.system.api.RemoteUserService;
@@ -24,6 +25,7 @@ import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -37,6 +39,8 @@ import java.util.function.Function;
  */
 @Service
 public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoringRetrievalPlanMapper, TMonitoringRetrievalPlan> implements ITMonitoringRetrievalPlanService {
+private static final Long MINUS_ONE=-1L;
+private static final Long ZERO=0L;
     @Autowired
     private TMonitoringRetrievalPlanMapper tMonitoringRetrievalPlanMapper;
     @Autowired
@@ -45,8 +49,8 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     private RemoteOrgService remoteOrgService;
     @Autowired
     private RemoteRoleService remoteRoleService;
-private static final Long MINUS_ONE=-1L;
-private static final Long ZERO=0L;
+/*@Autowired
+private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;*/
     @Override
     public TableDataInfo<TMonitoringRetrievalPlan> selectPage(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         //未删除
@@ -65,7 +69,7 @@ private static final Long ZERO=0L;
         QueryWrapper<TMonitoringRetrievalPlan> query = new QueryWrapper<>(tMonitoringRetrievalPlan);
         //下穿
         tMonitoringRetrievalPlan.setCheckSub(true);
-        List<SysOrg> data = remoteOrgService.selectSysOrgByParentId(-MINUS_ONE, SecurityConstants.INNER);
+        List<SysOrg> data = remoteOrgService.selectSysOrgByParentId(MINUS_ONE, SecurityConstants.INNER);
         if (null == tMonitoringRetrievalPlan.getOrgId()) {
             tMonitoringRetrievalPlan.setOrgId(data.get(0).getId());
         }
@@ -111,8 +115,9 @@ private static final Long ZERO=0L;
         TMonitoringRetrievalPlan tMonitoringRetrievalPlan = tMonitoringRetrievalPlanMapper.selectById(id);
         tMonitoringRetrievalPlan.setPlanStatus(0);
         tMonitoringRetrievalPlanMapper.updateById(tMonitoringRetrievalPlan);
-        List<SysOrg> list = remoteOrgService.selectSysOrgByParentId(-MINUS_ONE, SecurityConstants.INNER);
+        List<SysOrg> list = remoteOrgService.selectSysOrgByParentId(MINUS_ONE, SecurityConstants.INNER);
         Integer i = 0;
+        List<TMonitoringRetrievalPlan>tMonitoringRetrievalPlans=new ArrayList<>();
         for (SysOrg l : list) {
             TMonitoringRetrievalPlan monitoringRetrievalPlan = new TMonitoringRetrievalPlan();
             monitoringRetrievalPlan.setPlanName(tMonitoringRetrievalPlan.getPlanName());
@@ -133,10 +138,14 @@ private static final Long ZERO=0L;
             monitoringRetrievalPlan.setDescription(tMonitoringRetrievalPlan.getDescription());
             monitoringRetrievalPlan.setCreateType(1);
             i = tMonitoringRetrievalPlanMapper.insert(monitoringRetrievalPlan);
+            tMonitoringRetrievalPlans.add(monitoringRetrievalPlan);
             if (i < 0) {
                 return i;
             }
         }
+        if (tMonitoringRetrievalPlan.getPlanCycle().equals("0")){
+         //   iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
+        }
         return i;
     }
 
@@ -171,8 +180,16 @@ private static final Long ZERO=0L;
         tMonitoringRetrievalPlan.setRoleName(sysRole.getRoleName());
         if (tMonitoringRetrievalPlan.getOrgType().equals("1")) {
             tMonitoringRetrievalPlan.setPlanStatus(1);
+            tMonitoringRetrievalPlan.setCreateType(0);
         } else {
             tMonitoringRetrievalPlan.setPlanStatus(0);
+            tMonitoringRetrievalPlan.setCreateType(1);
+            //无周期调用
+            if (tMonitoringRetrievalPlan.getPlanCycle().equals("0")){
+                List<TMonitoringRetrievalPlan>tMonitoringRetrievalPlans=new ArrayList<>();
+                tMonitoringRetrievalPlans.add(tMonitoringRetrievalPlan);
+               // iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
+            }
         }
         tMonitoringRetrievalPlan.setCreateType(0);
         return tMonitoringRetrievalPlanMapper.insert(tMonitoringRetrievalPlan);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/vo/CoreMonitoringTaskRegistrationVO.java

@@ -14,6 +14,8 @@ import java.util.List;
 public class CoreMonitoringTaskRegistrationVO extends CoreMonitoringTaskRegistration {
     @ApiModelProperty(value = "任务名")
     private String taskName;
+    @ApiModelProperty(value = "任务状态")
+    private String taskStatus;
     @ApiModelProperty(value = "总列表")
     private List<CoreMonitoringTaskRegistrationMonitorVO>coreMonitoringTaskRegistrationMonitorVOList;
 }

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

@@ -8,6 +8,7 @@ import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTas
 import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
 import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -16,6 +17,7 @@ import org.apache.ibatis.annotations.Param;
  * @author xunmei
  * @date 2023-08-25
  */
+@Mapper
 public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonitoringRetrievalTask> {
     /**
      * 查询监控调阅任务

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

@@ -51,6 +51,17 @@
         <include refid="selectCoreMonitoringTaskMonitorInfoVo"/>
         where task_monitor_id = #{monitorId}
     </select>
+    <select id="selectAbnormalByTaskId" resultType="java.lang.Long">
+        SELECT
+            COUNT( cmtmi.id )
+        FROM
+            core_monitoring_task_monitor_info cmtmi
+                LEFT JOIN core_monitoring_task_registration_monitor cmtrm ON cmtrm.id = cmtmi.task_monitor_id
+                LEFT JOIN core_monitoring_task_registration cmtr ON cmtr.id = cmtrm.task_registration_id
+        WHERE
+            cmtmi.situation = 1
+          AND cmtr.task_id=#{taskId}
+    </select>
 
     <insert id="insertCoreMonitoringTaskMonitorInfo" parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo">
         insert into core_monitoring_task_monitor_info

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

@@ -46,6 +46,7 @@
         SELECT
             cmtr.id as id,
             cmrt.task_name as  taskName,
+               cmrt.status as  taskStatus,
             cmtr.task_start_time as taskStartTime
         FROM
             core_monitoring_retrieval_task cmrt

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeviceController.java

@@ -64,7 +64,7 @@ public class SysDeviceController extends BaseController {
     @RequiresPermissions("system:device:query")
     @GetMapping(value = "/getHostByOrgId/{orgId}")
     public AjaxResult getHostByOrgId(@PathVariable(value = "orgId", required = false) Long orgId) {
-        return success(sysDeviceService.getHostByOrgId(orgId));
+        return success(sysDeviceService.getHostByOrgId(orgId,null));
     }
 
     /**
@@ -72,15 +72,16 @@ public class SysDeviceController extends BaseController {
      */
     @ApiOperation(value = "通过机构id查询主机")
     @RequiresPermissions("system:device:query")
-    @GetMapping(value = "/getSysDeviceByOrgId/{orgId}")
-    public AjaxResult getSysDeviceByOrgId(@PathVariable(value = "orgId", required = false)Long orgId) {
-        return success(sysDeviceService.getHostByOrgId(orgId));
+    @GetMapping(value = "/getSysDeviceByOrgId")
+    public AjaxResult getSysDeviceByOrgId(Long orgId,Long monitorId) {
+        return success(sysDeviceService.getHostByOrgId(orgId,monitorId));
     }
 
     @ApiOperation(value = "通过主机查询视频监控")
-    @GetMapping(value = "/getSysDeviceByHostId/{hostId}")
-    public AjaxResult getSysDeviceByHostId(@PathVariable(value = "hostId", required = false)Long hostId) {
-        return success(sysDeviceService.getSysDeviceByHostId(hostId));
+    @RequiresPermissions("system:device:query")
+    @GetMapping(value = "/getSysDeviceByHostId")
+    public AjaxResult getSysDeviceByHostId(Long hostId,Long monitorId) {
+        return success(sysDeviceService.getSysDeviceByHostId(hostId,monitorId));
     }
 
     /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysDeviceMapper.java

@@ -21,7 +21,7 @@ public interface SysDeviceMapper extends BaseMapper<SysDevice> {
      * @return 【请填写功能名称】
      */
      SysDevice selectSysDeviceById(Long id);
-
+List<Long>selectVideoChannelByMonitorId(Long monitorId );
     /**
      * 根据机构查出所有的视频主机
      * @param orgId

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysDeviceService.java

@@ -22,11 +22,10 @@ public interface ISysDeviceService extends IService<SysDevice> {
     SysDevice selectSysDeviceById(Long id);
 
     /**
-     *
      * @param orgId
      * @return
      */
-    List<SysDevice> getHostByOrgId(Long orgId);
+    List<SysDevice> getHostByOrgId(Long orgId,Long monitorId);
 
     /**
      * 查询【设备管理】列表
@@ -35,7 +34,9 @@ public interface ISysDeviceService extends IService<SysDevice> {
      * @return 【设备管理】集合
      */
     List<SysDevice> selectSysDeviceList(SysDevice sysDevice);
-List<SysDevice> getSysDeviceByHostId(Long hostId);
+
+    List<SysDevice> getSysDeviceByHostId(Long hostId,Long monitorId);
+
     /**
      * 新增【设备管理】
      *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysDeviceServiceImpl.java

@@ -1,7 +1,9 @@
 package com.xunmei.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.api.domain.SysDevice;
@@ -9,7 +11,9 @@ import com.xunmei.system.api.domain.SysOrg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xunmei.system.service.ISysOrgService;
+
 import java.util.Arrays;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -76,8 +80,21 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
     }
 
     @Override
-    public List<SysDevice> getHostByOrgId(Long orgId) {
-        return sysDeviceMapper.getHostByOrgId(orgId);
+    public List<SysDevice> getHostByOrgId(Long orgId, Long monitorId) {
+        List<SysDevice> hostByOrgId = sysDeviceMapper.getHostByOrgId(orgId);
+        if (null != monitorId) {
+            for (int i = hostByOrgId.size() - 1; i > 0; i--) {
+                List<Long> longs = sysDeviceMapper.selectVideoChannelByMonitorId(monitorId);
+                QueryWrapper queryWrapper = new QueryWrapper();
+                queryWrapper.eq("del_flag", "0");
+                queryWrapper.eq("host_id", hostByOrgId.get(i).getId());
+                List<SysDevice> list = baseMapper.selectList(queryWrapper);
+                if (CollectionUtils.isEmpty(list) || list.size() == longs.size()) {
+                    hostByOrgId.remove(hostByOrgId.get(i));
+                }
+            }
+        }
+        return hostByOrgId;
     }
 
     /**
@@ -92,10 +109,12 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
     }
 
     @Override
-    public List<SysDevice> getSysDeviceByHostId(Long hostId) {
-        QueryWrapper queryWrapper=new QueryWrapper();
-        queryWrapper.eq("del_flag","0");
-        queryWrapper.eq("host_id",hostId);
+    public List<SysDevice> getSysDeviceByHostId(Long hostId, Long monitorId) {
+        List<Long> longs = sysDeviceMapper.selectVideoChannelByMonitorId(monitorId);
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("del_flag", "0");
+        queryWrapper.eq("host_id", hostId);
+        queryWrapper.notIn("id", longs);
         List<SysDevice> list = baseMapper.selectList(queryWrapper);
         return list;
     }

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysDeviceMapper.xml

@@ -90,6 +90,14 @@
         WHERE
         org_id =#{orgId} and del_flag='0' and device_type='0'
     </select>
+    <select id="selectVideoChannelByMonitorId" resultType="java.lang.Long">
+        SELECT
+            video_channel
+        FROM
+            core_monitoring_task_registration_monitor
+        WHERE
+            id = #{monitorId}
+    </select>
 
     <insert id="insertSysDevice" parameterType="com.xunmei.system.api.domain.SysDevice">
         insert into sys_device