From 1175d7d58bb4127ed12d76132252b32629bfeb8f Mon Sep 17 00:00:00 2001
From: lisai <lisai17@sina.com>
Date: Sat, 8 Oct 2022 01:59:14 +0800
Subject: [PATCH] .

---
 .../whdc/zhdbaqapi/model/cklat/CklatQueryDto.java    |  5 ++++-
 .../service/impl/DeviceDataServiceImpl.java          | 12 ++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/whdc/zhdbaqapi/model/cklat/CklatQueryDto.java b/src/main/java/com/whdc/zhdbaqapi/model/cklat/CklatQueryDto.java
index ae1cb30..cab498f 100644
--- a/src/main/java/com/whdc/zhdbaqapi/model/cklat/CklatQueryDto.java
+++ b/src/main/java/com/whdc/zhdbaqapi/model/cklat/CklatQueryDto.java
@@ -1,6 +1,6 @@
 package com.whdc.zhdbaqapi.model.cklat;
 
-import com.fasterxml.jackson.annotation.JsonAlias;
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
@@ -17,12 +17,15 @@ import java.util.Date;
 public class CklatQueryDto {
 
     @JsonProperty("device_id")
+    @JSONField(name = "device_id")
     private String deviceId;
 
     @JsonProperty("channel_num")
+    @JSONField(name = "channel_num")
     private Integer channelNum;
 
     @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssZ", timezone = "GMT+8")
+    @JSONField(name = "start_timestamp", format = "yyyy-MM-dd'T'HH:mm:ssZ")
     @JsonProperty("start_timestamp")
     private Date startTimestamp;
 }
diff --git a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java
index 013cba0..84882bf 100644
--- a/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java
+++ b/src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java
@@ -1,9 +1,8 @@
 package com.whdc.zhdbaqapi.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.whdc.zhdbaqapi.constant.Constants;
 import com.whdc.zhdbaqapi.mapper.DeviceDataMapper;
 import com.whdc.zhdbaqapi.model.cklat.CklatQueryDto;
 import com.whdc.zhdbaqapi.model.cklat.CklatRecord;
@@ -14,7 +13,6 @@ import com.whdc.zhdbaqapi.model.entity.DeviceInfo;
 import com.whdc.zhdbaqapi.model.vo.DeviceDataVo;
 import com.whdc.zhdbaqapi.service.IDeviceDataService;
 import com.whdc.zhdbaqapi.service.IDeviceInfoService;
-import com.whdc.zhdbaqapi.utils.DataUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -31,7 +29,6 @@ import java.math.BigDecimal;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author 李赛
@@ -58,7 +55,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
-    private static ObjectMapper objectMapper = new ObjectMapper();
+//    private static ObjectMapper objectMapper = new ObjectMapper();
 
     @Override
     public IPage<DeviceDataVo> page(FindDeviceDto findDto) {
@@ -75,10 +72,9 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
 
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);
-            HttpEntity<String> request = new HttpEntity<String>(objectMapper.writeValueAsString(query), headers);
+            HttpEntity<String> request = new HttpEntity<String>(JSON.toJSONString(query), headers);
 
-            ResponseEntity<CklatResult> result = restTemplate.
-                    postForEntity(cklat_data_api, request, CklatResult.class);
+            ResponseEntity<CklatResult> result = restTemplate.postForEntity(cklat_data_api, request, CklatResult.class);
 
             CklatResult ret = result.getBody();