From eb28cab79dc230ed71771f3984bcab69a435e53b Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 25 十一月 2024 18:15:47 +0800
Subject: [PATCH] 接口调整，增加封仓确认单同步
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java | 2
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2442.java | 68 ++++++
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2445.java | 27 ++
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2449.java | 28 ++
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2443.java | 26 ++
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2446.java | 27 ++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1213.java | 130 +++++++++++
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2448.java | 27 ++
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 6
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2447.java | 27 ++
src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2444.java | 28 ++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java | 2
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java | 2
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1209.java | 16 +
src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java | 12 +
src/main/resources/application-pro5349.yml | 4
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1213Rep.java | 24 ++
src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java | 2
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java | 4
src/main/resources/application-dev.yml | 30 ++
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 4
src/main/resources/application.yml | 2
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotStatusConfirm.java | 109 +++++++++
23 files changed, 590 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 96b0ffa..bdfbef9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -43,6 +43,8 @@
@Autowired
private Fzzy40Sync1212 fzzySync1212;
@Autowired
+ private Fzzy40Sync1213 fzzySync1213;
+ @Autowired
private Fzzy40Sync1109 fzzySync1109;
@Autowired
private Fzzy40Sync2102 fzzySync2102;
@@ -97,6 +99,8 @@
//璐﹂潰搴撳瓨淇℃伅鍚屾
fzzySync1211.syncData(kqdm, deptId, start, end);
+ //灏佷粨纭淇℃伅鍚屾
+ fzzySync1213.syncData(kqdm, deptId, start, end);
/*-----鍚勭渷鐙湁鎺ュ彛淇℃伅鍚屾-----*/
//涓婃捣甯傚钩鍙�2023鐗�
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotStatusConfirm.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotStatusConfirm.java
new file mode 100644
index 0000000..7bf413d
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotStatusConfirm.java
@@ -0,0 +1,109 @@
+package com.fzzy.async.fzzy40.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Desc: 浠撴埧鐘舵�佺‘璁よ〃
+ * @author:
+ * @update-time:
+ */
+@Data
+@Entity
+@Table(name = "D_DEPOT_STATUS_CONFIRM")
+public class Fz40DepotStatusConfirm {
+
+ /**
+ * 21yyyyMMdd+鍥涗綅椤哄簭鍙�
+ * 21202405041234
+ */
+ @Id
+ @Column(name = "fcqrdh", length = 14)
+ @PropertyDef(label = "灏佷粨纭鍗曞彿", description = "鏍规嵁涓�瀹氱殑瑙勫垯鐢熸垚")
+ private String fcqrdh;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 50)
+ @PropertyDef(label = "搴撳尯缂栫爜")
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 28)
+ @PropertyDef(label = "璐т綅缂栫爜")
+ private String depotId;
+
+ /*** ------------------------纭鍐呭-------------------------------------**/
+ @Column(name = "fcrq")
+ @PropertyDef(label = "灏佷粨鏃ユ湡", description = "yyyy-MM-dd")
+ private Date fcrq;
+
+ @Column(name = "FOOD_VARIETY_", length = 20)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 20)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "FOOD_LOCATION_ID_", length = 20)
+ @PropertyDef(label = "浜у湴鍚嶇О浠ｇ爜")
+ private String foodLocationId;
+
+ @Column(name = "FOOD_LOCATION_", length = 40)
+ @PropertyDef(label = "浜у湴鍚嶇О")
+ private String foodLocation;
+
+ @Column(name = "FOOD_YEAR_", length = 10)
+ @PropertyDef(label = "鏀惰揣骞村害")
+ private String foodYear;
+
+ @Column(name = "COUNTRY_", length = 10)
+ @PropertyDef(label = "鍥藉埆")
+ private String country;
+
+ @Column(name = "STORE_KEEPER_NAME_", length = 64)
+ @PropertyDef(label = "淇濈鍛�", description = "涓枃鍚嶇О")
+ private String storeKeeperName;
+
+ @Column(name = "fcsl")
+ @PropertyDef(label = "灏佷粨鏁伴噺", description = "鎵�鏈夊叆搴撲俊鎭腑鐨勫噣閲嶄箣鍜岋紝鍗曚綅KG")
+ private Double fcsl = 0.0;
+
+
+ /*** ------------------------鍏叡瀛楁-------------------------------------**/
+
+ @Column(name = "APPLY_USER_", length = 50)
+ @PropertyDef(label = "鐢宠浜�")
+ private String applyUser;
+
+ @Column(name = "DEPT_AUDIT_USER_", length = 50)
+ @PropertyDef(label = "閮ㄩ棬瀹℃牳浜�")
+ private String deptAuditUser;
+
+ @Column(name = "LEADER_AUDIT_USER_", length = 50)
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
+ private String leaderAuditUser;
+
+ // 澶囨敞
+ @Column(name = "REMARKS_", length = 200)
+ @PropertyDef(label = "澶囨敞淇℃伅")
+ private String remarks;
+
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1213.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1213.java
new file mode 100644
index 0000000..3b81b2a
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1213.java
@@ -0,0 +1,130 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1213;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1213Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40DepotStatusConfirm;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1213Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author czt
+ * 灏佷粨纭鍗�
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1213 {
+
+ @Autowired
+ private Fzzy40Sync1213Rep fzzy40Sync1213Rep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1213Rep api1213Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ /**
+ * 鍚屾灏佷粨纭淇℃伅
+ *
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+
+ log.info("-------------1213鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1208);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40DepotStatusConfirm> list = fzzy40Sync1213Rep.listData(deptId, start, end);
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板皝浠撶‘璁や俊鎭�------------------");
+ return;
+ }
+
+ Api1213 apiData;
+ Api1105 api1105;
+ List<Api1213> api1213List;
+ for (Fz40DepotStatusConfirm depotStatusConfirm : list) {
+
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(depotStatusConfirm.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+
+ apiData = new Api1213();
+ BeanUtils.copyProperties(depotStatusConfirm, apiData);
+ apiData.setFcqrdh(depotStatusConfirm.getFcqrdh());
+ apiData.setBizId(depotStatusConfirm.getFcqrdh());
+ apiData.setKqdm(kqdm);
+ apiData.setHwdm(api1105.getHwdm());
+
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, depotStatusConfirm.getFoodVariety().substring(0, 3));
+ apiData.setLspzdm(mappingCode);
+
+ //绮鎬ц川
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, depotStatusConfirm.getFoodType());
+ apiData.setLsxzdm(mappingCode);
+ //绮绛夌骇
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, depotStatusConfirm.getFoodLevel());
+ apiData.setLsdjdm(mappingCode);
+ //浜у湴浠ｇ爜
+ mappingCode = commonService.getFoodLocationIdFromCache(depotStatusConfirm.getFoodLocation());
+ if (StringUtils.isEmpty(mappingCode)) {
+ mappingCode = apiData.getHwdm().substring(2, 8);
+ }
+ apiData.setCd(mappingCode);
+ //骞村害
+ apiData.setShnd(depotStatusConfirm.getFoodYear());
+ if(StringUtils.isEmpty(depotStatusConfirm.getCountry())){
+ apiData.setGb("156");
+ }
+ apiData.setBgy(depotStatusConfirm.getStoreKeeperName());
+ apiData.setFcsqr(depotStatusConfirm.getApplyUser());
+ apiData.setBmshr(depotStatusConfirm.getDeptAuditUser());
+ apiData.setLdshr(depotStatusConfirm.getLeaderAuditUser());
+ apiData.setZhgxsj(new Date());
+
+ api1213List = api1213Rep.getDataById(apiData.getBizId());
+ if (null == api1213List || api1213List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1213List.get(0).getCzbz());
+ }
+
+ //淇濆瓨鏁版嵁
+ api1213Rep.save(apiData);
+ }
+
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1213Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1213Rep.java
new file mode 100644
index 0000000..e669471
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1213Rep.java
@@ -0,0 +1,24 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40DepotStatusConfirm;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 绮璐攢-璐﹂潰搴撳瓨
+ */
+public interface Fzzy40Sync1213Rep extends JpaRepository<Fz40DepotStatusConfirm, String> {
+
+ /**
+ * 鏍规嵁搴撳尯缂栫爜鍙婃椂闂磋幏鍙栬处闈㈠簱瀛樹俊鎭�
+ *
+ * @return
+ */
+ @Query("from Fz40DepotStatusConfirm where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
+ List<Fz40DepotStatusConfirm> listData(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+
+}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java
index 3590d16..4db1387 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1504.java
@@ -68,7 +68,7 @@
private String corgcode;
@PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- @JsonProperty("xqydm")
+ @JsonProperty("tydwbm")
private String tydwbm;
@PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2442.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2442.java
new file mode 100644
index 0000000..e9312b8
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2442.java
@@ -0,0 +1,68 @@
+package com.fzzy.push.nx2024.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-灏佷粨纭鍗�
+ * @Author CZT
+ * @Date 2024/10/28 15:20
+ */
+@Data
+public class Nx2024Api2442 implements Serializable {
+
+ @PropertyDef(label = "灏佷粨纭鍗曞彿")
+ private String fcqrdh;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜")
+ private String tyhwbm;
+
+ @PropertyDef(label = "灏佷粨鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date fcrq;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜")
+ private String lsdjdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ private String shnd;
+
+ @PropertyDef(label = "鍥藉埆")
+ private String gb;
+
+ @PropertyDef(label = "浜у湴")
+ private String cd;
+
+ @PropertyDef(label = "淇濈鍛�")
+ private String bgy;
+
+ @PropertyDef(label = "灏佷粨鏁伴噺(鍏枻)")
+ private Double fcsl;
+
+ @PropertyDef(label = "灏佷粨鐢宠浜�")
+ private String fcsqr;
+
+ @PropertyDef(label = "閮ㄩ棬瀹℃牳浜�")
+ private String bmshr;
+
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
+ private String ldshr;
+
+ @PropertyDef(label = "澶囨敞")
+ private String bz;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private String zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2443.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2443.java
new file mode 100644
index 0000000..b27c639
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2443.java
@@ -0,0 +1,26 @@
+package com.fzzy.push.nx2024.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-璐﹀淇℃伅
+ * @Author CZT
+ * @Date 2024/10/28 15:38
+ */
+@Data
+public class Nx2024Api2443 implements Serializable {
+
+
+
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2444.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2444.java
new file mode 100644
index 0000000..53a9517
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2444.java
@@ -0,0 +1,28 @@
+package com.fzzy.push.nx2024.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-绉戠洰淇℃伅
+ * @Author CZT
+ * @Date 2024/10/28 15:38
+ */
+@Data
+public class Nx2024Api2444 implements Serializable {
+
+
+
+
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2445.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2445.java
new file mode 100644
index 0000000..9d4f8e5
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2445.java
@@ -0,0 +1,27 @@
+package com.fzzy.push.nx2024.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-绉戠洰浣欓琛�
+ * @Author CZT
+ * @Date 2024/10/28 15:38
+ */
+@Data
+public class Nx2024Api2445 implements Serializable {
+
+
+
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2446.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2446.java
new file mode 100644
index 0000000..a59438c
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2446.java
@@ -0,0 +1,27 @@
+package com.fzzy.push.nx2024.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-浼氳鍑瘉淇℃伅
+ * @Author CZT
+ * @Date 2024/10/28 15:38
+ */
+@Data
+public class Nx2024Api2446 implements Serializable {
+
+
+
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2447.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2447.java
new file mode 100644
index 0000000..d61389e
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2447.java
@@ -0,0 +1,27 @@
+package com.fzzy.push.nx2024.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-鐜伴噾娴侀噺鍒嗛厤淇℃伅
+ * @Author CZT
+ * @Date 2024/10/28 15:38
+ */
+@Data
+public class Nx2024Api2447 implements Serializable {
+
+
+
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2448.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2448.java
new file mode 100644
index 0000000..9c9e3fa
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2448.java
@@ -0,0 +1,27 @@
+package com.fzzy.push.nx2024.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-鍥哄畾璧勪骇鍗＄墖淇℃伅
+ * @Author CZT
+ * @Date 2024/10/28 15:38
+ */
+@Data
+public class Nx2024Api2448 implements Serializable {
+
+
+
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2449.java b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2449.java
new file mode 100644
index 0000000..fd7efdf
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2024/dto/Nx2024Api2449.java
@@ -0,0 +1,28 @@
+package com.fzzy.push.nx2024.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 瀹佸鐪佸钩鍙�2024鐗�-璧勪骇鎶樻棫淇℃伅
+ * @Author CZT
+ * @Date 2024/10/28 15:38
+ */
+@Data
+public class Nx2024Api2449 implements Serializable {
+
+
+
+
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 10a5f59..e31462a 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -662,11 +662,11 @@
//璐ㄦ鍗曞彿
List<Api1310> api1310List = api1310Rep.getDataByHwdm(api1205.getHwdm(), "02");
if (null != api1310List && api1310List.size() > 0) {
- api1205.setZjbgdh(apiData.getHwdm() + api1310List.get(0).getZjbgdh());
+ api1205.setZjbgdh(api1310List.get(0).getZjbgdh());
}
//鐢熸垚鏂瑰紡
if(null == api1205.getScfs()){
- api1205.setScfs(1);
+ api1205.setScfs("1");
}
if(StringUtils.isEmpty(api1205.getSdblyy())){
api1205.setSdblyy("娴佺▼鐢熸垚鏃犺ˉ褰曞師鍥�");
@@ -799,6 +799,8 @@
if(api1209.getRksl() < api1209.getRkjz()){
api1209.setRksl(api1209.getRkjz());
}
+ api1209.setCqqrbs(apiData.getCqqrbs() + "");
+ api1209.setSfch(apiData.getSfch() + "");
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1209);
return api1209;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
index 6d1e32d..56e85dd 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
@@ -151,7 +151,7 @@
private String ckjsdh;
@PropertyDef(label = "鐢熸垚鏂瑰紡")
- private Integer scfs;
+ private String scfs;
@PropertyDef(label = "鎵嬪姩琛ュ綍鍘熷洜")
private String sdblyy;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
index 612ae51..34842a3 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
@@ -83,7 +83,7 @@
private Double zrshde;
@PropertyDef(label = "鏄惁瓒呰��", description = "1:鏄紝2锛氬惁")
- private Integer sfch;
+ private String sfch;
@PropertyDef(label = "瓒呰�楁暟閲�")
private Double chsl;
@@ -95,7 +95,7 @@
private String syyy;
@PropertyDef(label = "鍑烘竻纭鏍囪瘑",description = "0锛氭湭瀹屾垚鍑烘竻纭锛�1锛氬凡瀹屾垚鍑烘竻纭")
- private Integer cqqrbs;
+ private String cqqrbs;
@PropertyDef(label = "鍑烘竻纭鏃堕棿")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java
index 4041977..2ef064b 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1504.java
@@ -72,7 +72,7 @@
private String tydwbm;
@PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- @JsonProperty("xkqdm")
+ @JsonProperty("tykqbm")
private String tykqbm;
@PropertyDef(label = "鎿嶄綔鏍囧織")
diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
index 7c2bbd2..1700e65 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -11,6 +11,7 @@
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
+import com.fzzy.api.view.repository.Api1208Rep;
import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -43,6 +44,8 @@
private ApiCommonService apiCommonService;
@Autowired
private ApiTriggerService apiTriggerService;
+ @Autowired
+ private Api1208Rep api1208Rep;
@Autowired
private ApiLogRep apiLogRep;
@Autowired
@@ -573,6 +576,15 @@
}
//瀹為檯鎹熻�楁暟閲忚祴鍊�
apiData.setSjsysl(api1209.getJzsysl());
+
+ //璁剧疆鍝佺銆佹�ц川銆佺瓑绾с�佸勾搴�
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ apiData.setLspzdm(api1208List.get(0).getLspzdm());
+ apiData.setLsxzdm(api1208List.get(0).getLsxzdm());
+ apiData.setLsdjdm(api1208List.get(0).getLsdjdm());
+ apiData.setShnd(api1208List.get(0).getShnd());
+ }
return apiData;
}
if (Constant.API_CODE_1210.equals(inteId)) {
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1209.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1209.java
index bd1c118..85d71b3 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1209.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1209.java
@@ -143,6 +143,22 @@
@JsonProperty("BZ")
private String bz;
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ @JsonProperty("LSPZDM")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ @JsonProperty("LSXZDM")
+ private String lsxzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜")
+ @JsonProperty("LSDJDM")
+ private String lsdjdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害")
+ @JsonProperty("SHND")
+ private String shnd;
+
@PropertyDef(label = "鎿嶄綔鏍囧織")
@JsonProperty("CZBZ")
private String czbz;
diff --git a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java
index 292fd5d..2c14333 100644
--- a/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java
+++ b/src/main/java/com/fzzy/push/sx2024/data/SX2024Api1504.java
@@ -71,7 +71,7 @@
private String tydwbm;
@PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- @JsonProperty("xkqdm")
+ @JsonProperty("tydwbm")
private String tykqbm;
@PropertyDef(label = "鎿嶄綔鏍囧織")
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 6dde16c..a489eed 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -6,34 +6,52 @@
#涓绘暟鎹簮
primary:
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8 #瀹佸鐭冲槾灞�
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞挎境
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_002?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_001_gkxc?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娓彛鏂颁粨 1
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_002_lcck?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鑰佷粨浠撳簱 1
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_003_jzys?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-閲戠伓涓�鎵� 1
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_004_jzes?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-閲戠伓浜屾墍 1
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_005_xcck?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-瑗胯儶鏂颁粨浠撳簱 1
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_006_dfck?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-瑗胯儶涓滃嚖浠撳簱 1
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_007_zsck?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鐩村睘浠撳簱 1
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_008_lyzyz?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-绮补杞繍绔� 1
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_009_hxls?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娌虫邯绮绠＄悊鎵� 1
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_010_hpls?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鍜屽钩绮绠＄悊鎵� 1
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_011_hmls?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娴烽棬绮绠＄悊鎵� 1
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_012_hsmy?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鎭掔敓绫充笟
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_201?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴� - 澶х背浠ｅ偍鎶氬窞甯�
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢鍙板北
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢闊跺叧
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5322?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢寰愰椈
- url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5329?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢浣涘北绂呭煄鍖�
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5348?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢姹曞ご娼崡
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5349_sx?useUnicode=true&useSSL=false&characterEncoding=utf-8 #闄曡タ鏌炴按鍘�
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5352?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢澧炲煄鍐烽摼-澶╂鼎澧炲煄搴�
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5354?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢澧炲煄鍐烽摼-澶╂鼎澧炲煄搴�
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
-# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5306?useUnicode=true&useSSL=false&characterEncoding=utf-8 #瀹佸鐭冲槾灞�
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞挎境
-# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5322?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢寰愰椈
- url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5348?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢姹曞ご娼崡
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5349?useUnicode=true&useSSL=false&characterEncoding=utf-8 #闄曡タ鏌炴按鍘�
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5352?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢澧炲煄鍐烽摼-澶╂鼎澧炲煄搴�
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5354?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢澧炲煄-涓滈儴绮补涓績搴�
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
diff --git a/src/main/resources/application-pro5349.yml b/src/main/resources/application-pro5349.yml
index 62a316d..d5033e8 100644
--- a/src/main/resources/application-pro5349.yml
+++ b/src/main/resources/application-pro5349.yml
@@ -1,6 +1,6 @@
########################## 闄曡タ鏌炴按鍘� ##########################
server:
- port: 8090
+ port: 8091
jetty:
max-http-post-size: 209715200
tomcat:
@@ -9,7 +9,7 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_2024?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
username: root
password: Fzzy@#$%5432..K
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