From c9a3644b14e1307addeadea23cb5c2f5b2d8b28f Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 12 六月 2024 09:45:02 +0800 Subject: [PATCH] 1、完善通信中间件TkFindP206V1_0_0类和log4j2.yml代码; 2、删除common模块中的HttpUtil类(用不到了); 3、实现P206V1_0_0协议的功能码99H和A0H的上下行数据解析。 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java index 1d9c5d8..6def3c1 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java @@ -3,6 +3,7 @@ import com.dy.pipIrrGlobal.daoPr.PrControllerMapper; import com.dy.pipIrrGlobal.daoPr.PrControllerTrampMapper; import com.dy.pipIrrGlobal.daoRm.*; +import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper; import com.dy.pipIrrGlobal.pojoPr.PrController; import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp; import com.dy.pipIrrGlobal.pojoRm.*; @@ -45,6 +46,10 @@ private RmLossLastMapper rmLossLastMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂版暟鎹瓺AO @Autowired private RmLossHistoryMapper rmLossHistoryMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙叉暟鎹瓺AO + @Autowired + private RmCommandHistoryMapper rmCommandHistoryDao ;//杩滅▼鍛戒护鏃ュ織鐩稿叧 + @Autowired + private SeVirtualCardMapper seVirtualCardDao ;//铏氭嫙鍗$浉鍏� //@Autowired //@Lazy @@ -86,6 +91,14 @@ @Transactional(rollbackFor = Exception.class) public void savePrConctrollerTramp(PrControllerTramp po){ this.prControllerTrampMapperDao.insert(po) ; + } + /** + * 淇濆瓨娴佹氮鎺у埗鍣� + * @param po + */ + @Transactional(rollbackFor = Exception.class) + public void updatePrConctrollerTramp(PrControllerTramp po){ + this.prControllerTrampMapperDao.updateByPrimaryKeySelective(po) ; } @@ -131,6 +144,14 @@ this.rmAlarmStateHistoryMapperDao.insert(po) ; } + /** + * 鍙樻洿铏氭嫙鍗″崰鐢ㄧ姸鎬� + * @param intakeId + */ + @Transactional(rollbackFor = Exception.class) + public void updateVirCardNoUseState(Long intakeId){ + this.seVirtualCardDao.updateVcCardNoUseStateByIntakeId(intakeId); ; + } ///////////////////////////////////////////////// @@ -369,5 +390,17 @@ return null ; } + ////////////////////////////////////////////////////// + // + // 鍛戒护鏃ュ織鐩稿叧 + // + ////////////////////////////////////////////////////// + public RmCommandHistory getCommandLog(String commandId){ + return rmCommandHistoryDao.selectByPrimaryKey(Long.parseLong(commandId)) ; + } + public void updateCommandLog(RmCommandHistory po){ + rmCommandHistoryDao.updateByPrimaryKeySelective(po) ; + } + } -- Gitblit v1.8.0