调阅任务登记和远程调用接口

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteDeviceService.java

@@ -0,0 +1,25 @@
+package com.xunmei.system.api;
+
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.constant.ServiceNameConstants;
+import com.xunmei.system.api.domain.SysDevice;
+import com.xunmei.system.api.factory.RemoteConfigFallbackFactory;
+import com.xunmei.system.api.factory.RemoteDeviceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/8/29
+ */
+@FeignClient(contextId = "remoteDeviceService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteDeviceFallbackFactory.class)
+public interface RemoteDeviceService {
+    @GetMapping("/device/getSysDeviceByOrgId")
+    List<SysDevice> getSysDeviceByOrgId(@RequestParam("orgId") Long orgId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @GetMapping("/device/getSysDeviceByHostId")
+    List<SysDevice> getSysDeviceByHostId(@RequestParam("hostId")Long hostId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+}

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteRoleService.java

@@ -3,8 +3,6 @@ package com.xunmei.system.api;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.constant.ServiceNameConstants;
 import com.xunmei.common.core.domain.IdName;
-import com.xunmei.common.core.domain.R;
-import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.system.api.Eto.RoleConditionEto;
 import com.xunmei.system.api.domain.SysRole;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -22,7 +20,7 @@ import java.util.List;
 public interface RemoteRoleService {
 
     @GetMapping("/role/getRoleById")
-    R<SysRole> getRoleById(@RequestParam("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    SysRole getRoleById(@RequestParam("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @GetMapping("/role/getNames")
     List<IdName<Long, String>> getNames(RoleConditionEto condition);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysDevice.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysDevice.java

@@ -1,27 +1,23 @@
-package com.xunmei.system.domain;
-
-import java.util.Date;
+package com.xunmei.system.api.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 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;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.xunmei.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.xunmei.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
- * 【请填写功能名称】对象 sys_device
- *
- * @author xunmei
- * @date 2023-08-22
+ * @author :LuoWei
+ * @date : 2023/8/29
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteDeviceFallbackFactory.java

@@ -0,0 +1,35 @@
+package com.xunmei.system.api.factory;
+
+import com.xunmei.system.api.RemoteDeviceService;
+import com.xunmei.system.api.domain.SysDevice;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/8/29
+ */
+@Component
+public class RemoteDeviceFallbackFactory implements FallbackFactory<RemoteDeviceService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteDeviceFallbackFactory.class);
+
+    @Override
+    public RemoteDeviceService create(Throwable cause) {
+        log.error("用户服务调用失败:{}", cause.getMessage());
+        return new RemoteDeviceService() {
+            @Override
+            public List<SysDevice> getSysDeviceByOrgId(Long orgId, String source) {
+                return null;
+            }
+
+            @Override
+            public List<SysDevice> getSysDeviceByHostId(Long hostId, String source) {
+                return null;
+            }
+        };
+    }
+}

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteRoleFallbackFactory.java

@@ -2,8 +2,6 @@ package com.xunmei.system.api.factory;
 
 
 import com.xunmei.common.core.domain.IdName;
-import com.xunmei.common.core.domain.R;
-import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.system.api.Eto.RoleConditionEto;
 import com.xunmei.system.api.RemoteRoleService;
 import com.xunmei.system.api.domain.SysRole;
@@ -29,7 +27,7 @@ public class RemoteRoleFallbackFactory implements FallbackFactory<RemoteRoleServ
         log.error("用户服务调用失败:{}", cause.getMessage());
         return new RemoteRoleService() {
             @Override
-            public R<SysRole> getRoleById(Long id, String source) {
+            public SysRole getRoleById(Long id, String source) {
                 return null;
             }
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/domain/CoreMonitoringRetrievalTask.java

@@ -4,9 +4,7 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -2,7 +2,9 @@ package com.xunmei.core.access.controller;
 
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
+import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationMonitorDTO;
 import com.xunmei.core.access.service.ICoreMonitoringTaskMonitorInfoService;
+import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,17 +35,18 @@ import io.swagger.annotations.ApiOperation;
 public class CoreMonitoringTaskMonitorInfoController extends BaseController {
     @Autowired
     private ICoreMonitoringTaskMonitorInfoService coreMonitoringTaskMonitorInfoService;
+    @Autowired
+    private ICoreMonitoringTaskRegistrationMonitorService coreMonitoringTaskRegistrationMonitorService;
 
-    /**
+/*    *//**
      * 查询调阅任务登记检查情况列表
-     */
+     *//*
     @ApiOperation(value = "查询CoreMonitoringTaskMonitorInfo列表")
     @RequiresPermissions("system:info:list")
     @GetMapping("/list")
     public TableDataInfo<CoreMonitoringTaskMonitorInfo> list(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
         return null;
-        //  return coreMonitoringTaskMonitorInfoService.selectPage( coreMonitoringTaskMonitorInfo);
-    }
+    }*/
 
 
     /**
@@ -53,7 +56,8 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
     @RequiresPermissions("system:info:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(coreMonitoringTaskMonitorInfoService.selectCoreMonitoringTaskMonitorInfoById(id));
+        //传入监控id，因为一个监控对应一个项目
+        return success(coreMonitoringTaskRegistrationMonitorService.selectMonitorById(id));
     }
 
     /**
@@ -63,7 +67,7 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
     @RequiresPermissions("system:info:add")
     @Log(title = "调阅任务登记检查情况", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
+    public AjaxResult add(@RequestBody CoreMonitoringTaskRegistrationMonitorDTO coreMonitoringTaskMonitorInfo) {
         return toAjax(coreMonitoringTaskMonitorInfoService.insertCoreMonitoringTaskMonitorInfo(coreMonitoringTaskMonitorInfo));
     }
 
@@ -74,18 +78,18 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
     @RequiresPermissions("system:info:edit")
     @Log(title = "调阅任务登记检查情况", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
+    public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistrationMonitorDTO coreMonitoringTaskMonitorInfo) {
         return toAjax(coreMonitoringTaskMonitorInfoService.updateCoreMonitoringTaskMonitorInfo(coreMonitoringTaskMonitorInfo));
     }
 
-    /**
+/*    *//**
      * 删除调阅任务登记检查情况
-     */
+     *//*
     @ApiOperation(value = "删除CoreMonitoringTaskMonitorInfo")
     @RequiresPermissions("system:info:remove")
     @Log(title = "调阅任务登记检查情况", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(coreMonitoringTaskMonitorInfoService.deleteCoreMonitoringTaskMonitorInfoByIds(ids));
-    }
+    }*/
 }

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

@@ -1,10 +1,13 @@
 package com.xunmei.core.access.controller;
 
 import java.util.List;
+
 import com.xunmei.common.core.web.page.TableDataInfo;
 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.vo.CoreMonitoringTaskRegistrationVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,27 +33,25 @@ import io.swagger.annotations.ApiOperation;
  * @author xunmei
  * @date 2023-08-28
  */
-@Api(tags = {"CoreMonitoringTaskRegistration" })
+@Api(tags = {"CoreMonitoringTaskRegistration"})
 @RestController
 @RequestMapping("/registration")
 public class CoreMonitoringTaskRegistrationController extends BaseController {
     @Autowired
     private ICoreMonitoringTaskRegistrationService coreMonitoringTaskRegistrationService;
+    @Autowired
+    private ICoreMonitoringTaskRegistrationMonitorService coreMonitoringTaskRegistrationMonitorService;
 
-/**
- * 查询【请填写功能名称】列表
- */
-@ApiOperation(value = "查询CoreMonitoringTaskRegistration列表")
-@RequiresPermissions("system:registration:list")
-@GetMapping("/list")
-    public TableDataInfo<CoreMonitoringTaskRegistration> list(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
-
-     //   return coreMonitoringTaskRegistrationService.selectPage( coreMonitoringTaskRegistration);
-    return null;
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @ApiOperation(value = "查询CoreMonitoringTaskRegistration列表")
+    @RequiresPermissions("system:registration:list")
+    @GetMapping("/list")
+    public AjaxResult list(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        return success(coreMonitoringTaskRegistrationMonitorService.selectCoreMonitoringTaskRegistrationList(coreMonitoringTaskRegistration.getTaskId()));
     }
 
-
-
     /**
      * 获取【请填写功能名称】详细信息
      */
@@ -66,7 +67,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
      */
     @ApiOperation(value = "新增CoreMonitoringTaskRegistration")
     @RequiresPermissions("system:registration:add")
-    @Log(title = "【调阅任务登记NCF开始】" , businessType = BusinessType.INSERT)
+    @Log(title = "【调阅任务登记NCF开始】", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         return toAjax(coreMonitoringTaskRegistrationService.insertCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
@@ -77,20 +78,20 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
      */
     @ApiOperation(value = "修改CoreMonitoringTaskRegistration")
     @RequiresPermissions("system:registration:edit")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.UPDATE)
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         return toAjax(coreMonitoringTaskRegistrationService.updateCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
     }
-
-    /**
+    /*
+     *//**
      * 删除【请填写功能名称】
-     */
+     *//*
     @ApiOperation(value = "删除CoreMonitoringTaskRegistration")
     @RequiresPermissions("system:registration:remove")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(coreMonitoringTaskRegistrationService.deleteCoreMonitoringTaskRegistrationByIds(ids));
-    }
+    }*/
 }

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

@@ -33,10 +33,10 @@ import com.xunmei.common.security.annotation.RequiresPermissions;
 public class CoreMonitoringTaskRegistrationMonitorController extends BaseController {
     @Autowired
     private ICoreMonitoringTaskRegistrationMonitorService coreMonitoringTaskRegistrationMonitorService;
-
-/**
+/*
+*//**
  * 查询调阅任务登记监控列表
- */
+ *//*
 @ApiOperation(value = "查询CoreMonitoringTaskRegistrationMonitor列表")
 @RequiresPermissions("system:monitor:list")
 @GetMapping("/list")
@@ -44,7 +44,7 @@ public class CoreMonitoringTaskRegistrationMonitorController extends BaseControl
 
       //  return coreMonitoringTaskRegistrationMonitorService.selectPage( coreMonitoringTaskRegistrationMonitor);
    return  null;
-    }
+    }*/
 
 
 
@@ -79,15 +79,15 @@ public class CoreMonitoringTaskRegistrationMonitorController extends BaseControl
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
         return toAjax(coreMonitoringTaskRegistrationMonitorService.updateCoreMonitoringTaskRegistrationMonitor(coreMonitoringTaskRegistrationMonitor));
     }
-
-    /**
+/*
+    *//**
      * 删除调阅任务登记监控
-     */
+     *//*
     @ApiOperation(value = "删除CoreMonitoringTaskRegistrationMonitor")
     @RequiresPermissions("system:monitor:remove")
     @Log(title = "调阅任务登记监控" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(coreMonitoringTaskRegistrationMonitorService.deleteCoreMonitoringTaskRegistrationMonitorByIds(ids));
-    }
+    }*/
 }

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

