From 5eee7bc7335fde7078600448e2459212cdde57ff Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 31 Jul 2025 16:11:47 +0800
Subject: [PATCH] 1

---
 .../jobhandler/doubleprevent/FxgkcsJobHandler.java   | 11 ++++++++---
 .../jobhandler/doubleprevent/YhpcjhJobHandler.java   |  8 ++++----
 .../jobhandler/doubleprevent/YhpcrwJobHandler.java   |  4 ++--
 src/main/resources/mapper/FxfxdxMapper.xml           | 12 +-----------
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java
index f42e1d9..b567ff8 100644
--- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java
+++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java
@@ -61,9 +61,14 @@ public class FxgkcsJobHandler {
                                 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());
+
+
+                                    /*log.info("成功"+(i+1)+",");
+                                    log.info(""+jsonObject);
+                                    log.info("post:" + post.toString());*/
 
                                     success++;
                                 }else{
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 2874510..2522efb 100644
--- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java
+++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java
@@ -205,10 +205,10 @@ public class YhpcjhJobHandler {
                             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("成功"+(i+1)+",");
+                                    /*System.out.println(jsonObject);
+                                    System.out.println("post:" + post.toString());*/
+                                    XxlJobHelper.log("执行日志:" + company + post.toString());
 
                                     success++;
                                 }else{
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 7e4bf3e..8d7a641 100644
--- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java
+++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java
@@ -212,8 +212,8 @@ public class YhpcrwJobHandler {
                                         /*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("post:" + post.toString());*/
+                                        XxlJobHelper.log("执行日志:" + company + post.toString());
 
                                         success++;
                                     }else{
diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml
index f9aab76..f0adc7f 100644
--- a/src/main/resources/mapper/FxfxdxMapper.xml
+++ b/src/main/resources/mapper/FxfxdxMapper.xml
@@ -164,8 +164,6 @@
 	</select>
 
 	<select id="getFxgkcss" resultType="com.hxjt.dataupload.model.entity.doubleprevent.Fxgkcs">
-		-- 隐患排查与风险管控信息查询
-		-- 此查询旨在从多个相关表中获取恒信中碳氢能源科技（山东）有限公司的隐患排查与风险管控相关信息
 		SELECT
 			(case
 				when b.ORGANID = '309_ORG' then '山东恒信高科能源有限公司'
@@ -206,23 +204,16 @@
 			FORMAT(a.CREASTAMP, 'yyyy-MM-dd HH:mm:ss') AS jilushijian
 		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 PF_ACCOUNT h ON a.CREATOR = h.id
 		WHERE
 			 a.ISDELETE = 'N'
-		and c.ID not in ('e04da2d55e26c549985acba53bf45ad9', 'd165235276d2374524784fe7f9f35c21', 'cfa233c5b641ab4976b9fadb2fb58de7', 'a005d9911305814eac19ceb17266597a')
+			and c.ID not in ('e04da2d55e26c549985acba53bf45ad9', 'd165235276d2374524784fe7f9f35c21', 'cfa233c5b641ab4976b9fadb2fb58de7', 'a005d9911305814eac19ceb17266597a')
 			<if test='isSingleDay == "Y"'>
 				AND a.CREASTAMP BETWEEN
 				DATEADD(DAY, -1, CAST(SYSDATETIME() AS date)) AND
@@ -232,7 +223,6 @@
 	</select>
 
 	<select id="getYhpcjhs" resultType="com.hxjt.dataupload.model.entity.doubleprevent.Yhpcjh">
-
 		SELECT
 			(case
 				when b.ORGANID = '309_ORG' then '山东恒信高科能源有限公司'