From e5025d27ea3bbaad002227c7f4b2871f0d9e12df Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 27 八月 2025 17:02:23 +0800
Subject: [PATCH] 1、作物蒸腾量定时计算任务修改逻辑，以保证数据源准确性；2、修改null值bug。
---
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/timingTask/CalculateJob.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/timingTask/CalculateJob.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/timingTask/CalculateJob.java
index c5c184a..601daa7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/timingTask/CalculateJob.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/timingTask/CalculateJob.java
@@ -3,12 +3,15 @@
import com.dy.common.multiDataSource.DataSourceContext;
import com.dy.common.schedulerTask.TaskJob;
import com.dy.common.springUtil.SpringContextUtil;
+import com.dy.pipIrrGlobal.util.Org;
import com.dy.pipIrrModel.modelCalculate.ModelCalculator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
+
+import java.util.List;
/**
* @Author: liurunyu
@@ -19,21 +22,24 @@
private static Logger log = LogManager.getLogger(CalculateJob.class.getName()) ;
- private String orgTag ;
+ private List<Org.OrgVo> orgList ;
@Override
public void execute(JobExecutionContext ctx) throws JobExecutionException {
JobDataMap jobDataMap = ctx.getJobDetail().getJobDataMap() ;
if(jobDataMap != null){
- orgTag = (String)jobDataMap.get(ModelListener.orgKey) ;
+ orgList = (List<Org.OrgVo>)jobDataMap.get(ModelListener.orgListKey) ;
}
- if(orgTag == null){
+ if(orgList == null){
return ;
}
- DataSourceContext.set(orgTag);//璁剧疆鏁版嵁婧�
- ModelCalculator bean = (ModelCalculator)SpringContextUtil.getBean(ModelCalculator.selfBeanName);
- if(bean != null){
- bean.execute();
+
+ for(Org.OrgVo vo : orgList){
+ DataSourceContext.set(vo.tag);//璁剧疆鏁版嵁婧�
+ ModelCalculator bean = (ModelCalculator)SpringContextUtil.getBean(ModelCalculator.selfBeanName);
+ if(bean != null){
+ bean.execute();
+ }
}
}
}
--
Gitblit v1.8.0