@@ -28,7 +28,7 @@ public class CoreMonitoringTaskRegistrationMonitor extends BaseEntity
 private static final long serialVersionUID=1L;
 
     /** 主键 */
-    private String id;
+    private Long id;
 
     /** 调阅任务扫描主键 */
             @ApiModelProperty(value = "调阅任务扫描主键")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/dto/CoreMonitoringTaskRegistrationDTO.java

@@ -1,6 +1,7 @@
 package com.xunmei.core.access.dto;
 
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -11,5 +12,6 @@ import java.util.Date;
  */
 @Data
 public class CoreMonitoringTaskRegistrationDTO extends CoreMonitoringRetrievalTask {
+    @ApiModelProperty(value = "月份")
     private Date moth;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/dto/CoreMonitoringTaskRegistrationMonitorDTO.java

@@ -0,0 +1,18 @@
+package com.xunmei.core.access.dto;
+
+import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/8/29
+ */
+@Data
+public class CoreMonitoringTaskRegistrationMonitorDTO extends CoreMonitoringTaskRegistrationMonitor {
+    @ApiModelProperty(value = "项目列表")
+    private List<CoreMonitoringTaskMonitorInfo>coreMonitoringTaskMonitorInfoList;
+}

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

@@ -3,6 +3,7 @@ package com.xunmei.core.access.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -12,6 +13,7 @@ import java.util.List;
  * @author xunmei
  * @date 2023-08-29
  */
+@Mapper
 public interface CoreMonitoringTaskMonitorInfoMapper extends BaseMapper<CoreMonitoringTaskMonitorInfo> {
     /**
      * 查询调阅任务登记检查情况
@@ -30,6 +32,12 @@ public interface CoreMonitoringTaskMonitorInfoMapper extends BaseMapper<CoreMoni
     List<CoreMonitoringTaskMonitorInfo> selectCoreMonitoringTaskMonitorInfoList(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo);
 
     /**
+     *根据监控id查询项目
+     * @param monitorId
+     * @return
+     */
+    List<CoreMonitoringTaskMonitorInfo> selectCoreMonitoringTaskMonitorInfoByMonitorId(Long monitorId);
+    /**
      * 新增调阅任务登记检查情况
      *
      * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况

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

@@ -3,6 +3,7 @@ package com.xunmei.core.access.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -12,6 +13,7 @@ import java.util.List;
  * @author xunmei
  * @date 2023-08-28
  */
+@Mapper
 public interface CoreMonitoringTaskRegistrationMapper extends BaseMapper<CoreMonitoringTaskRegistration> {
     /**
      * 查询【请填写功能名称】

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -14,6 +15,7 @@ import java.util.List;
  * @author xunmei
  * @date 2023-08-29
  */
+@Mapper
 public interface CoreMonitoringTaskRegistrationMonitorMapper extends BaseMapper<CoreMonitoringTaskRegistrationMonitor> {
     /**
      * 查询调阅任务登记监控
@@ -76,4 +78,11 @@ public interface CoreMonitoringTaskRegistrationMonitorMapper extends BaseMapper<
      * @return
      */
  List<CoreMonitoringTaskRegistrationMonitorVO>    selectMonitorByTaskRegistrationId(Long taskRegistrationId);
+
+    /**
+     * 根据监控id查询监控
+      * @param id
+     * @return
+     */
+ CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
 }

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

@@ -4,6 +4,7 @@ package com.xunmei.core.access.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
+import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationMonitorDTO;
 
 import java.util.List;
 
@@ -33,10 +34,10 @@ public interface ICoreMonitoringTaskMonitorInfoService extends IService<CoreMoni
     /**
      * 新增调阅任务登记检查情况
      *
-     * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况
+     * @param coreMonitoringTaskRegistrationMonitorDTO 调阅任务登记检查情况
      * @return 结果
      */
-    int insertCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo);
+    int insertCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskRegistrationMonitorDTO coreMonitoringTaskRegistrationMonitorDTO);
 
     /**
      * 修改调阅任务登记检查情况
@@ -44,7 +45,7 @@ public interface ICoreMonitoringTaskMonitorInfoService extends IService<CoreMoni
      * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况
      * @return 结果
      */
-    int updateCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo);
+    int updateCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskRegistrationMonitorDTO coreMonitoringTaskMonitorInfo);
 
     /**
      * 批量删除调阅任务登记检查情况

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

@@ -4,6 +4,7 @@ package com.xunmei.core.access.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
+import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
 
 import java.util.List;
@@ -71,4 +72,6 @@ public interface ICoreMonitoringTaskRegistrationMonitorService extends IService<
      */
 
     CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationList(Long taskId);
