包保责任人隐患排查任务

src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java

@@ -21,6 +21,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.List;
 import java.util.concurrent.TimeUnit;
 
@@ -42,6 +43,8 @@ public class YhpcrwJobHandler {
         int fail = 0;
         long total = 0;
         ArrayList<Fxfxdx> zdwxys = fxfxdxService.getZdwxys();
+        //获取重大危险源包保责任人PF_EMPLOYEE.id
+        ArrayList<HashMap<String,String>> zdwxyBbzrrList = fxfxdxService.getZdwxyBbzrrs();
 
         int pageNum = 1;
         do {
@@ -65,9 +68,22 @@ public class YhpcrwJobHandler {
             //对本页数据进行上传
             for (int x = 0; x < pageInfo.getList().size(); x++) {
 
+                //处理任务类型和是否包保责任人
+                Yhpcrw yhpcrw = pageInfo.getList().get(x);
+                //System.out.println(yhpcrw);
 
 
-                //在此进行上传
+                String zerenrenIds = yhpcrw.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");
+                            yhpcrw.setShifoubaobaozerenren("是");
+                        }
+                    }
+                }
 
                 String HAZARD_NAME = pageInfo.getList().get(x).getFengxianfenxiduixian();
                 for (int j = 0; j < zdwxys.size(); j++) {
@@ -77,36 +93,90 @@ public class YhpcrwJobHandler {
                             if (DANGESOURCE_NAME.equals("甲醇中间储存单元")) {
                                 pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
                                 pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
+                                if(!StringUtils.isBlank(bbzrrName)){
+                                    if(bbzrrName.equals("王来发")){
+                                        yhpcrw.setRenwuleixing("主要负责人任务");
+                                    }else if(bbzrrName.equals("王绍武")){
+                                        yhpcrw.setRenwuleixing("技术负责人任务");
+                                    }else if(bbzrrName.equals("王国敬")){
+                                        yhpcrw.setRenwuleixing("操作负责人任务");
+                                    }
+                                }
                             }
                             break;
                         case "重大危险源化产油库":
                             if (DANGESOURCE_NAME.equals("化产油库区")) {
                                 pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
                                 pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
+                                if(!StringUtils.isBlank(bbzrrName)){
+                                    if(bbzrrName.equals("王来发")){
+                                        yhpcrw.setRenwuleixing("主要负责人任务");
+                                    }else if(bbzrrName.equals("谭洪金")){
+                                        yhpcrw.setRenwuleixing("技术负责人任务");
+                                    }else if(bbzrrName.equals("李尽")){
+                                        yhpcrw.setRenwuleixing("操作负责人任务");
+                                    }
+                                }
                             }
                             break;
                         case "重大危险源甲醇储罐":
                             if (DANGESOURCE_NAME.equals("甲醇储存单元")) {
                                 pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
                                 pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
+                                if(!StringUtils.isBlank(bbzrrName)){
+                                    if(bbzrrName.equals("王来发")){
+                                        yhpcrw.setRenwuleixing("主要负责人任务");
+                                    }else if(bbzrrName.equals("王绍武")){
+                                        yhpcrw.setRenwuleixing("技术负责人任务");
+                                    }else if(bbzrrName.equals("王国敬")){
+                                        yhpcrw.setRenwuleixing("操作负责人任务");
+                                    }
+                                }
                             }
                             break;
                         case "重大危险源空分站":
                             if (DANGESOURCE_NAME.equals("空分站单元")) {
                                 pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
                                 pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
+                                if(!StringUtils.isBlank(bbzrrName)){
+                                    if(bbzrrName.equals("王来发")){
+                                        yhpcrw.setRenwuleixing("主要负责人任务");
+                                    }else if(bbzrrName.equals("王绍武")){
+                                        yhpcrw.setRenwuleixing("技术负责人任务");
+                                    }else if(bbzrrName.equals("王国敬")){
+                                        yhpcrw.setRenwuleixing("操作负责人任务");
+                                    }
+                                }
                             }
                             break;
                         case "重大危险源气柜储存":
                             if (DANGESOURCE_NAME.equals("气柜")) {
                                 pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
                                 pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
+                                if(!StringUtils.isBlank(bbzrrName)){
+                                    if(bbzrrName.equals("王来发")){
+                                        yhpcrw.setRenwuleixing("主要负责人任务");
+                                    }else if(bbzrrName.equals("王绍武")){
+                                        yhpcrw.setRenwuleixing("技术负责人任务");
+                                    }else if(bbzrrName.equals("王国敬")){
+                                        yhpcrw.setRenwuleixing("操作负责人任务");
+                                    }
+                                }
                             }
                             break;
                         case "重大危险源粗苯蒸馏":
                             if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) {
                                 pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
                                 pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
+                                if(!StringUtils.isBlank(bbzrrName)){
+                                    if(bbzrrName.equals("王来发")){
+                                        yhpcrw.setRenwuleixing("主要负责人任务");
+                                    }else if(bbzrrName.equals("谭洪金")){
+                                        yhpcrw.setRenwuleixing("技术负责人任务");
+                                    }else if(bbzrrName.equals("李尽")){
+                                        yhpcrw.setRenwuleixing("操作负责人任务");
+                                    }
+                                }
                             }
                             break;
                     }
@@ -124,7 +194,8 @@ public class YhpcrwJobHandler {
                     case "恒信中碳氢能源科技（山东）有限公司":
                         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(pageInfo.getList().get(x));
                         String post = null;
-                        try {
+                        System.out.println(jsonObject);
+                        /*try {
                             String miyao = "tp9tNKR6nGsS2mpdWzrQ02D93621E3411A0F";
                             post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, miyao);
                             boolean thisFailFlag = false;
@@ -179,7 +250,7 @@ public class YhpcrwJobHandler {
                                 Thread.currentThread().interrupt();
                             }
 
-                        }
+                        }*/
                         break;
                 }
 

src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -49,4 +50,6 @@ public interface FxfxdxMapper {
     List<Dlzy> getOneDlzysPage(@Param("isSingleDay")String isSingleDay);
 
     Map<String,String> getOTBILLIDById(@Param("id")String id);
+
+    ArrayList<HashMap<String, String>> getZdwxyBbzrrs();
 }

src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Yhpcrw.java

@@ -33,6 +33,15 @@ public class Yhpcrw {
     private String chuangjianren;
     private String chuangjianrenshoujih;
     private String chuangjianshijian;
+    private String zerenren;
+
+    public String getZerenren() {
+        return zerenren;
+    }
+
+    public void setZerenren(String zerenren) {
+        this.zerenren = zerenren;
+    }
 
     public String getQiyemingcheng() {
         return qiyemingcheng;

src/main/java/com/hxjt/dataupload/service/FxfxdxService.java

@@ -6,6 +6,7 @@ import com.hxjt.dataupload.model.entity.tszy.upload.*;
 
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -51,4 +52,7 @@ public interface FxfxdxService {
     List<Dlzy> getOneDlzysPage(String isSingleDay);
 
     Map<String,String> getOTBILLIDById(String id);
+
+
+    ArrayList<HashMap<String, String>> getZdwxyBbzrrs();
 }

src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -110,4 +111,9 @@ public class FxfxdxServiceImpl implements FxfxdxService {
     public Map<String, String> getOTBILLIDById(String id) {
         return fxfxdxMapper.getOTBILLIDById(id);
     }
+
+    @Override
+    public ArrayList<HashMap<String, String>> getZdwxyBbzrrs() {
+        return fxfxdxMapper.getZdwxyBbzrrs();
+    }
 }

src/main/resources/application-dev.yml

@@ -85,9 +85,7 @@ xxl:
   job:
     admin:
       #调度中心部署地址,多个配置逗号分隔 "http://address01,http://address02"
-      #上线
+      addresses: http://192.168.1.107:8080/xxl-job-admin
-      addresses: http://172.20.2.57:8080/xxl-job-admin
-      #addresses: http://127.0.0.1:8080/xxl-job-admin
     #执行器token，非空时启用 xxl-job, access token
     accessToken: data_upload
     executor:
@@ -107,9 +105,7 @@ xxl:
   mqtt:
     username: 10@ningyanghuagongchany20250508114250
     password: ce07f3c284084b42b674017b72fe73f2
-    #上线
+    hostUrl: tcp://192.168.1.107:1883
-    #hostUrl: tcp://112.245.55.112:18183
-    hostUrl: tcp://172.20.2.57:1883
     clientId: 10@ningyanghuagongchany20250508114250
     sensorDataTopic: /iot/10@ningyanghuagongchany20250422172632/thirdParty/sensorData
     timeout: 100

src/main/resources/application-prod.yml

@@ -85,9 +85,7 @@ xxl:
   job:
     admin:
       #调度中心部署地址,多个配置逗号分隔 "http://address01,http://address02"
-      #上线
+      addresses: http://127.0.0.1:8080/xxl-job-admin
-      addresses: http://192.168.1.107:8080/xxl-job-admin
-      #addresses: http://127.0.0.1:8080/xxl-job-admin
     #执行器token，非空时启用 xxl-job, access token
     accessToken: data_upload
     executor:
@@ -107,9 +105,7 @@ xxl:
   mqtt:
     username: 10@ningyanghuagongchany20250508114250
     password: ce07f3c284084b42b674017b72fe73f2
-    #上线
+    hostUrl: tcp://112.245.55.112:18183
-    #hostUrl: tcp://112.245.55.112:18183
-    hostUrl: tcp://192.168.1.107:1883
     clientId: 10@ningyanghuagongchany20250508114250
     sensorDataTopic: /iot/10@ningyanghuagongchany20250422172632/thirdParty/sensorData
     timeout: 100

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
+    active: dev
 server:
   port: 8118

src/main/resources/mapper/FxfxdxMapper.xml

@@ -375,7 +375,8 @@
 
 			'13665487126' as chuangjianrenshoujih,
 			FORMAT(i.CREASTAMP,
-			'yyyy-MM-dd HH:mm:ss') AS chuangjianshijian
+			'yyyy-MM-dd HH:mm:ss') AS chuangjianshijian,
+			i.FPERSIONID AS zerenren
 		FROM
 			ISM_RISKMEASURE a
 
@@ -407,6 +408,7 @@
 			i.FCHECKERID = l.ID
 		WHERE
 			 a.ISDELETE = 'N'
+		and i.FPERSIONID in ('1_EMP','137_EMP','2_EMP','710_EMP','828_EMP')
 
 			<choose>
 				<when test='isSingleDay == "Y"'>
@@ -421,6 +423,9 @@
 		ORDER BY
 		chuangjianshijian
 	</select>
+	<select id="getZdwxyBbzrrs" resultType="java.util.HashMap">
+		select id,EMPNAME from PF_EMPLOYEE pe  where EMPNAME in ('王来发','谭洪金','李尽','王绍武','王国敬')
+	</select>
 
 	<select id="getOneYhzldasPage" resultType="com.hxjt.dataupload.model.entity.doubleprevent.Yhzlda">
 		SELECT