lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

master
lisai 2022-10-08 01:59:14 +08:00
parent 3b55af9365
commit 1175d7d58b
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/whdc/zhdbaqapi/model/cklat/CklatQueryDto.java
View File

@ -1,6 +1,6 @@
package com.whdc.zhdbaqapi.model.cklat; 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.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
@ -17,12 +17,15 @@ import java.util.Date;
public class CklatQueryDto { public class CklatQueryDto {
@JsonProperty("device_id") @JsonProperty("device_id")
@JSONField(name = "device_id")
private String deviceId; private String deviceId;
@JsonProperty("channel_num") @JsonProperty("channel_num")
@JSONField(name = "channel_num")
private Integer channelNum; private Integer channelNum;
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssZ", timezone = "GMT+8") @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") @JsonProperty("start_timestamp")
private Date startTimestamp; private Date startTimestamp;
} }

12
src/main/java/com/whdc/zhdbaqapi/service/impl/DeviceDataServiceImpl.java
View File

@ -1,9 +1,8 @@
package com.whdc.zhdbaqapi.service.impl; package com.whdc.zhdbaqapi.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.mapper.DeviceDataMapper;
import com.whdc.zhdbaqapi.model.cklat.CklatQueryDto; import com.whdc.zhdbaqapi.model.cklat.CklatQueryDto;
import com.whdc.zhdbaqapi.model.cklat.CklatRecord; 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.model.vo.DeviceDataVo;
import com.whdc.zhdbaqapi.service.IDeviceDataService; import com.whdc.zhdbaqapi.service.IDeviceDataService;
import com.whdc.zhdbaqapi.service.IDeviceInfoService; import com.whdc.zhdbaqapi.service.IDeviceInfoService;
import com.whdc.zhdbaqapi.utils.DataUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -31,7 +29,6 @@ import java.math.BigDecimal;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Set;
/** /**
* @author 李赛 * @author 李赛
@ -58,7 +55,7 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
@Autowired @Autowired
private RedisTemplate<String, String> redisTemplate; private RedisTemplate<String, String> redisTemplate;
private static ObjectMapper objectMapper = new ObjectMapper(); // private static ObjectMapper objectMapper = new ObjectMapper();
@Override @Override
public IPage<DeviceDataVo> page(FindDeviceDto findDto) { public IPage<DeviceDataVo> page(FindDeviceDto findDto) {
@ -75,10 +72,9 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON); 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. ResponseEntity<CklatResult> result = restTemplate.postForEntity(cklat_data_api, request, CklatResult.class);
postForEntity(cklat_data_api, request, CklatResult.class);
CklatResult ret = result.getBody(); CklatResult ret = result.getBody();