From 72ccaba01fdc04831c0cc66a9186b436543c7eee Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 5 Jun 2025 13:52:15 +0800
Subject: [PATCH] 1

---
 pom.xml                                       |   2 +-
 .../doubleprevent/YhpcjhJobHandler.java       | 101 +++++++++++++++++-
 .../doubleprevent/YhpcrwJobHandler.java       |  15 +--
 .../model/entity/doubleprevent/Yhpcjh.java    |   9 ++
 src/main/resources/application-dev.yml        |   2 +-
 src/main/resources/application-prod.yml       |   2 +-
 src/main/resources/mapper/FxfxdxMapper.xml    |  30 +++---
 7 files changed, 132 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index b9a47d2..f1dd710 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid-spring-boot-starter</artifactId>
-			<version>1.2.9</version>
+			<version>1.2.16</version>
 		</dependency>
 		<!-- shangxian配置 -->
 		<!-- <dependency>
diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java
index e15c266..27f82f7 100644
--- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java
+++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.hxjt.dataupload.model.entity.doubleprevent.Fxfxdx;
 import com.hxjt.dataupload.model.entity.doubleprevent.Fxgkcs;
 import com.hxjt.dataupload.model.entity.doubleprevent.Yhpcjh;
+import com.hxjt.dataupload.model.entity.doubleprevent.Yhpcrw;
 import com.hxjt.dataupload.service.FxfxdxService;
 import com.hxjt.dataupload.utils.HttpUtils;
 import com.xxl.job.core.context.XxlJobHelper;
@@ -19,6 +20,7 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
 
@@ -41,7 +43,41 @@ public class YhpcjhJobHandler {
         }
 
         ArrayList<Fxfxdx> zdwxys = fxfxdxService.getZdwxys();
