From 3e82bb3f97e95c90099070787da4455e64b95b3f Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 28 十一月 2024 14:39:19 +0800 Subject: [PATCH] 1、监视升级过程RTU集合以地址排序; 2、实现升级结果查询与导出。 --- pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultSv.java | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultSv.java index 0ccc142..bb5ee46 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultSv.java @@ -25,7 +25,7 @@ private UgRtuControllerMapper dao ; /** - * 鍒嗛〉鏌ヨ涓�涓崌绾т换鍔′腑鎵�鏈夋帶鍒跺櫒鍗囩骇缁撴煡 + * 鍒嗛〉鏌ヨ涓�涓崌绾т换鍔′腑涓�浜涙帶鍒跺櫒鍗囩骇缁撴煡 * @return 鎺у埗鍣ㄥ崌绾х粨鏌� */ public QueryResultVo<List<VoUgResult>> selectSome(QueryUgResultVo queryVo){ @@ -53,4 +53,26 @@ return rsVo ; } + + /** + * 鍒嗛〉鏌ヨ涓�涓崌绾т换鍔′腑鎵�鏈夋帶鍒跺櫒鍗囩骇缁撴煡 + * @return 鎺у埗鍣ㄥ崌绾х粨鏌� + */ + public List<VoUgResult> selectAll(QueryUgResultVo queryVo){ + Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ; + List<VoUgResult> list = this.dao.selectControllerUpgradeResults(params) ; + if(list != null && list.size() > 0){ + for(VoUgResult vo : list){ + if(vo.isOver != null && vo.isOver.byteValue() == 1){ + vo.isOverStr = "鏄�" ; + }else{ + vo.isOverStr = "鍚�" ; + } + if(vo.ugState != null){ + vo.ugStateStr = UpgradeRtu.getStateName(vo.ugState) ; + } + } + } + return list ; + } } -- Gitblit v1.8.0