/*省测任务上送上级系统模型同步修改*/

inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java

@@ -62,7 +62,7 @@ public class ClientService {
     public AjaxResult handleLowMsg(JSONObject jsonObject) {
         int type = jsonObject.getInteger("Type");
         String msg = jsonObject.toJSONString();
-        logger.info("CLIENT 处理上级系统下发消息, 内容：{}", msg);
+        logger.info("CLIENT 处理上级系统下发消息, type: {}, 内容：{}", type, msg);
         String result = null;
         String deviceCode;
         if (Arrays.contains(taskTypeArray, type)) {
@@ -75,14 +75,20 @@ public class ClientService {
                     patrolTaskController.sendJQR(patrolTask);
                     break;
                 case 61:
-                    BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain();
-                    basedataEqpbookMomain.setType(deviceCode);
-                    String eqpBookListInfo = patrolResultController.getEqpBookListInfo(basedataEqpbookMomain);
-                    JSONObject parse = JSONObject.parseObject(eqpBookListInfo);
-                    JSONObject itemJson = new JSONObject();
-                    itemJson.put(modelMap.get(deviceCode), parse.getString(modelMap.get(deviceCode)));
-                    logger.info("上级模型查询上报内容：{}", itemJson.toJSONString());
-                    return AjaxResult.success("ok", itemJson.toJSONString());
+                    try {
+                        logger.info("CLIENT 处理上级系统下发消息 61");
+                        BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain();
+                        basedataEqpbookMomain.setType(deviceCode);
+                        String eqpBookListInfo = patrolResultController.getEqpBookListInfo(basedataEqpbookMomain);
+                        logger.info("CLIENT 处理上级系统下发消息 61, res: {}", eqpBookListInfo);
+                        JSONObject parse = JSONObject.parseObject(eqpBookListInfo);
+                        JSONObject itemJson = new JSONObject();
+                        itemJson.put(modelMap.get(deviceCode), parse.getString(modelMap.get(deviceCode)));
+                        logger.info("上级模型查询上报内容：{}", itemJson.toJSONString());
+                        return AjaxResult.success("ok", itemJson.toJSONString());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 case 81:
                     JSONArray jsonArray = jsonObject.getJSONArray("Items");
                     for (int i = 0; i < jsonArray.size(); ++i) {

inspect-main/inspect-main-task/pom.xml

@@ -14,6 +14,11 @@
     <version>3.4.0</version>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.inspect</groupId>
             <artifactId>inspect-base-datasource</artifactId>

inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/FeignMinioService.java

@@ -0,0 +1,13 @@
+package com.inspect.fegin;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+@FeignClient("inspect-tcpserver")
+public interface FeignMinioService {
+    @PostMapping(value = "/minio/file/upload", consumes = "multipart/form-data")
+    UploadResponse uploadFileToMinio(@RequestPart("file") MultipartFile file);
+}

inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/MultipartFileUtils.java

@@ -0,0 +1,21 @@
+package com.inspect.fegin;
+
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class MultipartFileUtils {
+
+    public static MultipartFile toMultipartFile(InputStream inputStream, String fileName, String contentType) throws IOException {
+        return new MockMultipartFile(
+                "file",                // 表单字段名，对应 @RequestParam("file")
+                fileName,              // 上传文件名
+                contentType,           // MIME 类型
+                inputStream            // 文件流
+        );
+    }
+}
+

inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/UploadResponse.java

@@ -0,0 +1,20 @@
+package com.inspect.fegin;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class UploadResponse {
+    private String fileName;
+    private String url;
+
+    @Override
+    public String toString() {
+        return "UploadResponse{" +
+                "fileName='" + fileName + '\'' +
+                ", url='" + url + '\'' +
+                '}';
+    }
+}
+

inspect-main/inspect-main-task/src/main/java/com/inspect/maintain/controller/MaintainRegionController.java

@@ -627,6 +627,7 @@ public class MaintainRegionController extends BaseController {
         DataMsg.setFilePath(algorithmBaseImagePath);
         DataMsg.setFileName(filename + ".xml");
         DataMsg.setInputStream(in_nocode);
+        DataMsg.setIsImplicit("true");
         SFTPUtil.uploadFileForXml(DataMsg);
         SendTask sendTask = new SendTask();
         sendTask.setReceiveCode("");

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

@@ -29,6 +29,9 @@ import com.inspect.base.core.web.page.TableDataInfo;
 import com.inspect.common.log.annotation.Log;
 import com.inspect.common.log.enums.BizType;
 import com.inspect.base.redis.service.RedisService;
+import com.inspect.fegin.FeignMinioService;
+import com.inspect.fegin.MultipartFileUtils;
+import com.inspect.fegin.UploadResponse;
 import com.inspect.infrared.InfraredImageParser;
 import com.inspect.infrared.InfraredRequestParam;
 import com.inspect.infrared.InfraredResponse;
@@ -168,6 +171,9 @@ public class PatrolResultController extends BaseController {
     @Resource
     private MessageUtils messageUtils;
 
+    @Resource
+    private FeignMinioService feignMinioService;
+
     @GetMapping({"/list"})
     public TableDataInfo list(PatrolResult patrolResult) {
         String mainId = patrolResult.getMainId();
@@ -1677,6 +1683,7 @@ public class PatrolResultController extends BaseController {
 
     @GetMapping({"/getEqpBookListInfoForXml"})
     public String getEqpBookListInfo(BasedataEqpBookMoMain basedataEqpBook) {
+        logger.info("getEqpBookListInfo!!!!!!");
         Map<String, String> stationMap = patrolResultService.selectBasedataStation();
         String stationNo = stationMap.get("station_no");
         String stationName = stationMap.get("station_name");
@@ -1708,6 +1715,7 @@ public class PatrolResultController extends BaseController {
                 String path;
                 switch (type) {
                     case "4":
+                        logger.info("getEqpBookListInfo type 4!!!!!!");
                         path = baseDataClient.superSystemSynPatrolPointModel();
                         str = "{\"device_file_path\":\"" + path + "\"}";
                         return str;
@@ -1883,7 +1891,9 @@ public class PatrolResultController extends BaseController {
             }
         }
 
+        logger.info("getEqpBookListInfo 2!!!!!!");
         InputStream inputStream = new ByteArrayInputStream(modelXml.getBytes());
+
         str = "";
         switch (type) {
             case "1":
@@ -1927,7 +1937,10 @@ public class PatrolResultController extends BaseController {
         DataMsg.setFilePath(algorithmBaseImagePath);
         DataMsg.setFileName(filename + ".xml");
         DataMsg.setInputStream(inputStream);
+        DataMsg.setIsImplicit("true");
+        logger.info("getEqpBookListInfo 3!!!!!!");
         SFTPUtil.uploadFileForXml(DataMsg);
+        logger.info("getEqpBookListInfo 4!!!!!!");
         String typename = "";
         switch (type) {
             case "1":
@@ -1959,6 +1972,19 @@ public class PatrolResultController extends BaseController {
                 break;
         }
 
+        logger.info("getEqpBookListInfo5!!!!!!");
+        UploadResponse uploadResponse = new UploadResponse("test", "http://emptu.com");
+        try {
+            MultipartFile multipartFile = MultipartFileUtils.toMultipartFile(new ByteArrayInputStream(modelXml.getBytes()),
+                    filename,
+                    ("application/octet-stream"));
+            uploadResponse = feignMinioService.uploadFileToMinio(multipartFile);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        logger.info("uploadResponse: {}", uploadResponse);
+
         str = "{\"" + typename + "\":\"" + algorithmBaseImagePath + filename + ".xml\"}";
         return str;
     }

inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

@@ -2314,6 +2314,7 @@ public class PatrolTaskController extends BaseController {
         DataMsg.setFilePath(algorithmBaseImagePath);
         DataMsg.setFileName(filename + ".xml");
         DataMsg.setInputStream(in_nocode);
+        DataMsg.setIsImplicit("true");
         SFTPUtil.uploadFileForXml(DataMsg);
         SendTask sendTask = new SendTask();
         sendTask.setReceiveCode("");

inspect-metadata/pom.xml

@@ -41,6 +41,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
@@ -86,6 +90,26 @@
             <groupId>com.inspect</groupId>
             <artifactId>inspect-base-ivs</artifactId>
         </dependency>
+        <!-- JAXB API -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+
+        <!-- JAXB Runtime (RI) -->
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.3</version>
+        </dependency>
+
+        <!-- Java Activation Framework (JAF)，JAXB 依赖它 -->
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0.1</version>
+        </dependency>
     </dependencies>
 
     <build>

inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/service/impl/BasedataEqpBookServiceImpl.java

@@ -605,6 +605,7 @@ public class BasedataEqpBookServiceImpl implements IBasedataEqpBookService {
             DataMsg.setFilePath(mapPath);
             DataMsg.setFileName(filename + ".xml");
             DataMsg.setInputStream(in);
+            DataMsg.setIsImplicit("true");
             SFTPUtil.uploadFileForXml(DataMsg);
             String sendCode = basedataEqpBookList.get(0).getPatrolDeviceCode();
             String code = basedataStation.get(0).getStationNo();
@@ -672,6 +673,7 @@ public class BasedataEqpBookServiceImpl implements IBasedataEqpBookService {
         DataMsg.setFilePath(mapPath);
         DataMsg.setFileName(filename + "." + fileType);
         DataMsg.setInputStream(in);
+        DataMsg.setIsImplicit("true");
         SFTPUtil.uploadFileForXml(DataMsg);
         BasedataEqpBook basedataEqpbook = this.basedataEqpbookMapper.selectBasedataEqpBookByPatrolDeviceCode(patroldeviceCode);
         basedataEqpbook.setMapFilePath(mapPath + filename + "." + fileType);

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/feign/FeignMinioService.java

@@ -0,0 +1,12 @@
+package com.inspect.metadata.patrolpointmnt.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+
+@FeignClient(value = "http://199.199.199.169:22508")
+public interface FeignMinioService {
+    @PostMapping(value = "/minio/file/upload", consumes = "multipart/form-data")
+    UploadResponse uploadFileToMinio(@RequestPart("file") MultipartFile file);
+}

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/feign/MultipartFileUtils.java

@@ -0,0 +1,20 @@
+package com.inspect.metadata.patrolpointmnt.feign;
+
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+public class MultipartFileUtils {
+
+    public static MultipartFile toMultipartFile(ByteArrayInputStream inputStream, String fileName, String contentType) throws IOException {
+        return new MockMultipartFile(
+                "file",                // 表单字段名，对应 @RequestParam("file")
+                fileName,              // 上传文件名
+                contentType,           // MIME 类型
+                inputStream            // 文件流
+        );
+    }
+}
+

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/feign/UploadResponse.java

@@ -0,0 +1,29 @@
+package com.inspect.metadata.patrolpointmnt.feign;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+
+public class UploadResponse implements Serializable {
+    private String fileName;
+    private String url;
+
+    public UploadResponse() {}
+
+    public UploadResponse(String fileName, String url) {
+        this.fileName = fileName;
+        this.url = url;
+    }
+
+    @Override
+    public String toString() {
+        return "UploadResponse{" +
+                "fileName='" + fileName + '\'' +
+                ", url='" + url + '\'' +
+                '}';
+    }
+}
+

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

@@ -17,6 +17,9 @@ import com.inspect.metadata.patrolpointmnt.domain.vo.DevicePointModel;
 import com.inspect.metadata.patrolpointmnt.domain.vo.DevicePointModelItem;
 import com.inspect.metadata.patrolpointmnt.domain.vo.PointLatestResultVo;
 import com.inspect.metadata.patrolpointmnt.domain.vo.PointStatsVo;
+import com.inspect.metadata.patrolpointmnt.feign.FeignMinioService;
+import com.inspect.metadata.patrolpointmnt.feign.MultipartFileUtils;
+import com.inspect.metadata.patrolpointmnt.feign.UploadResponse;
 import com.inspect.metadata.patrolpointmnt.mapper.BasedataPatrolPointMapper;
 import com.inspect.metadata.patrolpointmnt.mapper.BasedataPatrolPointPresetMapper;
 import com.inspect.metadata.patrolpointmnt.service.IBasedataPatrolPointService;
@@ -46,6 +49,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 @Service
 public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointService {
@@ -69,6 +73,9 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
     @Resource
     private BasedataAlgSubtypeMapper basedataAlgSubtypeMapper;
 
+    @Resource
+    private FeignMinioService feignMinioService;
+
     public BasedataPatrolPoint selectBasedataPatrolPointByPatrolPointId(Long patrolPointId) {
         return this.basedataPatrolpointMapper.selectBasedataPatrolPointByPatrolPointId(patrolPointId);
     }
@@ -144,6 +151,8 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
         if (null != modelXml && !modelXml.isEmpty()) {
             String typename = "device_file_path";
             String ftpUpPath = this.modelFileUpToFtps(typename, modelXml, stationNo);
+            String filename = ftpUpPath.substring(ftpUpPath.lastIndexOf("/") + 1);
+            ftpUpPath = modelFileUpToMinio(filename, modelXml);
             System.out.println("ftpUpPath::" + ftpUpPath);
             return ftpUpPath;
         } else {
@@ -420,6 +429,7 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
             DataMsg.setFilePath(fileUpPath);
             DataMsg.setFileName(filename + ".xml");
             DataMsg.setInputStream(in_nocode);
+            DataMsg.setIsImplicit("true");
             SFTPUtil.uploadFileForXml(DataMsg);
         } catch (Exception e) {
             e.printStackTrace();
@@ -428,7 +438,23 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
         return fileUpPath + filename + ".xml";
     }
 
+    private String modelFileUpToMinio(String filename, String modelXml) {
+        String result = "";
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(modelXml.getBytes());
+        UploadResponse uploadResponse = new UploadResponse("test", "http://emptu.com");
+        try {
+            MultipartFile multipartFile = MultipartFileUtils.toMultipartFile(inputStream,
+                    filename,
+                    ("application/octet-stream"));
+            uploadResponse = feignMinioService.uploadFileToMinio(multipartFile);
+            return uploadResponse.getUrl();
+        } catch (Exception e) {
+            e.printStackTrace();
 
+        }
+
+        return result;
+    }
     @Override
     public PointStatsVo getInspectPointStats(PointStatsVo pointStatsVo) {
         PointStatsVo inspectPointStats = basedataPatrolpointMapper.getInspectPointStats(pointStatsVo);

inspect-metadata/src/main/java/com/inspect/metadata/version/service/impl/VersionManagementServiceImpl.java

@@ -73,6 +73,7 @@ public class VersionManagementServiceImpl implements IVersionManagementService {
         DataMsg.setFilePath(mapPath);
         DataMsg.setFileName(filename + "." + fileType);
         DataMsg.setInputStream(in);
+        DataMsg.setIsImplicit("true");
         SFTPUtil.uploadFileForXml(DataMsg);
         return mapPath + filename + "." + fileType;
     }