From 17810b3b68347e838f1d5966de25d206c0e63a83 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 18 三月 2024 19:33:15 +0800
Subject: [PATCH] 优化出库数据同步
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java | 115 --------------------------------------
src/main/resources/application-dev.yml | 5 +
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 1
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 4 +
src/main/resources/application.yml | 4
src/main/java/com/fzzy/api/Constant.java | 28 ++++++---
6 files changed, 28 insertions(+), 129 deletions(-)
diff --git a/src/main/java/com/fzzy/api/Constant.java b/src/main/java/com/fzzy/api/Constant.java
index 981ae0e..f91bc09 100644
--- a/src/main/java/com/fzzy/api/Constant.java
+++ b/src/main/java/com/fzzy/api/Constant.java
@@ -224,15 +224,25 @@
/**
* 鍥剧墖绫诲瀷
*/
- public static String IMG_NAME_TYPE_PMT = "PMT";
- public static String IMG_NAME_TYPE_GL = "GL";
- public static String IMG_NAME_TYPE_GR = "GR";
- public static String IMG_NAME_TYPE_GT = "GT";
- public static String IMG_NAME_TYPE_TL = "TL";
- public static String IMG_NAME_TYPE_TR = "TR";
- public static String IMG_NAME_TYPE_TT = "TT";
- public static String IMG_NAME_TYPE_SL = "SL";
- public static String IMG_NAME_TYPE_SF = "SF";
+ public static String IMG_NAME_TYPE_PMT = "PMT"; //楦熺灠鍥�
+ public static String IMG_NAME_TYPE_DJ = "DJ"; //鐧昏
+ public static String IMG_NAME_TYPE_RK = "RK"; //鍏ュ簱鐧昏鐓х墖
+ public static String IMG_NAME_TYPE_CK = "CK"; //杞﹁締鍑哄簱鐓х墖
+ public static String IMG_NAME_TYPE_GL = "GL"; //绉版瘺閲嶅墠鐓х墖
+ public static String IMG_NAME_TYPE_GR = "GR"; //绉版瘺閲嶅悗鐓х墖
+ public static String IMG_NAME_TYPE_GT = "GT"; //绉版瘺閲嶉《鐓х墖
+ public static String IMG_NAME_TYPE_TL = "TL"; //绉扮毊閲嶅墠鐓х墖
+ public static String IMG_NAME_TYPE_TR = "TR"; //绉扮毊閲嶅悗鐓х墖
+ public static String IMG_NAME_TYPE_TT = "TT"; //绉扮毊閲嶉《鐓х墖
+ public static String IMG_NAME_TYPE_SL = "SL"; //缁撶畻鏃跺敭绮汉鐓х墖
+ public static String IMG_NAME_TYPE_SF = "SF"; //鍞伯浜鸿韩浠借瘉鐓х墖
+ public static String IMG_NAME_TYPE_IVG = "IVG"; //鍏ュ簱绉版瘺閲嶈棰�
+ public static String IMG_NAME_TYPE_IVT = "IVT"; //鍏ュ簱绉扮毊閲嶈棰�
+ public static String IMG_NAME_TYPE_OVG = "OVG"; //鍑哄簱绉版瘺閲嶈棰�
+ public static String IMG_NAME_TYPE_OVT = "OVT"; //鍑哄簱绉扮毊閲嶈棰�
+ public static String IMG_NAME_TYPE_DJV = "DJV"; //鐧昏鏃惰棰�
+ public static String IMG_NAME_TYPE_RKV = "RKV"; //杞﹁締鍏ュ簱鏃惰棰�
+ public static String IMG_NAME_TYPE_CKV = "CKV"; //杞﹁締鍑哄簱鏃惰棰�
/**
* 瀛楀吀鐖剁紪鐮�-鎿嶄綔鏍囧織
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
index b791547..98f35f9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
@@ -201,121 +201,6 @@
}
}
-
-// /**
-// * 鍚屾鏂囦欢鎺ュ彛
-// *
-// * @param deptId
-// * @param start
-// * @param end
-// */
-// public void syncData(String kqdm, String deptId, Date start, Date end) {
-//
-// log.info("-------------1109鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
-//
-// //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
-// ApiLog apiLog = new ApiLog();
-// apiLog.setType(ApiLog.TYPE_SYNC);
-// apiLog.setKqdm(deptId);
-// apiLog.setUploadTime(new Date());
-// apiLog.setInteId(Constant.API_CODE_1109);
-// apiLog.setStatus(99);
-// apiLog.setId(ContextUtil.getUUID());
-// try {
-// List<Fz40FileInfo> list = fzzySync1109Rep.listFileInfo(start, end);
-//
-// if (null == list || list.isEmpty()) {
-// log.info("-------------娌℃湁鑾峰彇鍒版枃浠朵俊鎭�------------------");
-// return;
-// }
-//
-// Map<String, Integer> map = new HashMap<>();
-// Api1109 apiData;
-// String wjlx;
-// String wjmc;
-// List<Api1109> api1109List;
-// List<Api1202> api1202List;
-// List<Api1205> api1205List;
-// String str = "";
-// for (Fz40FileInfo sysData : list) {
-// if (StringUtils.isEmpty(sysData.getBizId())) {
-// continue;
-// }
-// //鏍规嵁鍥剧墖id鏌ヨ瀵瑰簲鍑哄叆搴撲俊鎭�
-// if(sysData.getBizId().startsWith(IMG_START_R)){
-// api1202List = api1202Rep.getDataByBizId(sysData.getBizId());
-// if (null == api1202List || api1202List.isEmpty()) {
-// continue;
-// }
-// str = api1202List.get(0).getRkywdh();
-// }
-// if(sysData.getBizId().startsWith(IMG_START_C)){
-// api1205List = api1205Rep.getDataByBizId(sysData.getBizId());
-// if (null == api1205List || api1205List.isEmpty()) {
-// continue;
-// }
-// str = api1205List.get(0).getCkywdh();
-// }
-//
-// //鍙悓姝ョО閲�
-// if (BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())) {
-// wjlx = "";
-// wjmc = kqdm;
-// //鍏ュ簱鎶撴媿鍥�
-// if (sysData.getBizId().startsWith(IMG_START_R)) {
-// wjlx = IMG_TYPE_2;
-// wjmc += "_" + Constant.INOUT_TYPE_14 + sysData.getBizId().substring(4);
-// }
-// //鍑哄簱鎶撴媿鍥�
-// if (sysData.getBizId().startsWith(IMG_START_C)) {
-// wjlx = IMG_TYPE_3;
-// wjmc += "_" + Constant.INOUT_TYPE_15 + sysData.getBizId().substring(4);
-// }
-// //鑻ユ枃浠剁被鍨嬩负绌猴紝鍒欒烦杩�
-// if (StringUtils.isEmpty(wjlx)) {
-// continue;
-// }
-//
-// apiData = new Api1109();
-//
-// //涓婚敭id
-// apiData.setId(UUID.randomUUID().toString());
-// //鏂囦欢璺緞
-// apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());
-//
-// //鏂囦欢鍚嶇О
-// wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
-// apiData.setWjmc(wjmc);
-// //鏂囦欢绫诲瀷
-// apiData.setWjlx(wjlx);
-//
-// //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
-// apiData.setZhgxsj(sysData.getCreateTime());
-//
-// //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
-// apiData.setBizId(sysData.getFileId());
-// apiData.setKqdm(kqdm);
-// apiData.setSyncTime(new Date());
-//
-// api1109List = api1109Rep.getDataByBizId(apiData.getBizId());
-// if (null == api1109List || api1109List.isEmpty()) {
-// apiData.setCzbz(Constant.CZBZ_I);
-// } else {
-// apiData.setCzbz(api1109List.get(0).getCzbz());
-// }
-//
-// //淇濆瓨鏁版嵁
-// api1109Rep.save(apiData);
-// log.info("1109---鍚屾鏁版嵁锛歿}", 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/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 2372af9..52d668d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -284,6 +284,7 @@
apiData.setJz(fz40InoutRecordItem.getSettleWeight());
apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
+ apiData.setQtkl(0 - fz40InoutRecordItem.getDe());
api1202List = api1202Rep.getDataById(apiData.getRkywdh());
if (null == api1202List || api1202List.isEmpty()) {
apiData.setCzbz(Constant.CZBZ_I);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index e01d57b..cc30aef 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -218,6 +218,8 @@
apiData.setCchlx("01");
apiData.setXldd("搴撳唴");
+ apiData.setBzbdbz(25);
+ apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
apiData.setZcbgyxm(StringUtils.isEmpty(sysData.getHandleUser())?"鍊间粨鍛�":sysData.getHandleUser());
apiData.setZxzydw("澶栬仒鍗曚綅");
@@ -253,7 +255,7 @@
apiData.setJz(fz40InoutRecordItem.getSettleWeight());
apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
-
+ apiData.setKzl(0 - fz40InoutRecordItem.getDe());
api1205List = api1205Rep.getDataById(apiData.getCkywdh());
if(null == api1205List || api1205List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 00b7505..bd9ac9e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -16,13 +16,14 @@
# 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 #骞夸笢姹曞ご娼崡
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_5303?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 #娼槼搴�
@@ -31,7 +32,7 @@
# 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_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
-# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5329?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 #骞夸笢姹曞ご娼崡
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4f73abd..bbeeabd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ##########################
spring:
profiles:
- active: pro
+ active: dev
application:
name: igds-api
main:
@@ -32,6 +32,6 @@
igds:
default:
- companyId: 5326
+ companyId: 5348
file-path: C:/app/igds-api
img-path: D:/IGDS/FILE/
\ No newline at end of file
--
Gitblit v1.9.3