From c8df11fb3e7dc23d775e9b3ab593959aa5420583 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Sat, 26 Jul 2025 16:52:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8C=E9=87=8D=E9=A2=84?= =?UTF-8?q?=E9=98=B2=E5=8C=85=E4=BF=9D=E8=B4=A3=E4=BB=BB=E4=BA=BA=E9=87=8D?= =?UTF-8?q?=E5=A4=A7=E5=8D=B1=E9=99=A9=E6=BA=90,=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=AF=B9=E8=B1=A1,=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=8D=95=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doubleprevent/FxfxdxJobHandler.java | 22 ++++++------ .../doubleprevent/FxfxdyJobHandler.java | 34 +++++++++---------- .../doubleprevent/YhpcjhJobHandler.java | 22 ++++++------ .../doubleprevent/YhpcrwJobHandler.java | 22 ++++++------ src/main/resources/application.yml | 2 +- src/main/resources/mapper/FxfxdxMapper.xml | 3 ++ 6 files changed, 54 insertions(+), 51 deletions(-) diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java index 071e2ce..4551e49 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java @@ -38,37 +38,37 @@ public class FxfxdxJobHandler { for (int j = 0; j < zdwxys.size(); j++) { String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi(); switch (HAZARD_NAME) { - case "重大危险源甲醇中间储存": - if (DANGESOURCE_NAME.equals("甲醇中间储存单元")) { + case "甲醇中间罐区": + if (DANGESOURCE_NAME.equals("甲醇中间罐区")) { fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); } break; - case "重大危险源化产油库": - if (DANGESOURCE_NAME.equals("化产油库区")) { + case "化产粗苯储存区": + if (DANGESOURCE_NAME.equals("化产粗苯储存区")) { fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); } break; - case "重大危险源甲醇储罐": - if (DANGESOURCE_NAME.equals("甲醇储存单元")) { + case "甲醇罐区": + if (DANGESOURCE_NAME.equals("甲醇罐区")) { fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); } break; - case "重大危险源空分站": - if (DANGESOURCE_NAME.equals("空分站单元")) { + case "空分站": + if (DANGESOURCE_NAME.equals("空分站")) { fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); } break; - case "重大危险源气柜储存": - if (DANGESOURCE_NAME.equals("气柜")) { + case "气柜储存单元": + if (DANGESOURCE_NAME.equals("气柜储存单元")) { fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); } break; - case "重大危险源粗苯蒸馏": + case "粗苯蒸馏单元": if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) { fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java index fa4f279..55fac28 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java @@ -40,40 +40,40 @@ public class FxfxdyJobHandler { for (int j = 0; j < zdwxys.size(); j++) { String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi(); switch (HAZARD_NAME) { - case "重大危险源甲醇中间储存": - if (DANGESOURCE_NAME.equals("甲醇中间储存单元")) { + case "甲醇中间罐区": + if (DANGESOURCE_NAME.equals("甲醇中间罐区")) { fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); - + //fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); } break; - case "重大危险源化产油库": - if (DANGESOURCE_NAME.equals("化产油库区")) { + case "化产粗苯储存区": + if (DANGESOURCE_NAME.equals("化产粗苯储存区")) { fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); - + //fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); } break; - case "重大危险源甲醇储罐": - if (DANGESOURCE_NAME.equals("甲醇储存单元")) { + case "甲醇罐区": + if (DANGESOURCE_NAME.equals("甲醇罐区")) { fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); - + //fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); } break; - case "重大危险源空分站": - if (DANGESOURCE_NAME.equals("空分站单元")) { + case "空分站": + if (DANGESOURCE_NAME.equals("空分站")) { fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); - + //fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); } break; - case "重大危险源气柜储存": - if (DANGESOURCE_NAME.equals("气柜")) { + case "气柜储存单元": + if (DANGESOURCE_NAME.equals("气柜储存单元")) { fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); - + //fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); } break; - case "重大危险源粗苯蒸馏": + case "粗苯蒸馏单元": if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) { fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); - + //fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); } break; } 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 f3be12d..2874510 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java @@ -82,8 +82,8 @@ public class YhpcjhJobHandler { for (int j = 0; j < zdwxys.size(); j++) { String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi(); switch (HAZARD_NAME) { - case "重大危险源甲醇中间储存": - if (DANGESOURCE_NAME.equals("甲醇中间储存单元")) { + case "甲醇中间罐区": + if (DANGESOURCE_NAME.equals("甲醇中间罐区")) { fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); if(!StringUtils.isBlank(bbzrrName)){ @@ -97,8 +97,8 @@ public class YhpcjhJobHandler { } } break; - case "重大危险源化产油库": - if (DANGESOURCE_NAME.equals("化产油库区")) { + case "化产粗苯储存区": + if (DANGESOURCE_NAME.equals("化产粗苯储存区")) { fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); if(!StringUtils.isBlank(bbzrrName)){ @@ -112,8 +112,8 @@ public class YhpcjhJobHandler { } } break; - case "重大危险源甲醇储罐": - if (DANGESOURCE_NAME.equals("甲醇储存单元")) { + case "甲醇罐区": + if (DANGESOURCE_NAME.equals("甲醇罐区")) { fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); if(!StringUtils.isBlank(bbzrrName)){ @@ -127,8 +127,8 @@ public class YhpcjhJobHandler { } } break; - case "重大危险源空分站": - if (DANGESOURCE_NAME.equals("空分站单元")) { + case "空分站": + if (DANGESOURCE_NAME.equals("空分站")) { fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); if(!StringUtils.isBlank(bbzrrName)){ @@ -142,8 +142,8 @@ public class YhpcjhJobHandler { } } break; - case "重大危险源气柜储存": - if (DANGESOURCE_NAME.equals("气柜")) { + case "气柜储存单元": + if (DANGESOURCE_NAME.equals("气柜储存单元")) { fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); if(!StringUtils.isBlank(bbzrrName)){ @@ -157,7 +157,7 @@ public class YhpcjhJobHandler { } } break; - case "重大危险源粗苯蒸馏": + case "粗苯蒸馏单元": if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) { fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); 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 2e4dfaf..7e4bf3e 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java @@ -90,8 +90,8 @@ public class YhpcrwJobHandler { for (int j = 0; j < zdwxys.size(); j++) { String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi(); switch (HAZARD_NAME) { - case "重大危险源甲醇中间储存": - if (DANGESOURCE_NAME.equals("甲醇中间储存单元")) { + 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)){ @@ -105,8 +105,8 @@ public class YhpcrwJobHandler { } } break; - case "重大危险源化产油库": - if (DANGESOURCE_NAME.equals("化产油库区")) { + 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)){ @@ -120,8 +120,8 @@ public class YhpcrwJobHandler { } } break; - case "重大危险源甲醇储罐": - if (DANGESOURCE_NAME.equals("甲醇储存单元")) { + 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)){ @@ -135,8 +135,8 @@ public class YhpcrwJobHandler { } } break; - case "重大危险源空分站": - if (DANGESOURCE_NAME.equals("空分站单元")) { + 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)){ @@ -150,8 +150,8 @@ public class YhpcrwJobHandler { } } break; - case "重大危险源气柜储存": - if (DANGESOURCE_NAME.equals("气柜")) { + 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)){ @@ -165,7 +165,7 @@ public class YhpcrwJobHandler { } } break; - case "重大危险源粗苯蒸馏": + case "粗苯蒸馏单元": if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) { pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME); pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ea88ff2..eb49595 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: prod + active: dev server: port: 8118 \ No newline at end of file diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml index 53ec8a6..a6f998a 100644 --- a/src/main/resources/mapper/FxfxdxMapper.xml +++ b/src/main/resources/mapper/FxfxdxMapper.xml @@ -306,6 +306,8 @@ WHERE a.ISDELETE = 'N' + --and b.name in ('甲醇中间罐区','甲醇罐区','气柜储存单元','空分站','化产粗苯储存区','粗苯蒸馏单元') + AND a.CREASTAMP BETWEEN DATEADD(DAY, -1, CAST(SYSDATETIME() AS date)) AND @@ -409,6 +411,7 @@ WHERE a.ISDELETE = 'N' --and i.FPERSIONID in ('1_EMP','137_EMP','2_EMP','710_EMP','828_EMP') + --and l.EMPNAME in ('王来发','王绍武','王国敬','李尽','谭洪金')