From db086bd2610a12f2cd189a9fb8e02b60a4dc6830 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 03 Aug 2023 17:52:27 +0800
Subject: [PATCH] BatchDataPo 判断修改
---
skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/BDDataPo.java | 11 ++++++-----
skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/BatchDataPo.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/BDDataPo.java b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/BDDataPo.java
index 6ce2c6a..4671f2e 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/BDDataPo.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/BDDataPo.java
@@ -64,21 +64,22 @@
this.pointId = po.getCd();
this.type = type;
- if (this.type == "1"){
+ if (type.equals( "1")){
//渗压
this.value = po.getSw_val();
- }else if (this.type == "2"){
+ }else if (type.equals("2")){
//渗流
- }else if (this.type == "3"){
+ }else if (type.equals("3")){
//x
this.value = po.getDe();
- }else if (this.type == "4"){
+ }else if (type.equals("4")){
//y
this.value = po.getDn();
- }else if (this.type == "5"){
+ }else if (type.equals("5")){
//z
this.value = po.getDu();
}
this.time = po.getTm();
+ this.damName = po.getRes_nm();
}
}
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/BatchDataPo.java b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/BatchDataPo.java
index 2eac4ee..2583444 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/BatchDataPo.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/BatchDataPo.java
@@ -20,7 +20,7 @@
List<BDDataPo> list = new ArrayList<>();
dataResPo.getChildren().forEach(dataResChildrenPo -> {
BDDataPo bdDataPo = new BDDataPo(dataResChildrenPo,type);
- if (type == "1"){
+ if (type.equals("1") ){
//渗压
if (dataResChildrenPo.getIs_main_cd().equals("y")){
PredictWatersPo waters = new PredictWatersPo(dataResChildrenPo.getTm(),dataResChildrenPo.getSw_val(),dataResChildrenPo.getRes_cd());
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java
index b4fd2fe..4b9674a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/NkyServiceImpl.java
@@ -113,7 +113,7 @@
headers.add("Accept", MediaType.APPLICATION_JSON.toString());
HttpEntity<String> httpEntity = new HttpEntity(jsonparams, headers);
-
+ System.out.println("请求参数："+ jsonparams);
RestTemplate template = new RestTemplate();
String resultStr = template.postForObject(url, httpEntity, String.class);
System.out.println(resultStr);
--
Gitblit v1.9.3