+
+    CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
 }

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

@@ -4,12 +4,19 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
+import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationMonitorDTO;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskMonitorInfoMapper;
+import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMonitorMapper;
 import com.xunmei.core.access.service.ICoreMonitoringTaskMonitorInfoService;
+import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.Arrays;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -25,7 +32,8 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMonitoringTaskMonitorInfoMapper, CoreMonitoringTaskMonitorInfo> implements ICoreMonitoringTaskMonitorInfoService {
     @Autowired
     private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;
-
+    @Autowired
+    private CoreMonitoringTaskRegistrationMonitorMapper coreMonitoringTaskRegistrationMonitorMapper;
 
 /*    @Override
     public TableDataInfo<CoreMonitoringTaskMonitorInfo> selectPage(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
@@ -85,25 +93,59 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
     /**
      * 新增调阅任务登记检查情况
      *
-     * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况
+     * @param coreMonitoringTaskRegistrationMonitorDTO 调阅任务登记检查情况
      * @return 结果
      */
     @Override
-    public int insertCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
-                coreMonitoringTaskMonitorInfo.setCreateTime(DateUtils.getNowDate());
-            return coreMonitoringTaskMonitorInfoMapper.insert(coreMonitoringTaskMonitorInfo);
+    public int insertCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskRegistrationMonitorDTO coreMonitoringTaskRegistrationMonitorDTO) {
+        //新增监控
+        CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskMonitorInfo = new CoreMonitoringTaskRegistrationMonitor();
+        coreMonitoringTaskMonitorInfo.setDelFlag("0");
+        coreMonitoringTaskMonitorInfo.setHost(coreMonitoringTaskRegistrationMonitorDTO.getHost());
+        coreMonitoringTaskMonitorInfo.setVideoChannel(coreMonitoringTaskRegistrationMonitorDTO.getVideoChannel());
+        coreMonitoringTaskMonitorInfo.setTaskRegistrationId(coreMonitoringTaskRegistrationMonitorDTO.getTaskRegistrationId());
+        coreMonitoringTaskMonitorInfo.setCreateTime(DateUtils.getNowDate());
+        coreMonitoringTaskMonitorInfo.setCreateBy(SecurityUtils.getUsername());
+        coreMonitoringTaskRegistrationMonitorMapper.insertCoreMonitoringTaskRegistrationMonitor(coreMonitoringTaskMonitorInfo);
+        //新增项目
+        List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfoList = coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList();
+        int i = 0;
+        for (CoreMonitoringTaskMonitorInfo c : coreMonitoringTaskMonitorInfoList) {
+            c.setCreateTime(DateUtils.getNowDate());
+            c.setCreateBy(SecurityUtils.getUsername());
+            i = coreMonitoringTaskMonitorInfoMapper.insertCoreMonitoringTaskMonitorInfo(c);
+            if (i < 1) {
+                return i;
+            }
+        }
+        return i;
     }
 
     /**
      * 修改调阅任务登记检查情况
      *
-     * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况
+     * @param coreMonitoringTaskRegistrationMonitorDTO 调阅任务登记检查情况
      * @return 结果
      */
     @Override
