From eb5a6e5a54efa997971beffc909bcadc06dc8886 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 21 四月 2025 10:45:16 +0800
Subject: [PATCH] 1、江海测试系统设备类型默认为阀； 2、完善通信中间件测试消息推送代码； 3、增加队列数据结构注释； 4、121服务器相关的初始化配置文件bug修改； 5、其他注释完善。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 228 insertions(+), 0 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
new file mode 100644
index 0000000..0bf3b74
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
@@ -0,0 +1,228 @@
+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.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;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-07-23 16:02
+ * @LastEditTime 2024-07-23 16:02
+ * @Description 鍚勭被鏁版嵁鎶ユ湇鍔＄被
+ */
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ReportSv {
+ // 闃�鎺у櫒鏁寸偣鎶AO
+ private final RmOnHourReportHistoryMapper rmOnHourReportHistoryMapper;
+ private final RmOnHourReportLastMapper rmOnHourReportLastMapper;
+
+ // 闃�鎺у櫒寮�鍏抽榾鎶AO
+ private final RmOpenCloseValveHistoryMapper rmOpenCloseValveHistoryMapper;
+ private final RmOpenCloseValveLastMapper rmOpenCloseValveLastMapper;
+
+ // 闃�鎺у櫒瀹氭椂鎶AO
+ private final RmTimingReportHistoryMapper rmTimingReportHistoryMapper;
+ private final RmTimingReportLastMapper rmTimingReportLastMapper;
+
+ // 宸ヤ綔鎶AO
+ private final RmWorkReportHistoryMapper rmWorkReportHistoryMapper;
+ private final RmWorkReportLastMapper rmWorkReportLastMapper;
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏁寸偣鎶ュ巻鍙茶褰�
+ * @param qo
+ * @return
+ */
+ 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);
+
+ QueryResultVo<List<VoOnHour>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmOnHourReportHistoryMapper.getOnHourReports_history(params);
+ 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) {
+ qo.completionTimeNoEmpty() ;
+
+ 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