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-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java | 47 +++++++++++++++++++----------------------------
1 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java
index 55c979c..53d5b19 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationSv.java
@@ -1,11 +1,12 @@
package com.dy.pipIrrWechat.irrigation;
import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pipIrrGlobal.daoIr.IrGroupClientMapper;
-import com.dy.pipIrrGlobal.daoIr.IrUnitClientMapper;
+import com.dy.pipIrrGlobal.daoIr.IrIrrigateGroupMapper;
+import com.dy.pipIrrGlobal.daoIr.IrProjectMapper;
import com.dy.pipIrrGlobal.voIr.VoGroupSimple;
-import com.dy.pipIrrGlobal.voIr.VoUnitSimple;
-import com.dy.pipIrrWechat.irrigation.qo.QoClient;
+import com.dy.pipIrrGlobal.voIr.VoProjectSimple;
+import com.dy.pipIrrWechat.irrigation.qo.QoGroup;
+import com.dy.pipIrrWechat.irrigation.qo.QoProject;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,46 +26,36 @@
@Service
public class IrrigationSv {
@Autowired
- private IrGroupClientMapper irGroupClientMapper;
+ private IrProjectMapper irProjectMapper;
@Autowired
- private IrUnitClientMapper irUnitClientMapper;
+ private IrIrrigateGroupMapper irIrrigateGroupMapper;
/**
- * 鏍规嵁鍐滄埛缂栧彿鑾峰彇杞亴缁勫垪琛�
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇椤圭洰璁板綍(绮剧畝)
* @param queryVo
* @return
*/
- public QueryResultVo<List<VoGroupSimple>> getGroupsByClientId(QoClient queryVo) {
+ public List<VoProjectSimple> getSimpleProjects(QoProject queryVo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
-
- Long itemTotal = irGroupClientMapper.getGroupCountByClientId(params);
-
- QueryResultVo<List<VoGroupSimple>> rsVo = new QueryResultVo<>();
- rsVo.pageSize = queryVo.pageSize;
- rsVo.pageCurr = queryVo.pageCurr;
-
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = irGroupClientMapper.getGroupsByClientId(params);
- return rsVo;
+ return irProjectMapper.getSimpleProjects(params);
}
/**
- * 鏍规嵁鍐滄埛缂栧彿鑾峰彇鐏屾簤鍗曞厓鍒楄〃
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇杞亴缁勫垪琛�
* @param queryVo
* @return
*/
- public QueryResultVo<List<VoUnitSimple>> getUnitsByClientId(QoClient queryVo) {
+ public List<VoGroupSimple> getSimpleGroups(QoGroup queryVo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+ //Long itemTotal = irIrrigateGroupMapper.getSimpleGroupCount(params);
- Long itemTotal = irUnitClientMapper.getUnitCountByClientId(params);
+ //QueryResultVo<List<VoGroupSimple>> rsVo = new QueryResultVo<>();
- QueryResultVo<List<VoUnitSimple>> rsVo = new QueryResultVo<>();
- rsVo.pageSize = queryVo.pageSize;
- rsVo.pageCurr = queryVo.pageCurr;
-
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = irUnitClientMapper.getUnitsByClientId(params);
- return rsVo;
+ //rsVo.calculateAndSet(itemTotal, params);
+ //rsVo.obj = irIrrigateGroupMapper.getSimpleGroups(params);
+ //return rsVo;
+ return irIrrigateGroupMapper.getSimpleGroups(params);
}
+
}
--
Gitblit v1.8.0