pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/dto/A200ResDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/dto/ResultDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/DevA200TestparamService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
pom.xml
@@ -127,6 +127,12 @@ <artifactId>poi-tl</artifactId> <version>1.5.1</version> </dependency> <dependency> <groupId>com.alibaba.fastjson2</groupId> <artifactId>fastjson2</artifactId> <version>2.0.52</version> </dependency> <!--websocket--> <dependency> <groupId>org.springframework.boot</groupId> src/main/java/com/whyc/dto/A200ResDto.java
@@ -3,9 +3,11 @@ import com.google.gson.annotations.SerializedName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import java.io.Serializable; @Data @ToString public class A200ResDto implements Serializable { @@ -37,15 +39,15 @@ private Double dischargeCapacity; @ApiModelProperty(value = "预放容量限制是否开启") @SerializedName("isDischargeCapacityEnable") private boolean dischargeCapacityEnable; //@SerializedName("isDischargeCapacityEnable") private boolean isDischargeCapacityEnable; @ApiModelProperty(value = "单串下限(V)") private Double minBatteryVoltage; @ApiModelProperty(value = "单串下限是否开启") @SerializedName("isMinBatteryVoltageEnable") private boolean minBatteryVoltageEnable; //@SerializedName("isMinBatteryVoltageEnable") private boolean isMinBatteryVoltageEnable; @ApiModelProperty(value = "充电目标电压(V)") private Double chargeVoltage; @@ -66,15 +68,15 @@ private Double chargeCapacity; @ApiModelProperty(value = "预充容量限制是否开启") @SerializedName("isChargeCapacityEnable") private boolean chargeCapacityEnable; //@SerializedName("isChargeCapacityEnable") private boolean isChargeCapacityEnable; @ApiModelProperty(value = "单串上限") private Double maxBatteryVoltage; @ApiModelProperty(value = "单串上限限制是否开启") @SerializedName("isMaxBatteryVoltageEnable") private boolean maxBatteryVoltageEnable; //@SerializedName("isMaxBatteryVoltageEnable") private boolean isMaxBatteryVoltageEnable; @ApiModelProperty(value = "充电功率(KW)") private Double chargePower; src/main/java/com/whyc/dto/ResultDto.java
@@ -1,12 +1,13 @@ package com.whyc.dto; import lombok.Data; import lombok.ToString; @Data @ToString public class ResultDto { String code; String msg; A200ResDto data; Object data; } src/main/java/com/whyc/service/DevA200TestparamService.java
@@ -1,17 +1,16 @@ package com.whyc.service; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.whyc.dto.A200ResDto; import com.whyc.dto.Response; import com.whyc.dto.ResultDto; import com.whyc.mapper.DevA200TestparamMapper; import com.whyc.mapper.DevInfMapper; import com.whyc.pojo.db_lithium_ram_db.DevA200Testparam; import com.whyc.pojo.db_lithium_ram_db.DevActmTestparam; import com.whyc.pojo.db_lithium_ram_db.DevInf; import com.whyc.util.ActionUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; @@ -37,7 +36,11 @@ DevInf dinf=dinfMapper.selectOne(wrapper); String url="http://"+dinf.getDevIp()+":8080/webService/getTestParameter"; String results = restTemplate.postForObject(url, null, String.class); ResultDto dto=ActionUtil.getGson().fromJson(results,ResultDto.class); ResultDto dto= ActionUtil.getGson().fromJson(results,ResultDto.class); //System.out.println(results); /*ResultDto dto= JSONObject.parseObject(results,ResultDto.class); A200ResDto a200= JSONObject.parseObject(dto.getData().toString(),A200ResDto.class);*/ //System.out.println(dto.toString()); return dto; }