Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect

inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java

@@ -175,8 +175,8 @@ public class SftpClient {
 //            ftps.connect("192.168.1.198", 21);
 //            boolean loginRes = ftps.login("hangtian", "123qweasd");
 //            ftps.connect("124.221.104.159", 10990);
-            ftps.connect("124.221.104.159", 10990);
-            //          ftps.connect("192.168.1.116", 1990);
+            // ftps.connect("124.221.104.159", 10990);
+                      ftps.connect("192.168.1.12", 990);
             boolean loginRes = ftps.login("ftpuser", "atia2018");
             System.out.println(loginRes);
             ftps.setFileType(2);

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java

@@ -2,6 +2,7 @@ package com.inspect.metadata.patrolpointmnt.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.inspect.base.core.constant.Color;
 import com.inspect.metadata.alg.domain.BasedataAlgSubtype;
 import com.inspect.metadata.alg.service.IBasedataAlgSubtypeService;
 import com.inspect.metadata.montdatamqhandle.service.component.BasedataMontPatrolPointHandleComponent;
@@ -87,9 +88,28 @@ public class BasedataPatrolPointController extends BaseController {
         if (null == basedataPatrolpoint.getDeviceId()) {
             return getDataTable(new ArrayList<>());
         } else {
+            logger.info("[META] monitorList: basedataPatrolPoint: {}", basedataPatrolpoint);
             List<BasedataPatrolPoint> list = basedataPatrolPointService.selectBasedataMonitorList(basedataPatrolpoint);
             logger.info("[META] deviceId: {}, size: {}", basedataPatrolpoint.getDeviceId(), list.size());
-            return getDataTable(list);
+            List<BasedataPatrolPoint> listEx = new ArrayList<>();
+            for(int i = 0; i < list.size(); i++) {
+                BasedataPatrolPoint basedataPatrolPoint = list.get(i);
+                logger.info(Color.GREEN + "[META] monitorList result: {}" + Color.END, basedataPatrolPoint);
+                BasedataPatrolPoint basedataPatrolPoint2 = new BasedataPatrolPoint();
+                basedataPatrolPoint2.setDeviceId(basedataPatrolpoint.getDeviceId());
+                basedataPatrolPoint2.setPatrolPointId(basedataPatrolPoint.getPatrolPointId());
+                basedataPatrolPoint2.setDeviceId(basedataPatrolPoint.getDeviceId());
+                basedataPatrolPoint2.setMainDeviceId(basedataPatrolPoint.getMainDeviceId());
+                basedataPatrolPoint2.setPatrolPointCode(basedataPatrolPoint.getPatrolPointCode());
+                basedataPatrolPoint2.setPatrolPointName(basedataPatrolPoint.getPatrolPointName());
+                basedataPatrolPoint2.setDeviceName(basedataPatrolPoint.getDeviceName());
+                basedataPatrolPoint2.setAlgSubtypeId(basedataPatrolPoint.getAlgSubtypeId());
+                basedataPatrolPoint2.setAlgSubtypeIds(basedataPatrolPoint.getAlgSubtypeIds());
+                basedataPatrolPoint2.setPatrolContent(basedataPatrolPoint.getPatrolContent());
+                basedataPatrolPoint2.setAreaId(basedataPatrolPoint.getAreaId());
+                listEx.add(basedataPatrolPoint2);
+            }
+            return getDataTable(listEx);
         }
     }
 

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java

@@ -76,11 +76,12 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
 
     public List<BasedataPatrolPoint> selectBasedataMonitorList(BasedataPatrolPoint basedataPatrolpoint) {
         List<BasedataPatrolPoint> pointList = this.basedataPatrolpointMapper.selectBasedataMonitorList(basedataPatrolpoint);
+        logger.info("[META] pointList cnt: {}", pointList.size());
         if (null != basedataPatrolpoint.getDeviceId()) {
             BasedataDevice basedataDevice = this.basedataDeviceMapper.selectBasedataDeviceByDeviceId(basedataPatrolpoint.getDeviceId());
             basedataPatrolpoint.setDeviceTypeId(basedataDevice.getDeviceTypeId());
             List<BasedataPatrolPoint> stdPointList = this.basedataPatrolpointMapper.selectBasedataMonitorUnionList(basedataPatrolpoint);
-
+            logger.info("[META] stdPointList cnt: {}", stdPointList.size());
             for (BasedataPatrolPoint stdPoint : stdPointList) {
                 if (!pointList.isEmpty()) {
                     if (pointList.stream().filter((item) -> stdPoint.getStdParolPointId().equals(item.getStdParolPointId())).count() == 0) {
@@ -93,10 +94,12 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
         }
 
         List<BasedataAlgSubtype> basedataAlgSubtypes = this.basedataAlgSubtypeMapper.selectBasedataAlgSubtypeList(new BasedataAlgSubtype());
+        logger.info("[META] basedataAlgSubtypes cnt: {}", basedataAlgSubtypes.size());
         Map<String, String> algSubtypeMap = new HashMap<>();
         basedataAlgSubtypes.forEach((item) -> {
             algSubtypeMap.put(item.getAlgSubtypeId() + "", item.getAlgSubtypeName());
         });
+        logger.info("[META] algSubtypeMap: {}", algSubtypeMap);
         pointList.forEach((item) -> item.loadAlgSubtypeName(algSubtypeMap));
         return pointList;
     }