Merge branch 'V0.0.1' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.1

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

@@ -39,9 +39,9 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/registration")
 public class CoreMonitoringTaskRegistrationController extends BaseController {
     @Autowired
-    private CoreMonitoringTaskRegistrationServiceImpl coreMonitoringTaskRegistrationService;
+    private ICoreMonitoringTaskRegistrationService iCoreMonitoringTaskRegistrationService;//扫描
     @Autowired
-    private ICoreMonitoringTaskRegistrationMonitorService iCoreMonitoringTaskRegistrationMonitorService;
+    private ICoreMonitoringTaskRegistrationMonitorService iCoreMonitoringTaskRegistrationMonitorService;//监控
 
     /**
      * 查询【请填写功能名称】列表
@@ -60,7 +60,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
     @RequiresPermissions("system:registration:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(coreMonitoringTaskRegistrationService.selectCoreMonitoringTaskRegistrationById(id));
+        return success(iCoreMonitoringTaskRegistrationService.selectCoreMonitoringTaskRegistrationById(id));
     }
 
     /**
@@ -71,7 +71,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
     @Log(title = "【调阅任务登记NCF开始】", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
-        return toAjax(coreMonitoringTaskRegistrationService.insertCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
+        return toAjax(iCoreMonitoringTaskRegistrationService.insertCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
     }
 
     /**
@@ -82,7 +82,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
-        return toAjax(coreMonitoringTaskRegistrationService.updateCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
+        return toAjax(iCoreMonitoringTaskRegistrationService.updateCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
     }
     /*
      *//**

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

@@ -16,6 +16,9 @@ import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
 import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
@@ -27,6 +30,7 @@ import java.util.List;
  * @author xunmei
  * @date 2023-08-28
  */
+@Lazy
 @Service
 public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreMonitoringTaskRegistrationMapper, CoreMonitoringTaskRegistration> implements ICoreMonitoringTaskRegistrationService {
     private static final Integer ONE = 1;
@@ -34,44 +38,11 @@ public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreM
     @Autowired
     private CoreMonitoringTaskRegistrationMapper coreMonitoringTaskRegistrationMapper;
     @Autowired
-    private ICoreMonitoringRetrievalTaskService coreMonitoringRetrievalTaskService;
+    private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;//任务
     @Autowired
-    private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
-@Autowired
-private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;
-  /*  @Override
-    public TableDataInfo<CoreMonitoringTaskRegistration> selectPage(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
-        //未删除
-        coreMonitoringTaskRegistration.setDeleted(0L);
-        Page<CoreMonitoringTaskRegistration> page;
-        //分页
-        if (coreMonitoringTaskRegistration.getPageNum()!=null&&coreMonitoringTaskRegistration.getPageSize()!=null)
-        {
-            page = new Page<>(coreMonitoringTaskRegistration.getPageNum(), coreMonitoringTaskRegistration.getPageSize());
-        }else{
-            page = new Page<>();
-        }
-        //查询条件
-        QueryWrapper<CoreMonitoringTaskRegistration> query = new QueryWrapper<>(coreMonitoringTaskRegistration);
-        //下穿
-        if (coreMonitoringTaskRegistration.getCheckSub()){
-            List<Long> ids = orgService.selectCheckSubOrgIdList(coreMonitoringTaskRegistration.getOrgId());
-            //清空前端传递的org_id
-            coreMonitoringTaskRegistration.setOrgId(null);
-            //添加in条件
-            query.in("org_id",ids);
-        }
-        //时间范围查询
-        if (coreMonitoringTaskRegistration.getParams().get("beginTime")!=null&&coreMonitoringTaskRegistration.getParams().get("endTime")!=null){
-            query.between("create_time", coreMonitoringTaskRegistration.getParams().get("beginTime"), coreMonitoringTaskRegistration.getParams().get("endTime"));
-        }
-        //获取数据
-        page = coreMonitoringTaskRegistrationMapper.selectPage(page, query);
-        //抓换为TableDataInfo适配前端
-        return TableDataInfo.build(page);
-    }*/
-
-
+    private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;//任务
+    @Autowired
+    private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;//项目
     /**
      * 查询【请填写功能名称】
      *
@@ -83,7 +54,7 @@ private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;
         CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO = new CoreMonitoringTaskRegistrationVO();
         CoreMonitoringTaskRegistration coreMonitoringTaskRegistration = coreMonitoringTaskRegistrationMapper.selectById(id);
         BeanUtils.copyProperties(coreMonitoringTaskRegistration, coreMonitoringTaskRegistrationVO);
-        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = coreMonitoringRetrievalTaskService.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
+        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = iCoreMonitoringRetrievalTaskService.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
         coreMonitoringTaskRegistrationVO.setTaskName(coreMonitoringRetrievalTask.getTaskName());
         return coreMonitoringTaskRegistrationVO;
     }
@@ -139,7 +110,7 @@ private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;
         coreMonitoringRetrievalTask.setSubmitTime(DateUtils.getNowDate());
         coreMonitoringRetrievalTask.setRetrievalUser(SecurityUtils.getUserId());
         Long i = coreMonitoringTaskMonitorInfoMapper.selectAbnormalByTaskId(coreMonitoringTaskRegistration.getTaskId());
-           coreMonitoringRetrievalTask.setExceptionCount(i);
+        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

@@ -23,8 +23,13 @@ import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -37,10 +42,11 @@ import java.util.function.Function;
  * @author xunmei
  * @date 2023-08-24
  */
+@Lazy
 @Service
 public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoringRetrievalPlanMapper, TMonitoringRetrievalPlan> implements ITMonitoringRetrievalPlanService {
-private static final Long MINUS_ONE=-1L;
-private static final Long ZERO=0L;
+    private static final Long MINUS_ONE = -1L;
+    private static final Long ZERO = 0L;
     @Autowired
     private TMonitoringRetrievalPlanMapper tMonitoringRetrievalPlanMapper;
     @Autowired
@@ -49,8 +55,10 @@ private static final Long ZERO=0L;
     private RemoteOrgService remoteOrgService;
     @Autowired
     private RemoteRoleService remoteRoleService;
-/*@Autowired
-private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;*/
+    @Lazy
+    @Resource
+    private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;
+
     @Override
     public TableDataInfo<TMonitoringRetrievalPlan> selectPage(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         //未删除
@@ -74,7 +82,6 @@ private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;
             tMonitoringRetrievalPlan.setOrgId(data.get(0).getId());
         }
         if (tMonitoringRetrievalPlan.getCheckSub()) {
-            //List<Long> ids = remoteOrgService.selectCheckSubOrgIdList(tMonitoringRetrievalPlan.getOrgId(), SecurityConstants.INNER);
             List<Long> ids = remoteOrgService.selectCheckSubOrgIdList(tMonitoringRetrievalPlan.getOrgId(), SecurityConstants.INNER);
             //清空前端传递的org_id
             tMonitoringRetrievalPlan.setOrgId(null);
@@ -117,7 +124,7 @@ private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;
         tMonitoringRetrievalPlanMapper.updateById(tMonitoringRetrievalPlan);
         List<SysOrg> list = remoteOrgService.selectSysOrgByParentId(MINUS_ONE, SecurityConstants.INNER);
         Integer i = 0;
-        List<TMonitoringRetrievalPlan>tMonitoringRetrievalPlans=new ArrayList<>();
+        List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
         for (SysOrg l : list) {
             TMonitoringRetrievalPlan monitoringRetrievalPlan = new TMonitoringRetrievalPlan();
             monitoringRetrievalPlan.setPlanName(tMonitoringRetrievalPlan.getPlanName());
@@ -143,8 +150,8 @@ private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;
                 return i;
             }
         }
-        if (tMonitoringRetrievalPlan.getPlanCycle().equals("0")){
-         //   iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
+        if (tMonitoringRetrievalPlan.getPlanCycle().equals("0")) {
+            iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
         }
         return i;
     }
@@ -185,10 +192,10 @@ private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;
             tMonitoringRetrievalPlan.setPlanStatus(0);
             tMonitoringRetrievalPlan.setCreateType(1);
             //无周期调用
-            if (tMonitoringRetrievalPlan.getPlanCycle().equals("0")){
-                List<TMonitoringRetrievalPlan>tMonitoringRetrievalPlans=new ArrayList<>();
+            if (tMonitoringRetrievalPlan.getPlanCycle().equals("0")) {
+                List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
                 tMonitoringRetrievalPlans.add(tMonitoringRetrievalPlan);
-               // iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
+                iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
             }
         }
         tMonitoringRetrievalPlan.setCreateType(0);

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

@@ -29,6 +29,10 @@ import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -52,6 +56,7 @@ import java.util.stream.Collectors;
  * @author xunmei
  * @date 2023-08-25
  */
+@Lazy
 @Service
 public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMonitoringRetrievalTaskMapper, CoreMonitoringRetrievalTask> implements ICoreMonitoringRetrievalTaskService {
     @Resource
@@ -61,7 +66,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     @Resource
     private RemoteDictDataService dictDataService;
     @Resource
-    private ITMonitoringRetrievalPlanService tMonitoringRetrievalPlanService;
+    private ITMonitoringRetrievalPlanService itMonitoringRetrievalPlanService;
 
     @Override
     public TableDataInfo selectPage(RetrievalTaskPageDto request) {
@@ -336,7 +341,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getPlanStatus, 0);
         queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getIsDeleted, 0);
         queryWrapper.lambda().eq(TMonitoringRetrievalPlan::getCreateType, 1);
-        List<TMonitoringRetrievalPlan> planList = tMonitoringRetrievalPlanService.list();
+        List<TMonitoringRetrievalPlan> planList = itMonitoringRetrievalPlanService.list();
         //按计划生成任务
         for (TMonitoringRetrievalPlan plan : planList) {
             //获取计划关联的机构