From 3e8e2bfdfbcf06659d7734d3e1cb63fd0f46c35d Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 03 一月 2025 15:30:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
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..0b7860a 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;
@@ -65,7 +66,7 @@
@Override
public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
- Predicate predicate = criteriaBuilder.equal(root.get("inteId"), ApiCodeConstant.API_1023);
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), ApiCodeConstant.API_9201);
predicates.add(predicate);
if (null != param) {
if (StringUtils.isNotBlank(param.getKqdm())) {
@@ -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;
@@ -168,7 +169,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, "21", ApiCodeConstant.API_1023);
+ ApiParam param = new ApiParam(apiConf, "21", ApiCodeConstant.API_9201);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -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_9201, 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