From 83a5abea31bf14c78572d3a4c5fdf14afb97c82f Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 11 一月 2025 10:58:15 +0800
Subject: [PATCH] 增加登录日志和错误次数校验

---
 src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java |   47 ++++++++++++++++++++++++++---------------------
 1 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
index 9c3cb9e..ed126b8 100644
--- a/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2024/SX2024ApiRemoteService.java
@@ -11,6 +11,7 @@
 import com.fzzy.api.service.ApiRemoteService;
 import com.fzzy.api.service.ApiTriggerService;
 import com.fzzy.api.utils.*;
+import com.fzzy.api.view.repository.Api1208Rep;
 import com.fzzy.api.view.repository.Api1404Rep;
 import com.fzzy.api.view.repository.ApiLogRep;
 
@@ -25,6 +26,7 @@
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -43,6 +45,8 @@
     private ApiCommonService apiCommonService;
     @Autowired
     private ApiTriggerService apiTriggerService;
+    @Autowired
+    private Api1208Rep api1208Rep;
     @Autowired
     private ApiLogRep apiLogRep;
     @Autowired
@@ -96,14 +100,14 @@
             //鑾峰彇鎸囦护id
             String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
             String orderId = (String) redisUtil.get(key);
-            if (StringUtils.isEmpty(orderId)) {
-                log.error("鎸囦护id澶辨晥");
-                ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
-                apiLog.setStatus(99);
-                apiLog.setResult("鎸囦护id澶辨晥");
-                apiLogRep.save(apiLog);
-                return responseDto;
-            }
+//            if (StringUtils.isEmpty(orderId)) {
+//                log.error("鎸囦护id澶辨晥");
+//                ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
+//                apiLog.setStatus(99);
+//                apiLog.setResult("鎸囦护id澶辨晥");
+//                apiLogRep.save(apiLog);
+//                return responseDto;
+//            }
 
             //灏佽鎺ㄩ�佹暟鎹�
             SX2024ReqDto reqData = new SX2024ReqDto();
@@ -246,7 +250,7 @@
             BeanUtils.copyProperties(data, apiData);
             //璁剧疆绲变竴浠撴埧缂栫爜
             if (StringUtils.isEmpty(apiData.getTycfbm())) {
-                String tycfbm = apiCommonService.getTykqbm(apiData.getCfbh());
+                String tycfbm = apiCommonService.getTycfbm(apiData.getCfbh());
                 apiData.setTycfbm(tycfbm);
             }
             //璁剧疆绲变竴寤掗棿鍚嶇О
@@ -553,7 +557,7 @@
             }
             //璁剧疆绮潈鍗曚綅绲变竴缂栫爜
             if (StringUtils.isEmpty(apiData.getLqgstydwbm())) {
-                String tydwbm = apiCommonService.getTydwbm(apiData.getHwdm());
+                String tydwbm = apiCommonService.getTydwbm(apiData.getLqgsdwdm());
                 apiData.setLqgstydwbm(tydwbm);
             }
             return apiData;
@@ -573,6 +577,15 @@
             }
             //瀹為檯鎹熻�楁暟閲忚祴鍊�
             apiData.setSjsysl(api1209.getJzsysl());
+
+            //璁剧疆鍝佺銆佹�ц川銆佺瓑绾с�佸勾搴�
+            List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getHwdm());
+            if (null != api1208List && api1208List.size() > 0) {
+                apiData.setLspzdm(api1208List.get(0).getLspzdm());
+                apiData.setLsxzdm(api1208List.get(0).getLsxzdm());
+                apiData.setLsdjdm(api1208List.get(0).getLsdjdm());
+                apiData.setShnd(api1208List.get(0).getShnd());
+            }
             return apiData;
         }
         if (Constant.API_CODE_1210.equals(inteId)) {
@@ -853,21 +866,13 @@
             Api1504 api1504 = (Api1504)data;
             SX2024Api1504 apiData = new SX2024Api1504();
             BeanUtils.copyProperties(api1504, apiData);
-            //璁剧疆绲变竴鍗曚綅缂栫爜
-            if (StringUtils.isEmpty(apiData.getXqydm())) {
-                String tydwbm = apiCommonService.getTydwbm(apiData.getCOrgCode());
-                apiData.setXqydm(tydwbm);
-            }
-            //璁剧疆绲变竴搴撳尯缂栫爜
-            if (StringUtils.isEmpty(apiData.getXkqdm())) {
-                String tykqbm = apiCommonService.getTykqbm(api1504.getKqdm());
-                apiData.setXkqdm(tykqbm);
-            }
             return apiData;
         }
         if (Constant.API_CODE_1505.equals(inteId)) {
+            Api1505 api1505 = (Api1505)data;
             SX2024Api1505 apiData = new SX2024Api1505();
-            BeanUtils.copyProperties(data, apiData);
+            BeanUtils.copyProperties(api1505, apiData);
+            apiData.setCqunit(api1505.getCqunit() + "");
             return apiData;
         }
         if (Constant.API_CODE_1506.equals(inteId)) {

--
Gitblit v1.9.3