+        //获取重大危险源包保责任人PF_EMPLOYEE.id
+        ArrayList<HashMap<String,String>> zdwxyBbzrrList = fxfxdxService.getZdwxyBbzrrs();
+        System.out.println("共"+fxgkcs.size()+"条需要上传");
         for (int i = 0; i < fxgkcs.size(); i++) {
+
+
+
+            //处理任务类型和是否包保责任人
+            Yhpcjh yhpcjh = fxgkcs.get(i);
+            //System.out.println(yhpcrw);
+
+
+            String zerenrenIds = yhpcjh.getZerenren();
+            String bbzrrName = "";
+            if(!StringUtils.isBlank(zerenrenIds)&&!zerenrenIds.contains(";")){
+                for(HashMap<String,String> map1 :zdwxyBbzrrList){
+                    if(map1.get("id").equals(zerenrenIds)){
+                        //System.out.println(yhpcrw.getZerenren());
+                        bbzrrName = map1.get("EMPNAME");
+                        //System.out.println("包保责任人:"+bbzrrName);
+                        //yhpcjh.setShifoubaobaozerenren("是");
+                        if(!StringUtils.isBlank(yhpcjh.getBaobaozerenrenduiyin())){
+                            if(yhpcjh.getBaobaozerenrenduiyin().equals("0")){
+                                yhpcjh.setBaobaozerenrenduiyin("10");
+                            }
+                            yhpcjh.setBaobaorenwuduiyingxi(yhpcjh.getYinhuanpaichaneirong());
+                        }
+
+
+                    }
+                }
+            }
+
+
+
             String HAZARD_NAME = fxgkcs.get(i).getFengxianfenxiduixian();
             for (int j = 0; j < zdwxys.size(); j++) {
                 String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi();
@@ -50,36 +86,90 @@ public class YhpcjhJobHandler {
                         if (DANGESOURCE_NAME.equals("甲醇中间储存单元")) {
                             fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
                             fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
+                            if(!StringUtils.isBlank(bbzrrName)){
+                                if(bbzrrName.equals("王来发")){
+                                    yhpcjh.setRenwuleixing("主要负责人任务");
+                                }else if(bbzrrName.equals("王绍武")){
+                                    yhpcjh.setRenwuleixing("技术负责人任务");
+                                }else if(bbzrrName.equals("王国敬")){
+                                    yhpcjh.setRenwuleixing("操作负责人任务");
+                                }
+                            }
                         }
                         break;
                     case "重大危险源化产油库":
                         if (DANGESOURCE_NAME.equals("化产油库区")) {
                             fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
                             fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
+                            if(!StringUtils.isBlank(bbzrrName)){
+                                if(bbzrrName.equals("王来发")){
+                                    yhpcjh.setRenwuleixing("主要负责人任务");
+                                }else if(bbzrrName.equals("谭洪金")){
+                                    yhpcjh.setRenwuleixing("技术负责人任务");
+                                }else if(bbzrrName.equals("李尽")){
+                                    yhpcjh.setRenwuleixing("操作负责人任务");
+                                }
+                            }
                         }
                         break;
                     case "重大危险源甲醇储罐":
                         if (DANGESOURCE_NAME.equals("甲醇储存单元")) {
                             fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
                             fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
+                            if(!StringUtils.isBlank(bbzrrName)){
+                                if(bbzrrName.equals("王来发")){
+                                    yhpcjh.setRenwuleixing("主要负责人任务");
+                                }else if(bbzrrName.equals("王绍武")){
+                                    yhpcjh.setRenwuleixing("技术负责人任务");
+                                }else if(bbzrrName.equals("王国敬")){
+                                    yhpcjh.setRenwuleixing("操作负责人任务");
+                                }
+                            }
                         }
                         break;
                     case "重大危险源空分站":
                         if (DANGESOURCE_NAME.equals("空分站单元")) {
                             fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
                             fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
+                            if(!StringUtils.isBlank(bbzrrName)){
+                                if(bbzrrName.equals("王来发")){
+                                    yhpcjh.setRenwuleixing("主要负责人任务");
+                                }else if(bbzrrName.equals("王绍武")){
+                                    yhpcjh.setRenwuleixing("技术负责人任务");
+                                }else if(bbzrrName.equals("王国敬")){
+                                    yhpcjh.setRenwuleixing("操作负责人任务");
+                                }
+                            }
                         }
                         break;
                     case "重大危险源气柜储存":
                         if (DANGESOURCE_NAME.equals("气柜")) {
                             fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
                             fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
+                            if(!StringUtils.isBlank(bbzrrName)){
+                                if(bbzrrName.equals("王来发")){
+                                    yhpcjh.setRenwuleixing("主要负责人任务");
+                                }else if(bbzrrName.equals("王绍武")){
+                                    yhpcjh.setRenwuleixing("技术负责人任务");
+                                }else if(bbzrrName.equals("王国敬")){
+                                    yhpcjh.setRenwuleixing("操作负责人任务");
+                                }
+                            }
                         }
                         break;
                     case "重大危险源粗苯蒸馏":
                         if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) {
                             fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
                             fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
+                            if(!StringUtils.isBlank(bbzrrName)){
+                                if(bbzrrName.equals("王来发")){
+                                    yhpcjh.setRenwuleixing("主要负责人任务");
+                                }else if(bbzrrName.equals("谭洪金")){
+                                    yhpcjh.setRenwuleixing("技术负责人任务");
+                                }else if(bbzrrName.equals("李尽")){
+                                    yhpcjh.setRenwuleixing("操作负责人任务");
+                                }
+                            }
                         }
                         break;
                 }
@@ -108,15 +198,17 @@ public class YhpcjhJobHandler {
                         boolean thisFailFlag = false;
                         boolean postIsNull = false;
                         boolean postNoMsgs = false;
+                        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                        String formattedDate = LocalDateTime.now().format(formatter);
                         if(!StringUtils.isBlank(post)){
                             JSONObject postJsonObj = JSONObject.parseObject(post);
                             if(postJsonObj.get("msg")!=null && postJsonObj.get("code")!=null && postJsonObj.get("status")!=null && !StringUtils.isBlank(postJsonObj.get("msg").toString())&&!StringUtils.isBlank(postJsonObj.get("code").toString())&&!StringUtils.isBlank(postJsonObj.get("status").toString())){
                                 if(postJsonObj.get("msg").equals("成功")&&postJsonObj.get("code").toString().equals("1000000")&&postJsonObj.get("status").toString().equals("200")){//status
                                     //成功
                                     System.out.println("成功"+(i+1)+",");
-                                    //System.out.println(jsonObject);
-                                    //System.out.println("post:" + post.toString());
-                                    //XxlJobHelper.log("执行日志:" + company + post.toString());
+                                    System.out.println(jsonObject);
+                                    System.out.println("post:" + post.toString());
+                                    XxlJobHelper.log("执行日志:" + company + post.toString());
 
                                     success++;
                                 }else{
@@ -131,8 +223,7 @@ public class YhpcjhJobHandler {
                             thisFailFlag = true;
                         }
                         if(thisFailFlag){//异常情况
-                            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                            String formattedDate = LocalDateTime.now().format(formatter);
+
                             System.out.println(" 当前时间: " + formattedDate);  // 示例输出：2025-03-12 08:29:25
                             System.out.println("失败"+(i+1)+",隐患排查任务");
                             if(!postIsNull){
diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java
index 0afd591..ed3dcf4 100644
--- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java
+++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java
@@ -198,19 +198,22 @@ public class YhpcrwJobHandler {
                         //System.out.println(jsonObject);
                         try {
                             String miyao = "tp9tNKR6nGsS2mpdWzrQ02D93621E3411A0F";
-                            post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, miyao);
+                            post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, miyao);//
                             boolean thisFailFlag = false;
                             boolean postIsNull = false;
                             boolean postNoMsgs = false;
+                            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                            String formattedDate = LocalDateTime.now().format(formatter);
                             if(!StringUtils.isBlank(post)){
                                 JSONObject postJsonObj = JSONObject.parseObject(post);
                                 if(postJsonObj.get("msg")!=null && postJsonObj.get("code")!=null && postJsonObj.get("status")!=null && !StringUtils.isBlank(postJsonObj.get("msg").toString())&&!StringUtils.isBlank(postJsonObj.get("code").toString())&&!StringUtils.isBlank(postJsonObj.get("status").toString())){
                                     if(postJsonObj.get("msg").equals("成功")&&postJsonObj.get("code").toString().equals("1000000")&&postJsonObj.get("status").toString().equals("200")){//status
                                         //成功
+                                        System.out.println(" 当前时间: " + formattedDate);
                                         System.out.println("成功"+(x+1)+",");
-                                        //System.out.println(jsonObject);
-                                        //System.out.println("post:" + post.toString());
-                                        //XxlJobHelper.log("执行日志:" + company + post.toString());
+                                        System.out.println("请求体:"+jsonObject);
+                                        System.out.println("post:" + post.toString());
+                                        XxlJobHelper.log("执行日志:" + company + post.toString());
 
                                         success++;
                                     }else{
@@ -225,8 +228,8 @@ public class YhpcrwJobHandler {
                                 thisFailFlag = true;
                             }
                             if(thisFailFlag){//异常情况
-                                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                                String formattedDate = LocalDateTime.now().format(formatter);
+
+
                                 System.out.println(" 当前时间: " + formattedDate);  // 示例输出：2025-03-12 08:29:25
                                 System.out.println("失败"+(x+1)+",隐患排查任务");
                                 System.out.println("地址:"+url);
diff --git a/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Yhpcjh.java b/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Yhpcjh.java
index 9cc8206..71b9d62 100644
--- a/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Yhpcjh.java
+++ b/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Yhpcjh.java
@@ -34,6 +34,15 @@ public class Yhpcjh {
     private String chushipaicharenwukai;
     private String jiluren;
     private String jilushijian;
+    private String zerenren;
+
+    public String getZerenren() {
+        return zerenren;
+    }
+
+    public void setZerenren(String zerenren) {
+        this.zerenren = zerenren;
+    }
 
     public String getQiyemingcheng() {
         return qiyemingcheng;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f9296e9..21735e2 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -76,7 +76,7 @@ spring:
           wall:
             config:
               comment-allow: true  # 允许注释
-            db-type: sqlserver     # 明确指定数据库类型
+              db-type: sqlserver     # 明确指定数据库类型
       #指定默认数据源(必须配置)
       primary: syncplant
       #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index da74021..5149ec9 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -76,7 +76,7 @@ spring:
           wall:
             config:
               comment-allow: true  # 允许注释
-            db-type: sqlserver     # 明确指定数据库类型
+              db-type: sqlserver     # 明确指定数据库类型
       #指定默认数据源(必须配置)
       primary: syncplant
       #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml
index 7acf9c7..6c13967 100644
--- a/src/main/resources/mapper/FxfxdxMapper.xml
+++ b/src/main/resources/mapper/FxfxdxMapper.xml
@@ -228,7 +228,7 @@
 	</select>
 
 	<select id="getYhpcjhs" resultType="com.hxjt.dataupload.model.entity.doubleprevent.Yhpcjh">
-		-- 此查询用于获取恒信中碳氢能源科技（山东）有限公司的隐患排查计划相关信息
+
 		SELECT
 			(case
 				when b.ORGANID = '309_ORG' then '山东恒信高科能源有限公司'
@@ -244,8 +244,7 @@
 			end) AS weixianhuaxuepindeng,
 			b.name AS fengxianfenxiduixian,
 			b.code AS anquanfengxianfenxid,
-			--缺失字段 重大危险源名称
-			--缺失字段 重大危险源等级
+
 			c.NAME AS fengxianfenxidanyuan1,
 			c.ID AS fengxianfenxidanyuan,
 			d.NAME AS fengxianshijianmingc,
@@ -255,6 +254,7 @@
 			g.FTROUBLESHOOT AS yinhuanpaichaneirong,
 			h.ID AS yinhuanpaicharenwuid,
 			h.FCHECKCYCLE AS yinhuanpaichazhouqi,
+			h.FPERSIONID AS zerenren,
 			(CASE
 				WHEN h.FCHECKCYCLEUNIT = '1' THEN '小时'
 				WHEN h.FCHECKCYCLEUNIT = '2' THEN '天'
@@ -272,40 +272,40 @@
 			'每天' AS gongzuorileixing,
 			'日常任务' AS renwuleixing,
 			FORMAT(h.FSTARTDATE,
-			'yyyy-MM-dd HH:mm:ss') AS baobaorenwuduiyingxi,
-			--缺失字段 包保责任人对应 任务项
-			--缺失字段 首次排查时间
+			'yyyy-MM-dd HH:mm:ss') AS chushipaicharenwukai,
 			i.ACCOUNTDESC AS jiluren,
 			FORMAT(a.CREASTAMP,
-			'yyyy-MM-dd HH:mm:ss') AS jilushijian
+			'yyyy-MM-dd HH:mm:ss') AS jilushijian,
+			SUBSTRING(ISNULL(h.FBBTASKREALTE, ''), 7, LEN(ISNULL(h.FBBTASKREALTE, ''))) AS baobaozerenrenduiyin
 		FROM
 			ISM_RISKMEASURE a
-			-- 左连接风险信息表
+
 		LEFT JOIN ISM_HAZARD b ON
 			a.FHAZARDID = b.ID
-			-- 左连接风险单元表
+
 		LEFT JOIN ISM_HAZARDUNIT c ON
 			a.FRISKUNITID = c.ID
-			-- 左连接风险事件表
+
 		LEFT JOIN ISM_RISKEVENT d ON
 			a.FRISKEVENTID = d.ID
-			-- 左连接风险分类表1
+
 		LEFT JOIN ISM_CONMEATYPE e ON
 			a.FCLASSIFY1 = e.ID
-			-- 左连接风险分类表2
+
 		LEFT JOIN ISM_CONMEATYPE f ON
 			a.FCLASSIFY2 = f.ID
-			-- 左连接故障排除表
+
 		LEFT JOIN ISM_TROUBLESHOOT g ON
 			a.ID = g.FRISKMEASUREID
-			-- 左连接隐患排查任务表
+
 		LEFT JOIN ISM_CHECKTASK h ON
 			g.ID = h.FTROUBLESHOOTID
-			-- 左连接账户表
+
 		LEFT JOIN PF_ACCOUNT i ON
 			a.CREATOR = i.id
 		WHERE
 			a.ISDELETE = 'N'
+
 			<if test='isSingleDay == "Y"'>
 				AND a.CREASTAMP BETWEEN
 					DATEADD(DAY, -1, CAST(SYSDATETIME() AS date)) AND