From 8b889170245f71cdc16b880ba82258a538a2e02f Mon Sep 17 00:00:00 2001
From: htjcAdmin <qinyanlei@ht-atia.com>
Date: Wed, 12 Mar 2025 11:47:03 +0800
Subject: [PATCH] =?UTF-8?q?/*1.=20=E5=8D=8E=E8=BD=AF=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=EF=BC=9A=E5=8D=8E=E8=BD=AF=E7=82=B9=E4=BD=8D=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E4=B8=AD=E5=90=AB=E6=9C=89=E4=B8=8B=E5=88=92=E7=BA=BF=EF=BC=8C?=
 =?UTF-8?q?=E8=B7=9F=E6=88=91=E4=BB=AC=E5=BE=97=E5=88=86=E9=9A=94=E7=AC=A6?=
 =?UTF-8?q?=E7=9B=B8=E4=BA=92=E5=86=B2=E7=AA=81=EF=BC=8C=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E4=BB=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E9=87=8C=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8D=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=86=E9=9A=94=E7=AC=A6=E4=B8=BA=E7=AB=96?=
 =?UTF-8?q?=E7=BA=BF=E3=80=822.=20=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=86=99=E8=A1=A8=E5=BE=97=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84=E9=94=99=E8=AF=AF=E3=80=82?=
 =?UTF-8?q?*/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/inspect/base/core/sftp/SftpClient.java   | 11 ++++++-----
 .../task/controller/PatrolTaskController.java    |  2 +-
 .../mapper/task/PatrolTaskInfoMapper.xml         |  2 +-
 .../BasedataMontPatrolPointHandleComponent.java  |  4 ++--
 .../BasedataMontPatrolPointConsumerHandle.java   | 16 +++++++++-------
 .../montdata/BasedataMontTaskResultMapper.xml    |  2 +-
 .../montdata/BasedataMontTaskStaDataMapper.xml   |  2 +-
 7 files changed, 21 insertions(+), 18 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 225f0e9..9afb163 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
