From 637e5d4b9b37f165c639ed74cdaf7b98c514473b Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 21 十二月 2023 20:33:17 +0800
Subject: [PATCH] 调整宁夏省平台文件上传接口
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java | 4
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 14 ++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java | 4
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java | 5 -
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java | 71 +++++++++++++++++++++++
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java | 41 +++++++++++++
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 13 +++-
7 files changed, 138 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java
index e74b814..f3789c5 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1303.java
@@ -84,15 +84,12 @@
//妫�鏌ュ铏柟娉曪紝0-杩滅▼銆�1-浜哄伐銆�2-鍏朵粬
api1303.setJchcff("0");
//鍙戠敓閮ㄤ綅锛屽潗鏍囧～鍐欙細x,y,z
- api1303.setFsbw(null);//闈炲繀濉瓧娈�
+ api1303.setFsbw("绮潰");//闈炲繀濉瓧娈�
//瀹宠櫕绉嶇被銆傚涓敤#闅斿紑#TODO >> 寰呬紭鍖栬皟鏁�
api1303.setHczl("21212");
//铏彛瀵嗗害鍊奸泦鍚�
- if(StringUtils.isEmpty(fz40Pest.getPoints())){
- continue;
- }
String ckmdzjh = this.geeCkmdzjh(fz40Pest.getPestMax(), fz40Pest.getPoints());
api1303.setCkmdzjh(ckmdzjh);
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
index 8d24882..9207075 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
@@ -81,8 +81,8 @@
api1306.setXzjssj(fz40DrugLog.getEnd());
//璁剧疆铏妫�娴嬪崟鍙�
api1306.setHcjcdh(api1105.getHwdm() + fz40DrugLog.getPestBatchId());
- api1303List = api1303Rep.getDataByHcjcdh(fz40DrugLog.getPestBatchId());
- if (null != api1303List || api1303List.size() > 0) {
+ api1303List = api1303Rep.getDataByBizId(fz40DrugLog.getPestBatchId());
+ if (null != api1303List && api1303List.size() > 0) {
api1306.setHcjcdh(api1303List.get(0).getHcjcdh());
}
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index bec128a..a01ceba 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -200,9 +200,13 @@
return api1108;
}
if (NX2023Constant.NX_2023_API_CODE_1109.equals(inteId)) {
+ Nx2023Api1109 api1109 = new Nx2023Api1109();
Api1109 apiData = (Api1109) data;
- apiData.setWjl(FileUtils.fileToByteString(apiData.getWjdz()));
- return apiData;
+ BeanUtils.copyProperties(apiData, api1109);
+ Map<String, String> map = new HashMap<>();
+ map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
+ api1109.setWjl(JSON.toJSONString(map));
+ return api1109;
}
if (NX2023Constant.NX_2023_API_CODE_1111.equals(inteId)) {
Nx2023Api1111 api1111 = new Nx2023Api1111();
@@ -224,6 +228,12 @@
BeanUtils.copyProperties(data, api1201);
return api1201;
}
+ if (NX2023Constant.NX_2023_API_CODE_1203.equals(inteId)) {
+ Nx2023Api1203 api1203 = new Nx2023Api1203();
+ BeanUtils.copyProperties(data, api1203);
+ return api1203;
+ }
+
if (NX2023Constant.NX_2023_API_CODE_1211.equals(inteId)) {
Nx2023Api1211 api1211 = new Nx2023Api1211();
BeanUtils.copyProperties(data, api1211);
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java
new file mode 100644
index 0000000..8b18f4d
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java
@@ -0,0 +1,41 @@
+package com.fzzy.push.nx2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-鏂囦欢淇℃伅
+ */
+@Data
+public class Nx2023Api1109 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6615204510395829490L;
+
+
+ @PropertyDef(label = "鏂囦欢鍚嶇О")
+ private String wjmc;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "鏂囦欢绫诲瀷", description = "1锛氬簱鍖洪笩鐬板浘 2锛氬叆搴撳浘鐗� 3锛氬嚭搴撳浘鐗� 4锛氬叆搴撴鏂よ棰戯紙鎴彇妫�鏂ゆ椂闂村墠鍚庡悇 5绉掗挓瑙嗛锛�5锛氬嚭搴撴鏂よ棰戯紙鎴彇妫�鏂ゆ椂闂村墠鍚庡悇 5 绉掗挓瑙嗛锛�104锛氱啅钂稿妗堟帴鍙ｉ檮浠�")
+ private String wjlx;
+
+ @PropertyDef(label = "鏂囦欢娴�")
+ private String wjl;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zhgxsj;
+
+}
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java
new file mode 100644
index 0000000..0acfc06
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java
@@ -0,0 +1,71 @@
+package com.fzzy.push.nx2023.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-绮鍏ュ簱妫�楠屼俊鎭�
+ */
+@Data
+public class Nx2023Api1203 implements Serializable {
+
+ @PropertyDef(label = "鍏ュ簱妫�楠屽崟鍙�")
+ private String rkjydh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
+ private String rkywdh;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎵︽牱鏃堕棿")
+ private Date qysj;
+
+ @PropertyDef(label = "鎵︽牱浜哄鍚�")
+ private String qyrxm;
+
+ @PropertyDef(label = "鎵︽牱鏂瑰紡")
+ private String qyfs;
+
+ @PropertyDef(label = "妫�楠岄」鐩�,闅斿紑")
+ private String jyxm;
+
+ @PropertyDef(label = "妫�楠屽��,闅斿紑")
+ private String jyz;
+
+ @PropertyDef(label = "澧炴墸浠�(鍏�,闅斿紑)")
+ private String zkj;
+
+ @PropertyDef(label = "澧炴墸閲�(鍏枻,闅斿紑)")
+ private String zkl;
+
+ @PropertyDef(label = "妫�楠屼汉濮撳悕")
+ private String jyrxm;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "妫�楠屾椂闂�")
+ private Date jysj;
+
+ @PropertyDef(label = "妫�楠岀粨鏋�")
+ private String jyjg;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "绮瀹氱瓑")
+ private String lsdd;
+
+ @PropertyDef(label = "淇濈鍛樺鏍�")
+ private String bgyfh;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date zhgxsj;
+}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 5671e74..f4820d2 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -487,9 +487,14 @@
if (null != api1208List && api1208List.size() > 0) {
api1203.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
- //璁剧疆璐ㄦ缂栫爜(榛樿绛夊悓浜庡叆搴撹川妫�鍗曞彿)
+ //璁剧疆璐ㄦ缂栫爜(榛樿绛夊悓浜庡叆搴撹川妫�鍗曞彿),鑻ヤ负鑸硅繍锛屽垯璁剧疆涓虹郴缁熷唴鑸硅繍鐨勫崟鍙�
api1203.setZjbh(api1203.getRkjydh());
-
+ List<Api1202> api1202List = api1202Rep.getDataById(api1203.getRkywdh());
+ if (null != api1202List && api1202List.size() > 0) {
+ if(api1202List.get(0).getYsgj().equals("3")){
+ api1203.setZjbh(api1202List.get(0).getBizId().substring(2));
+ }
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1203);
return api1203;
@@ -885,8 +890,8 @@
}
}
}
- api1403.setLrsl(lrsl);
- api1403.setLcsl(lcsl);
+ api1403.setLrsl(lrsl/1000 + "");
+ api1403.setLcsl(lcsl/1000 + "");
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1403);
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
index b0b4de9..5e5b772 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
@@ -66,10 +66,10 @@
private String bjw;
@PropertyDef(label = "杞叆鏁伴噺")
- private Double lrsl;
+ private String lrsl;
@PropertyDef(label = "杞嚭鏁伴噺")
- private Double lcsl;
+ private String lcsl;
}
--
Gitblit v1.9.3