From 7c8d42e0ff3e8d0be0521a4867dc4e1827c1f3b2 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 07 八月 2023 17:26:01 +0800
Subject: [PATCH] 武汉军粮省平台-优化保存及推送
---
src/main/java/com/fzzy/api/service/ApiTriggerService.java | 3 +
src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml | 23 +++++++++++
src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java | 36 +++++++++++++-----
src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java | 6 ++
4 files changed, 57 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/fzzy/api/service/ApiTriggerService.java b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
index eee5322..00f60f3 100644
--- a/src/main/java/com/fzzy/api/service/ApiTriggerService.java
+++ b/src/main/java/com/fzzy/api/service/ApiTriggerService.java
@@ -184,6 +184,8 @@
list.add(new ApiTrigger(PushProtocol.SB_SC_2021.getCode(), PushProtocol.SB_SC_2021.getName()));
list.add(new ApiTrigger(PushProtocol.SB_GD_2022.getCode(), PushProtocol.SB_GD_2022.getName()));
list.add(new ApiTrigger(PushProtocol.SB_GD_2020.getCode(), PushProtocol.SB_GD_2020.getName()));
+ list.add(new ApiTrigger(PushProtocol.SB_HN_2022.getCode(), PushProtocol.SB_HN_2022.getName()));
+ list.add(new ApiTrigger(PushProtocol.SB_WHJL_2023.getCode(), PushProtocol.SB_WHJL_2023.getName()));
list.add(new ApiTrigger(PushProtocol.HB_FZZY_JG_2022.getCode(), PushProtocol.HB_FZZY_JG_2022.getName()));
list.add(new ApiTrigger(PushProtocol.SB_SHJdJW_2023.getCode(), PushProtocol.SB_SHJdJW_2023.getName()));
return list;
@@ -202,6 +204,7 @@
list.add(new ApiTrigger(SyncProtocol.FZZY_V30_GB.getCode(), SyncProtocol.FZZY_V30_GB.getName()));
list.add(new ApiTrigger(SyncProtocol.FZZY_V35_GB.getCode(), SyncProtocol.FZZY_V35_GB.getName()));
list.add(new ApiTrigger(SyncProtocol.FZZY_V40_GB.getCode(), SyncProtocol.FZZY_V40_GB.getName()));
+ list.add(new ApiTrigger(SyncProtocol.FZZY_V40_WHJL.getCode(), SyncProtocol.FZZY_V40_WHJL.getName()));
list.add(new ApiTrigger(SyncProtocol.FZZY_V35_SHYZ.getCode(), SyncProtocol.FZZY_V35_SHYZ.getName()));
return list;
}
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
index ab9be50..90d2f5a 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
@@ -1,10 +1,15 @@
package com.fzzy.push.whhpjl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.PushService11;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1101;
import lombok.extern.slf4j.Slf4j;
@@ -12,6 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -26,6 +32,8 @@
@Autowired
private WhjlApiRemoteService apiRemoteService;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
@Override
public String getProtocol() {
@@ -60,26 +68,34 @@
*/
private void pushData1101(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO 鑾峰彇鍐涘伐浼佷笟淇℃伅
- List<WhjlApi1101> items = new ArrayList<>();
+ //鑾峰彇鍐涘伐浼佷笟淇℃伅
+ List<ApiInfoData> items = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1101);
+
if (null == items || items.isEmpty()) {
return;
}
param.setInteCategory(WhjlConstant.API_CATEGORY_11);
param.setInteId(WhjlConstant.API_CODE_1101);
+ List<WhjlApi1101> list = new ArrayList<>();
+ WhjlApi1101 whjlApi1101;
+ for (ApiInfoData infoData : items) {
+ whjlApi1101 = JSONObject.parseObject(infoData.getData().toString(), WhjlApi1101.class);
+ whjlApi1101.setKqdm(infoData.getKqdm());
+ whjlApi1101.setCzbz(infoData.getCzbz());
+ whjlApi1101.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1101.setBizId(infoData.getDataId());
+ list.add(whjlApi1101);
+ }
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
- ResponseDto responseDto = apiRemoteService.pushData(param, items);
+ ResponseDto responseDto = apiRemoteService.pushData(param, list);
if (responseDto.getSuccess() == 0) {
//鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
- WhjlApi1101 d;
- for (WhjlApi1101 data : items) {
- d = new WhjlApi1101();
- BeanUtils.copyProperties(data, d);
- if("i".equals(d.getCzbz())){
- d.setCzbz("u");
- //TODO 鏇存柊鐘舵�侊紝寰呭疄鐜�
+ for (ApiInfoData data : items) {
+ if(Constant.CZBZ_I.equals(data.getCzbz())){
+ data.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(data);
}
}
}
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml b/src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml
index 151dce9..7a460b8 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml
+++ b/src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml
@@ -506,6 +506,19 @@
<Property name="dataType">Date</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
</PropertyDef>
+ <PropertyDef name="czbz">
+ <Property></Property>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtGBArea">
<Property name="creationType">com.fzzy.api.entity.GbArea</Property>
@@ -860,6 +873,16 @@
<Property name="property">updateTime</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
<Tools/>
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java
index 4437aac..5ca8385 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java
+++ b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java
@@ -53,6 +53,10 @@
WhjlApi1101 whjlApi1101;
for (ApiInfoData infoData : result) {
whjlApi1101 = JSONObject.parseObject(infoData.getData().toString(), WhjlApi1101.class);
+ whjlApi1101.setKqdm(infoData.getKqdm());
+ whjlApi1101.setCzbz(infoData.getCzbz());
+ whjlApi1101.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1101.setBizId(infoData.getDataId());
list.add(whjlApi1101);
}
return list;
@@ -75,6 +79,7 @@
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
infoData.setRemarks("澶囨敞淇℃伅");
apiInfoDataRep.save(infoData);
@@ -133,7 +138,6 @@
infoData.setInteId(WhjlConstant.API_CODE_1101);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
- infoData.setRemarks("澶囨敞淇℃伅");
data.setCzbz(Constant.CZBZ_U);
infoData.setCzbz(Constant.CZBZ_U);
--
Gitblit v1.9.3