-    public int updateCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
-                coreMonitoringTaskMonitorInfo.setUpdateTime(DateUtils.getNowDate());
-        return coreMonitoringTaskMonitorInfoMapper.updateById(coreMonitoringTaskMonitorInfo);
+    public int updateCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskRegistrationMonitorDTO coreMonitoringTaskRegistrationMonitorDTO) {
+        //修改监控
+        CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor = coreMonitoringTaskRegistrationMonitorMapper.selectById(coreMonitoringTaskRegistrationMonitorDTO.getId());
+        coreMonitoringTaskRegistrationMonitor.setHost(coreMonitoringTaskRegistrationMonitorDTO.getHost());
+        coreMonitoringTaskRegistrationMonitor.setVideoChannel(coreMonitoringTaskRegistrationMonitorDTO.getVideoChannel());
+        coreMonitoringTaskRegistrationMonitor.setUpdateTime(DateUtils.getNowDate());
+        coreMonitoringTaskRegistrationMonitor.setUpdateBy(SecurityUtils.getUsername());
+        coreMonitoringTaskRegistrationMonitorMapper.updateById(coreMonitoringTaskRegistrationMonitor);
+        int i = 0;
+        for (CoreMonitoringTaskMonitorInfo c : coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList()) {
+            c.setUpdateTime(DateUtils.getNowDate());
+            c.setUpdateBy(SecurityUtils.getUsername());
+            i = coreMonitoringTaskMonitorInfoMapper.updateById(c);
+            if (i < 1) {
+                return i;
+            }
+        }
+        return i;
     }
 
     /**

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

@@ -1,20 +1,26 @@
 package com.xunmei.core.access.service.impl;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
+
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
+import com.xunmei.core.access.mapper.CoreMonitoringTaskMonitorInfoMapper;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.Arrays;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
 
 
 /**
@@ -27,7 +33,8 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImpl<CoreMonitoringTaskRegistrationMonitorMapper, CoreMonitoringTaskRegistrationMonitor> implements ICoreMonitoringTaskRegistrationMonitorService {
     @Autowired
     private CoreMonitoringTaskRegistrationMonitorMapper coreMonitoringTaskRegistrationMonitorMapper;
-
+    @Autowired
+    private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;
 
 /*    @Override
     public TableDataInfo<CoreMonitoringTaskRegistrationMonitor> selectPage(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
@@ -92,8 +99,8 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
      */
     @Override
     public int insertCoreMonitoringTaskRegistrationMonitor(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
-                coreMonitoringTaskRegistrationMonitor.setCreateTime(DateUtils.getNowDate());
-            return coreMonitoringTaskRegistrationMonitorMapper.insert(coreMonitoringTaskRegistrationMonitor);
+        coreMonitoringTaskRegistrationMonitor.setCreateTime(DateUtils.getNowDate());
+        return coreMonitoringTaskRegistrationMonitorMapper.insert(coreMonitoringTaskRegistrationMonitor);
     }
 
     /**
@@ -104,7 +111,7 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
      */
     @Override
     public int updateCoreMonitoringTaskRegistrationMonitor(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
-                coreMonitoringTaskRegistrationMonitor.setUpdateTime(DateUtils.getNowDate());
+        coreMonitoringTaskRegistrationMonitor.setUpdateTime(DateUtils.getNowDate());
         return coreMonitoringTaskRegistrationMonitorMapper.updateById(coreMonitoringTaskRegistrationMonitor);
     }
 
