设备信息字段对齐

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);
 
     }

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;
         }
     }
 

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 = "单位"

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;

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 = "单位"

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 = "单位"