优化

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

@@ -175,6 +175,7 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
             return AjaxResult.error("修改任务状态失败" + e.getMessage());
         }
     }
+
     @InnerAuth
     @PostMapping("/rebuildTask")
     public AjaxResult rebuildTask(@RequestBody String event) {

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

@@ -122,14 +122,16 @@ public interface ICoreMonitoringRetrievalTaskBuilderService extends IService<Cor
 
     /**
      * 查询结束时间是当前之后的任务
+     *
      * @param planId
      * @param startTime
      * @return
      */
-    List<Long>selectTaskByStartTime(Long planId, String startTime);
+    List<Long> selectTaskByStartTime(Long planId, String startTime);
 
     /**
      * 删除今天的任务
+     *
      * @param planId
      * @param day
      */
@@ -137,11 +139,12 @@ public interface ICoreMonitoringRetrievalTaskBuilderService extends IService<Cor
 
     /**
      * 查询今天的任务
+     *
      * @param planId
      * @param day
      * @return
      */
-    List<Long>selectTaskByToday(Long planId, String day);
+    List<Long> selectTaskByToday(Long planId, String day);
 
     void deleteAllTaskByPlanIds(List<Long> planId);
 

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

@@ -349,7 +349,7 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
             sysOrg.setType(Integer.valueOf(p.getOrgType()));
             List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);*/
             List<SysOrg> sysOrgs = orgList.stream().
-                    filter(s -> (s.getPath()!=null&&s.getPath().contains(p.getOrgPath()) )&& (s.getType() != null && s.getType().toString().equals(p.getOrgType())))
+                    filter(s -> (s.getPath() != null && s.getPath().contains(p.getOrgPath())) && (s.getType() != null && s.getType().toString().equals(p.getOrgType())))
                     .collect(Collectors.toList());
             for (SysOrg s : sysOrgs) {
                 TMonitoringRetrievalPlan plan = new TMonitoringRetrievalPlan();

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

@@ -231,10 +231,10 @@ public class SysDeviceController extends BaseController {
                                 throw new RuntimeException("设备" + d.getDeviceName() + "关联主机不正确");
                             }
                         }
-                        if(null!=d.getDefinition()){
-                            if (d.getDefinition().equals("是")){
+                        if (null != d.getDefinition()) {
+                            if (d.getDefinition().equals("是")) {
                                 sysDevice.setDefinition("1");
-                            }else {
+                            } else {
                                 sysDevice.setDefinition("0");
                             }
                         }
@@ -261,7 +261,7 @@ public class SysDeviceController extends BaseController {
 
     @RequiresPermissions("system:device:export")
     @PostMapping("/downInChargeOfTemplate")
-    public void downInChargeOfTemplate(HttpServletResponse response) throws IOException{
+    public void downInChargeOfTemplate(HttpServletResponse response) throws IOException {
         sysDeviceService.downInChargeOfTemplate(response);
     }
 

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

@@ -61,7 +61,7 @@ public interface ISysDeviceService extends IService<SysDevice> {
      */
     int insertSysDevice(SysDevice sysDevice);
 
-    void downInChargeOfTemplate(HttpServletResponse response)throws IOException;
+    void downInChargeOfTemplate(HttpServletResponse response) throws IOException;
 
     /**
      * 修改【设备管理】

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

@@ -334,7 +334,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
 
     @Override
     public List<SysOrg> selectSysOrgByPathAndType(String path, Integer type) {
-        return sysOrgMapper.selectSysOrgByPathAndType(path,type);
+        return sysOrgMapper.selectSysOrgByPathAndType(path, type);
     }
 
     @Override
@@ -824,6 +824,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
 
     /**
      * 从数据库中查询下级
+     *
      * @param id
      * @return
      */
@@ -835,7 +836,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         OrgTypeEnum orgTypeEnum = OrgTypeEnum.getOrgTypeEnum(org.getType());
         LambdaQueryWrapper<SysOrg> wrapper = new LambdaQueryWrapper<SysOrg>();
         wrapper.notLike(SysOrg::getName, "各部门").notLike(SysOrg::getShortName, "各部门").isNotNull(SysOrg::getPath);
-        wrapper.eq(SysOrg::getIsLock,0);
+        wrapper.eq(SysOrg::getIsLock, 0);
 
         switch (orgTypeEnum) {
             case SHEGN_LIAN_SHE:
@@ -852,16 +853,16 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 }
         }
 
-        wrapper.select(SysOrg::getId,SysOrg::getShortName,SysOrg::getBreviary,SysOrg::getType,SysOrg::getPath);
+        wrapper.select(SysOrg::getId, SysOrg::getShortName, SysOrg::getBreviary, SysOrg::getType, SysOrg::getPath);
 
-        List<SysOrg> orgs= baseMapper.selectList(wrapper);
-        orgs.forEach(item->{
-            if(ObjectUtil.isNull(item.getSort())){
+        List<SysOrg> orgs = baseMapper.selectList(wrapper);
+        orgs.forEach(item -> {
+            if (ObjectUtil.isNull(item.getSort())) {
                 item.setSort(0);
             }
         });
         orgs.sort(Comparator.comparing(SysOrg::getSort));
-        return  orgs;
+        return orgs;
     }
 
     @Override