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-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java
index af11c12..266d941 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java
@@ -5,7 +5,6 @@
import com.dy.pipIrrGlobal.daoMd.MdCropsMapper;
import com.dy.pipIrrGlobal.daoPr.PrStWeatherMapper;
import com.dy.pipIrrGlobal.pojoMd.MdCrops;
-import com.dy.pipIrrGlobal.pojoPr.PrStWeather;
import com.dy.pipIrrGlobal.voMd.VoCrops;
import com.dy.pipIrrGlobal.voPr.VoWeather;
import lombok.extern.slf4j.Slf4j;
@@ -27,10 +26,13 @@
public class CropsSv {
private MdCropsMapper mdCropsDao ;
- private PrStWeatherMapper prStWeatherMapper ;
+ private PrStWeatherMapper prStWeatherDao;
@Autowired
- private void setDao(MdCropsMapper dao) { this.mdCropsDao = dao; }
+ private void setDao(MdCropsMapper mdCropsDao, PrStWeatherMapper prStWeatherDao) {
+ this.mdCropsDao = mdCropsDao;
+ this.prStWeatherDao = prStWeatherDao;
+ }
/**
* 寰楀埌涓�涓疄浣�
@@ -43,7 +45,7 @@
this.setStoppedStr(vo) ;
this.setLife(vo) ;
if(vo.weatherId != null){
- VoWeather wVo = this.prStWeatherMapper.selectOne(vo.weatherId) ;
+ VoWeather wVo = this.prStWeatherDao.selectOne(vo.weatherId) ;
if(wVo != null){
vo.weatherName = wVo.getName() ;
}
--
Gitblit v1.8.0