From 4941a9e02e1a89ae3e584787ac1cbf580825f2f2 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 25 十一月 2024 18:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
index 9c0d03d..ed05d2d 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
@@ -7,16 +7,15 @@
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.service.PushService12;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1204;
-import com.fzzy.otherview.whhpjl.dto.WhjlApi1207;
-import com.fzzy.otherview.whhpjl.dto.WhjlApi1214;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1206;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1212;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.ArrayList;
import java.util.List;
@@ -28,7 +27,7 @@
*/
@Slf4j
@Component
-public class WhjlPushService12 implements PushService11 {
+public class WhjlPushService12 implements PushService12 {
@Autowired
private WhjlApiRemoteService apiRemoteService;
@@ -111,15 +110,15 @@
}
param.setInteCategory(WhjlConstant.API_CATEGORY_12);
param.setInteId(WhjlConstant.API_CODE_1207);
- List<WhjlApi1207> list = new ArrayList<>();
- WhjlApi1207 whjlApi1207;
+ List<WhjlApi1206> list = new ArrayList<>();
+ WhjlApi1206 whjlApi1206;
for (ApiInfoData infoData : items) {
- whjlApi1207 = JSONObject.parseObject(infoData.getData(), WhjlApi1207.class);
- whjlApi1207.setKqdm(infoData.getKqdm());
- whjlApi1207.setCzbz(infoData.getCzbz());
- whjlApi1207.setUpdateTime(infoData.getUpdateTime());
- whjlApi1207.setBizId(infoData.getDataId());
- list.add(whjlApi1207);
+ whjlApi1206 = JSONObject.parseObject(infoData.getData(), WhjlApi1206.class);
+ whjlApi1206.setKqdm(infoData.getKqdm());
+ whjlApi1206.setCzbz(infoData.getCzbz());
+ whjlApi1206.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1206.setBizId(infoData.getDataId());
+ list.add(whjlApi1206);
}
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
@@ -149,15 +148,15 @@
}
param.setInteCategory(WhjlConstant.API_CATEGORY_12);
param.setInteId(WhjlConstant.API_CODE_1214);
- List<WhjlApi1214> list = new ArrayList<>();
- WhjlApi1214 whjlApi1214;
+ List<WhjlApi1212> list = new ArrayList<>();
+ WhjlApi1212 whjlApi1212;
for (ApiInfoData infoData : items) {
- whjlApi1214 = JSONObject.parseObject(infoData.getData(), WhjlApi1214.class);
- whjlApi1214.setKqdm(infoData.getKqdm());
- whjlApi1214.setCzbz(infoData.getCzbz());
- whjlApi1214.setUpdateTime(infoData.getUpdateTime());
- whjlApi1214.setBizId(infoData.getDataId());
- list.add(whjlApi1214);
+ whjlApi1212 = JSONObject.parseObject(infoData.getData(), WhjlApi1212.class);
+ whjlApi1212.setKqdm(infoData.getKqdm());
+ whjlApi1212.setCzbz(infoData.getCzbz());
+ whjlApi1212.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1212.setBizId(infoData.getDataId());
+ list.add(whjlApi1212);
}
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
--
Gitblit v1.9.3