From 5e765b7358c0a1f91b30acf48d442c08073fdbed Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 30 九月 2025 16:06:58 +0800
Subject: [PATCH] 优化数据源配置
---
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsSv.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 a7e741b..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
@@ -3,8 +3,10 @@
import com.dy.common.util.DateTime;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoMd.MdCropsMapper;
+import com.dy.pipIrrGlobal.daoPr.PrStWeatherMapper;
import com.dy.pipIrrGlobal.pojoMd.MdCrops;
import com.dy.pipIrrGlobal.voMd.VoCrops;
+import com.dy.pipIrrGlobal.voPr.VoWeather;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +26,13 @@
public class CropsSv {
private MdCropsMapper mdCropsDao ;
+ 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;
+ }
/**
* 寰楀埌涓�涓疄浣�
@@ -38,6 +44,12 @@
if(vo != null){
this.setStoppedStr(vo) ;
this.setLife(vo) ;
+ if(vo.weatherId != null){
+ VoWeather wVo = this.prStWeatherDao.selectOne(vo.weatherId) ;
+ if(wVo != null){
+ vo.weatherName = wVo.getName() ;
+ }
+ }
}
return vo ;
}
@@ -139,6 +151,7 @@
}
if(days > vo.life4End){
vo.lifeCur = "宸茬粨鏉�" ;
+ vo.lifeLenStr = "--" ;
}
}
if(vo.life3Start != null && vo.life3End != null){
@@ -163,8 +176,12 @@
}
if(days < vo.life1Start){
vo.lifeCur = "鏈紑濮�" ;
+ vo.lifeLenStr = "--" ;
}
}
+ }else{
+ vo.lifeCur = "鏈紑濮�" ;
+ vo.lifeLenStr = "--" ;
}
}
}catch (Exception e){
--
Gitblit v1.8.0