From 3e00a494fc8c2955b5781f79d6b952a4bb3a497c Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Wed, 5 Jun 2024 17:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E8=87=AA=E6=96=B0=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20=E6=A0=B9=E6=8D=AE=E4=BC=81=E4=B8=9Axxbh=20?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=91=A8=E6=9C=9F=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mudu/quartz/AcheckTaskQuartz.java     | 22 ++++++++++++++++---
 src/main/resources/application-prod.yml       | 10 ++++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java
index d40a775..a02f173 100644
--- a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java
+++ b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java
@@ -104,7 +104,11 @@ public class AcheckTaskQuartz {
     @Value("${zcXxUrl}")
     private String zcXxUrl;
 
+    @Value("${zczqUrl}")
+    private String zczqUrl;
 
+    @Value("${xczqUrl}")
+    private String xczqUrl;
     /**
      * 新增创建时间为昨天且处于审批通过的工单数据
      *
@@ -133,11 +137,17 @@ public class AcheckTaskQuartz {
             return null;
         }
         for (ACheckQuatzRequest a : list) {
-            // todo 来自新表查询 根据企业xxbh 以及周期编号
-            String xcrwuuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
             //获取企业编号
             ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(a.getName(), a.getEntCode());
             String enterPriseId = aSafeQyjcxx.getXxbh();
+            // todo 来自新表查询 根据企业xxbh 以及周期编号
+            JSONObject xcjsonObject = new JSONObject();
+            xcjsonObject.put("xxbh", aSafeQyjcxx.getXxbh());
+            xcjsonObject.put("zqbh", rwzqUuid);
+            String xcresponse = HttpRequest.post(xczqUrl).contentType("application/x-www-form-urlencoded;charset=UTF-8").body(xcjsonObject.toJSONString()).execute().body();
+            JSONObject xcjsonResponse = JSON.parseObject(xcresponse);
+            String xcrwuuid = xcjsonResponse.getString("msg");
+
             //根据工单获取数据
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("improvingNo", a.getImprovingNo());
@@ -594,7 +604,13 @@ public class AcheckTaskQuartz {
             return null;
         }
         for (ACheckQuatzZichaRequest a : list) {
-            String zcrwUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
+            JSONObject zcjsonObject = new JSONObject();
+            zcjsonObject.put("xxbh", a.getEnterpriseID());
+            zcjsonObject.put("zqbh", rwzqUuid);
+            String zcresponse = HttpRequest.post(zczqUrl).contentType("application/x-www-form-urlencoded;charset=UTF-8").body(zcjsonObject.toJSONString()).execute().body();
+            JSONObject zcjsonResponse = JSON.parseObject(zcresponse);
+            String zcrwUuid = zcjsonResponse.getString("msg");
+
             /**
              *新增任务周期a_safe_rwzq
              */
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index af9e9df..1f8a74b 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -49,4 +49,12 @@ zcXxUrl: http://221.229.220.83:9028/mudu/quatz/zicha
 bqbhUrl: http://221.229.220.83:9028/mudu/aSafeBqbhpx/findAll
 
 # 特殊作业
-tszyUrl: http://221.229.220.83:9028/mudu/aSafeQyzypgl/findAll
\ No newline at end of file
+tszyUrl: http://221.229.220.83:9028/mudu/aSafeQyzypgl/findAll
+
+
+#自查周期url
+zczqUrl: http://221.229.220.83:9028/mudu/aSafeZcrwRead
+
+
+#巡查周期url
+xczqUrl: http://221.229.220.83:9028/mudu/aSafeXcrwRead
\ No newline at end of file