From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:25:56 +0800
Subject: [PATCH] 1、实现万功能token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并相应修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java | 283 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 283 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java
new file mode 100644
index 0000000..24e0c4b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java
@@ -0,0 +1,283 @@
+package com.dy.rtuMw.server.rtuData.p206V2;
+
+import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.p206V2.DataV2;
+import com.dy.common.mw.protocol.p206V2.upVos.*;
+import com.dy.common.util.DateTime;
+import com.dy.pipIrrGlobal.pojoPr.PrController;
+import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
+import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast;
+import com.dy.rtuMw.server.ServerProperties;
+import com.dy.rtuMw.server.forMs.SendMsCache;
+import com.dy.rtuMw.server.msCenter.MsCenterUnit;
+import com.dy.rtuMw.server.msCenter.MsObj;
+import com.dy.rtuMw.server.rtuData.TaskSurpport;
+import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author liurunyu
+ * @Date 2024/6/11 17:19
+ * @Description
+ */
+public class TkDealAlarmStatusV2 extends TaskSurpport {
+
+ private static final Logger log = LogManager.getLogger(TkDealAlarmStatusV2.class.getName()) ;
+
+ //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
+ public static final String taskId = "TkDealAlarmStatusV2" ;
+
+ //鏄惁鍦ㄦ煇涓椂鍒伙紙骞存湀鏃ユ椂锛変繚瀛樹簡鎶ヨ鐘舵�佹暟鎹�
+ private static final Map<String, Long> onceSaveAlarmData4Rtus = new HashMap<>();
+
+ /**
+ * 鎵ц鑺傜偣浠诲姟锛氭姤璀﹀強鐘舵��
+ * @param data 闇�瑕佸鐞嗙殑鏁版嵁
+ */
+ @Override
+ public void execute(Object data) {
+ Data d = (Data)data ;
+ Object subD = d.getSubData() ;
+ if(subD != null){
+ boolean toNext = false ;
+ DataV2 dV2 = (DataV2)subD ;
+ if(dV2 != null && dV2.subData != null){
+ //dV2.dataCd81Vo銆� dV2.dataCd84Vo 涓� dV2.dataCdC0Vo 涓嶄細鍚屾椂鏈夊��
+ Object cdObj = dV2.subData ;
+ try {
+ if (cdObj instanceof DataCd02Vo) {
+ //蹇冭烦鏁版嵁锛屾牴鎹换鍔kDealHearBeatV2,杩欓噷鏀跺埌鐨勫績璺虫椂锛屼竴瀹氭槸鎶ヨ鎴栫姸鎬佸彂鐢熶簡鏀瑰彉
+ DataCd02Vo dataCd02Vo = (DataCd02Vo)cdObj ;
+ if (dataCd02Vo.alarmVo != null || dataCd02Vo.stateVo != null) {
+ if(this.needSave2Db( d.getRtuAddr())){
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ //蹇冭烦娌℃湁鏃堕挓锛屽苟涓擱TU閽堝蹇冭烦鏁版嵁鐨勬満鍒舵槸涓婃姤涓嶆垚鍔熶笉閲嶅彂锛屾墍浠ユ椂闂撮噰鐢ㄦ湰鍦版椂闂�
+ String now = DateTime.yyyy_MM_dd_HH_mm_ss() ;
+ this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), now, dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), now, dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
+ this.cacheSaveTime(d.getRtuAddr());
+ if(dataCd02Vo.stateVo != null && dataCd02Vo.stateVo.valveState != null && dataCd02Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
+ if(controller != null && controller.getIntakeId() != null){
+ this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ toNext = true ;
+ }
+ }
+ }
+ }
+ } else if (cdObj instanceof DataCd81Vo) {
+ //闅忔満鑷姤鎶�
+ DataCd81Vo dataCd81Vo = (DataCd81Vo)cdObj ;
+ if (dataCd81Vo.alarmVo != null || dataCd81Vo.stateVo != null) {
+ if(this.needSave2Db( d.getRtuAddr())) {
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
+ this.cacheSaveTime(d.getRtuAddr());
+ if(dataCd81Vo.stateVo != null && dataCd81Vo.stateVo.valveState != null && dataCd81Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
+ if(controller != null && controller.getIntakeId() != null){
+ this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ toNext = true ;
+ }
+ }
+ }
+ }
+ } else if (cdObj instanceof DataCd84Vo) {
+ //闃�寮�宸ヤ綔鎶�
+ DataCd84Vo dataCd84Vo = (DataCd84Vo)cdObj ;
+ if (dataCd84Vo.alarmVo != null || dataCd84Vo.stateVo != null) {
+ if(this.needSave2Db( d.getRtuAddr())) {
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
+ this.cacheSaveTime(d.getRtuAddr());
+ /** 闃�寮�宸ヤ綔鎶ワ紝闃�闂ㄧ姸鎬佷竴瀹氭槸鎵撳紑鐘舵�侊紝鎵�浠ヤ笉璁剧疆涓嬮潰鏁版嵁浠ュ鍚庣画浠诲姟璁剧疆铏氭嫙鍗＄姸鎬�
+ if(dataCd84Vo.stateVo != null && dataCd84Vo.stateVo.valveState != null && dataCd84Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
+ if(controller != null && controller.getIntakeId() != null){
+ this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ }
+ }*/
+ }
+ }
+ } else if (cdObj instanceof DataCdC0Vo) {
+ //鏁寸偣鎶�
+ DataCdC0Vo dataCdC0Vo = (DataCdC0Vo)cdObj ;
+ if (dataCdC0Vo.alarmVo != null || dataCdC0Vo.stateVo != null) {
+ if(this.needSave2Db( d.getRtuAddr())) {
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
+ this.cacheSaveTime(d.getRtuAddr());
+ if(dataCdC0Vo.stateVo != null && dataCdC0Vo.stateVo.valveState != null && dataCdC0Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
+ if(controller != null && controller.getIntakeId() != null){
+ this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ toNext = true ;
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("淇濆瓨鎺у埗鍣ㄦ姤璀﹀拰鐘舵�佹暟鎹椂鍙戠敓寮傚父", e);
+ }
+ }
+ if(toNext){
+ this.toNextTasks(d);
+ }
+ }
+ }
+
+ private boolean needSave2Db(String rtuAddr){
+ if(!onceSaveAlarmData4Rtus.containsKey(rtuAddr)){
+ return true ;
+ }else{
+ Long time = onceSaveAlarmData4Rtus.get(rtuAddr) ;
+ Long ymdh = Long.parseLong(DateTime.yyyyMMddHH()) ;
+ if(ymdh.longValue() == time.longValue()){
+ //鍚屼竴涓皬鏃跺唴
+ return false ;
+ }else{
+ return true ;
+ }
+ }
+ }
+ private void cacheSaveTime(String rtuAddr){
+ onceSaveAlarmData4Rtus.put(rtuAddr, Long.parseLong(DateTime.yyyyMMddHH()));
+ }
+
+ /**
+ * 鎶ヨ鐘舵�佹暟鎹瓨鍏ユ秷鎭腑蹇�
+ * @param controller 鎺у埗鍣ㄥ璞�
+ * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
+ * @param dV12 鏁版嵁瀵硅薄
+ * @param alarmVo 鎶ヨ瀵硅薄
+ * @param stateVo 鐘舵�佸璞�
+ */
+ private void toMsCenter(PrController controller, String rtuAddr, DataV2 dV12, DataAlarmVo alarmVo, DataStateVo stateVo){
+ if(alarmVo != null && controller != null && alarmVo.hasAlarm()){
+ MsObj msObj = new MsObj() ;
+ msObj.put("name", "鎶ヨ");
+ msObj.put("rtuAddr", rtuAddr);
+ msObj.put("intakeId", controller.getIntakeId());
+ msObj.put("alarm", alarmVo.alarmContent());
+ msObj.put("dt", dV12.dt);
+ MsCenterUnit.getInstance().pushMs(msObj);
+ }
+ if(stateVo != null && controller != null && stateVo.valveState != null){
+ MsObj msObj = new MsObj() ;
+ msObj.put("name", "闃�鎬�");
+ msObj.put("rtuAddr", rtuAddr);
+ msObj.put("intakeId", controller.getIntakeId());
+ msObj.put("state", stateVo.valveState);
+ msObj.put("stateName", stateVo.valveState==0?"寮�":"鍏�");
+ msObj.put("dt", dV12.dt);
+ MsCenterUnit.getInstance().pushMs(msObj);
+ }
+ }
+ /**
+ * 淇濆瓨鎶ヨ鐘舵�佹渶鏂版暟鎹�
+ * @param sv 鏈嶅姟
+ * @param controller 鎺у埗鍣ㄥ璞�
+ * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
+ * @param rtuDt 鎺у埗鍣ㄦ椂閽�
+ * @param alarmVo 鎶ヨ瀵硅薄
+ * @param stateVo 鐘舵�佸璞�
+ */
+ private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, String rtuDt, DataV2 dV2, DataAlarmVo alarmVo, DataStateVo stateVo) throws Exception {
+ RmAlarmStateLast po = sv.getRmAlarmStateLast(controller.getIntakeId()) ;
+ if(po == null){
+ po = new RmAlarmStateLast();
+ po.controllerId = controller==null?null:controller.getId() ;
+ po.intakeId = controller==null?null:controller.getIntakeId() ;
+ po.rtuAddr = rtuAddr ;
+ po.valueFrom(dV2, rtuDt, alarmVo, stateVo);
+ if(alarmVo.hasAlarmExcludeLoss()){
+ po.sendMsTime = System.currentTimeMillis() ;
+ this.sendMessage(controller, alarmVo);
+ }
+ sv.saveRmAlarmStateLast(po) ;
+ }else{
+ if(po.sendMsTime == null){
+ if(alarmVo.hasAlarmExcludeLoss()) {
+ po.sendMsTime = System.currentTimeMillis();
+ this.sendMessage(controller, alarmVo);
+ }
+ }else{
+ if(alarmVo.hasAlarmExcludeLoss()){
+ Long now = System.currentTimeMillis() ;
+ if(((now - po.sendMsTime) / (1000 * 60)) > ServerProperties.sendDingDingAlarmMsInterval){
+ //澶т簬瑙勫畾鐨勯棿闅旀椂闂�
+ po.sendMsTime = System.currentTimeMillis() ;
+ this.sendMessage(controller, alarmVo);
+ }
+ }
+ }
+ po = this.update(controller, po, rtuDt, dV2, alarmVo, stateVo) ;
+ sv.updateRmAlarmStateLast(po);
+ }
+ }
+
+ /**
+ * 淇濆瓨鎶ヨ鐘舵�佸巻鍙茶褰�
+ * @param sv 鏈嶅姟
+ * @param controller 鎺у埗鍣ㄥ璞�
+ * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
+ * @param rtuDt 鎺у埗鍣ㄦ椂閽�
+ * @param alarmVo 鎶ヨ瀵硅薄
+ * @param stateVo 鐘舵�佸璞�
+ */
+ private void saveHistory(DbSv sv, PrController controller, String rtuAddr, String rtuDt, DataV2 dV2, DataAlarmVo alarmVo, DataStateVo stateVo) throws Exception {
+ RmAlarmStateHistory po = new RmAlarmStateHistory() ;
+ po.controllerId = controller==null?null:controller.getId() ;
+ po.intakeId = controller==null?null:controller.getIntakeId() ;
+ po.rtuAddr = rtuAddr ;
+ po.valueFrom(dV2, rtuDt, alarmVo, stateVo);
+ sv.saveRmAlarmStateHistory(po) ;
+ }
+
+
+ private RmAlarmStateLast update(PrController controller, RmAlarmStateLast po, String rtuDt, DataV2 dV2, DataAlarmVo alarmVo, DataStateVo stateVo) throws Exception {
+ po.controllerId = controller==null?null:controller.getId() ;
+ po.intakeId = controller==null?null:controller.getIntakeId() ;
+
+ po.updateFrom(dV2, rtuDt, alarmVo, stateVo);
+ return po ;
+
+ }
+
+
+
+ /**
+ * 鍚戦拤閽夊彂閫佹秷鎭�
+ * @param controller
+ * @param alarmVo
+ */
+ private void sendMessage(PrController controller, DataAlarmVo alarmVo){
+ String ms = "鍙栨按鍙ｂ��" + controller.getIntakeName() + "鈥濅骇鐢熸姤璀︼細" + alarmVo.alarmContentExcludeLoss() ;
+ try{
+ SendMsCache.cacheMs(ms);
+ }catch (Exception e){
+ log.error("缂撳瓨閽夐拤娑堟伅寮傚父锛�", e);
+ }
+ }
+
+}
--
Gitblit v1.8.0