From d5dab07dc674de7edbbc1bd6ade0486f54fbdb26 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 19:19:35 +0800
Subject: [PATCH] 1、实现万用token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
index d41a7c0..1c1afe7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
@@ -90,7 +90,12 @@
* @return
*/
public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_history(OpenCloseValveQO qo) {
- qo.completionTimeNoEmpty() ;
+ //涓嬮潰鐢眂ompletionTimeNoEmpty()鏀逛负completionTime()鍘熷洜锛�
+ //寮�鍏抽榾璁板綍涓紑闃�鏃堕棿鍜屽叧闃�鏃堕棿鏈夋椂涓嶄細鍚屾椂鏈夊�硷紝鍙兘鍏朵腑浠讳竴涓槸null鍊硷紝濡傛灉鐢ㄦ椂闂存潯浠舵煡璇紝鍒欒繖鏍风殑璁板綍灏辨煡涓嶅嚭鏉ヤ簡銆�
+ //濡傛灉瑕佺缉灏忔墍鏌ヨ璁板綍鐨勮寖鍥达紙鏁伴噺锛夛紝鍒欏彲浠庤褰旾D涓婅澶囦竴涓寖鍥淬��
+ //qo.completionTimeNoEmpty() ;
+ qo.completionTime() ;
+
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmOpenCloseValveHistoryMapper.getOpenCloseValveReportsCount_history(params);
@@ -104,7 +109,11 @@
if (list != null && list.size() > 0) {
for (VoOpenCloseValve vo : list) {
vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
- vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
+ if(vo.getClType() != null) {
+ vo.setCloseType(CommonV1.openCloseValveType(vo.getClType() == null ? (byte) 100 : vo.getClType()));
+ }else{
+ vo.setCloseType("");
+ }
}
}
rsVo.obj = list;
@@ -131,7 +140,11 @@
if (list != null && list.size() > 0) {
for (VoOpenCloseValve vo : list) {
vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
- vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
+ if(vo.getClType() != null){
+ vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
+ }else{
+ vo.setCloseType("");
+ }
}
}
rsVo.obj = list;
--
Gitblit v1.8.0