From 65b168669d6ad76c09b56b58e34be360c530e2d3 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 27 十月 2023 09:12:11 +0800
Subject: [PATCH] 优化调整上海接口
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java | 3 +++
src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java | 2 +-
src/main/java/com/fzzy/otherview/sh2023/ShApi1311.view.xml | 36 ++++++++++++++++++------------------
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 15 +++++++++++----
4 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
index 50c6e33..42982f9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
@@ -80,6 +80,9 @@
sh2023Api1311.setAzwz(sysData.getName());
sh2023Api1311.setAzwzlx(StringUtils.isEmpty(sysData.getSpdwlx()) ? "7" : sysData.getSpdwlx());
+ if(sh2023Api1311.getAzwzlx().length() == 1){
+ sh2023Api1311.setAzwzlx("0" + sh2023Api1311.getAzwzlx());
+ }
if ("12".equals(sh2023Api1311.getAzwzlx()) || "13".equals(sh2023Api1311.getAzwzlx())
|| "14".equals(sh2023Api1311.getAzwzlx()) || "15".equals(sh2023Api1311.getAzwzlx())) {
sh2023Api1311.setAzwzlx("99");
diff --git a/src/main/java/com/fzzy/otherview/sh2023/ShApi1311.view.xml b/src/main/java/com/fzzy/otherview/sh2023/ShApi1311.view.xml
index 13ff964..3a0d42c 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/ShApi1311.view.xml
+++ b/src/main/java/com/fzzy/otherview/sh2023/ShApi1311.view.xml
@@ -113,40 +113,40 @@
<Property name="mapValues">
<Collection>
<Entity>
- <Property name="key">1</Property>
- <Property name="value">1-鍑哄叆鍙�</Property>
+ <Property name="key">01</Property>
+ <Property name="value">01-鍑哄叆鍙�</Property>
</Entity>
<Entity>
- <Property name="key">2</Property>
- <Property name="value">2-鎵︽牱鏈�</Property>
+ <Property name="key">02</Property>
+ <Property name="value">02-鎵︽牱鏈�</Property>
</Entity>
<Entity>
- <Property name="key">3</Property>
- <Property name="value">3-鍖栭獙瀹�</Property>
+ <Property name="key">03</Property>
+ <Property name="value">03-鍖栭獙瀹�</Property>
</Entity>
<Entity>
- <Property name="key">4</Property>
- <Property name="value">4-缁撶畻瀹�</Property>
+ <Property name="key">04</Property>
+ <Property name="value">04-缁撶畻瀹�</Property>
</Entity>
<Entity>
- <Property name="key">5</Property>
- <Property name="value">5-鍦扮瀹�</Property>
+ <Property name="key">05</Property>
+ <Property name="value">05-鍦扮瀹�</Property>
</Entity>
<Entity>
- <Property name="key">6</Property>
- <Property name="value">6-搴撳尯涓诲共閬�</Property>
+ <Property name="key">06</Property>
+ <Property name="value">06-搴撳尯涓诲共閬�</Property>
</Entity>
<Entity>
- <Property name="key">7</Property>
- <Property name="value">7-浠撻棿鐩戞帶</Property>
+ <Property name="key">07</Property>
+ <Property name="value">07-浠撻棿鐩戞帶</Property>
</Entity>
<Entity>
- <Property name="key">8</Property>
- <Property name="value">8-浠撳唴</Property>
+ <Property name="key">08</Property>
+ <Property name="value">08-浠撳唴</Property>
</Entity>
<Entity>
- <Property name="key">9</Property>
- <Property name="value">9-鑽搧鎴垮唴澶�</Property>
+ <Property name="key">09</Property>
+ <Property name="value">09-鑽搧鎴垮唴澶�</Property>
</Entity>
<Entity>
<Property name="key">10</Property>
diff --git a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
index 8d0872d..f3fc1c0 100644
--- a/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
+++ b/src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java
@@ -37,7 +37,7 @@
import java.util.List;
/**
- * 涓婃捣甯傛帴鍙�-2101 妫�鏂ゅ崟
+ * 涓婃捣甯傛帴鍙�-1311 瑙嗛鐩戞帶鎺ュ彛
*
* @author czt
* @date 2023/8/17
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index cef14d7..577046a 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -270,10 +270,7 @@
map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
api1109.setWjl(JSON.toJSONString(map));
//涓婃捣甯傚钩鍙版枃浠跺悕绉拌鍒欙細搴撳尯缂栫爜_涓氬姟娴佹按鍙穇鍒嗙被鐮乢椤哄簭鐮�.jpg锛屼緥濡傦細91310114703439394M001_142211080101_GL_00.jpg
- String[] split = api1109.getWjmc().split(".");
- if (split.length == 2) {
- api1109.setWjmc(split[0] + "_00" + split[1]);
- }
+ api1109.setWjmc(getWjmc(api1109.getWjmc()));
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1109);
return api1109;
@@ -749,6 +746,16 @@
return data;
}
+ private String getWjmc(String wjmc){
+ if(wjmc.endsWith(".jpg")) {
+ wjmc = wjmc.replaceAll(".jpg", "_00.jpg");
+ }
+ if(wjmc.endsWith(".png")) {
+ wjmc = wjmc.replaceAll(".png", "_00.png");
+ }
+ return wjmc;
+ }
+
/**
* 鑾峰彇璐㈠姟鏁版嵁json
*
--
Gitblit v1.9.3