From f43613cc5aba07a9cb0482b7171ae6569c901e50 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 22 九月 2025 10:32:01 +0800
Subject: [PATCH] 61版本同步
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java
index abf3754..34b288a 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java
@@ -109,12 +109,13 @@
if (null != api1101List && api1101List.size() > 0) {
api9201.setDwmc(api1101List.get(0).getDwmc());
}
- api9201.setYjmc(data.getDrugName());
- api9201.setYjlx(data.getDrugType());
+ api9201.setYjmc(data.getDrugName().trim());
+ api9201.setYjlx(data.getDrugType().trim());
api9201.setLqrq(data.getLqsj());
api9201.setZhgxsj(data.getUpdateTime());
+ api9201.setXcfzr(data.getXcfzr().trim());
if (data.getLqr().contains("銆�")) {
- api9201.setLqr(data.getLqr().replace('銆�', '|'));
+ api9201.setLqr(data.getLqr().replace('銆�', '|').trim());
}
//鍌ㄧ伯绮儏鏄庣粏琛�
@@ -134,11 +135,12 @@
//绮鍝佺
String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, dtl.getFoodVariety());
api9201Dtl.setLspzdm(mappingCode);
- api9201Dtl.setLsxzdm(data.getFoodType());
- api9201Dtl.setLsdjdm(data.getFoodLevel());
- api9201Dtl.setLssl(data.getNumber());
- api9201Dtl.setSf(data.getPerWet());
- api9201Dtl.setZz(data.getPerImpurity());
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, dtl.getFoodType());
+ api9201Dtl.setLsxzdm(mappingCode);
+ api9201Dtl.setLsdjdm(dtl.getFoodLevel());
+ api9201Dtl.setLssl(dtl.getNumber());
+ api9201Dtl.setSf(dtl.getPerWet());
+ api9201Dtl.setZz(dtl.getPerImpurity());
dtlList.add(api9201Dtl);
}
api9201.setDtl(JSON.toJSONString(dtlList));
@@ -158,6 +160,8 @@
api9201Way = new Gd2022Api1023Way();
BeanUtils.copyProperties(data, api9201Way);
wayList = new ArrayList<>();
+ api9201Way.setSqfs(data.getSqfs().trim());
+ api9201Way.setXzfs(data.getXzfs().trim());
wayList.add(api9201Way);
api9201.setWay(JSON.toJSONString(wayList));
@@ -167,10 +171,17 @@
for (Fz40DrugLogPeople people : peoples) {
api9201People = new Gd2022Api1023People();
BeanUtils.copyProperties(people, api9201People);
- api9201People.setXm(people.getMx());
+ api9201People.setXm(people.getMx().trim());
+ api9201People.setZw(people.getZw().trim());
+ api9201People.setXzrwfg(people.getXzrwfg().trim());
+ api9201People.setStzk(people.getStzk().trim());
if (StringUtils.isEmpty(people.getZyzg())) {
- api9201People.setZyzg("鍩硅鍚堟牸");
+ people.setZyzg("鍩硅鍚堟牸");
}
+ if (StringUtils.isEmpty(people.getSfwb())) {
+ people.setSfwb("鍚�");
+ }
+ api9201People.setZyzg(people.getZyzg().trim());
peopleList.add(api9201People);
}
api9201.setPeople(JSON.toJSONString(peopleList));
@@ -187,7 +198,7 @@
}
} catch (Exception e) {
- log.error("---鐔忚捀澶囨鍚屾鎵ц澶辫触----{}", e.toString());
+ log.error("---鐔忚捀澶囨鍚屾鎵ц澶辫触----{}", e);
apiLog.setResult("鐔忚捀澶囨淇℃伅鍚屾鎵ц澶辫触锛�" + e.getMessage());
apiLogRep.save(apiLog);
}
--
Gitblit v1.9.3