From 72bf6da7c81d4da621552a3fc68a0eb87e417be0 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 18 十二月 2023 15:44:58 +0800
Subject: [PATCH] websocket推送加nowTime，recordTime
---
src/main/java/com/whyc/service/CKPowerDevSignalService.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/service/CKPowerDevSignalService.java b/src/main/java/com/whyc/service/CKPowerDevSignalService.java
index f439a35..221ecaf 100644
--- a/src/main/java/com/whyc/service/CKPowerDevSignalService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevSignalService.java
@@ -9,9 +9,11 @@
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevSignal;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevSignalSet;
import com.whyc.util.CommonUtil;
+import com.whyc.util.DateUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -41,11 +43,11 @@
//澶撮儴寮�鍏崇粺璁�
public Response getSwitchReal(){
- Map<String,Integer> map=new HashMap<>();
- map.put("onSwitch",0);
- map.put("offSwitch",0);
- //map.put("alarmSwitch",0);
- //map.put("runSwitch",0);
+ Map<String,String> map=new HashMap<>();
+ map.put("onSwitch","0");
+ map.put("offSwitch","0");
+ map.put("nowTime",DateUtil.format_YYYY_MM_DD_HH_MM_SS(new Date()));
+ map.put("recordTime",DateUtil.format_YYYY_MM_DD_HH_MM_SS(new Date()));
QueryWrapper<CKPowerDevSignal> query = Wrappers.query();
query.last(" limit 1");
CKPowerDevSignal switchReal=mapper.selectOne(query);
@@ -135,11 +137,12 @@
}else{
onSwitch+= CommonUtil.getIntToBinary(switchReal.getDc2Switch4TripFake());
}
+ map.put("recordTime", DateUtil.format_YYYY_MM_DD_HH_MM_SS(switchReal.getRecordTime()));
}
- map.put("onSwitch",onSwitch);
+ map.put("onSwitch",String.valueOf(onSwitch));
//鑾峰彇鎬荤殑鍚敤鏂矾鍣ㄥ紑鍏虫暟
int swtichAll=breakerInfMapper.getSwtichAll();
- map.put("offSwitch",swtichAll-onSwitch);
+ map.put("offSwitch",String.valueOf(swtichAll-onSwitch));
return new Response().set(1,map);
}
}
--
Gitblit v1.9.1