From 3b4b16061d0373e3eb5c6473586c6c6edd9393de Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 14 八月 2023 17:04:11 +0800
Subject: [PATCH] 优化4.0版本-出入库及合同同步
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java | 2
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java | 2
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1212Rep.java | 6 ---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java | 6 +--
src/main/resources/application-dev.yml | 8 ++--
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 10 ++++
src/main/resources/application-pro.yml | 11 +++--
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1212Rep.java | 12 ++---
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java | 4 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java | 45 +++++++++++++---------
10 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
index 9a51864..0f5faab 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1201.java
@@ -117,7 +117,7 @@
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getBank());
apiData.setBfkhh(mappingCode == null ? "999" : mappingCode);
- apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "1000000000000000000" : sysData.getBankAccount());
+ apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "100000000000000000" : sysData.getBankAccount());
apiData.setWcrq(sysData.getEndTime());
@@ -125,9 +125,7 @@
apiData.setSyncTime(new Date());
apiData.setBizId(sysData.getId());
-
- apiLog.setDataId(apiData.getBizId());
- apiLog.setKqdm(kqdm);
+ apiData.setKqdm(kqdm);
api1201List = api1201Rep.getDataById(apiData.getHth());
if(null == api1201List || api1201List.isEmpty()){
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java
index 109ad3b..3c468b3 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1212.java
@@ -101,7 +101,7 @@
apiData.setBizId(sysData.getId());
- api1212List = api1212Rep.getDataById(sysData.getKhbh());
+ api1212List = api1212Rep.getDataById(sysData.getId());
if(null == api1212List || api1212List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
}else {
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1212Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1212Rep.java
index bcdbf43..e4867a2 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1212Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1212Rep.java
@@ -1,12 +1,9 @@
package com.fzzy.async.fzzy35.repository;
import com.fzzy.async.fzzy35.entity.Fz35InoutCustomer;
-import com.fzzy.async.fzzy35.entity.Fz35MContract;
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;
/**
@@ -22,7 +19,4 @@
@Query("from Fz35InoutCustomer where deptId=:deptId order by id ")
List<Fz35InoutCustomer> listInoutCustomer(@Param("deptId") String deptId);
-
- @Query("from Fz35InoutCustomer where khbh=:khbh ")
- List<Fz35InoutCustomer> getDataById(@Param("khbh") String khbh);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
index 35a414f..c4998a3 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java
@@ -42,9 +42,9 @@
Date end = param.getEnd();
//瀹㈡埛鍚屾
-// fzzySync1212.syncData(kqdm, deptId, start, end);
+ fzzySync1212.syncData(kqdm, deptId, start, end);
//鍚堝悓鍚屾
-// fzzySync1201.syncData(kqdm, deptId, start, end);
+ fzzySync1201.syncData(kqdm, deptId, start, end);
//绮鍏ュ簱鍚屾
fzzySync1202.syncData(kqdm, deptId, start, end);
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 0ef1b56..6e7cbca 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1201.java
@@ -10,11 +10,14 @@
import com.fzzy.api.view.repository.Api1201Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutContract;
+import com.fzzy.async.fzzy40.entity.Fz40InoutCustomer;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1201Rep;
+import com.fzzy.async.fzzy40.repository.Fzzy40Sync1212Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -26,6 +29,8 @@
@Component
public class Fzzy40Sync1201 {
+ @Autowired
+ private Fzzy40Sync1212Rep fzzySync1212Rep;
@Autowired
private Fzzy40Sync1201Rep fzzySync1201Rep;
@Autowired
@@ -70,42 +75,48 @@
Api1201 apiData;
List<Api1201> api1201List;
+ List<Fz40InoutCustomer> listCustomer;
for (Fz40InoutContract sysData : list) {
apiData = new Api1201();
//鍗曚綅浠ｇ爜锛� 1101 鎺ュ彛鐨勫崟浣嶄唬 鐮侊級 +鑷畾涔夌紪鐮�
apiData.setHth(api1201.getDwdm() + sysData.getId());
- apiData.setHtmc(sysData.getName());
+ apiData.setHtmc(sysData.getName().trim());
apiData.setDwdm(api1201.getDwdm());
//涓氬姟绫诲瀷
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HT_YWLX, sysData.getType());
- apiData.setYwlx(mappingCode);
+ apiData.setYwlx(sysData.getType());
//瀹㈡埛绫诲瀷
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_KHLX, sysData.getCustomerType());
- apiData.setKhlx(mappingCode);
+ apiData.setKhlx(sysData.getCustomerType());
- apiData.setKhtyshxydm(StringUtils.isEmpty(sysData.getCustomerId()) ? "100000000000000000" :sysData.getCustomerId());
+ //浼佷笟瀹㈡埛锛岄渶瑕佽缃俊鐢ㄧ爜
+ if ("1".equals(sysData.getCustomerType())) {
+ listCustomer = fzzySync1212Rep.getDataById(sysData.getCustomerId());
+ if (null == listCustomer || listCustomer.isEmpty()) {
+ continue;
+ }
+ apiData.setKhtyshxydm(listCustomer.get(0).getKhbh());
+ }
+
apiData.setKhmc(sysData.getCustomerName());
- apiData.setFddbr(sysData.getCustomerSignUser());
+ apiData.setFddbr(StringUtils.isEmpty(sysData.getCustomerSignUser()) ? null : sysData.getCustomerSignUser());
apiData.setQdrq(sysData.getSigningTime());
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
apiData.setLspzdm(mappingCode);
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodVariety());
apiData.setLsxzdm(mappingCode);
- //鍗曚环锛氬厓/鍏枻-->鍏�/鍚�
- apiData.setHtdj(sysData.getPrice() == null ? 0.0 : sysData.getPrice()*1000);
+ //鍗曚环锛氬厓/鍚�
+ apiData.setHtdj(sysData.getPrice() == null ? 0.0 : sysData.getPrice());
apiData.setYdgxlssl(sysData.getContactAmount() == null ? 0.0 : sysData.getContactAmount());
apiData.setHtzje(new BigDecimal(sysData.getMoney()));
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_JSYHTYZX, "");
- apiData.setJsyhtyzx(mappingCode);
+ apiData.setJsyhtyzx(StringUtils.isEmpty(sysData.getJsyhtyzx()) ? "1" : sysData.getJsyhtyzx());
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getCustomerBank());
apiData.setKhfkhh(mappingCode);
@@ -117,7 +128,7 @@
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_BANK, sysData.getBank());
apiData.setBfkhh(mappingCode == null ? "999" : mappingCode);
- apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "1000000000000000000" : sysData.getBankAccount());
+ apiData.setBfzh(StringUtils.isEmpty(sysData.getBankAccount()) ? "100000000000000000" : sysData.getBankAccount());
apiData.setWcrq(sysData.getEndTime());
@@ -125,14 +136,12 @@
apiData.setSyncTime(new Date());
apiData.setBizId(sysData.getId());
-
- apiLog.setDataId(apiData.getBizId());
- apiLog.setKqdm(kqdm);
+ apiData.setKqdm(kqdm);
api1201List = api1201Rep.getDataById(apiData.getHth());
- if(null == api1201List || api1201List.isEmpty()){
+ if (null == api1201List || api1201List.isEmpty()) {
apiData.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
apiData.setCzbz(api1201List.get(0).getCzbz());
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 0b09017..696ffbc 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -65,6 +65,7 @@
apiLog.setInteId(Constant.API_CODE_1202);
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
+ String sfzh = "";
try {
//鑾峰彇绮鍏ュ簱璁板綍淇℃伅锛屾牴鎹祦绋嬪畬鎴愭椂闂磋幏鍙�
List<Fz40InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
@@ -94,7 +95,12 @@
}
apiData = new Api1202();
+
apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤
+ if(!DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd").equals(sysData.getId().substring(4, 10))){
+ apiData.setRkywdh(Constant.INOUT_TYPE_14 + DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd") + sysData.getId().substring(10));
+ }
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
@@ -115,7 +121,7 @@
apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getRkywdh());
}
- apiData.setXxdz(sysData.getUserAddress());
+ apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "璇︾粏鍦板潃":sysData.getUserAddress());
//杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
@@ -183,11 +189,13 @@
}else {
apiData.setCzbz(api1202List.get(0).getCzbz());
}
+ sfzh = apiData.getSfzh();
//淇濆瓨鏁版嵁
api1202Rep.save(apiData);
log.info("1202---鍚屾鏁版嵁锛歿}", apiData.toString());
}
} catch (Exception e) {
+ System.out.println(sfzh);
log.error("---鍚屾澶辫触----{}", e);
apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
apiLogRep.save(apiLog);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
index ac48ab2..930c6cd 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
@@ -97,7 +97,7 @@
apiData.setBizId(sysData.getId());
- api1212List = api1212Rep.getDataById(sysData.getKhbh());
+ api1212List = api1212Rep.getDataById(sysData.getId());
if(null == api1212List || api1212List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
}else {
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1212Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1212Rep.java
index 9fab138..f2042d9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1212Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1212Rep.java
@@ -4,7 +4,6 @@
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;
/**
@@ -13,14 +12,13 @@
public interface Fzzy40Sync1212Rep extends JpaRepository<Fz40InoutCustomer, String> {
/**
- * 鏍规嵁淇℃伅鑾峰彇瀹㈡埛淇℃伅
+ * 鏍规嵁淇℃伅鑾峰彇瀹㈡埛鍗曚綅淇℃伅
*
- * @param start
- * @param end
* @return
*/
-// @Query("from Fz40InoutCustomer where deptId=:deptId and updateTime >=:start and updateTime <:end order by updateTime ")
-// List<Fz40InoutCustomer> listInoutCustomer(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
- @Query("from Fz40InoutCustomer where deptId=:deptId order by updateTime ")
+ @Query("from Fz40InoutCustomer where deptId=:deptId order by id ")
List<Fz40InoutCustomer> listInoutCustomer(@Param("deptId") String deptId);
+
+ @Query("from Fz40InoutCustomer where id=:id order by id ")
+ List<Fz40InoutCustomer> getDataById(@Param("id") String id);
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 14c0ab6..3137e2d 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -8,7 +8,7 @@
# 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_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?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娓彛鏂颁粨
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鍏冲煚鑰佷粨
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_3?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鐩村睘浠撳簱
@@ -22,7 +22,7 @@
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_10?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_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 #姝︽眽榛勯檪鍐涚伯
username: root
password: Abc123..
@@ -32,10 +32,10 @@
# 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_3.5_5303?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_3.5_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_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 #姝︽眽榛勯檪鍐涚伯
username: root
password: Abc123..
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 2978a9b..46074c8 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,6 +1,6 @@
-########################## 澶ф咕鍖� ##########################
+########################## 骞夸笢鎯犲窞鎯犻槼 ##########################
server:
- port: 8081
+ port: 8090
jetty:
max-http-post-size: 209715200
tomcat:
@@ -38,7 +38,7 @@
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
# Redis鐩稿叧閰嶇疆
redis:
- database: 0
+ database: 1
host: 127.0.0.1
port: 6379
password: Abc123..
@@ -51,6 +51,7 @@
timeout: 6000
igds:
default:
- companyId: 5016
- file-path: C:/app/igds-api/
+ companyId: 5326
+
+ file-path: D:/IGDS-API/FILE/
img-path: D:/IGDS/FILE/
\ No newline at end of file
--
Gitblit v1.9.3