From 9f6dacf7b39e5aeba37d8faf575c9e56d8cbe51a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 11 十月 2025 13:35:42 +0800
Subject: [PATCH] 武汉黄陂军粮-质检报告共享接口同步及推送
---
src/main/java/com/fzzy/api/view/pr/GbUnifiedCodingPR.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/pr/GbUnifiedCodingPR.java b/src/main/java/com/fzzy/api/view/pr/GbUnifiedCodingPR.java
index 4770c01..4e54fe3 100644
--- a/src/main/java/com/fzzy/api/view/pr/GbUnifiedCodingPR.java
+++ b/src/main/java/com/fzzy/api/view/pr/GbUnifiedCodingPR.java
@@ -7,7 +7,9 @@
import com.fzzy.api.dto.GbCodingData;
import com.fzzy.api.dto.ReqGbCoding;
import com.fzzy.api.dto.RespGbCoding;
+import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.GbUnifiedCoding;
+import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.view.repository.GbUnifiedCodingRep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -18,6 +20,7 @@
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
+
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
@@ -41,6 +44,8 @@
private GbUnifiedCodingRep codingRep;
@Autowired
private RestTemplate restTemplate;
+ @Autowired
+ private ApiCommonService apiCommonService;
/**
* gbUnifiedCodingPR#pageList
@@ -72,12 +77,12 @@
}
str = (String) param.get("cfmc");
if (StringUtils.isNotBlank(str)) {
- Predicate predicate2 = cb.equal(root.get("cfmc"),str);
+ Predicate predicate2 = cb.equal(root.get("cfmc"), str);
predicates.add(predicate2);
}
str = (String) param.get("kqmc");
if (StringUtils.isNotBlank(str)) {
- Predicate predicate3 = cb.equal(root.get("kqmc"),str);
+ Predicate predicate3 = cb.equal(root.get("kqmc"), str);
predicates.add(predicate3);
}
return cb.and(predicates.toArray(new Predicate[0]));
@@ -117,17 +122,26 @@
return "鎵ц澶辫触锛氬崟浣嶇紪鐮佷负绌猴紝璇锋牳鏌ワ紒";
}
+ String url = GB_CODING_URL;
+ List<ApiConfs> apiConfs = apiCommonService.listCacheConf();
+ if (null != apiConfs || apiConfs.size() > 0) {
+ ApiConfs apiConf = apiConfs.get(0);
+ if (null != apiConf && StringUtils.isNotEmpty(apiConf.getGbCodingUrl())) {
+ url = apiConf.getGbCodingUrl();
+ }
+ }
+
//璁剧疆鍙傛暟
ReqGbCoding reqGbCoding = new ReqGbCoding(dwdm);
- RespGbCoding respGbCoding = restTemplate.postForObject(GB_CODING_URL, reqGbCoding, RespGbCoding.class);
- if(null == respGbCoding){
+ RespGbCoding respGbCoding = restTemplate.postForObject(url, reqGbCoding, RespGbCoding.class);
+ if (null == respGbCoding) {
return "鎷夊彇鏁版嵁澶辫触锛岃閲嶈瘯锛�";
}
- if(!"0".equals(respGbCoding.getCode())){
+ if (!"0".equals(respGbCoding.getCode())) {
return respGbCoding.getMsg();
}
GbCodingData data = JSONObject.parseObject(JSONObject.toJSONString(respGbCoding.getData()), GbCodingData.class);
- if(null == data || data.getList().isEmpty()){
+ if (null == data || data.getList().isEmpty()) {
return "鎷夊彇鏁版嵁涓虹┖锛岃閲嶈瘯锛�";
}
for (GbUnifiedCoding gbUnifiedCoding : data.getList()) {
--
Gitblit v1.9.3