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 | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 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 27e1ccc..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
@@ -36,15 +36,9 @@
* @param queryVo
* @return
*/
- public QueryResultVo<List<VoProjectSimple>> getSimpleProjects(QoProject queryVo) {
+ public List<VoProjectSimple> getSimpleProjects(QoProject queryVo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
- Long itemTotal = irProjectMapper.getSimpleProjectsCount(params);
-
- QueryResultVo<List<VoProjectSimple>> rsVo = new QueryResultVo<>();
-
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = irProjectMapper.getSimpleProjects(params);
- return rsVo;
+ return irProjectMapper.getSimpleProjects(params);
}
/**
@@ -52,15 +46,16 @@
* @param queryVo
* @return
*/
- public QueryResultVo<List<VoGroupSimple>> getSimpleGroups(QoGroup queryVo) {
+ public List<VoGroupSimple> getSimpleGroups(QoGroup queryVo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
- Long itemTotal = irIrrigateGroupMapper.getSimpleGroupCount(params);
+ //Long itemTotal = irIrrigateGroupMapper.getSimpleGroupCount(params);
- QueryResultVo<List<VoGroupSimple>> rsVo = new QueryResultVo<>();
+ //QueryResultVo<List<VoGroupSimple>> rsVo = new QueryResultVo<>();
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = irIrrigateGroupMapper.getSimpleGroups(params);
- return rsVo;
+ //rsVo.calculateAndSet(itemTotal, params);
+ //rsVo.obj = irIrrigateGroupMapper.getSimpleGroups(params);
+ //return rsVo;
+ return irIrrigateGroupMapper.getSimpleGroups(params);
}
}
--
Gitblit v1.8.0