From 6642bd2b06a87e8498bc83a0cc0e2a3d8ca2a582 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 九月 2023 09:28:54 +0800
Subject: [PATCH] 设备健康列表
---
ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
index 4783e76..f844901 100644
--- a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
+++ b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
@@ -164,7 +164,7 @@
//濡傛灉璇ョ埗绫婚泦鍚堝湪缁撴瀯涓凡缁忓瓨鍦ㄥ苟涓斾笉鏄澶囨暟鎹氨涓嶇敤閲嶅娣诲姞浜�
Long treeId = treeDeptWells.get(l).getDeptId();
Integer id = treeDeptWells.get(l).getId();
- if(ancestor.equals(treeId) && id==null){
+ if(ancestor.equals(treeId)){
wellTrue = true;
}
}
@@ -312,20 +312,21 @@
if ( (int) mapResult.get("code") == 200){
j.put("code", mapResult.get("code"));
List<Map<String , Object>> listResult = (List<Map<String, Object>>)JSON.parse((String)mapResult.get("resdata"));
+
if(listResult.size()>0){
for(int i = 0 ; i<listResult.size(); i++){
Map<String , Object> mapTemp = listResult.get(i);
- int id = (Integer)mapTemp.get("id"); //涓婚敭id
BigDecimal value = (BigDecimal)mapTemp.get("Value"); //鏁板��
String measureStr = (String)mapTemp.get("MeasureDate"); //娴嬮噺鏃堕棿
measureStr = measureStr.substring(measureStr.indexOf("(")+1, measureStr.indexOf(")",2));
SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String measureDate = f.format(Long.valueOf(measureStr));
mapTemp.put("MeasureDate", measureDate);
- j.put(id +"" , mapTemp);
+ mapTemp.put("Value", value.setScale(2, BigDecimal.ROUND_HALF_UP));
}
+ j.put("data",listResult);
}else {
- j.put("msg","鏃犳暟鎹�");
+ j.put("data",new ArrayList<>());
}
}else{
//閿欒鎻愮ず
--
Gitblit v1.9.3