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/ManureCtrl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureCtrl.java
index 1b6f71b..7ff4de2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureCtrl.java
@@ -35,15 +35,37 @@
}
/**
+ * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鏈�鏂拌褰�
+ * @param manureId
+ * @return
+ */
+ @GetMapping(path = "oneLast")
+ @SsoAop()
+ public BaseResponse<VoManure> oneLast(Long manureId){
+ try {
+ if(manureId == null){
+ return BaseResponseUtils.buildFail("姘磋偉鏈篿d涓嶈兘涓虹┖") ;
+ }
+ return BaseResponseUtils.buildSuccess(sv.oneLast(manureId));
+ } catch (Exception e) {
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
* 鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍
* @param qo
* @return
*/
- @GetMapping(path = "history")
+ @GetMapping(path = "oneHistory")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoManure>>> selectHistory(ManureQo qo){
+ public BaseResponse<QueryResultVo<List<VoManure>>> oneHistory(ManureQo qo){
try {
- return BaseResponseUtils.buildSuccess(sv.selectHistory(qo));
+ if(qo.manureId == null){
+ return BaseResponseUtils.buildFail("姘磋偉鏈篿d涓嶈兘涓虹┖") ;
+ }
+ qo.completionTime();
+ return BaseResponseUtils.buildSuccess(sv.oneHistory(qo));
} catch (Exception e) {
return BaseResponseUtils.buildException(e.getMessage()) ;
}
@@ -54,11 +76,28 @@
* @param qo
* @return
*/
- @GetMapping(path = "last")
+ @GetMapping(path = "someLast")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoManure>>> selectLast(ManureQo qo){
+ public BaseResponse<QueryResultVo<List<VoManure>>> someLast(ManureQo qo){
try {
- return BaseResponseUtils.buildSuccess(sv.selectLast(qo));
+ qo.completionTime();
+ return BaseResponseUtils.buildSuccess(sv.someLast(qo));
+ } catch (Exception e) {
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍
+ * @param qo
+ * @return
+ */
+ @GetMapping(path = "someHistory")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoManure>>> someHistory(ManureQo qo){
+ try {
+ qo.completionTime();
+ return BaseResponseUtils.buildSuccess(sv.someHistory(qo));
} catch (Exception e) {
return BaseResponseUtils.buildException(e.getMessage()) ;
}
--
Gitblit v1.8.0