From 656aa4f953eb52502a6414965e46642c31b6e8ee Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 29 四月 2025 15:33:09 +0800 Subject: [PATCH] 设备会在多种功能码上报数据中携带报警与状态数据,这样数据库保存设备报警与状态数据可能很多,为此修改逻辑,当前实现为一设备一个小时内只保存一条报警与状态数据。 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java | 141 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 141 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java new file mode 100644 index 0000000..7ef41eb --- /dev/null +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java @@ -0,0 +1,141 @@ +package com.dy.rtuMw.server.rtuData.p206V202404; + +import com.dy.common.mw.protocol.Command; +import com.dy.common.mw.protocol.CommandType; +import com.dy.common.mw.protocol.Data; +import com.dy.common.mw.protocol.p206V202404.*; +import com.dy.common.mw.protocol.p206V202404.upVos.*; +import com.dy.common.springUtil.SpringContextUtil; +import com.dy.pipIrrGlobal.pojoPr.PrController; +import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp; +import com.dy.pipIrrGlobal.pojoSe.SeClient; +import com.dy.rtuMw.server.ServerProperties; +import com.dy.rtuMw.server.rtuData.TaskSurpport; +import com.dy.rtuMw.server.rtuData.dbSv.DbSv; +import com.dy.rtuMw.web.com.CommandCtrl; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.text.ParseException; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * @Author liurunyu + * @Date 2024/5/8 14:18 + */ +public class TkPreGenObjsV202404 extends TaskSurpport { + + private static final Map<String, Boolean> onceUpDataRtus = new HashMap<>(); + + private static final Logger log = LogManager.getLogger(TkPreGenObjsV202404.class.getName()) ; + + //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷� + public static final String taskId = "TkPreGenObjsV202404" ; + + /** + * 鎵ц鑺傜偣浠诲姟 + * @param data 闇�瑕佸鐞嗙殑鏁版嵁 + */ + @Override + public void execute(Object data) throws ParseException { + Data d = (Data)data ; + String rtuAddr = d.getRtuAddr() ;//TkRtuData閲屽垽鏂簡rtuAddr涓虹┖ + if(d.subData != null && d.subData instanceof DataV202404){ + DataV202404 dataV202404 = (DataV202404)d.subData ; + if(dataV202404.subData != null && (dataV202404.subData instanceof DataCd8AVo || dataV202404.subData instanceof DataCd02Vo)){ + //杩囨护鎺夌櫥褰曞拰蹇冭烦鏁版嵁锛屼絾绗竴娆′笉杩囨护 + if(onceUpDataRtus.containsKey(rtuAddr)){ + return ; + } + } + } + if(!onceUpDataRtus.containsKey(rtuAddr)){ + onceUpDataRtus.put(rtuAddr, true) ; + } + + DbSv sv = SpringContextUtil.getBean(DbSv.class) ; + if(sv != null){ + PrController controller = sv.getControllersByRtuAddrAndIntakeNotNull(rtuAddr) ; + PrControllerTramp controllerTramp = null ; + SeClient clientVo = null ;//杩欎釜鍊煎璞′腑鍙湁id銆乶ame銆乤ddress浼氭湁鍊� + if(controller == null){ + //鏁版嵁搴撲腑鏈煡璇㈠埌鎺у埗鍣紙RTU瀹炰綋锛�(宸茬粡缁戝畾涓旀帶鍒跺櫒鍦板潃鐩哥) + //娴佹氮鑰呮帶鍒跺櫒 + controllerTramp = sv.getPrControllerTrampByRtuAddr(rtuAddr); + if(controllerTramp == null){ + //绗竴娆″彂鐜� + controllerTramp = new PrControllerTramp(null, rtuAddr, d.getProtocol(), (d.protocolVer==null?null:d.protocolVer.intValue()), new Date(), ServerProperties.orgTag) ; + //绗竴娆″彂鐜帮紝涓嬪彂娓呯┖RTU鍘嗗彶鍛戒护锛屼互浣垮叾閲嶆柊寮�濮嬭褰曟柊鍦扮偣鐨勬暟鎹� + this.sendClearCommand(rtuAddr, d.protocol); + } + }else{ + if(d.subData != null && d.subData instanceof DataV202404){ + clientVo = this.getClient(sv, (DataV202404)d.subData); + } + } + //涓嶈鏄惁涓烘祦娴帶鍒跺櫒锛圧TU瀹炰綋锛夛紝閮借杩涜涓嬫宸ヤ綔锛岃褰曞叾涓婃姤鐨勪竴浜涙暟鎹紝褰撶粦瀹氭帶鍒跺櫒鍚庯紝鏁版嵁鑷姩鏈変簡褰掑睘 + this.taskResult = new Object[]{sv, controller, controllerTramp, clientVo} ; + this.toNextTasks(data); + }else{ + log.error("涓ラ噸閿欒锛屾湭鑳藉緱鍒癉bSv瀵硅薄"); + } + } + + /** + * 寰楀埌鐩稿叧鍐滄埛淇℃伅 + */ + private SeClient getClient(DbSv sv, DataV202404 d1){ + SeClient clientVo = null ; + if(d1.subData != null && + (d1.subData instanceof DataCd84Vo || + d1.subData instanceof DataCd85Vo || + d1.subData instanceof DataCd80_5BVo)){ + //寮�闃�鎶ワ紝鍏抽榾鎶ワ紝闃�寮�宸ヤ綔鎶� + String icCardAddr = null ; + String icCardNo = null ; + if(d1.subData instanceof DataCd84Vo){ + DataCd84Vo vo = (DataCd84Vo)d1.subData ; + icCardAddr = vo.icCardAddr ; + icCardNo = vo.icCardNo ; + }else if(d1.subData instanceof DataCd85Vo){ + DataCd85Vo vo = (DataCd85Vo)d1.subData ; + icCardAddr = vo.icCardAddr ; + icCardNo = vo.icCardNo ; + }else if(d1.subData instanceof DataCd80_5BVo){ + DataCd80_5BVo vo = (DataCd80_5BVo)d1.subData ; + icCardAddr = vo.icCardAddr ; + icCardNo = vo.icCardNo ; + } + if(icCardAddr != null && icCardNo != null){ + if(icCardAddr.equals(ProtocolConstantV206V202404.vsCardAddr)){ + clientVo = sv.getClientIdAndNameByVsCardNo(icCardNo) ; + }else{ + clientVo = sv.getClientIdAndNameByCardAddrAndCardNo(icCardAddr, icCardNo) ; + } + } + } + return clientVo ; + } + /** + * 鍙戦�佹竻绌篟TU鐨勫懡浠� + * @param rtuAddr + * @param protocol + */ + private void sendClearCommand(String rtuAddr, String protocol){ + Command com = new Command() ; + com.id = Command.defaultId ; + com.rtuAddr = rtuAddr ; + com.protocol = protocol ; + com.type = CommandType.outerCommand; + com.code = CodeV202404.cd_99 ;//褰撳墠鏄痯206V202404鍗忚鐨勪换鍔� + com.rtuResultSendWebUrl = Command.ignoreRtuResultSendWebUrl ; + com.param = null ; + com.attachment = null ; + CommandCtrl comCtrl = SpringContextUtil.getBean(CommandCtrl.class) ; + if(comCtrl != null){ + comCtrl.sendOutComFromLocal(com) ; + } + } +} -- Gitblit v1.8.0