From 05aa35cd44519f34698a69a7151edb78e3cfae64 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 26 二月 2024 09:02:10 +0800
Subject: [PATCH] 优化上海熏蒸接口批次号
---
src/main/resources/application-pro.yml | 26 +++++++++++++++-----------
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 6 +++++-
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index f146029..7454a6e 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -792,10 +792,14 @@
Api1306 apiData = (Api1306) data;
BeanUtils.copyProperties(apiData, api1306);
api1306.setBjw(ShAreaBjw.getBjw(code));
- api1306.setPch(apiData.getXzzydh().substring(0, 30) + DateFormatUtils.format(apiData.getXzkssj(), "yyyy"));
api1306.setAjdm(apiData.getHwdm().substring(0, 28));
//涓婃捣鐔忚捀浣滀笟鍗曞彿锛氳揣浣嶄唬鐮�+yyyyMMdd + 3浣嶉『搴忓彿
api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId());
+ //璁剧疆鎵规鍙�
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1306.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
if (StringUtils.isEmpty(api1306.getSyff())) {
api1306.setSyff("0"); //娼В娉�
}
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 08d3502..1546be1 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 骞夸笢鎯犲窞浠叉伜 ##########################
+########################## 涓婃捣鍢夊畾 ##########################
server:
port: 8090
jetty:
@@ -9,16 +9,16 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
- username: root
- password: Fzzy@#$%5432..K
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: root
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
- username: root
- password: Fzzy@#$%5432..K
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: root
jpa:
#涓籮pa閰嶇疆
primary:
@@ -41,7 +41,7 @@
database: 1
host: 127.0.0.1
port: 6379
- password: Redispwd..
+ password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
pool:
max-active: 200
@@ -51,7 +51,11 @@
timeout: 6000
igds:
default:
- companyId: 5326
-
+ companyId: 5303
file-path: D:/IGDS-API/FILE/
- img-path: D:/IGDS/FILE/
\ No newline at end of file
+ img-path: D:/IGDS/FILE/
+ # 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
+ # 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB
+ #绉侀挜锛歁IICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=
--
Gitblit v1.9.3