From 777b739a5f9eb87dc094c24ffd26dba84b3dbc66 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 29 二月 2024 16:48:09 +0800
Subject: [PATCH] 年前未提交的黑河更新,提交
---
src/main/java/com/whyc/util/HeiHeUtil.java | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/whyc/util/HeiHeUtil.java b/src/main/java/com/whyc/util/HeiHeUtil.java
index 1bcc921..cace995 100644
--- a/src/main/java/com/whyc/util/HeiHeUtil.java
+++ b/src/main/java/com/whyc/util/HeiHeUtil.java
@@ -1455,6 +1455,9 @@
* @return
*/
public static Map<String, Object> relateObidWithTable(List<Battinf> battinfList, List<HeiHeRealtimeDataDTO> realtimeDataDTOS) {
+ Date now = new Date();
+ String nowStr = DateUtil.YYYY_MM_DD_HH_MM_SS.format(now);
+
Map<String,Object> map = new HashMap<>();
List<Fbs9100State> deviceStateList = new LinkedList<>();
List<BattRtstate> battStateList = new LinkedList<>();
@@ -1942,36 +1945,36 @@
switch (name){
case "绗�1缁勭數姹犵粍鐢靛帇": {
battState1.setGroupVol(Float.valueOf(val));
- Date recDatetime = battState1.getRecDatetime();
+ /*Date recDatetime = battState1.getRecDatetime();
//濡傛灉缁�1鏃堕棿瀛樺湪,涓庡綋鍓嶆椂闂村姣�.濮嬬粓鍙栨渶澶у��
if(recDatetime == null){
battState1.setRecDatetime(date);
}
else if(date.compareTo(recDatetime)>0){
battState1.setRecDatetime(date);
- }
+ }*/
}break;
case "绗�1缁勭數姹犵粍鐢垫祦": {
battState1.setGroupCurr(Float.valueOf(val));
- Date recDatetime = battState1.getRecDatetime();
+ /*Date recDatetime = battState1.getRecDatetime();
//濡傛灉缁�1鏃堕棿瀛樺湪,涓庡綋鍓嶆椂闂村姣�.濮嬬粓鍙栨渶澶у��
if(recDatetime == null){
battState1.setRecDatetime(date);
}
else if(date.compareTo(recDatetime)>0){
battState1.setRecDatetime(date);
- }
+ }*/
}break;
case "绗�1缁勫湪绾跨鐢靛帇": {
battState1.setOnlineVol(Float.valueOf(val));
- Date recDatetime = battState1.getRecDatetime();
+ /*Date recDatetime = battState1.getRecDatetime();
//濡傛灉缁�1鏃堕棿瀛樺湪,涓庡綋鍓嶆椂闂村姣�.濮嬬粓鍙栨渶澶у��
if(recDatetime == null){
battState1.setRecDatetime(date);
}
else if(date.compareTo(recDatetime)>0){
battState1.setRecDatetime(date);
- }
+ }*/
}
break;
case "绗�1缁勭數姹犵粍绗�1鑺傚崟浣撶數姹犵數鍘嬪��":
@@ -2297,35 +2300,36 @@
}break;
case "绗�2缁勭數姹犵粍鐢靛帇": {
battState2.setGroupVol(Float.valueOf(val));
- Date recDatetime = battState2.getRecDatetime();
+ /*Date recDatetime = battState2.getRecDatetime();
//濡傛灉缁�2鏃堕棿瀛樺湪,涓庡綋鍓嶆椂闂村姣�.濮嬬粓鍙栨渶澶у��
if(recDatetime == null){
battState2.setRecDatetime(date);
}
else if(date.compareTo(recDatetime)>0){
battState2.setRecDatetime(date);
- }
+ }*/
}break;
- case "绗�2缁勭數姹犵粍鐢垫祦":{battState2.setGroupCurr(Float.valueOf(val));
- Date recDatetime = battState2.getRecDatetime();
+ case "绗�2缁勭數姹犵粍鐢垫祦":{
+ battState2.setGroupCurr(Float.valueOf(val));
+ /*Date recDatetime = battState2.getRecDatetime();
//濡傛灉缁�2鏃堕棿瀛樺湪,涓庡綋鍓嶆椂闂村姣�.濮嬬粓鍙栨渶澶у��
if(recDatetime == null){
battState2.setRecDatetime(date);
}
else if(date.compareTo(recDatetime)>0){
battState2.setRecDatetime(date);
- }
+ }*/
}break;
case "绗�2缁勫湪绾跨鐢靛帇": {
battState2.setOnlineVol(Float.valueOf(val));
- Date recDatetime = battState2.getRecDatetime();
+ /*Date recDatetime = battState2.getRecDatetime();
//濡傛灉缁�2鏃堕棿瀛樺湪,涓庡綋鍓嶆椂闂村姣�.濮嬬粓鍙栨渶澶у��
if(recDatetime == null){
battState2.setRecDatetime(date);
}
else if(date.compareTo(recDatetime)>0){
battState2.setRecDatetime(date);
- }
+ }*/
}break;
case "绗�2缁勭數姹犵粍绗�1鑺傚崟浣撶數姹犵數鍘嬪��":
case "绗�2缁勭數姹犵粍绗�2鑺傚崟浣撶數姹犵數鍘嬪��":
@@ -2652,6 +2656,10 @@
}
}
+ //缁勭鏃堕棿璁剧疆涓哄綋鍓嶅��
+ battState1.setRecDatetime(now);
+ battState2.setRecDatetime(now);
+
//纭畾 璁惧1鍋滄鍘熷洜
int stopReason1;
String stopReason1Str = stopReasonSb1.toString();
@@ -2699,11 +2707,13 @@
//鍥炲啓璁惧鐘舵�佸拰缁堟鍘熷洜
deviceState1.setDevWorkstate(deviceStateType1);
deviceState1.setDevLastCaptestStopType(stopReason1);
- deviceState1.setRecordDatetime(deviceStateTypeTime1);
+ //deviceState1.setRecordDatetime(deviceStateTypeTime1);
+ deviceState1.setRecordDatetime(nowStr);
deviceState2.setDevWorkstate(deviceStateType2);
deviceState2.setDevLastCaptestStopType(stopReason2);
- deviceState2.setRecordDatetime(deviceStateTypeTime2);
+ //deviceState2.setRecordDatetime(deviceStateTypeTime2);
+ deviceState2.setRecordDatetime(nowStr);
//瀵瑰簲缁撴灉鎺ユ敹
deviceStateList.add(deviceState1);
deviceStateList.add(deviceState2);
@@ -2773,6 +2783,22 @@
battDataList.add(battRtdata);
}
+ //TODO 妯℃嫙鏍稿浣跨敤,姝ｅ紡鐜鍘绘帀
+ /*deviceState1.setDevWorkstate(2);
+ deviceState2.setDevWorkstate(3);*/
+
+ //鎵嬪姩寮哄埗澶勭悊 鏍稿(2)鍜屽仠鐢垫斁鐢�(3) 鏃� 鐢垫祦涓鸿礋鏁�
+ if(deviceState1.getDevWorkstate() == 2 || deviceState1.getDevWorkstate() == 3){
+ Float groupCurr1 = battState1.getGroupCurr();
+ battState1.setGroupCurr(-Math.abs(groupCurr1));
+ }
+ if(deviceState2.getDevWorkstate() == 2 || deviceState2.getDevWorkstate() == 3){
+ Float groupCurr2 = battState2.getGroupCurr();
+ battState2.setGroupCurr(-Math.abs(groupCurr2));
+ //TODO 娴嬭瘯浣跨敤,姝ｅ紡鐜鍘绘帀
+ //battState2.setGroupCurr(-3.1f);
+ }
+
//鍥炲～
//璁惧 2缁�
map.put("deviceState",deviceStateList);
--
Gitblit v1.9.1