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/entity/Fz40DrugLogApply.java | 2 +-
src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java | 9 +++++----
src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml | 7 +++++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java | 12 ++++++++----
4 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
index b81cee6..43ad9ca 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
@@ -22,7 +22,7 @@
@Id
@Column(name = "xzbm", length = 12)
- @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "yyyyMMDD+4浣嶉『搴忓彿")
private String xzbm;
@Column(name = "DEPT_ID_", length = 21)
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 95c015e..53a9aee 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -19,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;
@@ -117,7 +118,7 @@
GD2022Api1023.setLqrq(data.getLqsj());
GD2022Api1023.setZhgxsj(data.getUpdateTime());
if(data.getLqr().contains("銆�")){
- GD2022Api1023.setLqr(data.getLqr().replace('銆�', '|'));
+ GD2022Api1023.setLqr(data.getLqr().replace("銆�", "|"));
}
//鍌ㄧ伯绮儏鏄庣粏琛�
@@ -131,7 +132,7 @@
}
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, 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());
@@ -184,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);
@@ -197,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));
diff --git a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
index 6ccde2e..1e1cd92 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
+++ b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
@@ -532,6 +532,13 @@
<Property name="align">center</Property>
</DataColumn>
</DataGrid>
+ <ToolBar layoutConstraint="bottom">
+ <Fill/>
+ <DataPilot>
+ <Property name="itemCodes">pageSize,pages</Property>
+ <Property name="dataSet">dsMain</Property>
+ </DataPilot>
+ </ToolBar>
<Dialog id="dialogMain" layout="regionPadding:5">
<Property name="width">85%</Property>
<Property name="closeable">false</Property>
diff --git a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
index afa744e..9101183 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
@@ -19,6 +19,7 @@
import com.fzzy.push.gd2022.dto.Gd2022Api1023;
import com.fzzy.push.gd2022.ApiCodeConstant;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
@@ -108,7 +109,7 @@
@DataResolver
public void saveData(Gd2022Api1023 data) {
ApiInfoData infoData;
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm(), data.getKqdm());
if (apiInfoList.size() != 0) {
infoData = apiInfoList.get(0);
infoData.setData(JSON.toJSONString(data));
@@ -131,7 +132,7 @@
*/
@Expose
public void delData(Gd2022Api1023 data) {
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm(), data.getKqdm());
apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
}
@@ -143,7 +144,7 @@
if (null == data) {
return "鏃犳暟鎹墽琛�";
}
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm(), data.getKqdm());
data.setCzbz(Constant.CZBZ_D);
apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
return null;
@@ -183,7 +184,7 @@
if (responseDto.getSuccess() == 0) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
//鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
+ List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm(), data.getKqdm());
data.setCzbz(Constant.CZBZ_U);
infoData = apiInfoList.get(0);
infoData.setUpdateTime(new Date());
--
Gitblit v1.9.3