fix: 补充属性，增加参数

xymanager_admin/src/main/resources/application-test.yml

@@ -61,7 +61,7 @@ server:
 logging:
   config: classpath:log4j2.xml
   level:
-    com.shxy: trace
+    com.shxy: info
     org.springframework: warn
 
 

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnStatus.java

@@ -2,6 +2,7 @@ package com.shxy.xymanager_common.entity;
 
 import com.alibaba.excel.util.StringUtils;
 import com.shxy.xymanager_common.util.JSONUtil;
+import com.shxy.xymanager_common.vo.TerminalSelectVo;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Date;
@@ -297,6 +298,54 @@ public class MntnStatus {
                                 map.put("i1Version", vs[1]);
                             } else if (vs[0].equals("yw")) {
                                 map.put("maintainVersion", vs[1]);
+                            } else if (vs[0].equals("心跳间隔")) {
+                                map.put("heartbeatDuration", vs[1]);
+                            } else if (vs[0].equals("电池")) {
+                                map.put("battery", vs[1]);
+                            } else if (vs[0].equals("系统重启")) {
+                                map.put("rebootTimes", vs[1]);
+                            } else if (vs[0].equals("重启")) {
+                                map.put("rebootTimes", vs[1]);
+                            } else if (vs[0].equals("i1重启")) {
+                                map.put("i1RebootTimes", vs[1]);
+                            } else if (vs[0].equals("收")) {
+                                map.put("recv", vs[1]);
+                            } else if (vs[0].equals("拍")) {
+                                map.put("photoTimes", vs[1]);
+                            } else if (vs[0].equals("成")) {
+                                map.put("success", vs[1]);
+                            } else if (vs[0].equals("败")) {
+                                map.put("failure", vs[1]);
+                            } else if (vs[0].equals("传")) {
+                                map.put("uploads", vs[1]);
+                            } else if (vs[0].equals("心跳累计")) {
+                                map.put("numberOfHb", vs[1]);
+                            } else if (vs[0].equals("心跳")) {
+                                map.put("numberOfHb", vs[1]);
+                            } else if (vs[0].equals("网络异常")) {
+                                map.put("networkError", vs[1]);
+                            } else if (vs[0].equals("网络")) {
+                                map.put("networkError", vs[1]);
+                            } else if (vs[0].equals("信号1")) {
+                                map.put("signature1", vs[1]);
+                            } else if (vs[0].equals("信号2")) {
+                                map.put("signature2", vs[1]);
+                            } else if (vs[0].equals("卡1")) {
+                                map.put("simcard1", vs[1]);
+                            } else if (vs[0].equals("卡2")) {
+                                map.put("simcard2", vs[1]);
+                            } else if (vs[0].equals("mcu")) {
+                                map.put("mcu", vs[1]);
+                            } else if (vs[0].equals("ai")) {
+                                map.put("aiVersion", vs[1]);
+                            } else if (vs[0].equals("cam")) {
+                                map.put("cameraService", vs[1]);
+                            } else if (vs[0].equals("主板温度")) {
+                                map.put("mainBoardTmp", vs[1]);
+                            } else if (vs[0].equals("电池温度")) {
+                                map.put("batteryTmp", vs[1]);
+                            } else if (vs[0].equals("剩余存储空间")) {
+                                map.put("freeROM", vs[1]);
                             }
                         }
                     }
@@ -309,32 +358,92 @@ public class MntnStatus {
         return null;
     }
 