@@ -89,7 +89,7 @@ public class SftpClient {
                 = fileFullPath.startsWith(sftpLoginConfig.getBasePath()) ? fileFullPath : sftpLoginConfig.getBasePath() + fileFullPath;
 
         final String fileFullNameTmpEx = StringUtils.isNotEmpty(sftpLoginConfig.getPrefix()) ? sftpLoginConfig.getPrefix() + fileFullPathTmp : fileFullPathTmp;
-        log.info("[FTP] fileFullNameTmpEx: {}", fileFullPathTmp);
+        log.info(Color.CYAN + "[FTP] fileFullPath: {}, fileFullNameTmpEx: {}" + Color.END, fileFullPath, fileFullPathTmp);
         connect((ftps) -> {
             InputStream inputStream = ftps.retrieveFileStream(fileFullNameTmpEx);
             if (inputStream == null) {
@@ -175,19 +175,20 @@ 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("k", 10990);
+            ftps.connect("124.221.104.159", 10990);
+            //          ftps.connect("192.168.1.116", 1990);
             boolean loginRes = ftps.login("ftpuser", "atia2018");
             System.out.println(loginRes);
             ftps.setFileType(2);
 //            ftps.enterLocalPassiveMode();
-//            ftps.enterLocalPassiveMode();
+            ftps.enterLocalPassiveMode();
             ftps.setControlEncoding("UTF-8");
             ftps.setFileTransferMode(10);
             ftps.execPROT("P");
-            ftps.storeFile("11.jpg", new FileInputStream("E:/1.jpg"));
+            ftps.storeFile("1122234567.jpg", new FileInputStream("E:/1.jpg"));
 
 
-            String fileFullPathTmp = "1/2025/02/26/1339/CCD/1339_20250226095445_2023833_02160558340721910141.jpg";
+            String fileFullPathTmp = "1122.jpg";
             //String fileFullPathTmp = "/home/hangtian/11.jpg";
             InputStream inputStream = ftps.retrieveFileStream(fileFullPathTmp);
             if (inputStream == null) {
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java
index 12f6fe4..4faeb58 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java
@@ -592,7 +592,7 @@ public class PatrolTaskController extends BaseController {
                     }
                 } else {
                     List<String> infoList = patrolTaskInfoService.selectPatrolTaskInfoListByMajorId(String.valueOf(patrolTask.getTaskId()));
-                    logger.info("-----------------patrolTask.getTaskId(): " + patrolTask.getTaskId());
+                    logger.info("[TASK] taskId: {}", patrolTask.getTaskId());
                     if (!infoList.isEmpty()) {
                         patrolSendTask.setDeviceList(String.join(StringUtils.COMMA, infoList));
                     } else {
diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml
index 82eff10..e7a42fe 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml
+++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml
@@ -104,7 +104,7 @@
         </where>
     </select>
     <select id="selectPatrolTaskInfoListByMajorId" parameterType="String" resultType="String">
-        select substring_index(patrol_point_code, '_', -1)
+        select substring_index(patrol_point_code, '|', -1)
         from basedata_patrolpoint
         where patrol_point_id
                   in (select DISTINCT(device_id) from patrol_task_info where task_major_id = #{taskId})
diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java
index 35e62c3..2b7db61 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java
@@ -159,7 +159,7 @@ public class BasedataMontPatrolPointHandleComponent {
                     String originalDeviceId = modelItem.getComponent_id();
                     String originalAlgSubtypeIds = modelItem.getRecognition_type_list();
                     BasedataPatrolPoint basedataPatrolpoint = new BasedataPatrolPoint();
-                    basedataPatrolpoint.setPatrolPointCode(sendCode + "_" + device_id);
+                    basedataPatrolpoint.setPatrolPointCode(sendCode + "|" + device_id);
                     List<BasedataPatrolPoint> patrolpointList = this.basedataPatrolPointService.selectBasedataPatrolPointList(basedataPatrolpoint);
                     if (null != patrolpointList && !patrolpointList.isEmpty()) {
                         BasedataPatrolPoint patrolPoint = patrolpointList.get(0);
@@ -171,7 +171,7 @@ public class BasedataMontPatrolPointHandleComponent {
                         List<BasedataDevice> devices = this.basedataDeviceMapper.selectBasedataDeviceList(basedataDevice);
                         if (CollectionUtils.isNotEmpty(devices) && !devices.isEmpty()) {
                             BasedataDevice device = devices.get(0);
-                            patrolPointInsert.setPatrolPointCode(sendCode + "_" + device_id);
+                            patrolPointInsert.setPatrolPointCode(sendCode + "|" + device_id);
                             patrolPointInsert.setPatrolPointName(device_name);
                             patrolPointInsert.setOriginalMainDeviceId(main_device_id);
                             patrolPointInsert.setDeviceId(device.getDeviceId());
diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java
index 7e34b03..ac20668 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java
@@ -2,6 +2,7 @@ package com.inspect.metadata.montdatamqhandle.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.inspect.base.core.constant.Color;
 import com.inspect.metadata.alg.mapper.BasedataAlgSubtypeMapper;
 import com.inspect.metadata.bdconfig.domain.BasedataBdConfigMainSystem;
 import com.inspect.metadata.bdconfig.mapper.BasedataBdConfigAlgConvertMapper;
@@ -26,11 +27,15 @@ import java.util.Iterator;
 import java.util.List;
 import javax.annotation.Resource;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component("basedataMont-modelup-1024")
 public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataHandleService {
+    private final Logger log = LoggerFactory.getLogger(BasedataMontPatrolPointConsumerHandle.class);
+
     @Resource
     private IBasedataPatrolPointService basedataPatrolPointService;
     @Resource
@@ -60,7 +65,7 @@ public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataH
         String Type = jsonObject.getString("Type");
         String convertFlag = "0";
         String SendCode = jsonObject.getString("SendCode");
-        BasedataBdConfigMainSystem mainSystem = this.basedataBdconfigMainsystemMapper.selectBasedataBdConfigMainSystemByMainSystemCode(SendCode);
+        BasedataBdConfigMainSystem mainSystem = basedataBdconfigMainsystemMapper.selectBasedataBdConfigMainSystemByMainSystemCode(SendCode);
         if (null != mainSystem) {
             String flag = mainSystem.getConvertFlag();
             if (null != flag && flag.equals("1")) {
@@ -72,22 +77,19 @@ public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataH
         List<ModelFileItem> list = jsonObjectItems.toJavaList(ModelFileItem.class);
         if (null != list && !list.isEmpty()) {
             String modelString;
-            for (Iterator<ModelFileItem> iterator = list.iterator(); iterator.hasNext(); this.basedataMontPatrolPointHandleComponent.handPointModelData(SendCode, modelString)) {
+            for (Iterator<ModelFileItem> iterator = list.iterator(); iterator.hasNext(); basedataMontPatrolPointHandleComponent.handPointModelData(SendCode, modelString)) {
                 ModelFileItem item = iterator.next();
                 String deviceFilePath = item.getDevice_file_path();
                 String source = deviceFilePath;
-                System.out.println("目标文件待下载路径:" + deviceFilePath);
+                log.info(Color.BLUE + "[METADATA] TCPSERVER文件路径: {}" + Color.END, deviceFilePath);
                 ByteBuf byteBuf = Unpooled.buffer();
-
                 try {
-                    this.sftpClient.downLoad(source, (inputStream) -> {
+                    sftpClient.downLoad(source, (inputStream) -> {
                         byte[] bytes = new byte[1024];
-
                         int index;
                         while ((index = inputStream.read(bytes)) > -1) {
                             byteBuf.writeBytes(Arrays.copyOfRange(bytes, 0, index));
                         }
-
                     });
                 } catch (Exception e) {
                     e.printStackTrace();
diff --git a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskResultMapper.xml b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskResultMapper.xml
index e25d6f0..7e03833 100644
--- a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskResultMapper.xml
+++ b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskResultMapper.xml
@@ -117,7 +117,7 @@
             <if test="recognitionType != null">recognition_type,</if>
             <if test="recognitionTypeName != null">recognition_type_name,</if>
             <if test="fileType != null">file_type,</if>
-            <if test="file_path != null">file_path,</if>
+            <if test="filePath != null">file_path,</if>
             <if test="rectangle != null">rectangle,</if>
             <if test="taskPatrolledId != null">task_patrolled_id,</if>
             <if test="valid != null">valid,</if>
diff --git a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskStaDataMapper.xml b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskStaDataMapper.xml
index 6edfd2d..a844a8b 100644
--- a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskStaDataMapper.xml
+++ b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskStaDataMapper.xml
@@ -95,7 +95,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskPatrolledId != null and taskPatrolledId != ''">#{taskPatrolledId},</if>
-            <if test="taskName != null">#{task_name},</if>
+            <if test="taskName != null">#{taskName},</if>
             <if test="taskCode != null">#{taskCode},</if>
             <if test="taskState != null">#{taskState},</if>
             <if test="taskStateName != null">#{taskStateName},</if>