修改缺陷

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

@@ -40,7 +40,7 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
     @RequiresPermissions("core:task:weblist")
     @GetMapping("/list")
     public TableDataInfo list(RetrievalTaskPageDto request) {
-
+        coreMonitoringRetrievalTaskService.initializationTask();
         return coreMonitoringRetrievalTaskService.selectPage(request);
     }
 

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

@@ -6,8 +6,10 @@ import java.util.stream.Collectors;
 import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.security.annotation.InnerAuth;
 import com.xunmei.system.api.domain.SysDevice;
+import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysRole;
+import com.xunmei.system.service.ISysDictTypeService;
 import com.xunmei.system.service.impl.SysDeviceServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -40,7 +42,8 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 public class SysDeviceController extends BaseController {
     @Autowired
     private ISysDeviceService sysDeviceService;
-
+    @Autowired
+    private ISysDictTypeService dictTypeService;
     /**
      * 查询【请填写功能名称】列表
      */
@@ -72,7 +75,14 @@ public class SysDeviceController extends BaseController {
     @RequiresPermissions("system:device:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(sysDeviceService.selectSysDeviceById(id));
+        AjaxResult ajax = AjaxResult.success();
+        SysDevice device = sysDeviceService.selectSysDeviceById(id);
+        ajax.put("data", device);
+        List<SysDevice> hostByOrgId = sysDeviceService.getHostByOrgId(device.getOrgId(), null);
+        ajax.put("hostList", hostByOrgId);
+        List<SysDictData> deviceTypeByAssetType = dictTypeService.getDeviceTypeByAssetType(device.getAssetType());
+        ajax.put("devices", deviceTypeByAssetType);
+        return ajax;
     }
 
     /**