From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 26 十一月 2024 17:25:39 +0800 Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改; 2、RTU升级模拟器增加命令行设置服务端IP和端口功能; 3、应王江海要求,井电双控协议中也实现远程升级功能,因井电双控协议、阀控器协议不同,而双方协议中的升级子协议相同,所以通信中间件做增量开发、适应性修改,以适应这种混合协议情况,同时也提高通信中间件运行效率。 --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java index ad77562..69d6b32 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideSv.java @@ -47,11 +47,13 @@ public QueryResultVo<List<VoDivide>> getDivides(QueryVo queryVo) { Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo); + // 璁$畻绗﹀悎鏉′欢鐨勮褰曟暟 Long itemTotal = prDivideMapper.getRecordCount(params); QueryResultVo<List<VoDivide>> rsVo = new QueryResultVo<>() ; rsVo.pageSize = queryVo.pageSize ; rsVo.pageCurr = queryVo.pageCurr ; + rsVo.calculateAndSet(itemTotal, params); rsVo.obj = prDivideMapper.getDivides(params); return rsVo ; @@ -102,6 +104,16 @@ * @return 淇敼璁板綍鏉℃暟 */ public Integer updateByPrimaryKey(PrDivide po) { - return prDivideMapper.updateByPrimaryKey(po); + //return prDivideMapper.updateByPrimaryKey(po); + return prDivideMapper.updateByPrimaryKeySelective(po); + } + + /** + * 鏍规嵁鍒嗘按鎴跨紪鍙疯幏鍙栨墍灞炵墖鍖虹紪鍙� + * @param divideId 鍒嗘按鎴縄D + * @return 鎵�灞炵墖鍖篒D + */ + public Long getBlockIdById(Long divideId) { + return prDivideMapper.getBlockIdById(divideId); } } -- Gitblit v1.8.0