yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tsg' into tsg

master
李一帆 2025-04-07 16:53:57 +08:00
parent 8037cc33e2 b2040b0f8b
commit 62e58e7183
3 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java
View File

@ -133,6 +133,7 @@ public class DataTaskTSG {
for (StPptnR stPptnR : stcdLastPptnDatas) { for (StPptnR stPptnR : stcdLastPptnDatas) {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
String stcd = stPptnR.getStcd(); String stcd = stPptnR.getStcd();
String source = stPptnR.getSource().toLowerCase();
Date stm = stPptnR.getStm(); Date stm = stPptnR.getStm();
// 默认30天前 // 默认30天前
if (ObjectUtils.isEmpty(stm)) { if (ObjectUtils.isEmpty(stm)) {
@ -153,7 +154,12 @@ public class DataTaskTSG {
} }
} }
stm = calendar.getTime(); 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) Response resp = client.newCall(new Request.Builder().url(url)
.post(new FormBody.Builder().add("stcd", stcd) .post(new FormBody.Builder().add("stcd", stcd)
.add("stm", sdf.format(stm)) .add("stm", sdf.format(stm))
@ -272,12 +278,16 @@ public class DataTaskTSG {
} }
stm = calendar.getTime(); stm = calendar.getTime();
String url = jcskPath; String url = jcskPath;
if ("rr".equals(sttp)) { if("shylres".equals(source)) {
url += jcskPathZzRsvrRoute + source; url += "/" + source + "/rsvr";
} else if ("zz".equals(sttp)) {
url += jcskPathRrRiverRoute + source;
} else { } 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) Response resp = client.newCall(new Request.Builder().url(url)
.post(new FormBody.Builder().add("stcd", stRsvrR.getStcd()) .post(new FormBody.Builder().add("stcd", stRsvrR.getStcd())
@ -343,7 +353,13 @@ public class DataTaskTSG {
for (StPptnR stPptnR : stcdLastPptnDatas) { for (StPptnR stPptnR : stcdLastPptnDatas) {
String stm = "2024-01-01 00:00:00";// 补数据的开始时间 String stm = "2024-01-01 00:00:00";// 补数据的开始时间
Calendar calendar = Calendar.getInstance(); 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(); String stcd = stPptnR.getStcd();
Date etmD = null; Date etmD = null;
if (ObjectUtils.isEmpty(stPptnR.getEtm())) { if (ObjectUtils.isEmpty(stPptnR.getEtm())) {
@ -472,12 +488,16 @@ public class DataTaskTSG {
continue; continue;
} }
String url = jcskPath; String url = jcskPath;
if ("rr".equals(sttp)) { if("shylres".equals(source)) {
url += jcskPathZzRsvrRoute + source; url += "/" + source + "/rsvr";
} else if ("zz".equals(sttp)) {
url += jcskPathRrRiverRoute + source;
} else { } else {
continue; if ("rr".equals(sttp)) {
url += jcskPathZzRsvrRoute + source;
} else if ("zz".equals(sttp)) {
url += jcskPathRrRiverRoute + source;
} else {
continue;
}
} }
// 结束日期往前减4分钟，防止数据重复 // 结束日期往前减4分钟，防止数据重复
Calendar calendarEtm = Calendar.getInstance(); Calendar calendarEtm = Calendar.getInstance();

4
src/main/resources/mapper/StPptnRMapper.xml
View File

@ -11,7 +11,7 @@
LEFT JOIN (SELECT * LEFT JOIN (SELECT *
FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY stcd ORDER BY tm DESC ) AS rn FROM public.st_pptn_r) subquery 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 subquery.rn = 1) r ON stb.stcd = r.stcd
WHERE stb.source in ('QX', 'SW', 'SH') WHERE stb.source in ('QX', 'SW', 'SH', 'SHYLRES')
</select> </select>
<select id="getStcdFirstPptnData" resultType="com.gunshi.project.xyt.model.StPptnR"> <select id="getStcdFirstPptnData" resultType="com.gunshi.project.xyt.model.StPptnR">
@ -23,7 +23,7 @@
LEFT JOIN (SELECT * LEFT JOIN (SELECT *
FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY stcd ORDER BY tm ASC ) AS rn FROM public.st_pptn_r) subquery FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY stcd ORDER BY tm ASC ) AS rn FROM public.st_pptn_r) subquery
WHERE subquery.rn = 1) r ON stb.stcd = r.stcd 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')
</select> </select>
<select id="getPptnRDataList" resultType="java.util.Map"> <select id="getPptnRDataList" resultType="java.util.Map">

4
src/main/resources/mapper/StRsvrRMapper.xml
View File

@ -14,7 +14,7 @@
LEFT JOIN (SELECT * LEFT JOIN (SELECT *
FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY stcd ORDER BY tm DESC ) AS rn FROM public.st_river_r) subquery2 FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY stcd ORDER BY tm DESC ) AS rn FROM public.st_river_r) subquery2
WHERE subquery2.rn = 1) r2 ON stb.stcd = r2.stcd WHERE subquery2.rn = 1) r2 ON stb.stcd = r2.stcd
WHERE stb.source in ('SW', 'SH') WHERE stb.source in ('SW', 'SH', 'SHYLRES')
</select> </select>
<select id="getStcdFirstRsvrData" resultType="com.gunshi.project.xyt.model.StRsvrR"> <select id="getStcdFirstRsvrData" resultType="com.gunshi.project.xyt.model.StRsvrR">
SELECT stb.stcd, SELECT stb.stcd,
@ -28,6 +28,6 @@
LEFT JOIN (SELECT * LEFT JOIN (SELECT *
FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY stcd ORDER BY tm ASC ) AS rn FROM public.st_river_r) subquery2 FROM (SELECT *, ROW_NUMBER() OVER ( PARTITION BY stcd ORDER BY tm ASC ) AS rn FROM public.st_river_r) subquery2
WHERE subquery2.rn = 1) r2 ON stb.stcd = r2.stcd WHERE subquery2.rn = 1) r2 ON stb.stcd = r2.stcd
WHERE stb.source in ('SW', 'SH') WHERE stb.source in ('SW', 'SH', 'SHYLRES')
</select> </select>
</mapper> </mapper>