From a70bd1fd9fd10c3a8ae6cd83026be84b845ee0c9 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 01 八月 2024 15:22:42 +0800
Subject: [PATCH] 优化熏蒸备案数据同步
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
index a575d00..53a9aee 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -5,6 +5,7 @@
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.*;
import com.fzzy.async.fzzy40.entity.*;
@@ -18,6 +19,7 @@
import com.fzzy.push.gd2022.dto.Gd2022Api1023Way;
import com.fzzy.push.gd2022.ApiCodeConstant;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -54,6 +56,8 @@
private ApiCommonService commonService;
@Autowired
private ApiInfoDataRep apiInfoDataRep;
+ @Autowired
+ private ApiTriggerService apiTriggerService;
/**
@@ -64,7 +68,7 @@
* @param end
*/
public void syncData(String kqdm, String deptId, Date start, Date end) {
- log.info("-------------1023鎺ュ彛璁惧淇℃伅寮�濮嬪悓姝�------------------");
+ log.info("-------------1023鎺ュ彛鐔忚捀澶囨淇℃伅寮�濮嬪悓姝�------------------");
//鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
ApiLog apiLog = new ApiLog();
@@ -113,6 +117,9 @@
GD2022Api1023.setYjlx(data.getDrugType());
GD2022Api1023.setLqrq(data.getLqsj());
GD2022Api1023.setZhgxsj(data.getUpdateTime());
+ if(data.getLqr().contains("銆�")){
+ GD2022Api1023.setLqr(data.getLqr().replace("銆�", "|"));
+ }
//鍌ㄧ伯绮儏鏄庣粏琛�
List<Fz40DrugLogDtl> dtls = drugLogDtlRep.listDrugLogDtl(data.getXzbm());
@@ -121,10 +128,12 @@
BeanUtils.copyProperties(data, gd2022Api1023Dtl);
if (null != api1105) {
gd2022Api1023Dtl.setCfmc(api1105.getHwmc());
- gd2022Api1023Dtl.setCfdm(api1105.getHwdm().substring(0,25));
+ gd2022Api1023Dtl.setCfdm(api1105.getHwdm().substring(0, 25));
}
- gd2022Api1023Dtl.setLspzdm(data.getFoodVariety());
+ //绮鍝佺
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, data.getFoodVariety().substring(0, 3));
+ gd2022Api1023Dtl.setLspzdm(mappingCode);
gd2022Api1023Dtl.setLsxzdm(data.getFoodType());
gd2022Api1023Dtl.setLsdjdm(data.getFoodLevel());
gd2022Api1023Dtl.setLssl(data.getNumber());
@@ -176,6 +185,10 @@
gd2022Api1023People = new Gd2022Api1023People();
BeanUtils.copyProperties(people, gd2022Api1023People);
gd2022Api1023People.setXm(people.getMx());
+ if(StringUtils.isEmpty(gd2022Api1023People.getZyzg())){
+ gd2022Api1023People.setZyzg("楂樼骇");
+ }
+
peopleList.add(gd2022Api1023People);
}
GD2022Api1023.setPeoples(peopleList);
@@ -189,16 +202,15 @@
infoData.setBizType(PushProtocol.SB_GD_2022.getCode());
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getXzbm());
+ infoData.setId(data.getXzbm());
apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), kqdm);
if (null == apiInfoList || apiInfoList.isEmpty()) {
GD2022Api1023.setCzbz(Constant.CZBZ_I);
infoData.setCzbz(Constant.CZBZ_I);
- infoData.setId(ContextUtil.getUUID());
} else {
GD2022Api1023.setCzbz(apiInfoList.get(0).getCzbz());
infoData.setCzbz(apiInfoList.get(0).getCzbz());
- infoData.setId(apiInfoList.get(0).getId());
}
infoData.setData(JSON.toJSONString(GD2022Api1023));
@@ -209,8 +221,8 @@
}
} catch (Exception e) {
- log.error("---璁惧淇℃伅鍚屾鎵ц澶辫触----{}", e.toString());
- apiLog.setResult("璁惧淇℃伅鍚屾鎵ц澶辫触锛�" + e.getMessage());
+ log.error("---鐔忚捀澶囨鍚屾鎵ц澶辫触----{}", e.toString());
+ apiLog.setResult("鐔忚捀澶囨淇℃伅鍚屾鎵ц澶辫触锛�" + e.getMessage());
apiLogRep.save(apiLog);
}
}
--
Gitblit v1.9.3