From 0e61ae8dcd73c9c3805902e6c482d122b4363dad Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 17 八月 2023 20:22:27 +0800
Subject: [PATCH] 粮食购销同步2
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java | 105 +++++++++++++++
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1210Rep.java | 18 ++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java | 95 ++++++++++++-
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutVarietyChange.java | 148 +++++++++++++++++++++
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 9 +
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java | 1
6 files changed, 366 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 46ea62d..a4bc40d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -36,7 +36,11 @@
@Autowired
private Fzzy40Sync1206 fzzySync1206;
@Autowired
+ private Fzzy40Sync1207 fzzySync1207;
+ @Autowired
private Fzzy40Sync1209 fzzySync1209;
+ @Autowired
+ private Fzzy40Sync1210 fzzySync1210;
@Override
public String getProtocol() {
@@ -72,8 +76,8 @@
fzzySync1206.syncData(kqdm, deptId, start, end);
//绮鎹熺泭
fzzySync1209.syncData(kqdm, deptId, start, end);
- //鍊掍粨淇℃伅鍚屾 TODO
-
+ //鍊掍粨淇℃伅鍚屾
+ fzzySync1207.syncData(kqdm, deptId, start, end);
//鍑哄叆搴撴枃浠朵俊鎭悓姝� TODO
@@ -82,6 +86,7 @@
fzzySync1208.syncData(kqdm, deptId, start, end);
//绮鎬ц川杞彉淇℃伅鍚屾 TODO
+ fzzySync1210.syncData(kqdm, deptId, start, end);
//璐﹂潰搴撳瓨淇℃伅鍚屾 TODO
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutVarietyChange.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutVarietyChange.java
new file mode 100644
index 0000000..47f5fe8
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutVarietyChange.java
@@ -0,0 +1,148 @@
+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.io.Serializable;
+import java.util.Date;
+
+/**
+ * 缁煎悎绠＄悊-绮鎬ц川鍙樻洿锛屼富瑕佹槸鍑哄叆搴撲箣鍓嶅仛 鍌ㄥ杞晢鍝侊紝瀹屾垚涔嬪悗 鍟嗗搧杞偍澶囥��
+ * <p>
+ * 鍙樻洿璁板綍锛氳〃鍚嶅彉鏇翠负 D_INOUT_VARIETY_CHANGE
+ */
+@Data
+@Entity
+@Table(name = "D_INOUT_VARIETY_CHANGE")
+public class Fz40InoutVarietyChange implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "ID_", length = 41)
+ @PropertyDef(label = "绮鎬ц川杞彉鍗曞彿", description = "鐢辫揣浣嶄唬鐮�+鍒掕浆鏃ユ湡锛坹yyyMMdd锛�+3浣嶉『搴忓彿缁勬垚")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鍒嗗簱缂栫爜")
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鎵�灞炰粨搴�")
+ private String depotId;
+
+ @Column(name = "NUMBER_")
+ @PropertyDef(label = "绮鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double number = 0.0;
+
+ @Column(name = "CHANGE_NUMBER_")
+ @PropertyDef(label = "鍒掕浆鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double changeNumber = 0.0;
+
+ @Column(name = "APPROVAL_ID_", length = 40)
+ @PropertyDef(label = "鎵瑰噯鏂囧彿")
+ private String approvalId;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺", description = "浠ｇ爜涓嶈冻7浣嶉渶鍦ㄦ湯浣嶈ˉ0")
+ private String foodVariety;
+
+ /**
+ * 100銆佸偍澶囩伯 110銆佷腑澶偍澶囩伯 120銆佸湴鏂瑰偍澶囩伯
+ * 121銆佺渷(鑷不鍖恒�佺洿杈栧競)绾у湴鏂瑰偍澶囩伯
+ * 122銆佸競(鍦板尯銆佽嚜娌诲窞銆佺洘)绾у湴鏂瑰偍澶囩伯
+ * 123銆佸幙(鑷不鍘裤�佸幙绾у競銆佹棗銆佽嚜娌绘棗銆佸競杈栧尯銆佹灄鍖恒�佺壒鍖�)绾у湴鏂瑰偍澶囩伯
+ * 129銆佸叾浠栧偍澶囩伯 200銆佸晢鍝佺伯 270銆佷腑鍌ㄧ伯绯荤粺鍟嗗搧绮�
+ * 280銆佽繘鍙ｅ晢鍝佺伯 290銆佸叾浠栧晢鍝佺伯 300銆佹斂绛栨�х伯椋�
+ * 310銆佹渶浣庢敹璐环绮� 320銆佸浗瀹朵复鏃跺瓨鍌ㄧ伯 330銆佸浗瀹朵复鍌ㄨ繘鍙ｇ伯
+ * 340銆佸湴鏂逛复鏃跺瓨鍌ㄧ伯
+ */
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "鍒掕浆鍓嶇伯椋熸�ц川浠ｇ爜")
+ private String foodType;
+
+ @Column(name = "NEW_FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "鍒掕浆鍚庣伯椋熸�ц川浠ｇ爜")
+ private String newFoodType;
+
+ @Column(name = "CHANGE_TIME_")
+ @PropertyDef(label = "鍒掕浆鏃ユ湡")
+ private Date changeTime;
+
+ @PropertyDef(label = "浠撳偍瀹℃牳浜�")
+ @Column(name = "ccshr", length = 64)
+ private String ccshr;
+
+ @Column(name = "AUDIT_CCSH_", length = 10)
+ @PropertyDef(label = "瀹℃壒鐘舵��")
+ private String auditCcsh;
+
+ @Column(name = "INFO_CCSH_", length = 200)
+ @PropertyDef(label = "瀹℃牳璇存槑")
+ private String InfoCcsh;
+
+ @PropertyDef(label = "璐ㄦ瀹℃牳浜�")
+ @Column(name = "zjshr", length = 64)
+ private String zjshr;
+
+ @Column(name = "AUDIT_ZJSH_", length = 10)
+ @PropertyDef(label = "瀹℃壒鐘舵��")
+ private String auditZjsh;
+
+ @Column(name = "INFO_ZJSH_", length = 200)
+ @PropertyDef(label = "瀹℃牳璇存槑")
+ private String infoZjsh;
+
+ @PropertyDef(label = "缁熻瀹℃牳浜�")
+ @Column(name = "tjshr", length = 64)
+ private String tjshr;
+
+ @Column(name = "AUDIT_TJSH_", length = 10)
+ @PropertyDef(label = "瀹℃壒鐘舵��")
+ private String auditTjsh;
+
+ @Column(name = "INFO_TJSH_", length = 200)
+ @PropertyDef(label = "瀹℃牳璇存槑")
+ private String infoTjsh;
+
+ @PropertyDef(label = "浼氳瀹℃牳浜�")
+ @Column(name = "kjshr", length = 64)
+ private String kjshr;
+
+ @Column(name = "AUDIT_KJSH_", length = 10)
+ @PropertyDef(label = "瀹℃壒鐘舵��")
+ private String auditKjsh;
+
+ @Column(name = "INFO_KJSH_", length = 200)
+ @PropertyDef(label = "瀹℃牳璇存槑")
+ private String infoKjsh;
+
+ @PropertyDef(label = "棰嗗瀹℃牳浜�")
+ @Column(name = "ldshr", length = 64)
+ private String ldshr;
+
+ @Column(name = "AUDIT_LDSH_", length = 10)
+ @PropertyDef(label = "瀹℃壒鐘舵��", description = "鏈�缁堝鏍哥姸鎬佷互棰嗗瀹℃牳涓哄噯")
+ private String auditLdsh;
+
+ @Column(name = "INFO_LDSH_", length = 200)
+ @PropertyDef(label = "瀹℃牳璇存槑")
+ private String infoLdsh;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date updateTime;
+
+ @Column(name = "REMARK_", length = 200)
+ @PropertyDef(label = "澶囨敞")
+ private String remark;
+
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
index bf6d48f..1561e8b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1207.java
@@ -1,17 +1,29 @@
package com.fzzy.async.fzzy40.impl;
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1102;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1207;
+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.Api1102Rep;
import com.fzzy.api.view.repository.Api1207Rep;
import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40InoutStockChange;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1207Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.Date;
+import java.util.List;
+
/**
+ * 鍊掍粨淇℃伅
+ *
* @Author:YAN
*/
@Slf4j
@@ -19,17 +31,86 @@
public class Fzzy40Sync1207 {
@Autowired
- private Fzzy40Sync1202Rep fzzySync1202Rep;
- @Autowired
private Fzzy40Sync1207Rep fzzySync1207Rep;
- @Autowired
- private ApiTriggerService apiTriggerService;
- @Autowired
- private Api1207Rep api1207Rep;
@Autowired
private ApiCommonService commonService;
@Autowired
- private Api1102Rep api1102Rep;
+ private Api1207Rep api1207Rep;
@Autowired
private ApiLogRep apiLogRep;
+
+ /**
+ * 鍊掍粨淇℃伅鍚屾
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1207鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1207);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+
+ try {
+ List<Fz40InoutStockChange> list = fzzySync1207Rep.listStockChange(deptId, start, end);
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒板�掍粨淇℃伅------------------");
+ return;
+ }
+
+ Api1207 apiData;
+ Api1105 api1105In;
+ Api1105 api1105Out;
+ for (Fz40InoutStockChange sysData : list) {
+ //鑾峰彇璐т綅淇℃伅
+ api1105Out = commonService.getApi1105Cache(sysData.getDepotIdOut());
+ if (null == api1105Out) {
+ continue;
+ }
+ //鑾峰彇璐т綅淇℃伅
+ api1105In = commonService.getApi1105Cache(sysData.getDepotIdIn());
+ if (null == api1105In) {
+ continue;
+ }
+ apiData = new Api1207();
+ apiData.setDcdh(kqdm + sysData.getId());
+ apiData.setDclx(sysData.getType());
+ apiData.setDcjhwjbh(sysData.getPlanCode());
+ apiData.setTzdh(sysData.getNoticeId());
+ apiData.setDcdw(kqdm);
+ apiData.setDrdw(kqdm);
+ apiData.setLspzdm(sysData.getFoodVariety());
+ apiData.setDchwdm(api1105Out.getHwdm());
+ apiData.setDrhwdm(api1105In.getHwdm());
+ apiData.setDcrq(sysData.getChangeDate());
+ apiData.setDcsl(sysData.getNumber());
+ apiData.setBzw(sysData.getBzw());
+ apiData.setBzbjs(sysData.getBzbjs());
+ apiData.setZxzydw(sysData.getZxzydw());
+ apiData.setCzbz(Constant.CZBZ_I);
+ apiData.setZhgxsj(sysData.getUpdateTime());
+
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+
+ //淇濆瓨鏁版嵁
+ api1207Rep.save(apiData);
+ log.info("1207---鍚屾鏁版嵁锛歿}", apiData.toString());
+ }
+
+ } catch (Exception e) {
+ log.error("---鍊掍粨淇℃伅鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍊掍粨淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
index 4dc3bf6..b8e41b6 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
@@ -11,7 +11,6 @@
import com.fzzy.async.fzzy40.entity.Fz40InoutLossOver;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1209Rep;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
new file mode 100644
index 0000000..b124a0f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1210.java
@@ -0,0 +1,105 @@
+package com.fzzy.async.fzzy40.impl;
+
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.Api1105;
+import com.fzzy.api.entity.Api1209;
+import com.fzzy.api.entity.Api1210;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1209Rep;
+import com.fzzy.api.view.repository.Api1210Rep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.fzzy40.entity.Fz40InoutLossOver;
+import com.fzzy.async.fzzy40.entity.Fz40InoutVarietyChange;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1209Rep;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1210Rep;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鎬ц川杞彉
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fzzy40Sync1210 {
+
+ @Autowired
+ private Fzzy40Sync1210Rep fzzySync1210Rep;
+ @Autowired
+ private Api1210Rep api1210Rep;
+ @Autowired
+ private ApiCommonService commonService;
+ @Autowired
+ private ApiLogRep apiLogRep;
+
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1210鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId(Constant.API_CODE_1209);
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+
+ try {
+ List<Fz40InoutVarietyChange> list = fzzySync1210Rep.listVarietyChange(deptId, start, end);
+
+ if (null == list || list.isEmpty()) {
+ log.info("-------------娌℃湁鑾峰彇鍒版�ц川杞彉淇℃伅------------------");
+ return;
+ }
+
+ Api1210 apiData;
+ Api1105 api1105;
+
+ for (Fz40InoutVarietyChange sysData : list) {
+ //鑾峰彇璐т綅淇℃伅
+ api1105 = commonService.getApi1105Cache(sysData.getDepotId());
+ if (null == api1105) {
+ continue;
+ }
+ apiData = new Api1210();
+ apiData.setLsxzzbdh(api1105.getHwdm() + sysData.getId());
+ apiData.setHwdm(api1105.getHwdm());
+ apiData.setLssl(sysData.getNumber());
+ apiData.setHzsl(sysData.getChangeNumber());
+ apiData.setBzwh(sysData.getApprovalId());
+ apiData.setLspzdm(sysData.getFoodVariety());
+ apiData.setHzqlsxzdm(sysData.getFoodType());
+ apiData.setHzhlsxzdm(sysData.getNewFoodType());
+ apiData.setHzrq(sysData.getChangeTime());
+ apiData.setCcshr(sysData.getCcshr());
+ apiData.setZjshr(sysData.getZjshr());
+ apiData.setTjshr(sysData.getTjshr());
+ apiData.setKjshr(sysData.getKjshr());
+ apiData.setLdshr(sysData.getLdshr());
+ apiData.setBz(sysData.getRemark());
+ apiData.setCzbz(Constant.CZBZ_I);
+ apiData.setZhgxsj(sysData.getUpdateTime());
+
+ //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
+ apiData.setBizId(sysData.getId());
+ apiData.setKqdm(kqdm);
+ apiData.setSyncTime(new Date());
+ //淇濆瓨鏁版嵁
+ api1210Rep.save(apiData);
+
+ }
+
+ } catch (Exception e) {
+ log.error("---鍚屾澶辫触----{}", e);
+ apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1210Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1210Rep.java
new file mode 100644
index 0000000..e295188
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1210Rep.java
@@ -0,0 +1,18 @@
+package com.fzzy.async.fzzy40.repository;
+
+import com.fzzy.async.fzzy40.entity.Fz40InoutLossOver;
+import com.fzzy.async.fzzy40.entity.Fz40InoutVarietyChange;
+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;
+
+/**
+ * @Author:YAN
+ */
+public interface Fzzy40Sync1210Rep extends JpaRepository<Fz40InoutVarietyChange, String> {
+ @Query("from Fz40InoutVarietyChange where deptId=:deptId and changeTime >=:start and changeTime <:end order by changeTime ")
+ List<Fz40InoutVarietyChange> listVarietyChange(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
+}
--
Gitblit v1.9.3