Merge branch 'develop' of gitadmin/tuoheng_lc into release

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/vo/AirWeatherVO.java

@@ -32,7 +32,7 @@ public class AirWeatherVO implements Serializable {
         @ApiModelProperty(value = "parm")
         private ParmDTO parm;
         @ApiModelProperty(value = "mid")
-        private Integer mid;
+        private Double mid;
         @ApiModelProperty(value = "deviceid")
         private String deviceid;
         @ApiModelProperty(value = "timestamp")
@@ -53,11 +53,11 @@ public class AirWeatherVO implements Serializable {
         private ParmDTO parm;
         private ParmNewDTO parmNew;
         @ApiModelProperty(value = "mid")
-        private Integer mid;
+        private Double mid;
         @ApiModelProperty(value = "deviceid")
         private String deviceid;
         @ApiModelProperty(value = "timestamp")
-        private Integer timestamp;
+        private Double timestamp;
 
         @NoArgsConstructor
         @Data
@@ -112,11 +112,11 @@ public class AirWeatherVO implements Serializable {
         @ApiModelProperty(value = "parm")
         private ParmDTO parm;
         @ApiModelProperty(value = "mid")
-        private Integer mid;
+        private Double mid;
         @ApiModelProperty(value = "deviceid")
         private String deviceid;
         @ApiModelProperty(value = "timestamp")
-        private Integer timestamp;
+        private Double timestamp;
 
         @NoArgsConstructor
         @Data

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/ThInspectionServiceImpl.java

@@ -235,10 +235,7 @@ public class ThInspectionServiceImpl extends BaseServiceImpl<ThInspectionMapper,
                 log.info("获取天气信息，返回数据为空");
                 return new AirWeatherVO();
             }
-            log.info("获取天气信息，jsonResult Data={}", jsonResult.getData());
-            AirWeatherVO airWeatherVO = JSONObject.parseObject(JSONObject.toJSONString(jsonResult.getData()), AirWeatherVO.class);
-            log.info("获取天气信息，airWeatherVO={}", airWeatherVO);
-            return airWeatherVO;
+            return JSONObject.parseObject(JSONObject.toJSONString(jsonResult.getData()), AirWeatherVO.class);
         } catch (Exception e) {
             log.info("获取天气信息异常，url={}", url);
             log.info("获取天气信息异常，param={}", param);