From f1196ce7613f40c7f7560feb8ae8264a89bbd73e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 10 Apr 2024 16:55:36 +0800
Subject: [PATCH] 蓄水放水市州中台接口调用时更新数据,定时器添加参数

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/XsfsQktjServiceImpl.java |    5 +++++
 skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/SjztXxlJob.java      |   14 ++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/XsfsQktjServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/XsfsQktjServiceImpl.java
index aa157fa..f7bd546 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/XsfsQktjServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/service/impl/XsfsQktjServiceImpl.java
@@ -31,6 +31,7 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
@@ -179,6 +180,7 @@
 	 * @param xsfsQktj
 	 */
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void saveOrUpdateData(XsfsQktjVO xsfsQktj) {
 		// 参数拼接
 		StringBuilder builder = new StringBuilder("?");
@@ -225,6 +227,9 @@
 			XsfsQktj xsfsQktjBy = baseMapper.selectXsfsQktjBy(adCode,xsfsQktj.getQueryTime());
 			if (null!=xsfsQktjBy){
 				// 跳出本次循环
+				//更新
+				setXsfsQktjInfo(xsfsQktjBy,jsonArray,i,xsfsQktj.getQueryTime());
+				updateById(xsfsQktjBy);
 				continue;
 			}
 			XsfsQktj qkTj = new XsfsQktj();
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/SjztXxlJob.java b/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/SjztXxlJob.java
index e9fe05d..8cf925f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/SjztXxlJob.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/SjztXxlJob.java
@@ -5,10 +5,13 @@
 import cn.gistack.sm.sjztods.feign.IXsfsQktjClient;
 import cn.gistack.sm.sjztods.vo.SkxsQkTjVO;
 import cn.gistack.sm.sjztods.vo.XsfsQktjVO;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xxl.job.core.log.XxlJobLogger;
 import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -57,9 +60,16 @@
 	public ReturnT<String> execute(String param) {
 		XxlJobLogger.log("执行时间:"+ new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(DateUtil.now()));
 		XsfsQktjVO xsfsQktjVO = new XsfsQktjVO();
+		String todayDate = "";
+		if (StringUtil.isNotBlank(param)){
+			JSONObject jsonParam = JSON.parseObject(param);
+			String date = jsonParam.getString("date");
+			todayDate = date;
+		}else{
+			//设置今日时间
+			todayDate = new SimpleDateFormat("yyyy-MM-dd").format(DateUtil.now());
+		}
 
-		//设置今日时间
-		String todayDate = new SimpleDateFormat("yyyy-MM-dd").format(DateUtil.now());
 		xsfsQktjVO.setQueryTime(todayDate);
 
 		 xsfsQktjClient.saveRegionData(xsfsQktjVO);

--
Gitblit v1.9.3