fix: 动环巡检报告排版对齐机器人巡检报告模板

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

@@ -113,7 +113,7 @@ public class SftpClient {
             ftps.setFileType(FTPSClient.BINARY_FILE_TYPE);
             sftpFactory.init();
         }
-
+        ftps.setControlEncoding("UTF-8");
         ftps.enterLocalPassiveMode();
         ftps.enterLocalPassiveMode();
         ftps.setFileTransferMode(FTPSClient.STREAM_TRANSFER_MODE);

inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/ReportUploadService.java

@@ -15,6 +15,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 
 /**
  * 巡检报告上传服务（外部平台《巡检报告接口文档 v1.0.0》）
@@ -127,8 +128,9 @@ public class ReportUploadService {
                 out.write(reportInfoJson.getBytes("UTF-8"));
                 out.writeBytes("\r\n");
                 // file 字段
-                out.writeBytes("--" + boundary + "\r\n");
-                out.writeBytes("Content-Disposition: form-data; name=\"file\"; filename=\"" + fileName + "\"\r\n");
+                out.write(("--" + boundary + "\r\n").getBytes(StandardCharsets.UTF_8));
+                String fileHeader = "Content-Disposition: form-data; name=\"file\"; filename=\"" + fileName + "\"\r\n";
+                out.write(fileHeader.getBytes(StandardCharsets.UTF_8));
                 out.writeBytes("Content-Type: application/octet-stream\r\n\r\n");
                 try (InputStream in = new ByteArrayInputStream(fileBytes)) {
                     byte[] buf = new byte[8192];

inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookChannelMapper.xml

@@ -15,6 +15,7 @@
         <result property="channelName" column="channel_name"/>
         <result property="parentChannelId" column="parent_channel_id"/>
         <result property="eqpBookId" column="eqp_book_id"/>
+        <result property="eqpBookName" column="eqpBookName"/>
         <result property="channelType" column="channel_type"/>
         <result property="onlineState" column="online_state"/>
         <result property="channelContent" column="channel_content"/>
@@ -66,6 +67,7 @@
         be.area_name,
         be.station_name,
         be.station_code,
+        be.patrol_device_name as eqpBookName,
         bec.channel_id,
         bec.channel_code,
         bec.up_system_device_code,