From 928fcc803970cc47d8477dedd4e9bfc563202e7b Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Thu, 20 Mar 2025 17:03:32 +0800 Subject: [PATCH] =?UTF-8?q?/*=E7=94=9F=E4=BA=A7=E7=82=B9=E4=BD=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E6=9F=A5=E7=9C=8B=E7=82=B9=E4=BD=8D=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=AD=BB=E6=8E=89=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=82*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/base/core/sftp/SftpClient.java | 4 ++-- .../BasedataPatrolPointController.java | 22 ++++++++++++++++++- .../impl/BasedataPatrolPointServiceImpl.java | 5 ++++- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java index 9afb163..b6ca882 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java +++ b/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); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java index ce8eee5..4f60e79 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java +++ b/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 list = basedataPatrolPointService.selectBasedataMonitorList(basedataPatrolpoint); logger.info("[META] deviceId: {}, size: {}", basedataPatrolpoint.getDeviceId(), list.size()); - return getDataTable(list); + List 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); } } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java index 32a35fc..583abca 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java @@ -76,11 +76,12 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi public List selectBasedataMonitorList(BasedataPatrolPoint basedataPatrolpoint) { List 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 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 basedataAlgSubtypes = this.basedataAlgSubtypeMapper.selectBasedataAlgSubtypeList(new BasedataAlgSubtype()); + logger.info("[META] basedataAlgSubtypes cnt: {}", basedataAlgSubtypes.size()); Map 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; }