From 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 13 May 2024 18:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/requestpojo/BDDataPo.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 4671f2e..f8b39d2 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
@@ -62,21 +62,27 @@
public BDDataPo(DataResChildrenPo po,String type){
this.damId = po.getRes_cd();
this.pointId = po.getCd();
+ this.pointName = po.getCd_nm();
this.type = type;
if (type.equals( "1")){
//渗压
this.value = po.getSw_val();
+ this.typeName = "渗压";
}else if (type.equals("2")){
//渗流
+ this.typeName = "渗流";
}else if (type.equals("3")){
//x
this.value = po.getDe();
+ this.typeName = "X位移";
}else if (type.equals("4")){
//y
this.value = po.getDn();
+ this.typeName = "Y位移";
}else if (type.equals("5")){
//z
+ this.typeName = "Z位移";
this.value = po.getDu();
}
this.time = po.getTm();
--
Gitblit v1.9.3