-    public HashMap<String, Object> match(String version, String cma) {
+    public HashMap<String, Object> match(TerminalSelectVo vo) {
         HashMap<String, Object> map = this.makeRawReport();
         if (map != null) {
-            if (StringUtils.isNotBlank(version)) {
+            if (StringUtils.isNotBlank(vo.getVersion()) && StringUtils.isNotBlank(vo.getCma())) {
+                int v = 0;
+                int c = 0;
                 Iterator<String> it = map.keySet().iterator();
                 while (it.hasNext()) {
                     String key = it.next();
                     Object value = map.get(key);
                     if (key.toLowerCase().contains("version")) {
-                        if (value.toString().contains(version)) {
+                        if (value.toString().contains(vo.getVersion())) {
+                            v = 1;
+                        }
+                    }
+                    if (key.toLowerCase().contains("cma")) {
+                        if (value.toString().contains(vo.getVersion())) {
+                            c = 1;
+                        }
+                    }
+                }
+                if (vo.getVersionExclude()) {
+                    if (vo.getCmaExclude()) {
+                        if (v == 0 && c == 0) {
+                            return map;
+                        }
+                    } else {
+                        if (v == 0 && c == 1) {
+                            return map;
+                        }
+                    }
+                } else {
+                    if (vo.getCmaExclude()) {
+                        if (v == 1 && c == 0) {
+                            return map;
+                        }
+                    } else {
+                        if (v == 1 && c == 1) {
                             return map;
                         }
                     }
                 }
-            }
+            } else if (StringUtils.isNotBlank(vo.getVersion())) {
-            if (StringUtils.isNotBlank(cma)) {
+                int v = 0;
+                Iterator<String> it = map.keySet().iterator();
+                while (it.hasNext()) {
+                    String key = it.next();
+                    Object value = map.get(key);
+                    if (key.toLowerCase().contains("version")) {
+                        if (value.toString().contains(vo.getVersion())) {
+                            v = 1;
+                            break;
+                        }
+                    }
+                }
+                if (vo.getVersionExclude()) {
+                    if (v == 0) {
+                        return map;
+                    }
+                } else {
+                    if (v == 1) {
+                        return map;
+                    }
+                }
+            } else if (StringUtils.isNotBlank(vo.getCma())) {
+                int c = 0;
                 Iterator<String> it = map.keySet().iterator();
                 while (it.hasNext()) {
                     String key = it.next();
                     Object value = map.get(key);
                     if (key.toLowerCase().contains("cma")) {
-                        if (value.toString().contains(cma)) {
+                        if (value.toString().contains(vo.getCma())) {
-                            return map;
+                            c = 1;
+                            break;
                         }
                     }
                 }
+                if (vo.getCmaExclude()) {
+                    if (c == 0) {
+                        return map;
+                    }
+                } else {
+                    if (c == 1) {
+                        return map;
+                    }
+                }
             }
         }
         return null;

xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalSelectVo.java

@@ -43,8 +43,13 @@ public class TerminalSelectVo {
     private int pagesize;
 
     private String cma;
+    private Boolean cmaExclude;
     private String cmdid;
+    private Boolean cmdidExclude;
     private String version;
+    private Boolean versionExclude;
+    private String bsIdentifier;
+    private Boolean bsIdentifierExclude;
     private Integer activityId;
     private Integer mntn;
 

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java

@@ -5,6 +5,7 @@ import com.shxy.xymanager_common.exception.ApiException;
 import com.shxy.xymanager_dao.dao.MntnActivityTerminalsMapper;
 import com.shxy.xymanager_dao.dao.MntnActivitiesMapper;
 import com.shxy.xymanager_service.service.ActivitiesService;
+import com.shxy.xymanager_service.service.NewCacheService;
 import com.shxy.xymanager_service.service.TerminalExtService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -29,6 +30,8 @@ public class ActivitiesServiceImpl implements ActivitiesService {
     MntnActivityTerminalsMapper terminalsMapper;
     @Resource
     TerminalExtService terminalExtService;
+    @Resource
+    NewCacheService cacheService;
 
     @Override
     public List<MntnActivities> listAll() {
@@ -122,10 +125,12 @@ public class ActivitiesServiceImpl implements ActivitiesService {
     }
 
     @Override
-    public MntnActivities detail(Integer id) {
+    public List<MntnActivityTerminals> detail(Integer id) {
-        MntnActivities item = mapper.selectByPrimaryKey(id);
+        MntnActivityTerminalsExample example = new MntnActivityTerminalsExample();
-        this.fillItem(item);
+        MntnActivityTerminalsExample.Criteria criteria = example.createCriteria();
-        return item;
+        criteria.andActivityIdEqualTo(id);
+        List<MntnActivityTerminals> list = terminalsMapper.selectByExample(example);
+        return list;
     }
 
     private void fillItem(MntnActivities item) {
@@ -135,8 +140,10 @@ public class ActivitiesServiceImpl implements ActivitiesService {
         List<MntnActivityTerminals> list = terminalsMapper.selectByExample(example);
         List<Terminals> terms = new ArrayList<>();
         for (MntnActivityTerminals r : list) {
-            Terminals t = terminalExtService.getById(r.getTermId());
+            Terminals t = cacheService.getTerminal(r.getTermId());
-            terms.add(t);
+            if (t != null) {
+                terms.add(t);
+            }
         }
         item.setTerms(terms);
     }

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalExtServiceImpl.java

@@ -44,6 +44,18 @@ public class TerminalExtServiceImpl implements TerminalExtService {
 
     @Override
     public List<View_Dy_Line_Tower_Terminals> getExtTerminalList(TerminalSelectVo vo) {
+        if (vo.getCmaExclude() == null) {
+            vo.setCmaExclude(false);
+        }
+        if (vo.getVersionExclude() == null) {
+            vo.setVersionExclude(false);
+        }
+        if (vo.getCmdidExclude() == null) {
+            vo.setCmdidExclude(false);
+        }
+        if (vo.getBsIdentifierExclude() == null) {
+            vo.setBsIdentifierExclude(false);
+        }
         PermissionDetail permit = userService.getPermissionListFull();
 
         View_Dy_Line_Tower_TerminalsExample example = new View_Dy_Line_Tower_TerminalsExample();
@@ -65,7 +77,18 @@ public class TerminalExtServiceImpl implements TerminalExtService {
             criteria.andLineNameLike("%" + vo.getSearch() + "%");
         }
         if (StringUtils.isNotBlank(vo.getCmdid())) {
-            criteria.andCmdidLike("%" + vo.getCmdid() + "%");
+            if (vo.getCmdidExclude()) {
+                criteria.andCmdidNotLike("%" + vo.getCmdid() + "%");
+            } else {
+                criteria.andCmdidLike("%" + vo.getCmdid() + "%");
+            }
+        }
+        if (StringUtils.isNotBlank(vo.getBsIdentifier())) {
+            if (vo.getBsIdentifierExclude()) {
+                criteria.andBsIdentifierNotLike("%" + vo.getBsIdentifier() + "%");
+            } else {
+                criteria.andBsIdentifierLike("%" + vo.getBsIdentifier() + "%");
+            }
         }
         if (vo.getDevType() != null && vo.getDevType() > 0) {
             criteria.andDevTypeLike("%" + vo.getDevType() + "%");
@@ -87,10 +110,10 @@ public class TerminalExtServiceImpl implements TerminalExtService {
             }
         }
         if (vo.getActivityId() != null && vo.getActivityId() > 0) {
-            MntnActivities activities = activitiesService.detail(vo.getActivityId());
+            List<MntnActivityTerminals> actList = activitiesService.detail(vo.getActivityId());
             List<Integer> idList = new ArrayList<>();
-            for (Terminals item : activities.getTerms()) {
+            for (MntnActivityTerminals item : actList) {
-                idList.add(item.getId());
+                idList.add(item.getTermId());
             }
             criteria.andIdIn(idList);
         }
@@ -106,7 +129,7 @@ public class TerminalExtServiceImpl implements TerminalExtService {
             MntnStatus status = statusMapper.selectByPrimaryKey(item.getId());
             if (vo.needMatch()) {
                 if (status != null) {
-                    HashMap<String, Object> map = status.match(vo.getVersion(), vo.getCma());
+                    HashMap<String, Object> map = status.match(vo);
                     if (map != null) {
                         item.setRawReport(map);
                         result.add(item);

xymanager_service/src/main/java/com/shxy/xymanager_service/service/ActivitiesService.java

@@ -1,6 +1,7 @@
 package com.shxy.xymanager_service.service;
 
 import com.shxy.xymanager_common.entity.MntnActivities;
+import com.shxy.xymanager_common.entity.MntnActivityTerminals;
 
 import java.util.List;
 
@@ -14,6 +15,6 @@ public interface ActivitiesService {
 
     void delete(Integer id) throws Exception;
 
-    MntnActivities detail(Integer id);
+    List<MntnActivityTerminals> detail(Integer id);
 
 }