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-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java
index 11928ca..0a5441c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java
@@ -1,13 +1,19 @@
package com.dy.pipIrrProject.intakeController;
+import cn.hutool.core.date.DateTime;
+import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoPr.PrControllerTrampMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeControllerMapper;
import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
import com.dy.pipIrrGlobal.pojoPr.PrIntakeController;
import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -91,4 +97,43 @@
public Integer deleteTrampController(Long controllerId) {
return prControllerTrampMapper.deleteByPrimaryKey(controllerId);
}
+
+ /**
+ * 娓呯┖娴佹氮鎺у埗鍣�
+ * @param
+ * @return
+ */
+ public Integer emptyTrampController() {
+ return prControllerTrampMapper.emptyTrampController();
+ }
+
+ //娴佹氮鎺у埗鍣ㄥ
+ public Integer addTrampController(PrControllerTramp record){
+ return prControllerTrampMapper.insertSelective(record);
+ }
+
+
+/*娴佹氮鎺у埗鍣ㄦ煡*/
+ public QueryResultVo<List<PrControllerTramp>> getTrampControllers(TrampControllerQueryVo queryVo){
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+ Long itemTotal = prControllerTrampMapper.getTrampControllersCount(params);
+
+ QueryResultVo<List<PrControllerTramp>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = prControllerTrampMapper.getTrampControllers(params);
+
+ return rsVo;
+ }
+ /**
+ * 淇敼缁戝畾璁板綍閫氳繃鍙栨按鍙�
+ * @param record
+ * @return
+ */
+ public Integer updateBindRecord(PrIntakeController record){
+ return prIntakeControllerMapper.updateByIntakeSelective(record);
+ }
}
--
Gitblit v1.8.0