diff --git a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java index a2410ee..8dd282b 100644 --- a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java +++ b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/service/ClientService.java @@ -83,11 +83,11 @@ public class ClientService { break; case 61: try { - logger.info("使用线程池处理点位模型数据请求"); + logger.info("使用线程池处理模型数据请求"); threadPool.execute(new Runnable() { @Override public void run() { - logger.info("开始收集点位模型数据"); + logger.info("开始收集模型数据"); BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain(); basedataEqpbookMomain.setType(deviceCode); String eqpBookListInfo = patrolResultController.getEqpBookListInfo(basedataEqpbookMomain); @@ -96,7 +96,7 @@ public class ClientService { JSONObject itemJson = new JSONObject(); itemJson.put(modelMap.get(deviceCode), parse.getString(modelMap.get(deviceCode))); String json = itemJson.toJSONString(); - logger.info("上报点位模型数据到上级系统"); + logger.info("上报模型数据到上级系统"); syncDataToUpstreamService.postMessage(json); } }); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/FeignMinioService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/FeignMinioService.java index 9d088ac..89518ff 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/FeignMinioService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/FeignMinioService.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -@FeignClient("inspect-tcpserver") +@FeignClient("http://199.199.199.169:22508") public interface FeignMinioService { @PostMapping(value = "/minio/file/upload", consumes = "multipart/form-data") UploadResponse uploadFileToMinio(@RequestPart("file") MultipartFile file); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/UploadResponse.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/UploadResponse.java index b0a53c5..5ba6d5b 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/UploadResponse.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/fegin/UploadResponse.java @@ -3,12 +3,20 @@ package com.inspect.fegin; import lombok.AllArgsConstructor; import lombok.Data; +import java.io.Serializable; + @Data -@AllArgsConstructor -public class UploadResponse { +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{" + @@ -17,4 +25,3 @@ public class UploadResponse { '}'; } } - diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index 65b36dc..024cc73 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -1683,7 +1683,7 @@ public class PatrolResultController extends BaseController { @GetMapping({"/getEqpBookListInfoForXml"}) public String getEqpBookListInfo(BasedataEqpBookMoMain basedataEqpBook) { - logger.info("getEqpBookListInfo!!!!!!"); + logger.info("--------getEqpBookListInfo 1!!!!!!"); Map stationMap = patrolResultService.selectBasedataStation(); String stationNo = stationMap.get("station_no"); String stationName = stationMap.get("station_name"); @@ -1715,7 +1715,7 @@ public class PatrolResultController extends BaseController { String path; switch (type) { case "4": - logger.info("getEqpBookListInfo type 4!!!!!!"); + logger.info("--------getEqpBookListInfo 2 type:4!!!!!!"); path = baseDataClient.superSystemSynPatrolPointModel(); str = "{\"device_file_path\":\"" + path + "\"}"; return str; @@ -1891,7 +1891,7 @@ public class PatrolResultController extends BaseController { } } - logger.info("getEqpBookListInfo 2!!!!!!"); + logger.info("--------getEqpBookListInfo 2 type:other!!!!!!"); InputStream inputStream = new ByteArrayInputStream(modelXml.getBytes()); str = ""; @@ -1925,7 +1925,7 @@ public class PatrolResultController extends BaseController { break; } - filename = str + "_" + System.currentTimeMillis(); + filename = str + "_" + System.currentTimeMillis() + ".xml"; DataMsg DataMsg = new DataMsg(); DataMsg.setIp(patrolTaskFtp.getFtpIp()); DataMsg.setPort(patrolTaskFtp.getFtpPort()); @@ -1935,12 +1935,12 @@ public class PatrolResultController extends BaseController { DataMsg.setType("0"); String algorithmBaseImagePath = stationNo + "/Model/"; DataMsg.setFilePath(algorithmBaseImagePath); - DataMsg.setFileName(filename + ".xml"); + DataMsg.setFileName(filename); DataMsg.setInputStream(inputStream); DataMsg.setIsImplicit("true"); - logger.info("getEqpBookListInfo 3!!!!!!"); + logger.info("--------getEqpBookListInfo 3!!!!!!"); SFTPUtil.uploadFileForXml(DataMsg); - logger.info("getEqpBookListInfo 4!!!!!!"); + logger.info("--------getEqpBookListInfo 4!!!!!!"); String typename = ""; switch (type) { case "1": @@ -1972,21 +1972,21 @@ public class PatrolResultController extends BaseController { break; } - logger.info("getEqpBookListInfo5!!!!!!"); + logger.info("--------getEqpBookListInfo 5!!!!!!"); + String path = ""; 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); + path = uploadResponse.getUrl(); + logger.info("path: " + path); } catch (Exception e) { - e.printStackTrace(); + logger.error("error", e); } - logger.info("uploadResponse: {}", uploadResponse); - - str = "{\"" + typename + "\":\"" + algorithmBaseImagePath + filename + ".xml\"}"; - return str; + return "{\"" + typename + "\":\"" + path + "\"}"; } public static T noNullStringAttr(T cls) { diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/feign/UploadResponse.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/feign/UploadResponse.java index 6722f7b..9afe806 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/feign/UploadResponse.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/feign/UploadResponse.java @@ -6,7 +6,6 @@ import lombok.Data; import java.io.Serializable; @Data - public class UploadResponse implements Serializable { private String fileName; private String url; 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 7cacf22..22bedb7 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 @@ -477,21 +477,20 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi } 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, + MultipartFile multipartFile = MultipartFileUtils.toMultipartFile(new ByteArrayInputStream(modelXml.getBytes()), filename, ("application/octet-stream")); uploadResponse = feignMinioService.uploadFileToMinio(multipartFile); - return uploadResponse.getUrl(); + String path = uploadResponse.getUrl(); + logger.info("path: " + path); + return path; } catch (Exception e) { - e.printStackTrace(); - + logger.error("error", e); } - return result; + return ""; } @Override public PointStatsVo getInspectPointStats(PointStatsVo pointStatsVo) {