From ffbdb60fa78be56eb148e60f4972e163a46825a5 Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期四, 17 八月 2023 19:31:17 +0800
Subject: [PATCH] 提交 人员 设备 数据上报

---
 src/main/java/com/fzzy/api/view/repository/Api1112Rep.java  |    8 ++++
 src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java |    6 +++
 src/main/java/com/fzzy/push/impl/ComPushService11.java      |   68 ++++++++++++++++++++++++++++++----
 src/main/java/com/fzzy/api/view/repository/Api1107Rep.java  |    6 +++
 4 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java
index 3fd5bda..0dbc4f1 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java
@@ -1,11 +1,14 @@
 package com.fzzy.api.view.repository;
 
 import com.fzzy.api.entity.Api1107;
+import com.fzzy.api.entity.Api1112;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 
 public interface Api1107Rep extends JpaRepository<Api1107, String> {
@@ -22,4 +25,7 @@
     @Query("update Api1107 set czbz=:czbz where bizId=:id ")
     int updateStatus(@Param("id") String id, @Param("czbz") String czbz);
 
+    @Query("from Api1107 where kqdm=:kqdm")
+    List<Api1107> findPushData(@Param("kqdm") String kqdm);
+
 }
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1112Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1112Rep.java
index e489261..8972a58 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1112Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1112Rep.java
@@ -1,11 +1,15 @@
 package com.fzzy.api.view.repository;
 
 import com.fzzy.api.entity.Api1112;
+import com.fzzy.api.entity.Api1306;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
 
 
 public interface Api1112Rep extends JpaRepository<Api1112, String> {
@@ -22,4 +26,8 @@
     @Query("update Api1112 set czbz=:czbz where sfzhm=:id ")
     int updateStatus(@Param("id") String id, @Param("czbz") String czbz);
 
+
+    @Query("from Api1112 where kqdm=:kqdm")
+    List<Api1112> findPushData(@Param("kqdm") String kqdm);
+
 }
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java b/src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java
index 8be0d24..f1f7342 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022PushService11.java
@@ -35,6 +35,12 @@
 
         //搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆暟鎹�
         pushService.pushData1111(apiRemoteService, param);
+
+        //璁惧
+        pushService.pushData1107(apiRemoteService, param);
+
+        //浜哄憳
+        pushService.pushData1112(apiRemoteService, param);
     }
 
 }
diff --git a/src/main/java/com/fzzy/push/impl/ComPushService11.java b/src/main/java/com/fzzy/push/impl/ComPushService11.java
index 6cc557a..ffeab90 100644
--- a/src/main/java/com/fzzy/push/impl/ComPushService11.java
+++ b/src/main/java/com/fzzy/push/impl/ComPushService11.java
@@ -3,13 +3,9 @@
 import com.fzzy.api.Constant;
 import com.fzzy.api.data.ApiParam;
 import com.fzzy.api.dto.ResponseDto;
-import com.fzzy.api.entity.Api1101;
-import com.fzzy.api.entity.Api1102;
-import com.fzzy.api.entity.Api1111;
+import com.fzzy.api.entity.*;
 import com.fzzy.api.service.ApiRemoteService;
-import com.fzzy.api.view.repository.Api1101Rep;
-import com.fzzy.api.view.repository.Api1102Rep;
-import com.fzzy.api.view.repository.Api1111Rep;
+import com.fzzy.api.view.repository.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,8 +24,11 @@
     @Autowired
     private Api1102Rep api1102Rep;
     @Autowired
+    private Api1107Rep api1107Rep;
+    @Autowired
     private Api1111Rep api1111Rep;
-
+    @Autowired
+    private Api1112Rep api1112Rep;
     /**
      * 1101 鍗曚綅淇℃伅
      */
@@ -57,7 +56,7 @@
     }
 
     /**
-     * 1101 搴撳尯淇℃伅
+     * 1102 搴撳尯淇℃伅
      */
     public void pushData1102(ApiRemoteService apiRemoteService, ApiParam param) {
 
@@ -77,6 +76,32 @@
             if (responseDto.getSuccess() == 0) {
                 if (Constant.CZBZ_I.equals(data.getCzbz())) {
                     api1102Rep.updateStatus(data.getDwdm(), Constant.CZBZ_U);
+                }
+            }
+        }
+    }
+
+    /**
+     * 1107 璁惧淇℃伅
+     */
+    public void pushData1107(ApiRemoteService apiRemoteService, ApiParam param) {
+
+        List<Api1107> items = api1107Rep.findPushData(param.getKqdm());
+        if (null == items || items.isEmpty()) {
+            return;
+        }
+
+        param.setInteCategory(Constant.API_CATEGORY_11);
+        param.setInteId(Constant.API_CODE_1107);
+
+        ResponseDto responseDto;
+        for (Api1107 data : items) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+
+            if (responseDto.getSuccess() == 0) {
+                if (Constant.CZBZ_I.equals(data.getCzbz())) {
+                    api1107Rep.updateStatus(data.getDwdm(), Constant.CZBZ_U);
                 }
             }
         }
@@ -107,4 +132,31 @@
             }
         }
     }
+
+    /**
+     * 1112 浜哄憳淇℃伅
+     *
+     */
+    public void pushData1112(ApiRemoteService apiRemoteService, ApiParam param) {
+
+        List<Api1112> items = api1112Rep.findPushData(param.getKqdm());
+        if (null == items || items.isEmpty()) {
+            return;
+        }
+
+        param.setInteCategory(Constant.API_CATEGORY_11);
+        param.setInteId(Constant.API_CODE_1112);
+
+        ResponseDto responseDto;
+        for (Api1112 data : items) {
+            param.setBizId(data.getBizId());
+            responseDto = apiRemoteService.pushData(param, data);
+
+            if (responseDto.getSuccess() == 0) {
+                if (Constant.CZBZ_I.equals(data.getCzbz())) {
+                    api1112Rep.updateStatus(data.getSfzhm(), Constant.CZBZ_U);
+                }
+            }
+        }
+    }
 }

--
Gitblit v1.9.3