From 85a2968c85ab196eec3c189395f89f8e067701ef Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 07 五月 2025 15:27:50 +0800
Subject: [PATCH] RTU模拟器增加命令92的响应，以测试透传命令。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java | 185 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 173 insertions(+), 12 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 ed17765..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
@@ -1,9 +1,14 @@
package com.dy.pipIrrRemote.report;
+import com.dy.common.mw.protocol.p206V1.CommonV1;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.*;
import com.dy.pipIrrGlobal.voRm.VoOnHour;
-import com.dy.pipIrrRemote.report.qo.ReportQO;
+import com.dy.pipIrrGlobal.voRm.VoOpenCloseValve;
+import com.dy.pipIrrGlobal.voRm.VoTiming;
+import com.dy.pipIrrGlobal.voRm.VoWork;
+import com.dy.pipIrrRemote.report.qo.OnHourQO;
+import com.dy.pipIrrRemote.report.qo.OpenCloseValveQO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
@@ -44,17 +49,8 @@
* @param qo
* @return
*/
- public QueryResultVo<List<VoOnHour>> getOnHourReportsHistory(ReportQO qo) {
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart != null) {
- timeStart = timeStart + " 00:00:00";
- qo.setTimeStart(timeStart);
- }
- if(timeStop != null) {
- timeStop = timeStop + " 23:59:59";
- qo.setTimeStop(timeStop);
- }
+ public QueryResultVo<List<VoOnHour>> getOnHourReportsHistory(OnHourQO qo) {
+ qo.completionTime();
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmOnHourReportHistoryMapper.getOnHourReportsCount_history(params);
@@ -68,5 +64,170 @@
return rsVo ;
}
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏁寸偣鎶ユ渶鏂拌褰�
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoOnHour>> getOnHourReportsLast(OnHourQO qo) {
+ qo.completionTime();
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmOnHourReportLastMapper.getOnHourReportsCount_last(params);
+
+ QueryResultVo<List<VoOnHour>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmOnHourReportLastMapper.getOnHourReports_last(params);
+ return rsVo ;
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ュ巻鍙茶褰�
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_history(OpenCloseValveQO qo) {
+ //涓嬮潰鐢眂ompletionTimeNoEmpty()鏀逛负completionTime()鍘熷洜锛�
+ //寮�鍏抽榾璁板綍涓紑闃�鏃堕棿鍜屽叧闃�鏃堕棿鏈夋椂涓嶄細鍚屾椂鏈夊�硷紝鍙兘鍏朵腑浠讳竴涓槸null鍊硷紝濡傛灉鐢ㄦ椂闂存潯浠舵煡璇紝鍒欒繖鏍风殑璁板綍灏辨煡涓嶅嚭鏉ヤ簡銆�
+ //濡傛灉瑕佺缉灏忔墍鏌ヨ璁板綍鐨勮寖鍥达紙鏁伴噺锛夛紝鍒欏彲浠庤褰旾D涓婅澶囦竴涓寖鍥淬��
+ //qo.completionTimeNoEmpty() ;
+ qo.completionTime() ;
+
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmOpenCloseValveHistoryMapper.getOpenCloseValveReportsCount_history(params);
+
+ QueryResultVo<List<VoOpenCloseValve>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ List<VoOpenCloseValve> list = rmOpenCloseValveHistoryMapper.getOpenCloseValveReports_history(params);
+ if (list != null && list.size() > 0) {
+ for (VoOpenCloseValve vo : list) {
+ vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
+ if(vo.getClType() != null) {
+ vo.setCloseType(CommonV1.openCloseValveType(vo.getClType() == null ? (byte) 100 : vo.getClType()));
+ }else{
+ vo.setCloseType("");
+ }
+ }
+ }
+ rsVo.obj = list;
+ return rsVo ;
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ユ渶鏂拌褰�
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_last(OpenCloseValveQO qo) {
+ qo.completionTime() ;
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmOpenCloseValveLastMapper.getOpenCloseValveReportsCount_last(params);
+
+ QueryResultVo<List<VoOpenCloseValve>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ List<VoOpenCloseValve> list = rmOpenCloseValveLastMapper.getOpenCloseValveReports_last(params);
+ if (list != null && list.size() > 0) {
+ for (VoOpenCloseValve vo : list) {
+ vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
+ if(vo.getClType() != null){
+ vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
+ }else{
+ vo.setCloseType("");
+ }
+ }
+ }
+ rsVo.obj = list;
+ return rsVo ;
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瀹氭椂鎶ュ巻鍙茶褰�
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoTiming>> getTimingReportsHistory(OnHourQO qo) {
+ qo.completionTime() ;
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmTimingReportHistoryMapper.getTimingReportsCount_history(params);
+
+ QueryResultVo<List<VoTiming>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmTimingReportHistoryMapper.getTimingReports_history(params);
+ return rsVo ;
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瀹氭椂鎶ユ渶鏂拌褰�
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoTiming>> getTimingReportsLast(OnHourQO qo) {
+ qo.completionTime() ;
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmTimingReportLastMapper.getTimingReportsCount_last(params);
+
+ QueryResultVo<List<VoTiming>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmTimingReportLastMapper.getTimingReports_last(params);
+ return rsVo ;
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇宸ヤ綔鎶ュ巻鍙茶褰�
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoWork>> getWorkReportsHistory(OnHourQO qo) {
+ qo.completionTime() ;
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmWorkReportHistoryMapper.getWorkReportsCount_history(params);
+
+ QueryResultVo<List<VoWork>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmWorkReportHistoryMapper.getWorkReports_history(params);
+ return rsVo ;
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇宸ヤ綔鎶ユ渶鏂拌褰�
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoWork>> getWorkReportsLast(OnHourQO qo) {
+ qo.completionTime() ;
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmWorkReportLastMapper.getWorkReportsCount_last(params);
+
+ QueryResultVo<List<VoWork>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmWorkReportLastMapper.getWorkReports_last(params);
+ return rsVo ;
+ }
}
--
Gitblit v1.8.0