@@ -132,15 +139,30 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
 
     @Override
     public CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationList(Long taskId) {
-       // CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO=new CoreMonitoringTaskRegistrationVO();
+       //查询任务
         CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO = coreMonitoringTaskRegistrationMonitorMapper.selectTaskName(taskId);
-       if (null!=coreMonitoringTaskRegistrationVO){
-           List<CoreMonitoringTaskRegistrationMonitorVO> coreMonitoringTaskRegistrationMonitorVOS = coreMonitoringTaskRegistrationMonitorMapper.selectMonitorByTaskRegistrationId(coreMonitoringTaskRegistrationVO.getId());
-
-
-       }
-
+        if (null != coreMonitoringTaskRegistrationVO) {
+            //查询视频
+            List<CoreMonitoringTaskRegistrationMonitorVO> coreMonitoringTaskRegistrationMonitorVOS = coreMonitoringTaskRegistrationMonitorMapper.selectMonitorByTaskRegistrationId(coreMonitoringTaskRegistrationVO.getId());
+            if (CollectionUtils.isNotEmpty(coreMonitoringTaskRegistrationMonitorVOS)) {
+                coreMonitoringTaskRegistrationMonitorVOS.forEach(c -> {
+                    //查询项目
+                    List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfos = coreMonitoringTaskMonitorInfoMapper.selectCoreMonitoringTaskMonitorInfoByMonitorId(c.getId());
+                    c.setCoreMonitoringTaskMonitorInfoList(coreMonitoringTaskMonitorInfos);
+                });
+                coreMonitoringTaskRegistrationVO.setCoreMonitoringTaskRegistrationMonitorVOList(coreMonitoringTaskRegistrationMonitorVOS);
+            }
+        }
+        return coreMonitoringTaskRegistrationVO;
+    }
 
-        return null;
+    @Override
+    public CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id) {
+        //查询视频
+        CoreMonitoringTaskRegistrationMonitorVO coreMonitoringTaskRegistrationMonitorVO = baseMapper.selectMonitorById(id);
+       //根据视频查询项目
+        List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfos = coreMonitoringTaskMonitorInfoMapper.selectCoreMonitoringTaskMonitorInfoByMonitorId(coreMonitoringTaskRegistrationMonitorVO.getId());
+        coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(coreMonitoringTaskMonitorInfos);
+        return coreMonitoringTaskRegistrationMonitorVO;
     }
 }

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

