From 30b91395d4a779e18f546bd38282c11df14f2e5f Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 16 九月 2022 11:08:07 +0800
Subject: [PATCH] 数据字典fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyPlanDBQuery.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyTeamDBQuery.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoPageDO.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/TeamLevelEnum.java | 50 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfo.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java | 16
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencySuppliesClassificationEnum.java | 50 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java | 37 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfo.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSafetyEnum.java | 46 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSuitableEnum.java | 46 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillPlanWayEnum.java | 47 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyPlanLevelEnum.java | 47 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanPageRespDTO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSuppliesEnum.java | 47 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationDivisionEnum.java | 48 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java | 38 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java | 98 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationRescueEnum.java | 46 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencySuppliesStatusEnum.java | 46 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationEffectEnum.java | 46 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java | 38 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java | 38 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoPageDO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyPlanTypeEnum.java | 48 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationArrivalEnum.java | 46 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSufficientEnum.java | 47 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationReportEnum.java | 46 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java | 12
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/AccidentResultCodes.java | 10
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillPlanLevelEnum.java | 47 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoPageDO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java | 99 +--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/ApproveStatus.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java | 52 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfoDetailDO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationWholeEnum.java | 46 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfoDetailDO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationProtectionEnum.java | 46 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java | 100 +-
/dev/null | 33 -
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java | 84 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationEvacuateEnum.java | 46 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfoPageDO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java | 6
63 files changed, 1,429 insertions(+), 409 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java
index 181ea19..7d1d791 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfo.java
@@ -24,29 +24,29 @@
private Long drillExecuteId;
- private String suitable;
+ private Byte suitable;
- private String sufficient;
+ private Byte sufficient;
- private String arrival;
+ private Byte arrival;
- private String supplies;
+ private Byte supplies;
- private String protection;
+ private Byte protection;
- private String whole;
+ private Byte whole;
- private String division;
+ private Byte division;
- private String effect;
+ private Byte effect;
- private String report;
+ private Byte report;
- private String safety;
+ private Byte safety;
- private String rescue;
+ private Byte rescue;
- private String evacuate;
+ private Byte evacuate;
private Boolean needModify;
@@ -110,99 +110,99 @@
this.drillExecuteId = drillExecuteId;
}
- public String getSuitable() {
+ public Byte getSuitable() {
return suitable;
}
- public void setSuitable(String suitable) {
+ public void setSuitable(Byte suitable) {
this.suitable = suitable;
}
- public String getSufficient() {
+ public Byte getSufficient() {
return sufficient;
}
- public void setSufficient(String sufficient) {
+ public void setSufficient(Byte sufficient) {
this.sufficient = sufficient;
}
- public String getArrival() {
+ public Byte getArrival() {
return arrival;
}
- public void setArrival(String arrival) {
+ public void setArrival(Byte arrival) {
this.arrival = arrival;
}
- public String getSupplies() {
+ public Byte getSupplies() {
return supplies;
}
- public void setSupplies(String supplies) {
+ public void setSupplies(Byte supplies) {
this.supplies = supplies;
}
- public String getProtection() {
+ public Byte getProtection() {
return protection;
}
- public void setProtection(String protection) {
+ public void setProtection(Byte protection) {
this.protection = protection;
}
- public String getWhole() {
+ public Byte getWhole() {
return whole;
}
- public void setWhole(String whole) {
+ public void setWhole(Byte whole) {
this.whole = whole;
}
- public String getDivision() {
+ public Byte getDivision() {
return division;
}
- public void setDivision(String division) {
+ public void setDivision(Byte division) {
this.division = division;
}
- public String getEffect() {
+ public Byte getEffect() {
return effect;
}
- public void setEffect(String effect) {
+ public void setEffect(Byte effect) {
this.effect = effect;
}
- public String getReport() {
+ public Byte getReport() {
return report;
}
- public void setReport(String report) {
+ public void setReport(Byte report) {
this.report = report;
}
- public String getSafety() {
+ public Byte getSafety() {
return safety;
}
- public void setSafety(String safety) {
+ public void setSafety(Byte safety) {
this.safety = safety;
}
- public String getRescue() {
+ public Byte getRescue() {
return rescue;
}
- public void setRescue(String rescue) {
+ public void setRescue(Byte rescue) {
this.rescue = rescue;
}
- public String getEvacuate() {
+ public Byte getEvacuate() {
return evacuate;
}
- public void setEvacuate(String evacuate) {
+ public void setEvacuate(Byte evacuate) {
this.evacuate = evacuate;
}
@@ -230,31 +230,4 @@
this.modifyContent = modifyContent;
}
- @Override
- public String toString() {
- return "EmergencyDrillEvaluationInfo{" +
- "id=" + id +
- ", delFlag=" + delFlag +
- ", gmtCreate=" + gmtCreate +
- ", gmtModitify=" + gmtModitify +
- ", createUid=" + createUid +
- ", updateUid=" + updateUid +
- ", drillExecuteId=" + drillExecuteId +
- ", suitable='" + suitable + '\'' +
- ", sufficient='" + sufficient + '\'' +
- ", arrival='" + arrival + '\'' +
- ", supplies='" + supplies + '\'' +
- ", protection='" + protection + '\'' +
- ", whole='" + whole + '\'' +
- ", division='" + division + '\'' +
- ", effect='" + effect + '\'' +
- ", report='" + report + '\'' +
- ", safety='" + safety + '\'' +
- ", rescue='" + rescue + '\'' +
- ", evacuate='" + evacuate + '\'' +
- ", needModify=" + needModify +
- ", questionAndImprove='" + questionAndImprove + '\'' +
- ", modifyContent='" + modifyContent + '\'' +
- '}';
- }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java
index 95c7d21..e4dcec2 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoDetailDO.java
@@ -47,13 +47,13 @@
private BigDecimal drillExpense;
- private String drillLevel;
+ private Byte drillLevel;
private String drillAddress;
private String drillName;
- private String drillWay;
+ private Byte drillWay;
private String insuranceMeasures;
@@ -132,11 +132,11 @@
this.drillExpense = drillExpense;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
@@ -156,11 +156,11 @@
this.drillName = drillName;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
@@ -226,35 +226,43 @@
private Long drillExecuteId;
- private String suitable;
+ private Byte suitable;
- private String sufficient;
+ private Byte sufficient;
- private String arrival;
+ private Byte arrival;
- private String supplies;
+ private Byte supplies;
- private String protection;
+ private Byte protection;
- private String whole;
+ private Byte whole;
- private String division;
+ private Byte division;
- private String effect;
+ private Byte effect;
- private String report;
+ private Byte report;
- private String safety;
+ private Byte safety;
- private String rescue;
+ private Byte rescue;
- private String evacuate;
+ private Byte evacuate;
private Boolean needModify;
private String questionAndImprove;
private String modifyContent;
+
+ public Long getDrillPlanId() {
+ return drillPlanId;
+ }
+
+ public void setDrillPlanId(Long drillPlanId) {
+ this.drillPlanId = drillPlanId;
+ }
public Long getId() {
return id;
@@ -272,99 +280,99 @@
this.drillExecuteId = drillExecuteId;
}
- public String getSuitable() {
+ public Byte getSuitable() {
return suitable;
}
- public void setSuitable(String suitable) {
+ public void setSuitable(Byte suitable) {
this.suitable = suitable;
}
- public String getSufficient() {
+ public Byte getSufficient() {
return sufficient;
}
- public void setSufficient(String sufficient) {
+ public void setSufficient(Byte sufficient) {
this.sufficient = sufficient;
}
- public String getArrival() {
+ public Byte getArrival() {
return arrival;
}
- public void setArrival(String arrival) {
+ public void setArrival(Byte arrival) {
this.arrival = arrival;
}
- public String getSupplies() {
+ public Byte getSupplies() {
return supplies;
}
- public void setSupplies(String supplies) {
+ public void setSupplies(Byte supplies) {
this.supplies = supplies;
}
- public String getProtection() {
+ public Byte getProtection() {
return protection;
}
- public void setProtection(String protection) {
+ public void setProtection(Byte protection) {
this.protection = protection;
}
- public String getWhole() {
+ public Byte getWhole() {
return whole;
}
- public void setWhole(String whole) {
+ public void setWhole(Byte whole) {
this.whole = whole;
}
- public String getDivision() {
+ public Byte getDivision() {
return division;
}
- public void setDivision(String division) {
+ public void setDivision(Byte division) {
this.division = division;
}
- public String getEffect() {
+ public Byte getEffect() {
return effect;
}
- public void setEffect(String effect) {
+ public void setEffect(Byte effect) {
this.effect = effect;
}
- public String getReport() {
+ public Byte getReport() {
return report;
}
- public void setReport(String report) {
+ public void setReport(Byte report) {
this.report = report;
}
- public String getSafety() {
+ public Byte getSafety() {
return safety;
}
- public void setSafety(String safety) {
+ public void setSafety(Byte safety) {
this.safety = safety;
}
- public String getRescue() {
+ public Byte getRescue() {
return rescue;
}
- public void setRescue(String rescue) {
+ public void setRescue(Byte rescue) {
this.rescue = rescue;
}
- public String getEvacuate() {
+ public Byte getEvacuate() {
return evacuate;
}
- public void setEvacuate(String evacuate) {
+ public void setEvacuate(Byte evacuate) {
this.evacuate = evacuate;
}
@@ -390,13 +398,5 @@
public void setModifyContent(String modifyContent) {
this.modifyContent = modifyContent;
- }
-
- public Long getDrillPlanId() {
- return drillPlanId;
- }
-
- public void setDrillPlanId(Long drillPlanId) {
- this.drillPlanId = drillPlanId;
}
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoPageDO.java
index 028fed9..8ebefd6 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoPageDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillEvaluationInfoPageDO.java
@@ -23,9 +23,9 @@
private String drillAddress;
- private String drillWay;
+ private Byte drillWay;
- private String drillLevel;
+ private Byte drillLevel;
private Date drillPlanDate;
@@ -47,19 +47,19 @@
this.drillAddress = drillAddress;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoPageDO.java
index ce888c1..3312e9c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoPageDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteInfoPageDO.java
@@ -14,9 +14,9 @@
private String drillAddress;
- private String drillWay;
+ private Byte drillWay;
- private String drillLevel;
+ private Byte drillLevel;
private Date drillPlanDate;
@@ -38,19 +38,19 @@
this.drillAddress = drillAddress;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfo.java
index 0f97ef9..22b13d1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfo.java
@@ -50,13 +50,13 @@
private BigDecimal drillExpense;
- private String drillLevel;
+ private Byte drillLevel;
private String drillAddress;
private String drillName;
- private String drillWay;
+ private Byte drillWay;
private String insuranceMeasures;
@@ -176,11 +176,11 @@
this.drillExpense = drillExpense;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
@@ -200,11 +200,11 @@
this.drillName = drillName;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfoDetailDO.java
index 51e1bad..ea35ee6 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfoDetailDO.java
@@ -51,13 +51,13 @@
private BigDecimal drillExpense;
- private String drillLevel;
+ private Byte drillLevel;
private String drillAddress;
private String drillName;
- private String drillWay;
+ private Byte drillWay;
private String insuranceMeasures;
@@ -137,11 +137,11 @@
this.drillExpense = drillExpense;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
@@ -161,11 +161,11 @@
this.drillName = drillName;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfoPageDO.java
index 4996c06..7233d77 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfoPageDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillPlanInfoPageDO.java
@@ -16,9 +16,9 @@
private String drillAddress;
- private String drillWay;
+ private Byte drillWay;
- private String drillLevel;
+ private Byte drillLevel;
private Date drillPlanDate;
@@ -48,19 +48,19 @@
this.drillAddress = drillAddress;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
index 5d2944d..4fb3ac0 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
@@ -52,9 +52,9 @@
private Boolean associatedDanger;
- private String type;
+ private Byte type;
- private String level;
+ private Byte level;
private String name ;
@@ -146,19 +146,19 @@
this.associatedDanger = associatedDanger;
}
- public String getType() {
+ public Byte getType() {
return type;
}
- public void setType(String type) {
+ public void setType(Byte type) {
this.type = type;
}
- public String getLevel() {
+ public Byte getLevel() {
return level;
}
- public void setLevel(String level) {
+ public void setLevel(Byte level) {
this.level = level;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java
index ed63c26..33a9186 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoDetailDO.java
@@ -32,9 +32,9 @@
private Boolean associatedDanger;
- private String type;
+ private Byte type;
- private String level;
+ private Byte level;
private String name ;
@@ -86,19 +86,19 @@
this.associatedDanger = associatedDanger;
}
- public String getType() {
+ public Byte getType() {
return type;
}
- public void setType(String type) {
+ public void setType(Byte type) {
this.type = type;
}
- public String getLevel() {
+ public Byte getLevel() {
return level;
}
- public void setLevel(String level) {
+ public void setLevel(Byte level) {
this.level = level;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java
index 0c7e9c2..f7303a3 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java
@@ -35,9 +35,9 @@
private Integer status ;
- private String type;
+ private Byte type;
- private String level;
+ private Byte level;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date releaseDate;
@@ -66,19 +66,19 @@
this.status = status;
}
- public String getType() {
+ public Byte getType() {
return type;
}
- public void setType(String type) {
+ public void setType(Byte type) {
this.type = type;
}
- public String getLevel() {
+ public Byte getLevel() {
return level;
}
- public void setLevel(String level) {
+ public void setLevel(Byte level) {
this.level = level;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfo.java
index a7af3a0..534a8e3 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfo.java
@@ -27,8 +27,8 @@
private Long departmentId;
private Long principalUserUid;
private String principalUserName;
- private String status;
- private String classification;
+ private Byte status;
+ private Byte classification;
private String name;
private String number;
private String model;
@@ -159,19 +159,19 @@
this.principalUserUid = principalUserUid;
}
- public String getStatus() {
+ public Byte getStatus() {
return status;
}
- public void setStatus(String status) {
+ public void setStatus(Byte status) {
this.status = status;
}
- public String getClassification() {
+ public Byte getClassification() {
return classification;
}
- public void setClassification(String classification) {
+ public void setClassification(Byte classification) {
this.classification = classification;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfoDetailDO.java
index 6a4b6b7..597821a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfoDetailDO.java
@@ -30,8 +30,8 @@
private Integer usePeriod;
private Long departmentId;
private Long principalUserUid;
- private String status;
- private String classification;
+ private Byte status;
+ private Byte classification;
private String name;
private String number;
private String model;
@@ -122,19 +122,19 @@
this.principalUserUid = principalUserUid;
}
- public String getStatus() {
+ public Byte getStatus() {
return status;
}
- public void setStatus(String status) {
+ public void setStatus(Byte status) {
this.status = status;
}
- public String getClassification() {
+ public Byte getClassification() {
return classification;
}
- public void setClassification(String classification) {
+ public void setClassification(Byte classification) {
this.classification = classification;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java
index c54f6da..996fde8 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfo.java
@@ -36,7 +36,7 @@
private Long principalDepartmentId;
- private String teamLevel;
+ private Byte teamLevel;
private String teamName;
@@ -110,11 +110,11 @@
this.principalDepartmentId = principalDepartmentId;
}
- public String getTeamLevel() {
+ public Byte getTeamLevel() {
return teamLevel;
}
- public void setTeamLevel(String teamLevel) {
+ public void setTeamLevel(Byte teamLevel) {
this.teamLevel = teamLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java
index cca920b..ea0ada9 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoDetailDO.java
@@ -27,7 +27,7 @@
private Long principalDepartmentId;
- private String teamLevel;
+ private Byte teamLevel;
private String teamName;
@@ -61,11 +61,11 @@
this.principalDepartmentId = principalDepartmentId;
}
- public String getTeamLevel() {
+ public Byte getTeamLevel() {
return teamLevel;
}
- public void setTeamLevel(String teamLevel) {
+ public void setTeamLevel(Byte teamLevel) {
this.teamLevel = teamLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoPageDO.java
index 4ffdf24..422cf28 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoPageDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyTeamInfoPageDO.java
@@ -10,7 +10,7 @@
@TableId(type = IdType.AUTO)
private Long id;
- private String teamLevel;
+ private Byte teamLevel;
private String teamName;
@@ -26,11 +26,11 @@
this.id = id;
}
- public String getTeamLevel() {
+ public Byte getTeamLevel() {
return teamLevel;
}
- public void setTeamLevel(String teamLevel) {
+ public void setTeamLevel(Byte teamLevel) {
this.teamLevel = teamLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/ApproveStatus.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/ApproveStatus.java
index 0053cdd..2747546 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/ApproveStatus.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/ApproveStatus.java
@@ -2,7 +2,7 @@
public enum ApproveStatus {
- // 应急预案
+ // 审批中应急预案业务类型为1
EMERGENCY(1);
private Integer status;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationArrivalEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationArrivalEnum.java
new file mode 100644
index 0000000..950b320
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationArrivalEnum.java
@@ -0,0 +1,46 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillEvaluationArrivalEnum {
+
+ ARRIVAL_ONE((byte) 1, "迅速准确，基本按时到位"),
+ ARRIVAL_TWO((byte) 2, "未按时到位");
+
+ private Byte code;
+ private String value;
+
+ DrillEvaluationArrivalEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillEvaluationArrivalEnum> toMap() {
+ Map<Byte, DrillEvaluationArrivalEnum> map = new HashMap();
+ for (DrillEvaluationArrivalEnum teamLevelEnum : DrillEvaluationArrivalEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillEvaluationArrivalEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationDivisionEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationDivisionEnum.java
new file mode 100644
index 0000000..d3fcd93
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationDivisionEnum.java
@@ -0,0 +1,48 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillEvaluationDivisionEnum {
+
+ DIVISION_ONE((byte) 1, "安全，快速"),
+ DIVISION_TWO((byte) 2, "安全，不快速"),
+ DIVISION_THREE((byte) 3, "不安全，快速"),
+ DIVISION_FOUR((byte) 4, "不安全，不快速");
+
+ private Byte code;
+ private String value;
+
+ DrillEvaluationDivisionEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillEvaluationDivisionEnum> toMap() {
+ Map<Byte, DrillEvaluationDivisionEnum> map = new HashMap();
+ for (DrillEvaluationDivisionEnum teamLevelEnum : DrillEvaluationDivisionEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillEvaluationDivisionEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationEffectEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationEffectEnum.java
new file mode 100644
index 0000000..8945105
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationEffectEnum.java
@@ -0,0 +1,46 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillEvaluationEffectEnum {
+
+ EFFECT_ONE((byte) 1, "基本达到目的，部分环节有待改进"),
+ EFFECT_TWO((byte) 2, "为达到目的");
+
+ private Byte code;
+ private String value;
+
+ DrillEvaluationEffectEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillEvaluationEffectEnum> toMap() {
+ Map<Byte, DrillEvaluationEffectEnum> map = new HashMap();
+ for (DrillEvaluationEffectEnum teamLevelEnum : DrillEvaluationEffectEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillEvaluationEffectEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationEvacuateEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationEvacuateEnum.java
new file mode 100644
index 0000000..9460801
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationEvacuateEnum.java
@@ -0,0 +1,46 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillEvaluationEvacuateEnum {
+
+ EVACUATE_ONE((byte) 1, "按要求配合"),
+ EVACUATE_TWO((byte) 2, "未按要求配合");
+
+ private Byte code;
+ private String value;
+
+ DrillEvaluationEvacuateEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillEvaluationEvacuateEnum> toMap() {
+ Map<Byte, DrillEvaluationEvacuateEnum> map = new HashMap();
+ for (DrillEvaluationEvacuateEnum teamLevelEnum : DrillEvaluationEvacuateEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillEvaluationEvacuateEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationProtectionEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationProtectionEnum.java
new file mode 100644
index 0000000..31b35a5
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationProtectionEnum.java
@@ -0,0 +1,46 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillEvaluationProtectionEnum {
+
+ PROTECTION_ONE((byte) 1, "全部人员防护到位"),
+ PROTECTION_TWO((byte) 2, "人员未防护到位");
+
+ private Byte code;
+ private String value;
+
+ DrillEvaluationProtectionEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillEvaluationProtectionEnum> toMap() {
+ Map<Byte, DrillEvaluationProtectionEnum> map = new HashMap();
+ for (DrillEvaluationProtectionEnum teamLevelEnum : DrillEvaluationProtectionEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillEvaluationProtectionEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationReportEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationReportEnum.java
new file mode 100644
index 0000000..92347f9
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationReportEnum.java
@@ -0,0 +1,46 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillEvaluationReportEnum {
+
+ REPORT_ONE((byte) 1, "报告及时"),
+ REPORT_TWO((byte) 2, "报告不及时");
+
+ private Byte code;
+ private String value;
+
+ DrillEvaluationReportEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillEvaluationReportEnum> toMap() {
+ Map<Byte, DrillEvaluationReportEnum> map = new HashMap();
+ for (DrillEvaluationReportEnum teamLevelEnum : DrillEvaluationReportEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillEvaluationReportEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationRescueEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationRescueEnum.java
new file mode 100644
index 0000000..192d611
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationRescueEnum.java
@@ -0,0 +1,46 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillEvaluationRescueEnum {
+
+ RESCUE_ONE((byte) 1, "按要求协作"),
+ RESCUE_TWO((byte) 2, "未按要求协作");
+
+ private Byte code;
+ private String value;
+
+ DrillEvaluationRescueEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillEvaluationRescueEnum> toMap() {
+ Map<Byte, DrillEvaluationRescueEnum> map = new HashMap();
+ for (DrillEvaluationRescueEnum teamLevelEnum : DrillEvaluationRescueEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillEvaluationRescueEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSafetyEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSafetyEnum.java
new file mode 100644
index 0000000..8d2c4de
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSafetyEnum.java
@@ -0,0 +1,46 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillEvaluationSafetyEnum {
+
+ SAFETY_ONE((byte) 1, "按要求协作"),
+ SAFETY_TWO((byte) 2, "未按要求协作");
+
+ private Byte code;
+ private String value;
+
+ DrillEvaluationSafetyEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillEvaluationSafetyEnum> toMap() {
+ Map<Byte, DrillEvaluationSafetyEnum> map = new HashMap();
+ for (DrillEvaluationSafetyEnum teamLevelEnum : DrillEvaluationSafetyEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillEvaluationSafetyEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSufficientEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSufficientEnum.java
new file mode 100644
index 0000000..bd8db30
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSufficientEnum.java
@@ -0,0 +1,47 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillEvaluationSufficientEnum {
+
+ SUFFICIENT_ONE((byte) 1, "完全满足应急要求"),
+ SUFFICIENT_TWO((byte) 2, "不完全满足应急要求"),
+ SUFFICIENT_THREE((byte) 3, "完全不满足应急要求");
+
+ private Byte code;
+ private String value;
+
+ DrillEvaluationSufficientEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillEvaluationSufficientEnum> toMap() {
+ Map<Byte, DrillEvaluationSufficientEnum> map = new HashMap();
+ for (DrillEvaluationSufficientEnum teamLevelEnum : DrillEvaluationSufficientEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillEvaluationSufficientEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSuitableEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSuitableEnum.java
new file mode 100644
index 0000000..579f46c
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSuitableEnum.java
@@ -0,0 +1,46 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillEvaluationSuitableEnum {
+
+ SUITABLE_ONE((byte) 1, "全部能够执行"),
+ SUITABLE_TWO((byte) 2, "全部不能够执行");
+
+ private Byte code;
+ private String value;
+
+ DrillEvaluationSuitableEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillEvaluationSuitableEnum> toMap() {
+ Map<Byte, DrillEvaluationSuitableEnum> map = new HashMap();
+ for (DrillEvaluationSuitableEnum teamLevelEnum : DrillEvaluationSuitableEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillEvaluationSuitableEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSuppliesEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSuppliesEnum.java
new file mode 100644
index 0000000..4422633
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationSuppliesEnum.java
@@ -0,0 +1,47 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillEvaluationSuppliesEnum {
+
+ SUPPLIES_ONE((byte) 1, "现场物资成分，全部有效"),
+ SUPPLIES_TWO((byte) 2, "现场物资不充分"),
+ SUPPLIES_THREE((byte) 3, "现场没有物资");
+
+ private Byte code;
+ private String value;
+
+ DrillEvaluationSuppliesEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillEvaluationSuppliesEnum> toMap() {
+ Map<Byte, DrillEvaluationSuppliesEnum> map = new HashMap();
+ for (DrillEvaluationSuppliesEnum teamLevelEnum : DrillEvaluationSuppliesEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillEvaluationSuppliesEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationWholeEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationWholeEnum.java
new file mode 100644
index 0000000..e220c35
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillEvaluationWholeEnum.java
@@ -0,0 +1,46 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillEvaluationWholeEnum {
+
+ WHOLE_ONE((byte) 1, "协调基本顺利，能够满足要求"),
+ WHOLE_TWO((byte) 2, "协调不顺利");
+
+ private Byte code;
+ private String value;
+
+ DrillEvaluationWholeEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillEvaluationWholeEnum> toMap() {
+ Map<Byte, DrillEvaluationWholeEnum> map = new HashMap();
+ for (DrillEvaluationWholeEnum teamLevelEnum : DrillEvaluationWholeEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillEvaluationWholeEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillPlanLevelEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillPlanLevelEnum.java
new file mode 100644
index 0000000..66c68c5
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillPlanLevelEnum.java
@@ -0,0 +1,47 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillPlanLevelEnum {
+
+ LEVEL_ONE((byte) 1, "公司级"),
+ LEVEL_TWO((byte) 2, "分厂级"),
+ LEVEL_THREE((byte) 3, "车间级");
+
+ private Byte code;
+ private String value;
+
+ DrillPlanLevelEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillPlanLevelEnum> toMap() {
+ Map<Byte, DrillPlanLevelEnum> map = new HashMap();
+ for (DrillPlanLevelEnum teamLevelEnum : DrillPlanLevelEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillPlanLevelEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillPlanWayEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillPlanWayEnum.java
new file mode 100644
index 0000000..8cb7a6a
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/DrillPlanWayEnum.java
@@ -0,0 +1,47 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DrillPlanWayEnum {
+
+ WAY_ONE((byte) 1, "综合"),
+ WAY_TWO((byte) 2, "桌面"),
+ WAY_THREE((byte) 3, "专项");
+
+ private Byte code;
+ private String value;
+
+ DrillPlanWayEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, DrillPlanWayEnum> toMap() {
+ Map<Byte, DrillPlanWayEnum> map = new HashMap();
+ for (DrillPlanWayEnum teamLevelEnum : DrillPlanWayEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static DrillPlanWayEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyDrillPlanStatus.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyDrillPlanStatus.java
deleted file mode 100644
index 4b0fa29..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyDrillPlanStatus.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.gkhy.safePlatform.emergency.enums;
-
-public enum EmergencyDrillPlanStatus {
-
- START(1,"开始"),
- FIRST_LEVEL_APPROEAL(2,"一级审批"),
- SECOND_LEVEL_APPROEAL(3,"二级审批"),
- THIRD_LEVEL_APPROEAL(4,"三级审批"),
- END(5,"结束");
-
- private Integer status;
-
- private String desc;
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- EmergencyDrillPlanStatus(Integer status, String desc) {
- this.status = status;
- this.desc = desc;
- }
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyPlanLevelEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyPlanLevelEnum.java
new file mode 100644
index 0000000..ad1d41e
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyPlanLevelEnum.java
@@ -0,0 +1,47 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum EmergencyPlanLevelEnum {
+
+ LEVEL_ONE((byte) 1, "公司级"),
+ LEVEL_TWO((byte) 2, "分厂级"),
+ LEVEL_THREE((byte) 3, "车间级");
+
+ private Byte code;
+ private String value;
+
+ EmergencyPlanLevelEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, EmergencyPlanLevelEnum> toMap() {
+ Map<Byte, EmergencyPlanLevelEnum> map = new HashMap();
+ for (EmergencyPlanLevelEnum teamLevelEnum : EmergencyPlanLevelEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static EmergencyPlanLevelEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyPlanStatus.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyPlanStatus.java
deleted file mode 100644
index aa41e2d..0000000
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyPlanStatus.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.gkhy.safePlatform.emergency.enums;
-
-public enum EmergencyPlanStatus {
-
- START(1,"开始"),
- SECOND_LEVEL_APPROVAL(2,"审批中"),
- END(3,"结束");
-
- private Integer status;
-
- private String desc;
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- EmergencyPlanStatus(Integer status, String desc) {
- this.status = status;
- this.desc = desc;
- }
-}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyPlanTypeEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyPlanTypeEnum.java
new file mode 100644
index 0000000..8284a2d
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyPlanTypeEnum.java
@@ -0,0 +1,48 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum EmergencyPlanTypeEnum {
+
+ TYPE_ONE((byte) 1, "综合应急预案"),
+ TYPE_TWO((byte) 2, "现场处置预案"),
+ TYPE_THREE((byte) 3, "专项应急预案"),
+ TYPE_FOUR((byte) 4, "其他预案");
+
+ private Byte code;
+ private String value;
+
+ EmergencyPlanTypeEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, EmergencyPlanTypeEnum> toMap() {
+ Map<Byte, EmergencyPlanTypeEnum> map = new HashMap();
+ for (EmergencyPlanTypeEnum teamLevelEnum : EmergencyPlanTypeEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static EmergencyPlanTypeEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
index 60cbbf5..d3af0f7 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
@@ -2,6 +2,8 @@
public enum EmergencyResultCodes {
+ TEAM_ENUM_LEVEL_NOT_EXIST("T1000", "应急队伍队伍级别参数异常"),
+
TEAM_NAME_NULL("T1001", "应急队伍名称不可为空"),
TEAM_LEVEL_NULL("T1002", "应急队伍级别不可为空"),
@@ -36,21 +38,55 @@
PLAN_LOG_NOT_EXIST("P1003" , "应急预案启动记录不存在"),
+ PLAN_NAME_NULL("P1004" , "应急预案预案名称不可为空"),
+
+ PLAN_ENUM_TYPE_NOT_EXIST("P1005" , "应急预案预案类型异常"),
+
+ PLAN_ENUM_LEVEL_NOT_EXIST("P1006" , "应急预案预案级别异常"),
+
DRILL_PLAN_NOT_EXIST("D1001" , "应急演练计划不存在"),
DRILL_PLAN_NULL("D1002" , "应急演练计划不可为空"),
+
+ DRILL_PLAN_NAME_NULL("D1009" , "应急演练计划演练名称不可为空"),
DRILL_EXECUTE_NOT_EXIST("D1003" , "应急演练实施不存在"),
DRILL_EXECUTE_NULL("D1004" , "应急演练实施不可为空"),
+ DRILL_PLAN_ENUM_WAY_NOT_EXIST("D1007" , "应急演练计划演练方式类型异常"),
+
+ DRILL_PLAN_ENUM_LEVEL_NOT_EXIST("D1008" , "应急演练计划演练级别类型异常"),
+
DRILL_EVALUATION_NOT_EXIST("D1005" , "应急演练实施评价不存在"),
DRILL_EVALUATION_NULL("D1006" , "应急演练实施评价不可为空"),
+ DRILL_EVALUATION_ENUM_SUITABLE_NOT_EXIST("D1009" , "应急演练实施评价适应性类型异常"),
+ DRILL_EVALUATION_ENUM_SUFFICIENT_NOT_EXIST("D1009" , "应急演练实施评价充分性类型异常"),
+ DRILL_EVALUATION_ENUM_ARRIVAL_NOT_EXIST("D1009" , "应急演练实施评价人员到位情况类型异常"),
+ DRILL_EVALUATION_ENUM_SUPPLIES_NOT_EXIST("D1009" , "应急演练实施评价物资到位情况-现场物资类型异常"),
+ DRILL_EVALUATION_ENUM_PROTECTION_NOT_EXIST("D1009" , "应急演练实施评价物资到位情况-个人防护类型异常"),
+ DRILL_EVALUATION_ENUM_WHOLE_NOT_EXIST("D1009" , "应急演练实施评价协调组织情况-整体组织类型异常"),
+ DRILL_EVALUATION_ENUM_DIVISION_NOT_EXIST("D1009" , "应急演练实施评价协调组织情况-疏散组分工类型异常"),
+ DRILL_EVALUATION_ENUM_EFFECT_NOT_EXIST("D1009" , "应急演练实施评价实战效果评价类型异常"),
+ DRILL_EVALUATION_ENUM_REPORT_NOT_EXIST("D1009" , "应急演练实施评价支援部门和协作有效性-报告上级类型异常"),
+ DRILL_EVALUATION_ENUM_SAFETY_NOT_EXIST("D1009" , "应急演练实施评价支援部门和协作有效性-安全部门类型异常"),
+ DRILL_EVALUATION_ENUM_RESCUE_NOT_EXIST("D1009" , "应急演练实施评价支援部门和协作有效性-救援后勤部门类型异常"),
+ DRILL_EVALUATION_ENUM_EVACUATE_NOT_EXIST("D1009" , "应急演练实施评价支援部门和协作有效性-警戒撤离配合类型异常"),
+
+
+
+
SUPPLIES_NULL("S1001" , "应急物资不可为空"),
SUPPLIES_NOT_EXIST("S1002" , "应急物资不存在"),
+
+ SUPPLIES_NAME_NOT_EXIST("S1002" , "应急物资物资名称不可为空"),
+
+ SUPPLIES_ENUM_CLASSIFICATION_NOT_EXIST("S1011" , "应急物资物资分类类型异常"),
+
+ SUPPLIES_ENUM_STATUS_NOT_EXIST("S1012" , "应急物资物资状态类型异常"),
SUPPLIES_INSPECT_NULL("S1003" , "应急物资检查不可为空"),
@@ -72,6 +108,8 @@
YEAR_NULL("Y1001" , "年份不能为空"),
+
+
ERROR("A3000", "未知错误");
private String code;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencySuppliesClassificationEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencySuppliesClassificationEnum.java
new file mode 100644
index 0000000..5d45241
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencySuppliesClassificationEnum.java
@@ -0,0 +1,50 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum EmergencySuppliesClassificationEnum {
+
+ CLASSIFICATION_ONE((byte) 1, "事故气体吸收装置"),
+ CLASSIFICATION_TWO((byte) 2, "通讯设施"),
+ CLASSIFICATION_THREE((byte) 3, "交通运输工具"),
+ CLASSIFICATION_FOUR((byte) 4, "照明装置"),
+ CLASSIFICATION_FIVE((byte) 5, "防护器材"),
+ CLASSIFICATION_SIX((byte) 6, "其他");
+
+ private Byte code;
+ private String value;
+
+ EmergencySuppliesClassificationEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, EmergencySuppliesClassificationEnum> toMap() {
+ Map<Byte, EmergencySuppliesClassificationEnum> map = new HashMap();
+ for (EmergencySuppliesClassificationEnum teamLevelEnum : EmergencySuppliesClassificationEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static EmergencySuppliesClassificationEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencySuppliesStatusEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencySuppliesStatusEnum.java
new file mode 100644
index 0000000..71183b1
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencySuppliesStatusEnum.java
@@ -0,0 +1,46 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum EmergencySuppliesStatusEnum {
+
+ STATUS_ONE((byte) 1, "完好"),
+ STATUS_TWO((byte) 2, "维修");
+
+ private Byte code;
+ private String value;
+
+ EmergencySuppliesStatusEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, EmergencySuppliesStatusEnum> toMap() {
+ Map<Byte, EmergencySuppliesStatusEnum> map = new HashMap();
+ for (EmergencySuppliesStatusEnum teamLevelEnum : EmergencySuppliesStatusEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static EmergencySuppliesStatusEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/TeamLevelEnum.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/TeamLevelEnum.java
new file mode 100644
index 0000000..81eaf30
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/TeamLevelEnum.java
@@ -0,0 +1,50 @@
+package com.gkhy.safePlatform.emergency.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum TeamLevelEnum {
+
+ LEVEL_ONE((byte) 1, "公司"),
+ LEVEL_TWO((byte) 2, "厂房"),
+ LEVEL_THREE((byte) 3, "车间"),
+ LEVEL_FOUR((byte) 4, "工序"),
+ LEVEL_FIVE((byte) 5, "班组");
+
+
+ private Byte code;
+ private String value;
+
+ TeamLevelEnum(Byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public Byte getCode() {
+ return code;
+ }
+
+ public void setCode(Byte code) {
+ this.code = code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ // 转换成为 MAP<Byte, String>, 对外提供查询和遍历功能
+ public static Map<Byte, TeamLevelEnum> toMap() {
+ Map<Byte, TeamLevelEnum> map = new HashMap();
+ for (TeamLevelEnum teamLevelEnum : TeamLevelEnum.values()) {
+ map.put(teamLevelEnum.getCode(), teamLevelEnum);
+ }
+ return map;
+ }
+ public static TeamLevelEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java
index 9c41e4b..5abeadb 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java
@@ -14,29 +14,29 @@
// 应急演练实施的id 帮助数据进行筛选
private Long drillExecuteId;
- private String suitable;
+ private Byte suitable;
- private String sufficient;
+ private Byte sufficient;
- private String arrival;
+ private Byte arrival;
- private String supplies;
+ private Byte supplies;
- private String protection;
+ private Byte protection;
- private String whole;
+ private Byte whole;
- private String division;
+ private Byte division;
- private String effect;
+ private Byte effect;
- private String report;
+ private Byte report;
- private String safety;
+ private Byte safety;
- private String rescue;
+ private Byte rescue;
- private String evacuate;
+ private Byte evacuate;
private Boolean needModify;
@@ -47,6 +47,7 @@
private List<EmergencyDrillEvaluationFileReqDTO> fileList;
private List<EmergencyDrillEvaluationUserReqDTO> userList;
+
public Long getId() {
return id;
@@ -64,99 +65,99 @@
this.drillExecuteId = drillExecuteId;
}
- public String getSuitable() {
+ public Byte getSuitable() {
return suitable;
}
- public void setSuitable(String suitable) {
+ public void setSuitable(Byte suitable) {
this.suitable = suitable;
}
- public String getSufficient() {
+ public Byte getSufficient() {
return sufficient;
}
- public void setSufficient(String sufficient) {
+ public void setSufficient(Byte sufficient) {
this.sufficient = sufficient;
}
- public String getArrival() {
+ public Byte getArrival() {
return arrival;
}
- public void setArrival(String arrival) {
+ public void setArrival(Byte arrival) {
this.arrival = arrival;
}
- public String getSupplies() {
+ public Byte getSupplies() {
return supplies;
}
- public void setSupplies(String supplies) {
+ public void setSupplies(Byte supplies) {
this.supplies = supplies;
}
- public String getProtection() {
+ public Byte getProtection() {
return protection;
}
- public void setProtection(String protection) {
+ public void setProtection(Byte protection) {
this.protection = protection;
}
- public String getWhole() {
+ public Byte getWhole() {
return whole;
}
- public void setWhole(String whole) {
+ public void setWhole(Byte whole) {
this.whole = whole;
}
- public String getDivision() {
+ public Byte getDivision() {
return division;
}
- public void setDivision(String division) {
+ public void setDivision(Byte division) {
this.division = division;
}
- public String getEffect() {
+ public Byte getEffect() {
return effect;
}
- public void setEffect(String effect) {
+ public void setEffect(Byte effect) {
this.effect = effect;
}
- public String getReport() {
+ public Byte getReport() {
return report;
}
- public void setReport(String report) {
+ public void setReport(Byte report) {
this.report = report;
}
- public String getSafety() {
+ public Byte getSafety() {
return safety;
}
- public void setSafety(String safety) {
+ public void setSafety(Byte safety) {
this.safety = safety;
}
- public String getRescue() {
+ public Byte getRescue() {
return rescue;
}
- public void setRescue(String rescue) {
+ public void setRescue(Byte rescue) {
this.rescue = rescue;
}
- public String getEvacuate() {
+ public Byte getEvacuate() {
return evacuate;
}
- public void setEvacuate(String evacuate) {
+ public void setEvacuate(Byte evacuate) {
this.evacuate = evacuate;
}
@@ -198,30 +199,5 @@
public void setUserList(List<EmergencyDrillEvaluationUserReqDTO> userList) {
this.userList = userList;
- }
-
- @Override
- public String toString() {
- return "EmergencyDrillEvaluationReqDTO{" +
- "id=" + id +
- ", drillExecuteId=" + drillExecuteId +
- ", suitable='" + suitable + '\'' +
- ", sufficient='" + sufficient + '\'' +
- ", arrival='" + arrival + '\'' +
- ", supplies='" + supplies + '\'' +
- ", protection='" + protection + '\'' +
- ", whole='" + whole + '\'' +
- ", division='" + division + '\'' +
- ", effect='" + effect + '\'' +
- ", report='" + report + '\'' +
- ", safety='" + safety + '\'' +
- ", rescue='" + rescue + '\'' +
- ", evacuate='" + evacuate + '\'' +
- ", needModify=" + needModify +
- ", questionAndImprove='" + questionAndImprove + '\'' +
- ", modifyContent='" + modifyContent + '\'' +
- ", fileList=" + fileList +
- ", userList=" + userList +
- '}';
}
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java
index 16b0ef3..aa75be3 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java
@@ -39,13 +39,13 @@
private BigDecimal drillExpense;
- private String drillLevel;
+ private Byte drillLevel;
private String drillAddress;
private String drillName;
- private String drillWay;
+ private Byte drillWay;
private String insuranceMeasures;
@@ -129,11 +129,11 @@
this.drillExpense = drillExpense;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
@@ -153,11 +153,11 @@
this.drillName = drillName;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java
index d342880..344ac75 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java
@@ -30,9 +30,9 @@
private Boolean associatedDanger;
- private String type;
+ private Byte type;
- private String level;
+ private Byte level;
private String name ;
@@ -92,19 +92,19 @@
this.associatedDanger = associatedDanger;
}
- public String getType() {
+ public Byte getType() {
return type;
}
- public void setType(String type) {
+ public void setType(Byte type) {
this.type = type;
}
- public String getLevel() {
+ public Byte getLevel() {
return level;
}
- public void setLevel(String level) {
+ public void setLevel(Byte level) {
this.level = level;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java
index 5dac4a3..3283421 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java
@@ -33,8 +33,8 @@
private Integer usePeriod;
private Long departmentId;
private Long principalUserUid;
- private String status;
- private String classification;
+ private Byte status;
+ private Byte classification;
private String name;
private String number;
private String model;
@@ -125,19 +125,19 @@
this.principalUserUid = principalUserUid;
}
- public String getStatus() {
+ public Byte getStatus() {
return status;
}
- public void setStatus(String status) {
+ public void setStatus(Byte status) {
this.status = status;
}
- public String getClassification() {
+ public Byte getClassification() {
return classification;
}
- public void setClassification(String classification) {
+ public void setClassification(Byte classification) {
this.classification = classification;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
index 77ba093..278bd53 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
@@ -20,7 +20,7 @@
private Long principalDepartmentId;
- private String teamLevel;
+ private Byte teamLevel;
private String teamName;
@@ -58,11 +58,11 @@
this.principalDepartmentId = principalDepartmentId;
}
- public String getTeamLevel() {
+ public Byte getTeamLevel() {
return teamLevel;
}
- public void setTeamLevel(String teamLevel) {
+ public void setTeamLevel(Byte teamLevel) {
this.teamLevel = teamLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java
index d1cbb6a..66d765f 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java
@@ -43,13 +43,13 @@
private BigDecimal drillExpense;
- private String drillLevel;
+ private Byte drillLevel;
private String drillAddress;
private String drillName;
- private String drillWay;
+ private Byte drillWay;
private String insuranceMeasures;
@@ -99,29 +99,29 @@
private Long drillExecuteId;
- private String suitable;
+ private Byte suitable;
- private String sufficient;
+ private Byte sufficient;
- private String arrival;
+ private Byte arrival;
- private String supplies;
+ private Byte supplies;
- private String protection;
+ private Byte protection;
- private String whole;
+ private Byte whole;
- private String division;
+ private Byte division;
- private String effect;
+ private Byte effect;
- private String report;
+ private Byte report;
- private String safety;
+ private Byte safety;
- private String rescue;
+ private Byte rescue;
- private String evacuate;
+ private Byte evacuate;
private Boolean needModify;
@@ -181,11 +181,11 @@
this.drillExpense = drillExpense;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
@@ -205,11 +205,11 @@
this.drillName = drillName;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
@@ -301,99 +301,99 @@
this.drillExecuteId = drillExecuteId;
}
- public String getSuitable() {
+ public Byte getSuitable() {
return suitable;
}
- public void setSuitable(String suitable) {
+ public void setSuitable(Byte suitable) {
this.suitable = suitable;
}
- public String getSufficient() {
+ public Byte getSufficient() {
return sufficient;
}
- public void setSufficient(String sufficient) {
+ public void setSufficient(Byte sufficient) {
this.sufficient = sufficient;
}
- public String getArrival() {
+ public Byte getArrival() {
return arrival;
}
- public void setArrival(String arrival) {
+ public void setArrival(Byte arrival) {
this.arrival = arrival;
}
- public String getSupplies() {
+ public Byte getSupplies() {
return supplies;
}
- public void setSupplies(String supplies) {
+ public void setSupplies(Byte supplies) {
this.supplies = supplies;
}
- public String getProtection() {
+ public Byte getProtection() {
return protection;
}
- public void setProtection(String protection) {
+ public void setProtection(Byte protection) {
this.protection = protection;
}
- public String getWhole() {
+ public Byte getWhole() {
return whole;
}
- public void setWhole(String whole) {
+ public void setWhole(Byte whole) {
this.whole = whole;
}
- public String getDivision() {
+ public Byte getDivision() {
return division;
}
- public void setDivision(String division) {
+ public void setDivision(Byte division) {
this.division = division;
}
- public String getEffect() {
+ public Byte getEffect() {
return effect;
}
- public void setEffect(String effect) {
+ public void setEffect(Byte effect) {
this.effect = effect;
}
- public String getReport() {
+ public Byte getReport() {
return report;
}
- public void setReport(String report) {
+ public void setReport(Byte report) {
this.report = report;
}
- public String getSafety() {
+ public Byte getSafety() {
return safety;
}
- public void setSafety(String safety) {
+ public void setSafety(Byte safety) {
this.safety = safety;
}
- public String getRescue() {
+ public Byte getRescue() {
return rescue;
}
- public void setRescue(String rescue) {
+ public void setRescue(Byte rescue) {
this.rescue = rescue;
}
- public String getEvacuate() {
+ public Byte getEvacuate() {
return evacuate;
}
- public void setEvacuate(String evacuate) {
+ public void setEvacuate(Byte evacuate) {
this.evacuate = evacuate;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java
index 8d1dcca..ec5ba03 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java
@@ -20,9 +20,9 @@
private String drillAddress;
- private String drillWay;
+ private Byte drillWay;
- private String drillLevel;
+ private Byte drillLevel;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillPlanDate;
@@ -46,19 +46,19 @@
this.drillAddress = drillAddress;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java
index 444535d..08ff5e3 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java
@@ -10,9 +10,9 @@
private String drillAddress;
- private String drillWay;
+ private Byte drillWay;
- private String drillLevel;
+ private Byte drillLevel;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillPlanDate;
@@ -35,19 +35,19 @@
this.drillAddress = drillAddress;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java
index 1af45d4..797e677 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java
@@ -51,13 +51,13 @@
private BigDecimal drillExpense;
- private String drillLevel;
+ private Byte drillLevel;
private String drillAddress;
private String drillName;
- private String drillWay;
+ private Byte drillWay;
private String insuranceMeasures;
@@ -159,11 +159,11 @@
this.drillExpense = drillExpense;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
@@ -183,11 +183,11 @@
this.drillName = drillName;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanPageRespDTO.java
index 76220b5..e377a0a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanPageRespDTO.java
@@ -12,9 +12,9 @@
private String drillAddress;
- private String drillWay;
+ private Byte drillWay;
- private String drillLevel;
+ private Byte drillLevel;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillPlanDate;
@@ -46,19 +46,19 @@
this.drillAddress = drillAddress;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java
index 1f5c663..ab4d622 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java
@@ -30,9 +30,9 @@
private Boolean associatedDanger;
- private String type;
+ private Byte type;
- private String level;
+ private Byte level;
private String name ;
@@ -92,19 +92,19 @@
this.associatedDanger = associatedDanger;
}
- public String getType() {
+ public Byte getType() {
return type;
}
- public void setType(String type) {
+ public void setType(Byte type) {
this.type = type;
}
- public String getLevel() {
+ public Byte getLevel() {
return level;
}
- public void setLevel(String level) {
+ public void setLevel(Byte level) {
this.level = level;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
index bb251ba..811526b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
@@ -66,9 +66,9 @@
private Integer status ;
- private String type;
+ private Byte type;
- private String level;
+ private Byte level;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date releaseDate;
@@ -98,19 +98,19 @@
this.status = status;
}
- public String getType() {
+ public Byte getType() {
return type;
}
- public void setType(String type) {
+ public void setType(Byte type) {
this.type = type;
}
- public String getLevel() {
+ public Byte getLevel() {
return level;
}
- public void setLevel(String level) {
+ public void setLevel(Byte level) {
this.level = level;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java
index 39ba6e0..caa1e94 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java
@@ -58,8 +58,8 @@
private Integer usePeriod;
private Long departmentId;
private Long principalUserUid;
- private String status;
- private String classification;
+ private Byte status;
+ private Byte classification;
private String name;
private String number;
private String model;
@@ -150,19 +150,19 @@
this.principalUserUid = principalUserUid;
}
- public String getStatus() {
+ public Byte getStatus() {
return status;
}
- public void setStatus(String status) {
+ public void setStatus(Byte status) {
this.status = status;
}
- public String getClassification() {
+ public Byte getClassification() {
return classification;
}
- public void setClassification(String classification) {
+ public void setClassification(Byte classification) {
this.classification = classification;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java
index 82e9abb..6cabaae 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java
@@ -21,7 +21,7 @@
private Long principalDepartmentId;
- private String teamLevel;
+ private Byte teamLevel;
private String teamName;
@@ -59,11 +59,11 @@
this.principalDepartmentId = principalDepartmentId;
}
- public String getTeamLevel() {
+ public Byte getTeamLevel() {
return teamLevel;
}
- public void setTeamLevel(String teamLevel) {
+ public void setTeamLevel(Byte teamLevel) {
this.teamLevel = teamLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java
index 3c7d166..e9032f5 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java
@@ -7,7 +7,7 @@
private Long id;
- private String teamLevel;
+ private Byte teamLevel;
private String teamName;
@@ -25,11 +25,11 @@
this.id = id;
}
- public String getTeamLevel() {
+ public Byte getTeamLevel() {
return teamLevel;
}
- public void setTeamLevel(String teamLevel) {
+ public void setTeamLevel(Byte teamLevel) {
this.teamLevel = teamLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java
index 7a99b5a..3d330a8 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java
@@ -14,7 +14,7 @@
private String name ;
- private String type ;
+ private Byte type ;
public String getName() {
return name;
@@ -24,11 +24,11 @@
this.name = name;
}
- public String getType() {
+ public Byte getType() {
return type;
}
- public void setType(String type) {
+ public void setType(Byte type) {
this.type = type;
}
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java
index b5ab71e..09036e8 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java
@@ -4,7 +4,7 @@
private String teamName ;
- private String teamLevel ;
+ private Byte teamLevel ;
public String getTeamName() {
return teamName;
@@ -14,11 +14,11 @@
this.teamName = teamName;
}
- public String getTeamLevel() {
+ public Byte getTeamLevel() {
return teamLevel;
}
- public void setTeamLevel(String teamLevel) {
+ public void setTeamLevel(Byte teamLevel) {
this.teamLevel = teamLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyPlanDBQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyPlanDBQuery.java
index 535a8ab..e824429 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyPlanDBQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyPlanDBQuery.java
@@ -4,7 +4,7 @@
private String name ;
- private String type ;
+ private Byte type ;
private Boolean abolishStatus;
@@ -24,11 +24,11 @@
this.name = name;
}
- public String getType() {
+ public Byte getType() {
return type;
}
- public void setType(String type) {
+ public void setType(Byte type) {
this.type = type;
}
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyTeamDBQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyTeamDBQuery.java
index d36ce1d..0726073 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyTeamDBQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyTeamDBQuery.java
@@ -4,7 +4,7 @@
private String teamName ;
- private String teamLevel ;
+ private Byte teamLevel ;
public String getTeamName() {
return teamName;
@@ -14,11 +14,11 @@
this.teamName = teamName;
}
- public String getTeamLevel() {
+ public Byte getTeamLevel() {
return teamLevel;
}
- public void setTeamLevel(String teamLevel) {
+ public void setTeamLevel(Byte teamLevel) {
this.teamLevel = teamLevel;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java
index 1094759..89d01e1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java
@@ -5,8 +5,6 @@
import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO;
-import com.gkhy.safePlatform.emergency.enums.ApproveStatus;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanPageRespDTO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyWorkApproveDBQuery;
import java.util.List;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java
index e792e0e..e10a260 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java
@@ -8,7 +8,7 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
-import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
+import com.gkhy.safePlatform.emergency.enums.*;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillEvaluationFileReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillEvaluationReqDTO;
@@ -77,6 +77,9 @@
@Override
public ResultVO addEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
+ // 验证枚举
+ checkEnum(emergencyDrillEvaluationReqDTO);
+
// 判断请求中是否存在演练计划id
if (emergencyDrillEvaluationReqDTO.getDrillExecuteId() == null) {
throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NULL);
@@ -186,6 +189,8 @@
@Override
public ResultVO updateEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
+ // 验证枚举
+ checkEnum(emergencyDrillEvaluationReqDTO);
Date nowDate = new Date();
// 查询是否存在
EmergencyDrillEvaluationInfoDetailDO emergencyDrillEvaluationInfoDetailDO = emergencyDrillEvaluationInfoService.selectEmergencyDrillEvaluationByExecuteId(emergencyDrillEvaluationReqDTO.getDrillExecuteId());
@@ -322,4 +327,49 @@
emergencyDrillEvaluationUserInfoService.deleteEmergencyDrillEvaluationUserByDrillEvaluationId(DrillEvaluationId);
}
}
+
+
+ /**
+ *
+ * 枚举类验证
+ * @param emergencyDrillEvaluationReqDTO
+ */
+ public void checkEnum(EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
+ if (DrillEvaluationSuitableEnum.getByCode(emergencyDrillEvaluationReqDTO.getSuitable()) == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_SUITABLE_NOT_EXIST);
+ }
+ if (DrillEvaluationSufficientEnum.getByCode(emergencyDrillEvaluationReqDTO.getSufficient()) == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_SUFFICIENT_NOT_EXIST);
+ }
+ if (DrillEvaluationArrivalEnum.getByCode(emergencyDrillEvaluationReqDTO.getArrival()) == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_ARRIVAL_NOT_EXIST);
+ }
+ if (DrillEvaluationSuppliesEnum.getByCode(emergencyDrillEvaluationReqDTO.getSupplies()) == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_SUPPLIES_NOT_EXIST);
+ }
+ if (DrillEvaluationProtectionEnum.getByCode(emergencyDrillEvaluationReqDTO.getProtection()) == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_PROTECTION_NOT_EXIST);
+ }
+ if (DrillEvaluationWholeEnum.getByCode(emergencyDrillEvaluationReqDTO.getWhole()) == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_WHOLE_NOT_EXIST);
+ }
+ if (DrillEvaluationDivisionEnum.getByCode(emergencyDrillEvaluationReqDTO.getDivision()) == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_DIVISION_NOT_EXIST);
+ }
+ if (DrillEvaluationEffectEnum.getByCode(emergencyDrillEvaluationReqDTO.getEffect()) == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_EFFECT_NOT_EXIST);
+ }
+ if (DrillEvaluationReportEnum.getByCode(emergencyDrillEvaluationReqDTO.getReport()) == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_REPORT_NOT_EXIST);
+ }
+ if (DrillEvaluationSafetyEnum.getByCode(emergencyDrillEvaluationReqDTO.getSafety()) == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_SAFETY_NOT_EXIST);
+ }
+ if (DrillEvaluationRescueEnum.getByCode(emergencyDrillEvaluationReqDTO.getRescue()) == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_RESCUE_NOT_EXIST);
+ }
+ if (DrillEvaluationEvacuateEnum.getByCode(emergencyDrillEvaluationReqDTO.getEvacuate()) == null) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_EVALUATION_ENUM_EVACUATE_NOT_EXIST);
+ }
+ }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
index 14b3936..513b392 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
@@ -1,5 +1,6 @@
package com.gkhy.safePlatform.emergency.service.impl;
+import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
@@ -7,6 +8,8 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
+import com.gkhy.safePlatform.emergency.enums.DrillPlanLevelEnum;
+import com.gkhy.safePlatform.emergency.enums.DrillPlanWayEnum;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.*;
@@ -66,6 +69,11 @@
@Override
public ResultVO addEmergencyDrillPlan(Long uid, EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO) {
+ // 验证必填
+ checkRequired(emergencyDrillPlanReqDTO);
+ // 验证枚举
+ checkEnum(emergencyDrillPlanReqDTO);
+
// 判断请求中是否存在应急预案id
if (emergencyDrillPlanReqDTO.getPlanId() == null) {
throw new EmergencyException(EmergencyResultCodes.PLAN_NULL);
@@ -156,6 +164,12 @@
@Override
public ResultVO updateEmergencyDrillPlan(Long uid, EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO) {
+
+ // 验证必填
+ checkRequired(emergencyDrillPlanReqDTO);
+ // 验证枚举
+ checkEnum(emergencyDrillPlanReqDTO);
+
Date nowDate = new Date();
// 查询是否存在
EmergencyDrillPlanInfoDetailDO emergencyDrillPlanInfoDetailDO = emergencyDrillPlanInfoService.selectEmergencyDrillPlanById(emergencyDrillPlanReqDTO.getId());
@@ -290,4 +304,28 @@
emergencyDrillPlanUserInfoService.deleteEmergencyDrillPlanUserByDrillPlanId(DrillPlanId);
}
}
+
+
+ /**
+ * 验证必填项
+ * @return
+ */
+ private void checkRequired(EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO) {
+ //名称
+ if (StringUtils.isBlank(emergencyDrillPlanReqDTO.getDrillName())) {
+ throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NAME_NULL);
+ }
+ }
+
+ /**
+ * 验证枚举
+ */
+ private void checkEnum(EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO){
+ if (DrillPlanWayEnum.getByCode(emergencyDrillPlanReqDTO.getDrillWay())==null){
+ throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_ENUM_WAY_NOT_EXIST);
+ }
+ if (DrillPlanLevelEnum.getByCode(emergencyDrillPlanReqDTO.getDrillLevel())==null){
+ throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_ENUM_LEVEL_NOT_EXIST);
+ }
+ }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
index 9148846..6f4a884 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
@@ -6,10 +6,12 @@
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
+import com.gkhy.safePlatform.commons.utils.StringUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.enums.ApproveStatus;
+import com.gkhy.safePlatform.emergency.enums.EmergencyPlanTypeEnum;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.*;
@@ -95,6 +97,13 @@
@Override
public ResultVO addEmergencyPlan(Long uid, EmergencyPlanReqDTO emergencyPlanReqDTO) {
+ // 验证必填
+ checkRequired(emergencyPlanReqDTO);
+ // 验证枚举
+ checkEnum(emergencyPlanReqDTO);
+
+
+
Date nowDate = new Date();
// 新增应急预案
EmergencyPlanInfo emergencyPlanInfo = new EmergencyPlanInfo();
@@ -232,6 +241,11 @@
@Override
public ResultVO updateEmergencyPlan(Long uid, EmergencyPlanReqDTO emergencyPlanReqDTO) {
+ // 验证必填
+ checkRequired(emergencyPlanReqDTO);
+ // 验证枚举
+ checkEnum(emergencyPlanReqDTO);
+
Date nowDate = new Date();
// 查询是否存在
EmergencyPlanInfoDetailDO emergencyPlanInfoDetailDO = emergencyPlanInfoService.selectEmergencyPlanById(emergencyPlanReqDTO.getId());
@@ -462,4 +476,28 @@
emergencyPlanTeamInfoService.deleteEmergencyPlanTeamByPlanId(PlanId);
}
}
+
+ /**
+ * 验证必填项
+ * @return
+ */
+ private void checkRequired(EmergencyPlanReqDTO emergencyPlanReqDTO) {
+ //名称
+ if (StringUtils.isBlank(emergencyPlanReqDTO.getName())) {
+ throw new EmergencyException(EmergencyResultCodes.PLAN_NAME_NULL);
+ }
+ }
+
+ /**
+ * 验证枚举
+ */
+ private void checkEnum(EmergencyPlanReqDTO emergencyPlanReqDTO){
+ if (EmergencyPlanTypeEnum.getByCode(emergencyPlanReqDTO.getType())==null){
+ throw new EmergencyException(EmergencyResultCodes.PLAN_ENUM_TYPE_NOT_EXIST);
+ }
+ if (EmergencyPlanTypeEnum.getByCode(emergencyPlanReqDTO.getLevel())==null){
+ throw new EmergencyException(EmergencyResultCodes.PLAN_ENUM_LEVEL_NOT_EXIST);
+ }
+ }
+
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
index 4144f5c..442af4e 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
@@ -1,5 +1,6 @@
package com.gkhy.safePlatform.emergency.service.impl;
+import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepInfoRPCRespDTO;
@@ -10,6 +11,8 @@
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
+import com.gkhy.safePlatform.emergency.enums.EmergencySuppliesClassificationEnum;
+import com.gkhy.safePlatform.emergency.enums.EmergencySuppliesStatusEnum;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.*;
import com.gkhy.safePlatform.emergency.model.dto.resp.*;
@@ -96,6 +99,12 @@
@Override
public ResultVO addEmergencySupplies(Long uid, EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
+
+ // 验证必填
+ checkRequired(emergencySuppliesReqDTO);
+ //验证枚举
+ checkEnum(emergencySuppliesReqDTO);
+
Date nowDate = new Date();
// 新增应急物资
EmergencySuppliesInfo emergencySuppliesInfo = new EmergencySuppliesInfo();
@@ -153,6 +162,11 @@
@Override
public ResultVO updateEmergencySupplies(Long uid, EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
+ // 验证必填
+ checkRequired(emergencySuppliesReqDTO);
+ //验证枚举
+ checkEnum(emergencySuppliesReqDTO);
+
Date nowDate = new Date();
// 查询是否存在
EmergencySuppliesInfoDetailDO emergencySuppliesInfoDetailDO = emergencySuppliesInfoService.selectEmergencySuppliesById(emergencySuppliesReqDTO.getId());
@@ -198,4 +212,27 @@
}
}
+
+ /**
+ * 验证必填项
+ * @return
+ */
+ private void checkRequired(EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
+ //名称
+ if (StringUtils.isBlank(emergencySuppliesReqDTO.getName())) {
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_NAME_NOT_EXIST);
+ }
+ }
+
+ /**
+ * 验证枚举
+ */
+ private void checkEnum(EmergencySuppliesReqDTO emergencySuppliesReqDTO){
+ if (EmergencySuppliesClassificationEnum.getByCode(emergencySuppliesReqDTO.getClassification())==null){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_ENUM_CLASSIFICATION_NOT_EXIST);
+ }
+ if (EmergencySuppliesStatusEnum.getByCode(emergencySuppliesReqDTO.getStatus())==null){
+ throw new EmergencyException(EmergencyResultCodes.SUPPLIES_ENUM_STATUS_NOT_EXIST);
+ }
+ }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
index c43dc17..b19852a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyTeamServiceImpl.java
@@ -8,6 +8,7 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
+import com.gkhy.safePlatform.emergency.enums.TeamLevelEnum;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyTeamFileReqDTO;
@@ -85,6 +86,8 @@
public ResultVO<EmergencyTeamDetailRespDTO> addEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
//必填项验证
checkRequired(emergencyTeamReqDTO);
+ // 验证枚举
+ checkEnum(emergencyTeamReqDTO);
Date nowDate = new Date();
//1.新增应急队伍
@@ -161,6 +164,8 @@
@Override
public ResultVO updateEmergencyTeam(Long uid, EmergencyTeamReqDTO emergencyTeamReqDTO) {
+ // 验证枚举
+ checkEnum(emergencyTeamReqDTO);
Date nowDate = new Date();
//查询是否存在
EmergencyTeamInfoDetailDO emergencyTeamInfoDetailDO = emergencyTeamInfoService.selectEmergencyTeamById(emergencyTeamReqDTO.getId());
@@ -317,7 +322,7 @@
throw new EmergencyException(EmergencyResultCodes.TEAM_NAME_NULL);
}
//级别
- if (StringUtils.isBlank(emergencyTeamReqDTO.getTeamLevel())) {
+ if (emergencyTeamReqDTO.getTeamLevel() == null) {
throw new EmergencyException(EmergencyResultCodes.TEAM_LEVEL_NULL);
}
//负责人
@@ -363,4 +368,13 @@
}
}
+ /**
+ * 枚举验证
+ */
+ private void checkEnum(EmergencyTeamReqDTO emergencyTeamReqDTO) {
+ if (TeamLevelEnum.getByCode(emergencyTeamReqDTO.getTeamLevel()) == null) {
+ throw new EmergencyException(EmergencyResultCodes.TEAM_ENUM_LEVEL_NOT_EXIST);
+ }
+ }
+
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/AccidentResultCodes.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/AccidentResultCodes.java
index e569ede..1e690dd 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/AccidentResultCodes.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/AccidentResultCodes.java
@@ -13,7 +13,7 @@
EXPRESS_BRIEF_PROCESS_NULL("E1007","事故快报事故简要经过不能为空"),
EXPRESS_CASE_PRELIMINARY_ANALYSIS_NULL("E1008","事故快报事故原因初步分析不能为空"),
EXPRESS_EMERGENCY_PRECAUTIONS_NULL("E1009","事故快报应急防范措施不能为空"),
- EXPRESS_ENUMS_CAUSE_NOT_EXIST("E1010","事故快报事故原因参数非法"),
+ EXPRESS_ENUMS_CAUSE_NOT_EXIST("E1010","事故快报事故原因参数异常"),
ACCIDENT_REPORT_NULL("A1003", "事故报告不可为空"),
@@ -29,9 +29,9 @@
REPORT_ACCIDENT_HANDLING_NULL("R1009","事故报告事故处理不能为空"),
REPORT_FILL_IN_USER_UID_NULL("R1010","事故报告填写人不能为空"),
REPORT_FILL_IN_TIME_NULL("R1011","事故报告填写日期不能为空"),
- REPORT_ENUMS_TYPE_NOT_EXIST("E1012","事故报告事故类别参数非法"),
- REPORT_ENUMS_GRADE_NOT_EXIST("E1013","事故报告事故等级参数非法"),
- REPORT_ENUMS_LEVEL_NOT_EXIST("E1014","事故报告事故级别参数非法"),
+ REPORT_ENUMS_TYPE_NOT_EXIST("E1012","事故报告事故类别参数异常"),
+ REPORT_ENUMS_GRADE_NOT_EXIST("E1013","事故报告事故等级参数异常"),
+ REPORT_ENUMS_LEVEL_NOT_EXIST("E1014","事故报告事故级别参数异常"),
WORK_INJURY_DECLARATION_NULL("W1001", "工伤申报不可为空"),
@@ -41,7 +41,7 @@
WORK_INJURY_DECLARATION_USERNAME_NOT_EXIST("W1005", "申报人部门不可为空"),
WORK_INJURY_DECLARATION_TYPE_NULL("W1006", "工伤类型不可为空"),
WORK_INJURY_DECLARATION_DATA_NULL("W1006", "申报日期不可为空"),
- WORK_INJURY_DECLARATION_ENUMS_TYPE_NOT_EXIST("W1007","工伤申报工伤类型参数非法"),
+ WORK_INJURY_DECLARATION_ENUMS_TYPE_NOT_EXIST("W1007","工伤申报工伤类型参数异常"),
CASE_NULL("C1001", "事故案例不可为空"),
CASE_NOT_EXIST("C1002", "事故案例不存在"),
--
Gitblit v1.9.2