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/IrrigationCtrl.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java index 9399a4d..6962e05 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigation/IrrigationCtrl.java @@ -46,14 +46,14 @@ } @GetMapping(path = "/getSimpleGroups") - public BaseResponse<QueryResultVo<List<VoGroupSimple>>> getSimpleGroups(QoGroup qo) { - //if(qo.getProjectId() == null) { - // return BaseResponseUtils.buildErrorMsg("璇烽�夋嫨椤圭洰"); - //} + public BaseResponse<List<VoGroupSimple>> getSimpleGroups(QoGroup qo) { + if(qo.getProjectId() == null) { + return BaseResponseUtils.buildErrorMsg("璇烽�夋嫨椤圭洰"); + } try { - QueryResultVo<List<VoGroupSimple>> res = irrigationSv.getSimpleGroups(qo); - return BaseResponseUtils.buildSuccess(res); + //QueryResultVo<List<VoGroupSimple>> res = irrigationSv.getSimpleGroups(qo); + return BaseResponseUtils.buildSuccess(irrigationSv.getSimpleGroups(qo)); } catch (Exception e) { log.error("鑾峰彇杞亴缁勮褰曞紓甯�", e); return BaseResponseUtils.buildException(e.getMessage()); -- Gitblit v1.8.0