装置停用检维修记录

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

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hxjt.dataupload.model.entity.doubleprevent.Fxfxdx;
 import com.hxjt.dataupload.model.entity.doubleprevent.Yhpcrw;
+import com.hxjt.dataupload.model.entity.doubleprevent.Zztyjwxjl;
 import com.hxjt.dataupload.service.FxfxdxService;
 import com.hxjt.dataupload.utils.HttpUtils;
 import com.xxl.job.core.context.XxlJobHelper;
@@ -37,22 +38,22 @@ public class ZztyjwxjlJobHandler {
         int success = 0;
         int fail = 0;
         long total = 0;
-        ArrayList<Fxfxdx> zdwxys = fxfxdxService.getZdwxys();
+
 
         int pageNum = 1;
         do {
-            List<Yhpcrw> onePage = new ArrayList<>();
+            List<Zztyjwxjl> onePage = new ArrayList<>();
             // 1. 启动分页（必须紧邻查询语句）
             PageHelper.startPage(pageNum, pageSize);
             // 2. 执行查询（此时SQL已被自动拦截并添加分页逻辑）
             if (jobParam.equals("全量")) {
-                onePage = fxfxdxService.getOneYhpcrwsPage("N");
+                onePage = fxfxdxService.getOneZztyjwxjlsPage("N");
             } else {
-                onePage = fxfxdxService.getOneYhpcrwsPage("Y");
+                onePage = fxfxdxService.getOneZztyjwxjlsPage("Y");
             }
 
             // 3. 封装分页结果
-            PageInfo<Yhpcrw> pageInfo = new PageInfo<>(onePage);
+            PageInfo<Zztyjwxjl> pageInfo = new PageInfo<>(onePage);
             //设置总数
             total = pageInfo.getTotal();
             System.out.println("总条数:" + total);
@@ -65,63 +66,20 @@ public class ZztyjwxjlJobHandler {
 
                 //在此进行上传
 
-                String HAZARD_NAME = pageInfo.getList().get(x).getFengxianfenxiduixian();
+
-                for (int j = 0; j < zdwxys.size(); j++) {
+
-                    String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi();
-                    switch (HAZARD_NAME) {
-                        case "重大危险源甲醇中间储存":
-                            if (DANGESOURCE_NAME.equals("甲醇中间储存单元")) {
-                                pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
-                                pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
-                            }
-                            break;
-                        case "重大危险源化产油库":
-                            if (DANGESOURCE_NAME.equals("化产油库区")) {
-                                pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
-                                pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
-                            }
-                            break;
-                        case "重大危险源甲醇储罐":
-                            if (DANGESOURCE_NAME.equals("甲醇储存单元")) {
-                                pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
-                                pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
-                            }
-                            break;
-                        case "重大危险源空分站":
-                            if (DANGESOURCE_NAME.equals("空分站单元")) {
-                                pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
-                                pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
-                            }
-                            break;
-                        case "重大危险源气柜储存":
-                            if (DANGESOURCE_NAME.equals("气柜")) {
-                                pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
-                                pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
-                            }
-                            break;
-                        case "重大危险源粗苯蒸馏":
-                            if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) {
-                                pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
-                                pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
-                            }
-                            break;
-                    }
-                }
-                if ((!StringUtils.isBlank(pageInfo.getList().get(x).getZhongdaweixianyuande())) && pageInfo.getList().get(x).getZhongdaweixianyuande().length() > 2) {
-                    pageInfo.getList().get(x).setZhongdaweixianyuande(pageInfo.getList().get(x).getZhongdaweixianyuande().substring(0, 2));
-                }
 
 
 
                 String company = pageInfo.getList().get(x).getQiyemingcheng();
-                String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/yinhuanpaicharenwu/v1/yinhuanpaicharenwu";
+                String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/zhuangzhitingyongjia/v1/zhuangzhitingyongjia";
                 switch (company) {
                     case "山东恒信高科能源有限公司":
                     case "恒信中碳氢能源科技（山东）有限公司":
                         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(pageInfo.getList().get(x));
                         String post = null;
                         try {
-                            post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "tp9tNKR6nGsS2mpdWzrQ02D93621E3411A0F");
+                            post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "ItcolsvukNOwEGxifsyUCB7B5CB5EDD4161D");
 
                             boolean thisFailFlag = false;
                             boolean postIsNull = false;
@@ -149,7 +107,7 @@ public class ZztyjwxjlJobHandler {
                                 thisFailFlag = true;
                             }
                             if(thisFailFlag){//异常情况
-                                System.out.println("失败"+(x+1)+",隐患排查任务");
+                                System.out.println("失败"+(x+1)+",装置停用检维修记录");
                                 if(!postIsNull){
                                     System.out.println("post:" + post.toString());
                                     XxlJobHelper.log("执行日志:" + company + post.toString());

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

@@ -25,4 +25,6 @@ public interface FxfxdxMapper {
     List<Yhpcrw> getOneYhpcrwsPage(@Param("isSingleDay")String isSingleDay);
 
     List<Yhzlda> getOneYhzldasPage(@Param("isSingleDay")String isSingleDay);
+
+    List<Zztyjwxjl> getOneZztyjwxjlsPage(@Param("isSingleDay")String isSingleDay);
 }

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

@@ -0,0 +1,124 @@
+package com.hxjt.dataupload.model.entity.doubleprevent;
+
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class Zztyjwxjl {
+    private String qiyemingcheng;
+    private String qiyebianma;
+    private String weixianhuaxuepindeng;
+    private String fengxianfenxiduixian;
+    private String fengxianfenxiduixia1;
+    private String fengxianfenxidanyuan;
+    private String fengxianfenxidanyua1;
+    private String zhuangzhitingyongjia;
+    private String tingyongkaishishijia;
+    private String tingyongjieshushijia;
+    private String yuanyin;
+    private String chuangjianren;
+    private String chuangjianshijian;
+
+    public String getQiyemingcheng() {
+        return qiyemingcheng;
+    }
+
+    public void setQiyemingcheng(String qiyemingcheng) {
+        this.qiyemingcheng = qiyemingcheng;
+    }
+
+    public String getQiyebianma() {
+        return qiyebianma;
+    }
+
+    public void setQiyebianma(String qiyebianma) {
+        this.qiyebianma = qiyebianma;
+    }
+
+    public String getWeixianhuaxuepindeng() {
+        return weixianhuaxuepindeng;
+    }
+
+    public void setWeixianhuaxuepindeng(String weixianhuaxuepindeng) {
+        this.weixianhuaxuepindeng = weixianhuaxuepindeng;
+    }
+
+    public String getFengxianfenxiduixian() {
+        return fengxianfenxiduixian;
+    }
+
+    public void setFengxianfenxiduixian(String fengxianfenxiduixian) {
+        this.fengxianfenxiduixian = fengxianfenxiduixian;
+    }
+
+    public String getFengxianfenxiduixia1() {
+        return fengxianfenxiduixia1;
+    }
+
+    public void setFengxianfenxiduixia1(String fengxianfenxiduixia1) {
+        this.fengxianfenxiduixia1 = fengxianfenxiduixia1;
+    }
+
+    public String getFengxianfenxidanyuan() {
+        return fengxianfenxidanyuan;
+    }
+
+    public void setFengxianfenxidanyuan(String fengxianfenxidanyuan) {
+        this.fengxianfenxidanyuan = fengxianfenxidanyuan;
+    }
+
+    public String getFengxianfenxidanyua1() {
+        return fengxianfenxidanyua1;
+    }
+
+    public void setFengxianfenxidanyua1(String fengxianfenxidanyua1) {
+        this.fengxianfenxidanyua1 = fengxianfenxidanyua1;
+    }
+
+    public String getZhuangzhitingyongjia() {
+        return zhuangzhitingyongjia;
+    }
+
+    public void setZhuangzhitingyongjia(String zhuangzhitingyongjia) {
+        this.zhuangzhitingyongjia = zhuangzhitingyongjia;
+    }
+
+    public String getTingyongkaishishijia() {
+        return tingyongkaishishijia;
+    }
+
+    public void setTingyongkaishishijia(String tingyongkaishishijia) {
+        this.tingyongkaishishijia = tingyongkaishishijia;
+    }
+
+    public String getTingyongjieshushijia() {
+        return tingyongjieshushijia;
+    }
+
+    public void setTingyongjieshushijia(String tingyongjieshushijia) {
+        this.tingyongjieshushijia = tingyongjieshushijia;
+    }
+
+    public String getYuanyin() {
+        return yuanyin;
+    }
+
+    public void setYuanyin(String yuanyin) {
+        this.yuanyin = yuanyin;
+    }
+
+    public String getChuangjianren() {
+        return chuangjianren;
+    }
+
+    public void setChuangjianren(String chuangjianren) {
+        this.chuangjianren = chuangjianren;
+    }
+
+    public String getChuangjianshijian() {
+        return chuangjianshijian;
+    }
+
+    public void setChuangjianshijian(String chuangjianshijian) {
+        this.chuangjianshijian = chuangjianshijian;
+    }
+}

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

@@ -23,4 +23,6 @@ public interface FxfxdxService {
     List<Yhpcrw> getOneYhpcrwsPage(String isSingleDay);
     //隐患治理档案
     List<Yhzlda> getOneYhzldasPage(String isSingleDay);
+    //装置停用检维修记录
+    List<Zztyjwxjl> getOneZztyjwxjlsPage(String isSingleDay);
 }

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

@@ -53,4 +53,9 @@ public class FxfxdxServiceImpl implements FxfxdxService {
     public List<Yhzlda> getOneYhzldasPage(String isSingleDay) {
         return fxfxdxMapper.getOneYhzldasPage(isSingleDay);
     }
+
+    @Override
+    public List<Zztyjwxjl> getOneZztyjwxjlsPage(String isSingleDay) {
+        return fxfxdxMapper.getOneZztyjwxjlsPage(isSingleDay);
+    }
 }

src/main/resources/mapper/FxfxdxMapper.xml

@@ -538,4 +538,51 @@
 		order by
 			chuangjianshijian desc
 	</select>
+
+	<select id="getOneZztyjwxjlsPage" resultType="com.hxjt.dataupload.model.entity.doubleprevent.Zztyjwxjl">
+		-- 从多个相关表中查询特定组织下设备停用记录的相关信息
+		SELECT
+			(case
+				when b.ORGANID = '309_ORG' then '山东恒信高科能源有限公司'
+				else '恒信中碳氢能源科技（山东）有限公司'
+			end) AS qiyemingcheng,
+			(case
+				when b.ORGANID = '309_ORG' then '91370921328482832M'
+				else '91370921MA94AF5H3N'
+			end) AS qiyebianma,
+			(case
+				when b.ORGANID = '309_ORG' then '370910170'
+				else '370980326'
+			end) AS weixianhuaxuepindeng,
+			b.NAME AS fengxianfenxiduixian,
+			b.ID AS fengxianfenxiduixia1,
+			c.NAME AS fengxianfenxidanyuan,
+			-- 修正列别名拼写错误
+			c.ID AS fengxianfenxidanyua1,
+			a.ID AS zhuangzhitingyongjia,
+			--a.FSTOPBTIME AS tingyongkaishishijia,
+			FORMAT(a.FSTOPBTIME,
+			'yyyy-MM-dd HH:mm:ss') AS tingyongkaishishijia,
+			--a.FSTOPETIME AS tingyongjieshushijia,
+			FORMAT(a.FSTOPETIME,
+			'yyyy-MM-dd HH:mm:ss') AS tingyongjieshushijia,
+			a.FSTOPREASON AS yuanyin,
+			d.EMPNAME AS chuangjianren,
+			FORMAT(a.CREASTAMP,
+			'yyyy-MM-dd HH:mm:ss') AS chuangjianshijian
+		FROM
+			ISM_HAZARDUNITRECORD A
+		-- 左连接风险信息表
+		LEFT JOIN ISM_HAZARD b ON a.FHAZARDID = b.ID
+		-- 左连接风险单元表
+		LEFT JOIN ISM_HAZARDUNIT c ON a.FUNITID = c.ID
+		-- 左连接员工表
+		LEFT JOIN PF_EMPLOYEE d ON a.CREATOR = d.ID
+		WHERE
+			a.ISDELETE = 'N'
+			--AND (DATEDIFF(dd, a.CREASTAMP, GETDATE() - 1) = 0);
+			<if test='isSingleDay == "Y"'>
+				AND (DATEDIFF(dd, a.CREASTAMP, GETDATE() - 1) = 0);
+			</if>
+	</select>
 </mapper>