pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202405.java
File was renamed from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatus.java @@ -2,12 +2,8 @@ import com.dy.common.mw.protocol.Data; import com.dy.common.mw.protocol.p206V202404.DataV202404 ; import com.dy.common.mw.protocol.p206V202404.upVos.DataCd80_5BVo; import com.dy.common.mw.protocol.p206V202404.upVos.DataCd81Vo; import com.dy.common.mw.protocol.p206V202404.upVos.DataCd93_A3_85Vo; import com.dy.common.util.DateTime; import com.dy.common.mw.protocol.p206V202404.upVos.*; import com.dy.pipIrrGlobal.pojoPr.PrController; import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory; import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast; import com.dy.rtuMw.server.rtuData.TaskSurpport; import com.dy.rtuMw.server.rtuData.dbSv.DbSv; @@ -18,12 +14,12 @@ * @Author liurunyu * @Date 2024/5/8 14:18 */ public class TkDealAlarmStatus extends TaskSurpport { public class TkDealAlarmStatusV202405 extends TaskSurpport { private static final Logger log = LogManager.getLogger(TkDealAlarmStatus.class.getName()) ; private static final Logger log = LogManager.getLogger(TkDealAlarmStatusV202405.class.getName()) ; //类ID，一定与Tree.xml配置文件中配置一致 public static final String taskId = "TkDealAlarmStatus" ; public static final String taskId = "TkDealAlarmStatusV202405" ; /** * 执行节点任务：报警及状态 @@ -39,24 +35,34 @@ Object cdObj = dV202404.subData ; if(cdObj != null){ try{ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ; Object[] objs = this.getTaskResults(TkPreGenObjsV202405.taskId) ; DbSv sv = (DbSv)objs[0] ; PrController controller = (PrController)objs[1] ; if(cdObj instanceof DataCd80_5BVo){ if(cdObj instanceof DataCd81Vo){ //设备终端随机自报 DataCd81Vo cdData = (DataCd81Vo)(cdObj) ; this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), null, null, null, cdData, null, null) ; this.saveHistory(sv, controller, d.getRtuAddr(), null, null, null, cdData, null, null) ; }else if(cdObj instanceof DataCd80_5BVo){ //设备终端工作上报 + 查询设备终端实时值 DataCd80_5BVo cdData = (DataCd80_5BVo)(cdObj) ; this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null) ; this.saveHistory(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null) ; this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null, null, null) ; this.saveHistory(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null, null, null) ; }else if(cdObj instanceof DataCd93_A3_85Vo){ //平台/APP远程关闭水泵/阀门 + 刷卡关泵/阀上报 DataCd93_A3_85Vo cdData = (DataCd93_A3_85Vo)(cdObj) ; this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null) ; this.saveHistory(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null) ; }else if(cdObj instanceof DataCd81Vo){ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null, null, null) ; this.saveHistory(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null, null, null) ; }else if(cdObj instanceof DataCd84Vo){ //设备终端随机自报 DataCd81Vo cdData = (DataCd81Vo)(cdObj) ; this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), null, null, null, cdData) ; this.saveHistory(sv, controller, d.getRtuAddr(), null, null, null, cdData) ; DataCd84Vo cdData = (DataCd84Vo)(cdObj) ; this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), null, null, null, null, cdData, null) ; this.saveHistory(sv, controller, d.getRtuAddr(), null, null, null, null, cdData, null) ; }else if(cdObj instanceof DataCdC2Vo){ //设备终端随机自报 DataCdC2Vo cdData = (DataCdC2Vo)(cdObj) ; this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), null, null, null, null, null, cdData) ; this.saveHistory(sv, controller, d.getRtuAddr(), null, null, null, null, null, cdData) ; } }catch (Exception e){ log.error("保存控制器报警和状态数据时发生异常", e); @@ -81,7 +87,9 @@ String rtuDt, DataCd80_5BVo vo80_5B, DataCd93_A3_85Vo vo93_A3_85, DataCd81Vo vo81) throws Exception { DataCd81Vo vo81, DataCd84Vo vo84, DataCdC2Vo voC2) throws Exception { // RmAlarmStateLast po = sv.getRmAlarmStateLast(rtuAddr) ; // if(po == null){ // po = new RmAlarmStateLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(), @@ -113,7 +121,9 @@ String rtuDt, DataCd80_5BVo vo80_5B, DataCd93_A3_85Vo vo93_A3_85, DataCd81Vo vo81) throws Exception { DataCd81Vo vo81, DataCd84Vo vo84, DataCdC2Vo voC2) throws Exception { // RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(), // rtuAddr, // DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt), @@ -129,7 +139,9 @@ String rtuDt, DataCd80_5BVo vo80_5B, DataCd93_A3_85Vo vo93_A3_85, DataCd81Vo vo81) throws Exception { DataCd81Vo vo81, DataCd84Vo vo84, DataCdC2Vo voC2) throws Exception { // po.controllerid = controller==null?null:controller.getId() ; // po.intakeid = controller==null?null:controller.getIntakeId() ; // pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202405.java
File was renamed from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTramp.java @@ -9,12 +9,12 @@ * @Date 2024/5/8 14:18 * 处理非流浪控制器,此任务无具体业务逻辑，只是在任务xml配置文件中，框住其子任务节点 */ public class TkDealControllerNoTramp extends TaskSurpport { public class TkDealControllerNoTrampV202405 extends TaskSurpport { private static final Logger log = LogManager.getLogger(TkDealControllerNoTramp.class.getName()) ; private static final Logger log = LogManager.getLogger(TkDealControllerNoTrampV202405.class.getName()) ; //类ID，一定与Tree.xml配置文件中配置一致 public static final String taskId = "TkDealControllerNoTramp" ; public static final String taskId = "TkDealControllerNoTrampV202405" ; /** * 执行节点任务 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTrampV202405.java
File was renamed from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTramp.java @@ -10,12 +10,12 @@ * @Author liurunyu * @Date 2024/5/8 14:18 */ public class TkDealControllerTramp extends TaskSurpport { public class TkDealControllerTrampV202405 extends TaskSurpport { private static final Logger log = LogManager.getLogger(TkDealControllerTramp.class.getName()) ; private static final Logger log = LogManager.getLogger(TkDealControllerTrampV202405.class.getName()) ; //类ID，一定与Tree.xml配置文件中配置一致 public static final String taskId = "TkDealControllerTramp" ; public static final String taskId = "TkDealControllerTrampV202405" ; /** * 执行节点任务 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponseV202405.java
File was renamed from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindComResponse.java @@ -10,12 +10,12 @@ * @Date 2024/5/8 14:18 * @Description 识别命令响应上报 */ public class TkFindComResponse extends TaskSurpport { public class TkFindComResponseV202405 extends TaskSurpport { private static final Logger log = LogManager.getLogger(TkFindComResponse.class.getName()) ; private static final Logger log = LogManager.getLogger(TkFindComResponseV202405.class.getName()) ; //类ID，一定与Tree.xml配置文件中配置一致 public static final String taskId = "TkFindComResponse" ; public static final String taskId = "TkFindComResponseV202405" ; /** * 执行节点任务 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindReportV202405.java
File was renamed from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkFindReport.java @@ -12,12 +12,12 @@ /** * 识别非命令应答 */ public class TkFindReport extends TaskSurpport { public class TkFindReportV202405 extends TaskSurpport { private static final Logger log = LogManager.getLogger(TkFindReport.class.getName()) ; private static final Logger log = LogManager.getLogger(TkFindReportV202405.class.getName()) ; //类ID，一定与Tree.xml配置文件中配置一致 public static final String taskId = "TkFindReport" ; public static final String taskId = "TkFindReportV202405" ; /** * 执行节点任务 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202405.java
File was renamed from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjs.java @@ -15,12 +15,12 @@ * @Author liurunyu * @Date 2024/5/8 14:18 */ public class TkPreGenObjs extends TaskSurpport { public class TkPreGenObjsV202405 extends TaskSurpport { private static final Logger log = LogManager.getLogger(TkPreGenObjs.class.getName()) ; private static final Logger log = LogManager.getLogger(TkPreGenObjsV202405.class.getName()) ; //类ID，一定与Tree.xml配置文件中配置一致 public static final String taskId = "TkPreGenObjs" ; public static final String taskId = "TkPreGenObjsV202405" ; /** * 执行节点任务 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponseV202405.java
File was renamed from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponse.java @@ -1,7 +1,6 @@ package com.dy.rtuMw.server.rtuData.p206V202404; import com.dy.common.mw.protocol.Data; import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1; import com.dy.common.mw.protocol.p206V202404.DataV202404; import com.dy.rtuMw.server.rtuData.TaskSurpport; import org.apache.logging.log4j.LogManager; @@ -12,12 +11,12 @@ * @Date 2024/5/8 14:18 * @Description 处理命令响应上报 */ public class TkRtuDealCommandResponse extends TaskSurpport { public class TkRtuDealCommandResponseV202405 extends TaskSurpport { private static final Logger log = LogManager.getLogger(TkRtuDealCommandResponse.class.getName()) ; private static final Logger log = LogManager.getLogger(TkRtuDealCommandResponseV202405.class.getName()) ; //类ID，一定与Tree.xml配置文件中配置一致 public static final String taskId = "TkRtuDealCommandResponse" ; public static final String taskId = "TkRtuDealCommandResponseV202405" ; /** * 执行节点任务：处理命令响应上报 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
@@ -31,18 +31,18 @@ </task> </task> <task id="TkFindP206V202404" name="识别P206V202404数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindP206V202404"> <task id="TkPreGenObjs" name="预先准备各对象并识别流浪控制器" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkPreGenObjs"> <task id="TkPreGenObjsV202405" name="预先准备各对象并识别流浪控制器" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkPreGenObjsV202405"> <!-- 处理流浪控制器 --> <task id="TkDealControllerTramp" name="处理流浪控制器" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealControllerTramp" /> <task id="TkDealControllerTrampV202405" name="处理流浪控制器" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealControllerTrampV202405" /> <!-- 非流浪者RTU，必须放在TkDealControllerTramp后面 --> <task id="TkDealControllerNoTramp" name="非流浪者RTU" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealControllerNoTramp"> <task id="TkDealControllerNoTrampV202405" name="非流浪者RTU" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealControllerNoTrampV202405"> <!-- 识别非命令应答上行数据 --> <task id="TkFindReport" name="识别非命令应答上行数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindReport"> <task id="TkDealAlarmStatus" name="控制器报警与状态数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealAlarmStatus" /> <task id="TkFindReportV202405" name="识别非命令应答上行数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindReportV202405"> <task id="TkDealAlarmStatusV202405" name="控制器报警与状态数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkDealAlarmStatusV202405" /> </task> <!-- 识别命令响应数据 --> <task id="TkFindComResponse" name="识别响应命令数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindComResponse"> <task id="TkRtuDealCommandResponse" name="RTU响应命令数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkRtuDealCommandResponse" > <task id="TkFindComResponseV202405" name="识别响应命令数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkFindComResponseV202405"> <task id="TkRtuDealCommandResponseV202405" name="RTU响应命令数据" enable="true" class="com.dy.rtuMw.server.rtuData.p206V202404.TkRtuDealCommandResponseV202405" > </task> </task> </task>
