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/manure/ManureSv.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java
index 609c9fd..f6d3ff7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java
@@ -28,14 +28,15 @@
@Autowired
private RmManureLastMapper rmManureLastDao ;
- /**
- * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍
- * @param qo
- * @return
- */
- public QueryResultVo<List<VoManure>> selectHistory(ManureQo qo) {
- qo.completionTime();
+ public VoManure oneLast(Long manureId) {
+ List<VoManure> list = this.rmManureLastDao.selectSomeByManureId(manureId) ;
+ if(list != null && list.size() > 0) {
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ public QueryResultVo<List<VoManure>> oneHistory(ManureQo qo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmManureHistoryDao.selectCount(params);
@@ -53,7 +54,7 @@
* @param qo
* @return
*/
- public QueryResultVo<List<VoManure>> selectLast(ManureQo qo) {
+ public QueryResultVo<List<VoManure>> someLast(ManureQo qo) {
qo.completionTime();
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
@@ -67,4 +68,25 @@
rsVo.obj = rmManureLastDao.selectSome(params);
return rsVo ;
}
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoManure>> someHistory(ManureQo qo) {
+ qo.completionTime();
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmManureHistoryDao.selectCount(params);
+
+ QueryResultVo<List<VoManure>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmManureHistoryDao.selectSome(params);
+ return rsVo ;
+ }
+
}
--
Gitblit v1.8.0