From b8bb7aac6f648cac32d14e44c9f410f383b53500 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 15 四月 2025 10:17:19 +0800
Subject: [PATCH] 更新上海接口V3.2
---
src/main/java/com/fzzy/api/timer/ApiSH2023Scheduled.java | 12 ++++++++++++
src/main/java/com/fzzy/api/view/repository/Api1201Rep.java | 9 +++++++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1115.java | 3 +++
src/main/java/com/fzzy/api/entity/Api1201.java | 4 ++++
src/main/java/com/fzzy/push/impl/ComPushService90.java | 2 +-
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java | 3 +++
src/main/resources/application.yml | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java | 2 ++
8 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1201.java b/src/main/java/com/fzzy/api/entity/Api1201.java
index 34275dd..1933f9e 100644
--- a/src/main/java/com/fzzy/api/entity/Api1201.java
+++ b/src/main/java/com/fzzy/api/entity/Api1201.java
@@ -244,4 +244,8 @@
@PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
@Column(name = "syncTime")
private Date syncTime;
+
+ @PropertyDef(label = "杞崲骞村害", description = "鐩墠涓婃捣浣跨敤")
+ @Column(name = "lhnd")
+ private String lhnd;
}
diff --git a/src/main/java/com/fzzy/api/timer/ApiSH2023Scheduled.java b/src/main/java/com/fzzy/api/timer/ApiSH2023Scheduled.java
index c0e0c03..7d5d870 100644
--- a/src/main/java/com/fzzy/api/timer/ApiSH2023Scheduled.java
+++ b/src/main/java/com/fzzy/api/timer/ApiSH2023Scheduled.java
@@ -7,6 +7,7 @@
import com.fzzy.otherview.sh2023.pr.SHApi1115PR;
import com.fzzy.push.sh2023.dto.SH2023Api1115;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -29,6 +30,8 @@
private Api1102Rep api1102Rep;
@Autowired
private Api1105Rep api1105Rep;
+ @Autowired
+ private Api1201Rep api1201Rep;
@Autowired
private Api1202Rep api1202Rep;
@Autowired
@@ -91,6 +94,15 @@
}
}
}
+
+ //璁剧疆鍚堝悓鏁�
+ Integer hts = 0;
+ List<Api1201> api1201List = api1201Rep.getNumByLhnd(api1102.getKqdm(), DateFormatUtils.format(new Date(), "yyyy"));
+ if(api1201List != null && api1201List.size() > 0){
+ hts = api1201List.size();
+ }
+ sh2023Api1115.setHts(hts + "");
+
//鍏ュ簱鏉℃暟
List<Api1202> api1202List = api1202Rep.getDataByYwrq(api1102.getKqdm(), DateUtil.getYearFirst(exeDate), exeDate);
if(null != api1202List && api1202List.size() > 0){
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java
index e145f39..a4eb507 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java
@@ -35,4 +35,13 @@
*/
@Query("from Api1201 where bizId =:bizId")
List<Api1201> getDataByBizId(@Param("bizId") String bizId);
+
+ /**
+ * 鏍规嵁搴撳尯浠ｇ爜鍜岃疆鎹㈠勾搴︽煡璇㈠悎鍚屼俊鎭�
+ * @param kqdm
+ * @param lhnd
+ * @return
+ */
+ @Query("from Api1201 where kqdm=:kqdm and lhnd =:lhnd")
+ List<Api1201> getNumByLhnd(@Param("kqdm") String kqdm, @Param("lhnd") String lhnd);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
index e6eb531..8d8f38c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -161,6 +161,8 @@
apiData.setYdwcsj(sysData.getEndTime());
apiData.setBfqyr(StringUtils.isEmpty(sysData.getSignUser()) ? "鏈柟绛剧害浜�" : sysData.getSignUser());
+ //璁剧疆骞村害
+ apiData.setLhnd(sysData.getYear());
apiData.setSyncTime(new Date());
apiData.setBizId(sysData.getId());
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService90.java b/src/main/java/com/fzzy/push/impl/ComPushService90.java
index c99ce25..4f82a3a 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService90.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService90.java
@@ -54,7 +54,7 @@
* 9101 鏁版嵁鐩哥鎬ф帴鍙�--涓婃捣甯傚钩鍙�
*/
public void pushData9101(ApiRemoteService apiRemoteService, ApiParam param) {
- // 鑾峰彇 瑙嗛鐩戞帶鎺ュ彛鏁版嵁
+ // 鑾峰彇 鏁版嵁鐩哥鎬ф帴鍙ｆ暟鎹�
List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(Constant.API_CODE_9101);
if (null == items || items.isEmpty()) {
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1115.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1115.java
index b9e2201..9d625ba 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1115.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1115.java
@@ -66,4 +66,7 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
+
+ @PropertyDef(label = "鍚堝悓鏁�", description = "鍏宠仈鏈疆鎹㈠勾搴﹀悎鍚屾�绘暟")
+ private String hts;
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
index 919997b..c3e00a3 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
@@ -168,4 +168,7 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
+
+ @PropertyDef(label = "杞崲骞村害")
+ private String lhnd;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bbeeabd..86a70b3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ##########################
spring:
profiles:
- active: dev
+ active: pro
application:
name: igds-api
main:
--
Gitblit v1.9.3