From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilSv.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilSv.java
index cac7ee4..4cbfdf4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/soil/SoilSv.java
@@ -1,9 +1,11 @@
package com.dy.pipIrrRemote.mqttSd1.soil;
import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoRm.RmSoilDayMapper;
import com.dy.pipIrrGlobal.daoRm.RmSoilHistoryMapper;
import com.dy.pipIrrGlobal.daoRm.RmSoilLastMapper;
import com.dy.pipIrrGlobal.voRm.VoSoil;
+import com.dy.pipIrrGlobal.voRm.VoSoilDay;
import com.dy.pipIrrRemote.mqttSd1.soil.SoilQo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -25,9 +27,39 @@
public class SoilSv {
@Autowired
+ private RmSoilDayMapper rmSoilDayDao ;
+ @Autowired
private RmSoilHistoryMapper rmSoilHistoryDao ;
@Autowired
private RmSoilLastMapper rmSoilLastDao ;
+
+ public VoSoilDay oneDay(Long soilId, Integer yyyyMMdd) {
+ List<VoSoilDay> list = this.rmSoilDayDao.selectOneBySoilId(soilId, yyyyMMdd) ;
+ if(list != null && list.size() > 0) {
+ return list.get(0) ;
+ }
+ return null ;
+ }
+
+ public List<VoSoilDay> oneDayByMonth(Long soilId, Integer yyyyMMddStart, Integer yyyyMMddEnd) {
+ return this.rmSoilDayDao.selectOneMonthBySoilId(soilId, yyyyMMddStart, yyyyMMddEnd) ;
+ }
+
+
+ public QueryResultVo<List<VoSoilDay>> someDay(SoilQo qo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmSoilDayDao.selectCount(params);
+
+ QueryResultVo<List<VoSoilDay>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmSoilDayDao.selectSome(params);
+ return rsVo ;
+ }
+
+
public VoSoil oneLast(Long soilId) {
List<VoSoil> list = this.rmSoilLastDao.selectSomeBySoilId(soilId) ;
@@ -37,9 +69,7 @@
return null ;
}
- public QueryResultVo<List<VoSoil>> oneHistory(Long soilId) {
- SoilQo qo = new SoilQo() ;
- qo.soilId = soilId ;
+ public QueryResultVo<List<VoSoil>> oneHistory(SoilQo qo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmSoilHistoryDao.selectCount(params);
--
Gitblit v1.8.0