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-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
index 3ced131..bbe60a5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
@@ -73,11 +73,13 @@
//瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
String timeStart = queryVo.getTimeStart();
String timeStop = queryVo.getTimeStop();
- if (timeStart != null && timeStart != "") {
+
+ if (timeStart == null || timeStart == "" || timeStop == null || timeStop == "") {
+ queryVo.setTimeStart(null);
+ queryVo.setTimeStop(null);
+ } else {
timeStart = timeStart + " 00:00:00";
queryVo.setTimeStart(timeStart);
- }
- if (timeStop != null && timeStop != "") {
timeStop = timeStop + " 23:59:59";
queryVo.setTimeStop(timeStop);
}
@@ -119,4 +121,23 @@
public int updateInspectDistance(Long inspectId, double distance ) {
return opeInspectMapper.updateInspectDistance(inspectId, distance);
}
+
+ /**
+ * 鏍规嵁宸℃鍛業D鑾峰彇宸℃鍒楄〃
+ * @param queryVo
+ * @return
+ */
+ public QueryResultVo<List<VoInspect>> getInstectsByInspectorId(QoInspect queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+ Long itemTotal = opeInspectMapper.getInstectsCountByInspectorId(params);
+
+ QueryResultVo<List<VoInspect>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = opeInspectMapper.getInstectsByInspectorId(params);
+ return rsVo;
+ }
}
--
Gitblit v1.8.0