From e71dc490d80d75bade55adb4a168953a27da1521 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Tue, 2 Sep 2025 17:56:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatrolTaskResultMainController.java | 2 +- .../controller/BasedataMontQueryController.java | 15 +++++++++------ .../montdata/domain/BasedataMontEvnData.java | 3 +++ .../montdata/domain/BasedataMontPatDevCoord.java | 3 +++ .../domain/BasedataMontPatDevRunData.java | 3 +++ .../domain/BasedataMontPatDevStaData.java | 4 ++++ 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java index 1d4fec7..a7ed241 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java @@ -264,7 +264,7 @@ public class PatrolTaskResultMainController extends BaseController { }); PrintUtil.useTime("exportExcelWordAndZip", startTime); // logger.info("-----------[ARCHIVE] EndTime: {}, reportIds: {}", DateUtil.now(), reportIds); - CompletableFuture.allOf(reportsToExportFuture).join(); +// CompletableFuture.allOf(reportsToExportFuture).join(); return toAjax(1); } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/controller/BasedataMontQueryController.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/controller/BasedataMontQueryController.java index 8e332dc..bf826df 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/controller/BasedataMontQueryController.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/controller/BasedataMontQueryController.java @@ -77,7 +77,7 @@ public class BasedataMontQueryController extends BaseController { } @GetMapping({"/getMsgToWrz/{deviceCode}/{type}"}) - public AjaxResult getMsgToWrz(@PathVariable("deviceCode") String deviceCode, @PathVariable("type") String type) { + public JSONObject getMsgToWrz(@PathVariable("deviceCode") String deviceCode, @PathVariable("type") String type) { JSONObject json; HashMap map; if ("2".equals(type)) { @@ -91,7 +91,7 @@ public class BasedataMontQueryController extends BaseController { } logger.info("DEVICE-RUNNING-DATA: {}, result: {}", new Date(), json); - return AjaxResult.success(json); + return json; } else if ("21".equals(type)) { json = this.basedataMontQueryService.getMontEvnData(deviceCode); if (null == json) { @@ -103,7 +103,7 @@ public class BasedataMontQueryController extends BaseController { logger.info("ENVIRONMENT-DATA: {}, key: {}, type: {}", new Date(), deviceCode, type); logger.info("ENVIRONMENT-DATA: {}, result: {} ", new Date(), json); - return AjaxResult.success(json); + return json; } else if ("1".equals(type)) { json = this.basedataMontQueryService.getMontPatrolDeviceStaData(deviceCode); if (null == json) { @@ -115,7 +115,7 @@ public class BasedataMontQueryController extends BaseController { logger.info("DEVICE-STATE-DATA: {}, key: {}, type: {}", new Date(), deviceCode, type); logger.info("DEVICE-STATE-DATA: {}, result: {}", new Date(), json); - return AjaxResult.success(json); + return json; } else if ("4".equals(type)) { json = this.basedataMontQueryService.getMontPatDevCoord(deviceCode); if (null == json) { @@ -127,9 +127,12 @@ public class BasedataMontQueryController extends BaseController { logger.info("DEVICE-POS-DATA: {}, key: {}, type: {}", new Date(), deviceCode, type); logger.info("DEVICE-POS-DATA: {}, result: {}", new Date(), json); - return AjaxResult.success(json); + return json; } else { - return AjaxResult.success("无此类型！"); + JSONObject resultJson = new JSONObject(); + resultJson.put("code", 200); + resultJson.put("msg", "无此类型！"); + return resultJson; } } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontEvnData.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontEvnData.java index 231bdc7..d09efc5 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontEvnData.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontEvnData.java @@ -1,5 +1,6 @@ package com.inspect.metadata.montdata.domain; +import com.fasterxml.jackson.annotation.JsonProperty; import com.inspect.base.core.annotation.Excel; import com.inspect.base.core.web.domain.BaseEntity; @@ -36,6 +37,7 @@ public class BasedataMontEvnData extends BaseEntity { @Excel( name = "类型名称" ) + @JsonProperty("type_name") private String typeName; @Excel( name = "值" @@ -44,6 +46,7 @@ public class BasedataMontEvnData extends BaseEntity { @Excel( name = "值带单位" ) + @JsonProperty("value_unit") private String valueUnit; @Excel( name = "单位" diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevCoord.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevCoord.java index 2bb9ca8..fbb2d5f 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevCoord.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevCoord.java @@ -1,5 +1,6 @@ package com.inspect.metadata.montdata.domain; +import com.fasterxml.jackson.annotation.JsonProperty; import com.inspect.base.core.annotation.Excel; import com.inspect.base.core.web.domain.BaseEntity; @@ -39,6 +40,7 @@ public class BasedataMontPatDevCoord extends BaseEntity { @Excel( name = "坐标,格式：”x,y,z,a”，x、y、z为地图文 件的坐标，a为巡视设备航向角" ) + @JsonProperty("coordinate_pixel") private String coordinatePixel; @Excel( name = "经纬度,格式：”x，y”" @@ -48,6 +50,7 @@ public class BasedataMontPatDevCoord extends BaseEntity { @Excel( name = "经纬度,格式：”x，y”" ) + @JsonProperty("coordinate_geography") private String coordinateGeography; private String createBy; private Date createTime; diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevRunData.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevRunData.java index 8676771..f845c5b 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevRunData.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevRunData.java @@ -1,5 +1,6 @@ package com.inspect.metadata.montdata.domain; +import com.fasterxml.jackson.annotation.JsonProperty; import com.inspect.base.core.annotation.Excel; import com.inspect.base.core.web.domain.BaseEntity; @@ -36,6 +37,7 @@ public class BasedataMontPatDevRunData extends BaseEntity { @Excel( name = "类型名称" ) + @JsonProperty("type_name") private String typeName; @Excel( name = "值" @@ -44,6 +46,7 @@ public class BasedataMontPatDevRunData extends BaseEntity { @Excel( name = "值带单位" ) + @JsonProperty("value_unit") private String valueUnit; @Excel( name = "单位" diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevStaData.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevStaData.java index 7761ada..d4a51f1 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevStaData.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdata/domain/BasedataMontPatDevStaData.java @@ -1,5 +1,6 @@ package com.inspect.metadata.montdata.domain; +import com.fasterxml.jackson.annotation.JsonProperty; import com.inspect.base.core.annotation.Excel; import com.inspect.base.core.web.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; @@ -37,6 +38,7 @@ public class BasedataMontPatDevStaData extends BaseEntity { @Excel( name = "类型名称" ) + @JsonProperty("type_name") private String typeName; @Excel( name = "值" @@ -45,10 +47,12 @@ public class BasedataMontPatDevStaData extends BaseEntity { @Excel( name = "值名称" ) + @JsonProperty("value_name") private String valueName; @Excel( name = "值带单位" ) + @JsonProperty("value_unit") private String valueUnit; @Excel( name = "单位"