From a0e5b14a6b8cf2a6e746828576d9591b74ced94b Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 17 十一月 2023 12:14:39 +0800
Subject: [PATCH] 调整视频监控点位标注信息接口同步

---
 src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 77d1b80..be60750 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -9,6 +9,8 @@
 import com.fzzy.api.service.ApiCommonService;
 import com.fzzy.api.service.ApiRemoteService;
 import com.fzzy.api.utils.*;
+import com.fzzy.api.view.repository.Api1101Rep;
+import com.fzzy.api.view.repository.Api1102Rep;
 import com.fzzy.api.view.repository.Api1404Rep;
 import com.fzzy.api.view.repository.ApiLogRep;
 import com.fzzy.push.gd2022.dto.*;
@@ -49,7 +51,10 @@
     private ApiCommonService apiCommonService;
     @Autowired
     private Api1404Rep api1404Rep;
-
+    @Autowired
+    private Api1101Rep api1101Rep;
+    @Autowired
+    private Api1102Rep api1102Rep;
     @Autowired
     private ApiLogRep apiLogRep;
 
@@ -346,6 +351,14 @@
         if (Constant.API_CODE_1111.equals(inteId)) {
             Gd2022Api1111 api1111 = new Gd2022Api1111();
             BeanUtils.copyProperties(data, api1111);
+            List<Api1102> api1102List = api1102Rep.findPushData(api1111.getKqdm());
+            if(null != api1102List && api1102List.size() > 0){
+                api1111.setKqmc(api1102List.get(0).getKqmc());
+            }
+            List<Api1101> api1101List = api1101Rep.findDataByDwdm(api1111.getDwdm());
+            if(null != api1101List && api1101List.size() > 0){
+                api1111.setDwmc(api1101List.get(0).getDwmc());
+            }
             return JSON.toJSONString(api1111);
         }
         if (Constant.API_CODE_1208.equals(inteId)) {
@@ -405,6 +418,10 @@
             api1403.setRotationInQty(lrsl);
             api1403.setRotationOutQty(lcsl);
             api1403.setDtls(dtls);
+            //鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
+            GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1403.getWjdz());
+            //璁剧疆涓婁紶鏂囦欢id
+            api1403.setFileStorageId((String) responseDto.getData());
             return JSON.toJSONString(api1403);
         }
         if (Constant.API_CODE_1404.equals(inteId)) {
@@ -655,7 +672,7 @@
             case "1112":
                 return ApiCodeConstant.API_CODE_RYXX;
             case "1113":
-                return "";
+                return ApiCodeConstant.API_CODE_QYXYXX;
             case "1201":
                 return ApiCodeConstant.API_CODE_HTXX;
             case "1202":
@@ -703,7 +720,7 @@
             case "1401":
                 return ApiCodeConstant.API_CODE_CBGM;
             case "1402":
-                return ApiCodeConstant.API_CODE_CBJHXX;
+                return ApiCodeConstant.API_CODE_CBJH;
             case "1403":
                 return ApiCodeConstant.API_CODE_LHJH;
             case "1404":

--
Gitblit v1.9.3