From a1a25c1830029c6eb3a8fc6ce4d23d7a20b3a515 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 30 六月 2025 09:13:21 +0800
Subject: [PATCH] 熏蒸备案调整
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync9201.java | 23 ++++++++++++++---------
src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java | 4 ++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java | 12 +++++++++---
3 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
index 03a3e98..d3d4317 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1209.java
@@ -12,9 +12,12 @@
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1209Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.Date;
import java.util.List;
@@ -107,10 +110,13 @@
apiData.setCksf(sysData.getCksf());
apiData.setCkzz(sysData.getCkzz());
apiData.setQzszkl(sysData.getQzszkl());
- apiData.setQzzrshde(sysData.getQzzrshde());
+
+ BigDecimal bigDecimal = BigDecimal.valueOf(sysData.getQzzrshde());
+ apiData.setQzzrshde(bigDecimal.setScale(3, RoundingMode.UP).doubleValue());
+
apiData.setChsl(sysData.getChsl());
- apiData.setCqqrbs(sysData.getCqqrbs());
- apiData.setCqqrsj(sysData.getCqqrsj());
+ apiData.setCqqrbs(1);
+ apiData.setCqqrsj(sysData.getCqqrsj() == null ? DateUtils.addSeconds(sysData.getCksj(), 120) : sysData.getCqqrsj());
apiData.setSyhj("2");
apiData.setSysfzc(StringUtils.isEmpty(sysData.getSysfzc()) ? "0" : sysData.getSysfzc());
apiData.setSfch(sysData.getSfch());
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..2f330db 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,12 @@
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());
if (data.getLqr().contains("銆�")) {
- api9201.setLqr(data.getLqr().replace('銆�', '|'));
+ api9201.setLqr(data.getLqr().replace('銆�', '|').trim());
}
//鍌ㄧ伯绮儏鏄庣粏琛�
@@ -134,11 +134,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));
@@ -167,10 +168,14 @@
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("鍩硅鍚堟牸");
}
+ api9201People.setZyzg(people.getZyzg().trim());
peopleList.add(api9201People);
}
api9201.setPeople(JSON.toJSONString(peopleList));
diff --git a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
index f388ac4..8f1ec15 100644
--- a/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/gd2023/GD2023ApiRemoteService2023.java
@@ -30,6 +30,8 @@
import java.lang.reflect.Field;
import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
import java.util.*;
/**
@@ -625,6 +627,8 @@
String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
apiData.setTyhwbm(tyhwbm);
}
+ BigDecimal bigDecimal = BigDecimal.valueOf(apiData.getQzzrshde());
+ apiData.setQzzrshde(bigDecimal.setScale(3, RoundingMode.UP).doubleValue());
apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
--
Gitblit v1.9.3