@@ -12,6 +12,7 @@ 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;
@@ -25,11 +26,14 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreMonitoringTaskRegistrationMapper, CoreMonitoringTaskRegistration> implements ICoreMonitoringTaskRegistrationService {
+  private static  final Long ONE=1L;
+  private static final Long TWO=2L;
     @Autowired
     private CoreMonitoringTaskRegistrationMapper coreMonitoringTaskRegistrationMapper;
 @Autowired
 private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;
-
+@Autowired
+private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
   /*  @Override
     public TableDataInfo<CoreMonitoringTaskRegistration> selectPage(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         //未删除
@@ -102,6 +106,10 @@ private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;
         coreMonitoringTaskRegistration.setTaskStartTime(DateUtils.getNowDate());
         coreMonitoringTaskRegistration.setDelFlag("0");
         coreMonitoringTaskRegistration.setCreateBy(SecurityUtils.getUsername());
+        //修改任务状态为进行中
+        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = coreMonitoringRetrievalTaskMapper.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
+        coreMonitoringRetrievalTask.setStatus(ONE);
+        coreMonitoringRetrievalTaskMapper.updateById(coreMonitoringRetrievalTask);
         return coreMonitoringTaskRegistrationMapper.insert(coreMonitoringTaskRegistration);
     }
 
@@ -114,6 +122,13 @@ private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;
     @Override
     public int updateCoreMonitoringTaskRegistration(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         coreMonitoringTaskRegistration.setUpdateTime(DateUtils.getNowDate());
+        coreMonitoringTaskRegistration.setUpdateBy(SecurityUtils.getUsername());
+        //修改任务状态已完成
+        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = coreMonitoringRetrievalTaskMapper.selectById(coreMonitoringTaskRegistration.getTaskId());
+        coreMonitoringRetrievalTask.setStatus(TWO);
+        coreMonitoringRetrievalTask.setUpdateBy(SecurityUtils.getUsername());
+        coreMonitoringRetrievalTask.setUpdateTime(DateUtils.getNowDate());
+        coreMonitoringRetrievalTaskMapper.updateById(coreMonitoringRetrievalTask);
         return coreMonitoringTaskRegistrationMapper.updateById(coreMonitoringTaskRegistration);
     }
 

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

@@ -165,8 +165,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         tMonitoringRetrievalPlan.setCreateBy(SecurityUtils.getUsername());
         tMonitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
         tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
-        R<SysRole> roleById = remoteRoleService.getRoleById(tMonitoringRetrievalPlan.getRoleId(), SecurityConstants.INNER);
-        SysRole sysRole = roleById.getData();
+        SysRole sysRole = remoteRoleService.getRoleById(tMonitoringRetrievalPlan.getRoleId(), SecurityConstants.INNER);
         tMonitoringRetrievalPlan.setRoleName(sysRole.getRoleName());
         if (tMonitoringRetrievalPlan.getOrgType().equals("1")) {
             tMonitoringRetrievalPlan.setPlanStatus(1);

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

@@ -2,6 +2,7 @@ package com.xunmei.core.access.vo;
 
 import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -12,7 +13,10 @@ import java.util.List;
  */
 @Data
 public class CoreMonitoringTaskRegistrationMonitorVO extends CoreMonitoringTaskRegistrationMonitor {
+    @ApiModelProperty(value = "主机名")
     private String hostName;
+    @ApiModelProperty(value = "监控通道名")
     private String videoChannelName;
+    @ApiModelProperty(value = "项目列表")
     private List<CoreMonitoringTaskMonitorInfo>coreMonitoringTaskMonitorInfoList;
 }

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

@@ -1,6 +1,7 @@
 package com.xunmei.core.access.vo;
 
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -11,6 +12,8 @@ import java.util.List;
  */
 @Data
 public class CoreMonitoringTaskRegistrationVO extends CoreMonitoringTaskRegistration {
+    @ApiModelProperty(value = "任务名")
     private String taskName;
+    @ApiModelProperty(value = "总列表")
     private List<CoreMonitoringTaskRegistrationMonitorVO>coreMonitoringTaskRegistrationMonitorVOList;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/controller/CoreMonitoringRetrievalTaskController.java

@@ -25,30 +25,32 @@ import java.util.List;
  * @author xunmei
  * @date 2023-08-25
  */
-@Api(tags = {"CoreMonitoringRetrievalTask" })
+@Api(tags = {"CoreMonitoringRetrievalTask"})
 @RestController
 @RequestMapping("/task")
 public class CoreMonitoringRetrievalTaskController extends BaseController {
     @Autowired
     private ICoreMonitoringRetrievalTaskService coreMonitoringRetrievalTaskService;
 
-/**
- * 查询监控调阅任务列表
- */
+    /**
+     * 查询监控调阅任务列表
+     */
     @ApiOperation(value = "查询CoreMonitoringRetrievalTask列表")
     @GetMapping("/list")
     public TableDataInfo list(RetrievalTaskPageDto request) {
 
-        return coreMonitoringRetrievalTaskService.selectPage( request);
+        return coreMonitoringRetrievalTaskService.selectPage(request);
     }
+
     /**
      * 查询监控调阅任务列表app
      */
     @ApiOperation(value = "app查询调阅任务列表")
     @GetMapping("/selectListApp")
-    public List<CoreMonitoringRetrievalTask>selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO){
-      return   coreMonitoringRetrievalTaskService.selectListApp(coreMonitoringTaskRegistrationDTO);
+    public AjaxResult selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO) {
+        return success(coreMonitoringRetrievalTaskService.selectListApp(coreMonitoringTaskRegistrationDTO));
     }
+
     /**
      * 导出excel
      */
@@ -57,12 +59,10 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
     @Log(title = "导出监控调阅任务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(RetrievalTaskPageDto request, HttpServletResponse response) throws IOException {
-        coreMonitoringRetrievalTaskService.export(request,response);
+        coreMonitoringRetrievalTaskService.export(request, response);
     }
 
 
-
-
     /**
      * 获取监控调阅任务详细信息
      */
@@ -78,7 +78,7 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
      */
     @ApiOperation(value = "新增CoreMonitoringRetrievalTask")
     @RequiresPermissions("core:task:add")
-    @Log(title = "监控调阅任务" , businessType = BusinessType.INSERT)
+    @Log(title = "监控调阅任务", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask) {
         return toAjax(coreMonitoringRetrievalTaskService.insertCoreMonitoringRetrievalTask(CoreMonitoringRetrievalTask));
@@ -89,7 +89,7 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
      */
     @ApiOperation(value = "修改CoreMonitoringRetrievalTask")
     @RequiresPermissions("core:task:edit")
-    @Log(title = "监控调阅任务" , businessType = BusinessType.UPDATE)
+    @Log(title = "监控调阅任务", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask) {
         return toAjax(coreMonitoringRetrievalTaskService.updateCoreMonitoringRetrievalTask(CoreMonitoringRetrievalTask));
@@ -100,7 +100,7 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
      */
     @ApiOperation(value = "删除CoreMonitoringRetrievalTask")
     @RequiresPermissions("core:task:remove")
-    @Log(title = "监控调阅任务" , businessType = BusinessType.DELETE)
+    @Log(title = "监控调阅任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(coreMonitoringRetrievalTaskService.deleteCoreMonitoringRetrievalTaskByIds(ids));

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 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.Param;
 
 /**
@@ -65,4 +66,6 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
     public int deleteCoreMonitoringRetrievalTaskByIds(Long[] ids);
 
     Page<CoreMonitoringRetrievalTaskVo> selectPageList(Page<CoreMonitoringRetrievalTaskVo> page, @Param("request") RetrievalTaskPageDto request);
+
+    List<CoreMonitoringRetrievalTask> selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO);
 }

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

@@ -118,11 +118,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public List<CoreMonitoringRetrievalTask> selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO) {
-       QueryWrapper queryWrapper=new QueryWrapper();
-        queryWrapper.eq("org_id",coreMonitoringTaskRegistrationDTO.getOrgId());
-        queryWrapper.eq("status",coreMonitoringTaskRegistrationDTO.getStatus());
-        queryWrapper.like("ymd_date",coreMonitoringTaskRegistrationDTO.getMoth());
-        return baseMapper.selectList(queryWrapper);
+        return baseMapper.selectListApp(coreMonitoringTaskRegistrationDTO);
     }
 
 

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

@@ -46,6 +46,11 @@
             <include refid="selectCoreMonitoringTaskMonitorInfoVo"/>
             where id = #{id}
     </select>
+    <select id="selectCoreMonitoringTaskMonitorInfoByMonitorId"
+            resultType="com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo">
+        <include refid="selectCoreMonitoringTaskMonitorInfoVo"/>
+        where task_monitor_id = #{monitorId}
+    </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

@@ -68,6 +68,21 @@
         WHERE
             cmtrm.task_registration_id =#{taskRegistrationId}
     </select>
+    <select id="selectMonitorById"
+            resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO">
+        SELECT
+            cmtrm.id AS id,
+            cmtrm.`host` AS `host`,
+            cmtrm.video_channel AS videoChannel,
+            sd.device_name AS hostName,
+            sd1.device_name AS videoChannelName
+        FROM
+            core_monitoring_task_registration_monitor cmtrm
+                LEFT JOIN sys_device sd ON sd.id = cmtrm.`host`
+                LEFT JOIN sys_device sd1 ON sd1.host_id = sd.id
+        WHERE
+            cmtrm.id = #{id}
+    </select>
 
     <insert id="insertCoreMonitoringTaskRegistrationMonitor" parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor">
         insert into core_monitoring_task_registration_monitor

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

@@ -67,7 +67,7 @@
     <select id="selectPageList" resultType="com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskVo">
         select a.*,b.name as roleName,c.name as retrievalUserName from core_monitoring_retrieval_task a left join sys_role b on a.role_id = b.id left join sys_user c on a.retrieval_user = c.id
         where 1=1
-        <if test="request.orgId != null ">
+        <if test="coreMonitoringTaskRegistrationDTO.orgId != null ">
             and a.org_id = #{request.orgId}
         </if>
         <if test="request.orgPath != null  and request.orgPath != ''">
@@ -91,6 +91,23 @@
         </if>
         order by a.ymd_date desc
     </select>
+    <select id="selectListApp"
+            resultType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
+        SELECT
+            *
+        FROM
+            core_monitoring_retrieval_task
+        WHERE 1=1
+        <if test="orgId != null ">
+            and org_id = #{orgId}
+        </if>
+        <if test="status !=null">
+            and status =#{status}
+        </if>
+     <if test="ymdDate !=null">
+         and ymdDate like concat('%', #{ymd_date}, '%')
+     </if>
+    </select>
 
     <insert id="insertCoreMonitoringRetrievalTask" parameterType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
         insert into core_monitoring_retrieval_task

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

@@ -1,9 +1,9 @@
 package com.xunmei.system.controller;
 
 import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
 
+import com.xunmei.common.security.annotation.InnerAuth;
+import com.xunmei.system.api.domain.SysDevice;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,13 +16,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
-import com.xunmei.system.domain.SysDevice;
 import com.xunmei.system.service.ISysDeviceService;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
 /**
@@ -45,7 +43,6 @@ public class SysDeviceController extends BaseController {
     @RequiresPermissions("system:device:list")
     @GetMapping("/list")
     public TableDataInfo<SysDevice> list(SysDevice sysDevice) {
-
         return sysDeviceService.selectPage(sysDevice);
     }
 
@@ -71,6 +68,23 @@ public class SysDeviceController extends BaseController {
     }
 
     /**
+     * 通过机构id查询主机
+     */
+    @ApiOperation(value = "通过机构id查询主机")
+    @InnerAuth
+    @GetMapping(value = "/getSysDeviceByOrgId")
+    public List<SysDevice> getSysDeviceByOrgId(Long orgId) {
+        return sysDeviceService.getHostByOrgId(orgId);
+    }
+
+    @ApiOperation(value = "通过主机查询视频监控")
+    @InnerAuth
+    @GetMapping(value = "/getSysDeviceByHostId")
+    public List<SysDevice> getSysDeviceByHostId(Long hostId) {
+        return sysDeviceService.getSysDeviceByHostId(hostId);
+    }
+
+    /**
      * 新增【请填写功能名称】
      */
     @ApiOperation(value = "新增SysDevice")

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

@@ -11,6 +11,8 @@ import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.service.ISysDictDataService;
 import com.xunmei.system.service.ISysDictTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -24,6 +26,7 @@ import java.util.List;
  *
  * @author xunmei
  */
+@Api(tags = {"SysData"})
 @RestController
 @RequestMapping("/dict/data")
 public class SysDictDataController extends BaseController
@@ -56,6 +59,7 @@ public class SysDictDataController extends BaseController
     /**
      * 根据字典类型查询字典数据信息
      */
+    @ApiOperation(value = "根据字典类型查询字典数据信息")
     @GetMapping(value = "/type/{dictType}")
     public AjaxResult dictType(@PathVariable String dictType)
     {

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

@@ -19,6 +19,7 @@ import com.xunmei.system.domain.vo.SysUserVO;
 import com.xunmei.system.service.ISysDeptService;
 import com.xunmei.system.service.ISysRoleService;
 import com.xunmei.system.service.ISysUserService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -206,12 +207,12 @@ public class SysRoleController extends BaseController {
     public AjaxResult all() {
         return success(roleService.selectSimpleRoleAll(null));
     }
-
+    @ApiOperation(value = "根据id查询角色")
     @InnerAuth
     @GetMapping(value = "/getRoleById")
-    public R<SysRole> getRoleById(Long id) {
-        SysRole byId = roleService.getById(id);
-        return R.ok(byId);
+    public SysRole getRoleById(Long id) {
+        SysRole sysRole = roleService.getById(id);
+        return sysRole;
     }
 
     @InnerAuth

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

@@ -2,8 +2,8 @@ package com.xunmei.system.mapper;
 
 import java.util.List;
 
-import com.xunmei.system.domain.SysDevice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.system.api.domain.SysDevice;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

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

@@ -2,10 +2,9 @@ package com.xunmei.system.service;
 
 import java.util.List;
 
-import com.xunmei.system.domain.SysDevice;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.system.api.domain.SysDevice;
 
 /**
  * 【设备管理】Service接口
@@ -36,7 +35,7 @@ public interface ISysDeviceService extends IService<SysDevice> {
      * @return 【设备管理】集合
      */
     List<SysDevice> selectSysDeviceList(SysDevice sysDevice);
-
+List<SysDevice> getSysDeviceByHostId(Long hostId);
     /**
      * 新增【设备管理】
      *

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

@@ -4,19 +4,17 @@ import java.util.List;
 
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.system.api.domain.SysDevice;
 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;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.system.mapper.SysDeviceMapper;
-import com.xunmei.system.domain.SysDevice;
 import com.xunmei.system.service.ISysDeviceService;
 
 /**
@@ -93,6 +91,15 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
         return sysDeviceMapper.selectList(new QueryWrapper<>(sysDevice));
     }
 
+    @Override
+    public List<SysDevice> getSysDeviceByHostId(Long hostId) {
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("del_flag","0");
+        queryWrapper.eq("host_id",hostId);
+        List<SysDevice> list = baseMapper.selectList(queryWrapper);
+        return list;
+    }
+
     /**
      * 新增【请填写功能名称】
      *

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

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.system.mapper.SysDeviceMapper">
 
-    <resultMap type="com.xunmei.system.domain.SysDevice" id="SysDeviceResult">
+    <resultMap type="com.xunmei.system.api.domain.SysDevice" id="SysDeviceResult">
         <result property="id" column="id"/>
         <result property="orgId" column="org_id"/>
         <result property="orgName" column="org_name"/>
@@ -43,7 +43,7 @@
         from sys_device
     </sql>
 
-    <select id="selectSysDeviceList" parameterType="com.xunmei.system.domain.SysDevice"
+    <select id="selectSysDeviceList" parameterType="com.xunmei.system.api.domain.SysDevice"
             resultMap="SysDeviceResult">
         <include refid="selectSysDeviceVo"/>
         <where>
@@ -85,13 +85,13 @@
         <include refid="selectSysDeviceVo"/>
         where id = #{id}
     </select>
-    <select id="getHostByOrgId" resultType="com.xunmei.system.domain.SysDevice">
+    <select id="getHostByOrgId" resultType="com.xunmei.system.api.domain.SysDevice">
         <include refid="selectSysDeviceVo"/>
         WHERE
         org_id =#{orgId} and del_flag='0' and device_type='0'
     </select>
 
-    <insert id="insertSysDevice" parameterType="com.xunmei.system.domain.SysDevice">
+    <insert id="insertSysDevice" parameterType="com.xunmei.system.api.domain.SysDevice">
         insert into sys_device
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,
@@ -163,7 +163,7 @@
         </trim>
     </insert>
 
-    <update id="updateSysDevice" parameterType="com.xunmei.system.domain.SysDevice">
+    <update id="updateSysDevice" parameterType="com.xunmei.system.api.domain.SysDevice">
         update sys_device
         <trim prefix="SET" suffixOverrides=",">
             <if test="orgId != null">org_id =