diff --git a/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java b/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java
index f855469..7eaba0f 100644
--- a/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java
+++ b/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java
@@ -133,6 +133,7 @@ public class DataTaskTSG {
for (StPptnR stPptnR : stcdLastPptnDatas) {
Calendar calendar = Calendar.getInstance();
String stcd = stPptnR.getStcd();
+ String source = stPptnR.getSource().toLowerCase();
Date stm = stPptnR.getStm();
// 默认30天前
if (ObjectUtils.isEmpty(stm)) {
@@ -153,7 +154,12 @@ public class DataTaskTSG {
}
}
stm = calendar.getTime();
- String url = jcskPath + jcskPathPptnRoute + stPptnR.getSource().toLowerCase();
+ String url = jcskPath;
+ if ("shylres".equals(source)) {
+ url += "/" + source + "/pptn";
+ } else {
+ url += jcskPathPptnRoute + stPptnR.getSource().toLowerCase();
+ }
Response resp = client.newCall(new Request.Builder().url(url)
.post(new FormBody.Builder().add("stcd", stcd)
.add("stm", sdf.format(stm))
@@ -272,12 +278,16 @@ public class DataTaskTSG {
}
stm = calendar.getTime();
String url = jcskPath;
- if ("rr".equals(sttp)) {
- url += jcskPathZzRsvrRoute + source;
- } else if ("zz".equals(sttp)) {
- url += jcskPathRrRiverRoute + source;
+ if("shylres".equals(source)) {
+ url += "/" + source + "/rsvr";
} else {
- continue;
+ if ("rr".equals(sttp)) {
+ url += jcskPathZzRsvrRoute + source;
+ } else if ("zz".equals(sttp)) {
+ url += jcskPathRrRiverRoute + source;
+ } else {
+ continue;
+ }
}
Response resp = client.newCall(new Request.Builder().url(url)
.post(new FormBody.Builder().add("stcd", stRsvrR.getStcd())
@@ -343,7 +353,13 @@ public class DataTaskTSG {
for (StPptnR stPptnR : stcdLastPptnDatas) {
String stm = "2024-01-01 00:00:00";// 补数据的开始时间
Calendar calendar = Calendar.getInstance();
- String url = jcskPath + jcskPathPptnRoute + stPptnR.getSource().toLowerCase();
+ String source = stPptnR.getSource().toLowerCase();
+ String url = jcskPath;
+ if ("shylres".equals(source)) {
+ url += "/" + source + "/pptn";
+ } else {
+ url += jcskPathPptnRoute + stPptnR.getSource().toLowerCase();
+ }
String stcd = stPptnR.getStcd();
Date etmD = null;
if (ObjectUtils.isEmpty(stPptnR.getEtm())) {
@@ -472,12 +488,16 @@ public class DataTaskTSG {
continue;
}
String url = jcskPath;
- if ("rr".equals(sttp)) {
- url += jcskPathZzRsvrRoute + source;
- } else if ("zz".equals(sttp)) {
- url += jcskPathRrRiverRoute + source;
+ if("shylres".equals(source)) {
+ url += "/" + source + "/rsvr";
} else {
- continue;
+ if ("rr".equals(sttp)) {
+ url += jcskPathZzRsvrRoute + source;
+ } else if ("zz".equals(sttp)) {
+ url += jcskPathRrRiverRoute + source;
+ } else {
+ continue;
+ }
}
// 结束日期往前减4分钟,防止数据重复
Calendar calendarEtm = Calendar.getInstance();
diff --git a/src/main/resources/mapper/StPptnRMapper.xml b/src/main/resources/mapper/StPptnRMapper.xml
index 0213a87..7b2cd8a 100644
--- a/src/main/resources/mapper/StPptnRMapper.xml
+++ b/src/main/resources/mapper/StPptnRMapper.xml
@@ -11,7 +11,7 @@
LEFT JOIN (SELECT *
FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY stcd ORDER BY tm DESC ) AS rn FROM public.st_pptn_r) subquery
WHERE subquery.rn = 1) r ON stb.stcd = r.stcd
- WHERE stb.source in ('QX', 'SW', 'SH')
+ WHERE stb.source in ('QX', 'SW', 'SH', 'SHYLRES')