liwenxuan
/
data-upload
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化双重预防包保责任人重大危险源,风险分析对象,风险分析单元

master
liwenxuan 4 months ago
parent
9decbff767
commit
c8df11fb3e
6 changed files with 54 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java
  2. 34
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java
  3. 22
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java
  4. 22
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java
  5. 2
      src/main/resources/application.yml
  6. 3
      src/main/resources/mapper/FxfxdxMapper.xml

22
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java
View File

@ -38,37 +38,37 @@ public class FxfxdxJobHandler {
for (int j = 0; j < zdwxys.size(); j++) { for (int j = 0; j < zdwxys.size(); j++) {
String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi(); String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi();
switch (HAZARD_NAME) { switch (HAZARD_NAME) {
case "重大危险源甲醇中间储存": case "甲醇中间罐区":
if (DANGESOURCE_NAME.equals("甲醇中间储存单元")) { if (DANGESOURCE_NAME.equals("甲醇中间罐区")) {
fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
} }
break; break;
case "重大危险源化产油库": case "化产粗苯储存区":
if (DANGESOURCE_NAME.equals("化产油库区")) { if (DANGESOURCE_NAME.equals("化产粗苯储存区")) {
fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
} }
break; break;
case "重大危险源甲醇储罐": case "甲醇罐区":
if (DANGESOURCE_NAME.equals("甲醇储存单元")) { if (DANGESOURCE_NAME.equals("甲醇罐区")) {
fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
} }
break; break;
case "重大危险源空分站": case "空分站":
if (DANGESOURCE_NAME.equals("空分站单元")) { if (DANGESOURCE_NAME.equals("空分站")) {
fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
} }
break; break;
case "重大危险源气柜储存": case "气柜储存单元":
if (DANGESOURCE_NAME.equals("气柜")) { if (DANGESOURCE_NAME.equals("气柜储存单元")) {
fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
} }
break; break;
case "重大危险源粗苯蒸馏": case "粗苯蒸馏单元":
if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) { if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) {
fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());

34
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java
View File

@ -40,40 +40,40 @@ public class FxfxdyJobHandler {
for (int j = 0; j < zdwxys.size(); j++) { for (int j = 0; j < zdwxys.size(); j++) {
String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi(); String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi();
switch (HAZARD_NAME) { switch (HAZARD_NAME) {
case "重大危险源甲醇中间储存": case "甲醇中间罐区":
if (DANGESOURCE_NAME.equals("甲醇中间储存单元")) { if (DANGESOURCE_NAME.equals("甲醇中间罐区")) {
fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
//fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
} }
break; break;
case "重大危险源化产油库": case "化产粗苯储存区":
if (DANGESOURCE_NAME.equals("化产油库区")) { if (DANGESOURCE_NAME.equals("化产粗苯储存区")) {
fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
//fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
} }
break; break;
case "重大危险源甲醇储罐": case "甲醇罐区":
if (DANGESOURCE_NAME.equals("甲醇储存单元")) { if (DANGESOURCE_NAME.equals("甲醇罐区")) {
fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
//fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
} }
break; break;
case "重大危险源空分站": case "空分站":
if (DANGESOURCE_NAME.equals("空分站单元")) { if (DANGESOURCE_NAME.equals("空分站")) {
fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
//fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
} }
break; break;
case "重大危险源气柜储存": case "气柜储存单元":
if (DANGESOURCE_NAME.equals("气柜")) { if (DANGESOURCE_NAME.equals("气柜储存单元")) {
fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
//fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
} }
break; break;
case "重大危险源粗苯蒸馏": case "粗苯蒸馏单元":
if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) { if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) {
fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxfxdxs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
//fxfxdxs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
} }
break; break;
} }

22
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java
View File

@ -82,8 +82,8 @@ public class YhpcjhJobHandler {
for (int j = 0; j < zdwxys.size(); j++) { for (int j = 0; j < zdwxys.size(); j++) {
String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi(); String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi();
switch (HAZARD_NAME) { switch (HAZARD_NAME) {
case "重大危险源甲醇中间储存": case "甲醇中间罐区":
if (DANGESOURCE_NAME.equals("甲醇中间储存单元")) { if (DANGESOURCE_NAME.equals("甲醇中间罐区")) {
fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
if(!StringUtils.isBlank(bbzrrName)){ if(!StringUtils.isBlank(bbzrrName)){
@ -97,8 +97,8 @@ public class YhpcjhJobHandler {
} }
} }
break; break;
case "重大危险源化产油库": case "化产粗苯储存区":
if (DANGESOURCE_NAME.equals("化产油库区")) { if (DANGESOURCE_NAME.equals("化产粗苯储存区")) {
fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
if(!StringUtils.isBlank(bbzrrName)){ if(!StringUtils.isBlank(bbzrrName)){
@ -112,8 +112,8 @@ public class YhpcjhJobHandler {
} }
} }
break; break;
case "重大危险源甲醇储罐": case "甲醇罐区":
if (DANGESOURCE_NAME.equals("甲醇储存单元")) { if (DANGESOURCE_NAME.equals("甲醇罐区")) {
fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
if(!StringUtils.isBlank(bbzrrName)){ if(!StringUtils.isBlank(bbzrrName)){
@ -127,8 +127,8 @@ public class YhpcjhJobHandler {
} }
} }
break; break;
case "重大危险源空分站": case "空分站":
if (DANGESOURCE_NAME.equals("空分站单元")) { if (DANGESOURCE_NAME.equals("空分站")) {
fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
if(!StringUtils.isBlank(bbzrrName)){ if(!StringUtils.isBlank(bbzrrName)){
@ -142,8 +142,8 @@ public class YhpcjhJobHandler {
} }
} }
break; break;
case "重大危险源气柜储存": case "气柜储存单元":
if (DANGESOURCE_NAME.equals("气柜")) { if (DANGESOURCE_NAME.equals("气柜储存单元")) {
fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
if(!StringUtils.isBlank(bbzrrName)){ if(!StringUtils.isBlank(bbzrrName)){
@ -157,7 +157,7 @@ public class YhpcjhJobHandler {
} }
} }
break; break;
case "重大危险源粗苯蒸馏": case "粗苯蒸馏单元":
if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) { if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) {
fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());

22
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java
View File

@ -90,8 +90,8 @@ public class YhpcrwJobHandler {
for (int j = 0; j < zdwxys.size(); j++) { for (int j = 0; j < zdwxys.size(); j++) {
String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi(); String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi();
switch (HAZARD_NAME) { switch (HAZARD_NAME) {
case "重大危险源甲醇中间储存": case "甲醇中间罐区":
if (DANGESOURCE_NAME.equals("甲醇中间储存单元")) { if (DANGESOURCE_NAME.equals("甲醇中间罐区")) {
pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME); pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
if(!StringUtils.isBlank(bbzrrName)){ if(!StringUtils.isBlank(bbzrrName)){
@ -105,8 +105,8 @@ public class YhpcrwJobHandler {
} }
} }
break; break;
case "重大危险源化产油库": case "化产粗苯储存区":
if (DANGESOURCE_NAME.equals("化产油库区")) { if (DANGESOURCE_NAME.equals("化产粗苯储存区")) {
pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME); pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
if(!StringUtils.isBlank(bbzrrName)){ if(!StringUtils.isBlank(bbzrrName)){
@ -120,8 +120,8 @@ public class YhpcrwJobHandler {
} }
} }
break; break;
case "重大危险源甲醇储罐": case "甲醇罐区":
if (DANGESOURCE_NAME.equals("甲醇储存单元")) { if (DANGESOURCE_NAME.equals("甲醇罐区")) {
pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME); pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
if(!StringUtils.isBlank(bbzrrName)){ if(!StringUtils.isBlank(bbzrrName)){
@ -135,8 +135,8 @@ public class YhpcrwJobHandler {
} }
} }
break; break;
case "重大危险源空分站": case "空分站":
if (DANGESOURCE_NAME.equals("空分站单元")) { if (DANGESOURCE_NAME.equals("空分站")) {
pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME); pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
if(!StringUtils.isBlank(bbzrrName)){ if(!StringUtils.isBlank(bbzrrName)){
@ -150,8 +150,8 @@ public class YhpcrwJobHandler {
} }
} }
break; break;
case "重大危险源气柜储存": case "气柜储存单元":
if (DANGESOURCE_NAME.equals("气柜")) { if (DANGESOURCE_NAME.equals("气柜储存单元")) {
pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME); pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());
if(!StringUtils.isBlank(bbzrrName)){ if(!StringUtils.isBlank(bbzrrName)){
@ -165,7 +165,7 @@ public class YhpcrwJobHandler {
} }
} }
break; break;
case "重大危险源粗苯蒸馏": case "粗苯蒸馏单元":
if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) { if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) {
pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME); pageInfo.getList().get(x).setZhongdaweixianyuanmi(DANGESOURCE_NAME);
pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); pageInfo.getList().get(x).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande());

2
src/main/resources/application.yml
View File

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

3
src/main/resources/mapper/FxfxdxMapper.xml
View File

@ -306,6 +306,8 @@
WHERE WHERE
a.ISDELETE = 'N' a.ISDELETE = 'N'
--and b.name in ('甲醇中间罐区','甲醇罐区','气柜储存单元','空分站','化产粗苯储存区','粗苯蒸馏单元')
<if test='isSingleDay == "Y"'> <if test='isSingleDay == "Y"'>
AND a.CREASTAMP BETWEEN AND a.CREASTAMP BETWEEN
DATEADD(DAY, -1, CAST(SYSDATETIME() AS date)) AND DATEADD(DAY, -1, CAST(SYSDATETIME() AS date)) AND
@ -409,6 +411,7 @@
WHERE WHERE
a.ISDELETE = 'N' a.ISDELETE = 'N'
--and i.FPERSIONID in ('1_EMP','137_EMP','2_EMP','710_EMP','828_EMP') --and i.FPERSIONID in ('1_EMP','137_EMP','2_EMP','710_EMP','828_EMP')
--and l.EMPNAME in ('王来发','王绍武','王国敬','李尽','谭洪金')
<choose> <choose>
<when test='isSingleDay == "Y"'> <when test='isSingleDay == "Y"'>

Write Preview
Loading…
Cancel
Save