| src/main/java/com/fzzy/api/Constant.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application-dev.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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"; //车辆出库时视频 /** * 字典父编码-操作标志 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); // } // } /** * 获取图片命名类型 * 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); 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); 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 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/
