From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Wed, 21 Sep 2022 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java | 5
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java | 20
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java | 3
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java | 4
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java | 9
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesInspectQuery.java | 2
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java | 2
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java | 50
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java | 106 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java | 24
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java | 8
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java | 70
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java | 14
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoExcel.java | 46
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java | 8
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java | 14
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java | 134 +-
safePlatfrom-out-web/src/main/resources/config/application-dev.yaml | 2
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java | 20
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java | 5
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetMngLevelEnum.java | 49 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java | 10
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java | 1
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java | 178 ++--
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java | 36
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java | 3
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/model/dto/resp/EmergencyPlanLogRespDTO.java | 11
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanLogReqDTO.java | 4
safePlatfrom-out-web/src/main/resources/config/application.yaml | 2
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java | 14
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java | 11
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentRepairStatusEnum.java | 47 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java | 37
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentLifeCycleEnum.java | 48 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java | 8
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoImportExcel.java | 38
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java | 8
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanLogQuery.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java | 22
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java | 16
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java | 8
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java | 5
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml | 6
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentResultCodes.java | 7
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentStopStatusEnum.java | 49 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesQuery.java | 1
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java | 3
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java | 24
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java | 32
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoExcel.java | 112 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java | 6
incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml | 6
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java | 8
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java | 5
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java | 29
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java | 4
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java | 56
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java | 38
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java | 10
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java | 12
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java | 42
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java | 10
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/KeypointEquipmentPartTypeEnum.java | 47 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java | 85 +-
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentRepairDetailDto.java | 56
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java | 208 ++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesMaintainQuery.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java | 18
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java | 16
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java | 26
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java | 13
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java | 36
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java | 4
85 files changed, 1,261 insertions(+), 874 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
index 8fc14ef..6e32171 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
@@ -70,9 +70,6 @@
/**
* 应急预案废止/还原
*/
- /**
- * 应急预案详情
- */
@RequestMapping(value = "/updateAbolish",method = RequestMethod.GET)
public ResultVO updateAbolish(Long id ,Boolean abolishStatus){
return emergencyPlanService.updateAbolish(id,abolishStatus);
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java
index 2f7b6ae..0969357 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java
@@ -49,7 +49,7 @@
}
/**
- * 应急预案修改
+ * 应急预案启动记录修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
public ResultVO updateEmergencyPlanLog(Authentication authentication, @RequestBody EmergencyPlanLogReqDTO emergencyPlanLogReqDTO) {
@@ -58,7 +58,7 @@
}
/**
- * 应急预案删除/批量删除
+ * 应急预案启动记录删除/批量删除
*/
@RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
public ResultVO batchDeleteEmergencyPlanLog(@RequestBody Long[] ids){
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java
index 8e2be46..74f031d 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java
@@ -24,7 +24,7 @@
private EmergencySuppliesMaintainService emergencySuppliesMaintainService;
/**
- * 应急物资检查列表
+ * 应急物资保养列表
*/
@RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
private ResultVO<List<EmergencySuppliesMaintainPageRespDTO>> list (@RequestBody PageQuery<EmergencySuppliesMaintainQuery> pageQuery){
@@ -33,7 +33,7 @@
}
/**
- * 应急物资检查新增
+ * 应急物资保养新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
public ResultVO addEmergencySuppliesMaintain(Authentication authentication, @RequestBody EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
@@ -42,7 +42,7 @@
}
/**
- * 应急物资检查详情
+ * 应急物资保养详情
*/
@RequestMapping(value = "/info/{id}",method = RequestMethod.GET)
public ResultVO<EmergencySuppliesMaintainDetailRespDTO> getEmergencySuppliesMaintainById(@PathVariable("id")Long id){
@@ -50,7 +50,7 @@
}
/**
- * 应急物资检查修改
+ * 应急物资保养修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
public ResultVO updateEmergencySuppliesMaintain(Authentication authentication, @RequestBody EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
@@ -59,7 +59,7 @@
}
/**
- * 应急物资检查删除/批量删除
+ * 应急物资保养删除/批量删除
*/
@RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
public ResultVO batchDeleteEmergencySuppliesMaintain(@RequestBody Long[] ids){
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 5abeadb..f578a23 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
@@ -11,43 +11,42 @@
private Long id;
- // 应急演练实施的id 帮助数据进行筛选
+ // 应急演练实施的id
private Long drillExecuteId;
-
+ //适宜性
private Byte suitable;
-
+ //充分性
private Byte sufficient;
-
+ //人员到位情况
private Byte arrival;
-
+ //物资到位情况-现场物资
private Byte supplies;
-
+ //物资到位情况-个人防护
private Byte protection;
-
+ //协调组织情况-整体组织
private Byte whole;
-
+ //协调组织情况-疏散组分工
private Byte division;
-
+ //实战效果评价
private Byte effect;
-
+ //支援部门和协作有效性-报告上级
private Byte report;
-
+ //支援部门和协作有效性-安全部门
private Byte safety;
-
+ //支援部门和协作有效性-救援后勤部门
private Byte rescue;
-
+ //支援部门和协作有效性-警戒撤离配合
private Byte evacuate;
-
+ //是否需要修改应急预案：0否1是
private Boolean needModify;
-
+ //存在问题和改进措施
private String questionAndImprove;
-
+ //修改内容
private String modifyContent;
-
+ //文件列表
private List<EmergencyDrillEvaluationFileReqDTO> fileList;
-
+ //人员列表
private List<EmergencyDrillEvaluationUserReqDTO> userList;
-
public Long getId() {
return id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java
index 37261da..f6c9c30 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java
@@ -7,7 +7,7 @@
import java.util.List;
public class EmergencyDrillExecuteReqDTO {
-
+ //记录人名称
private String recordUserName;
public String getRecordUserName() {
@@ -19,18 +19,18 @@
}
private Long id;
-
+ //状态 0：待评价 1 ：已评价
private Boolean status;
-
+ //演练记录时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillRecordDate;
-
+ //演练计划id
private Long drillPlanId;
-
+ //记录人uid
private Long recordUserUid;
-
+ //演练过程描述
private String processDesc;
-
+ //人员列表
private List<EmergencyDrillExecuteUserReqDTO> userList;
public Long getId() {
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 aa75be3..69b451f 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
@@ -7,7 +7,7 @@
import java.util.List;
public class EmergencyDrillPlanReqDTO {
-
+ //计划制定人名称
private String makingUserName;
public String getMakingUserName() {
@@ -20,41 +20,41 @@
private Long id;
-
+ //状态
private Integer status;
-
+ //计划制定日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date makingPlanDate;
-
+ //计划演练日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillPlanDate;
-
+ //计划制定人uid
private Long makingUserUid;
-
+ //计划制定部门ID
private Long makingDepartmentId;
-
+ //应急预案ID
private Long planId;
-
+ //主办部门ID
private Long departmentId;
-
+ //演练经费
private BigDecimal drillExpense;
-
+ //演练级别（数据字典）
private Byte drillLevel;
-
+ //演练地点
private String drillAddress;
-
+ //演练名称
private String drillName;
-
+ //演练方式（数据字典）
private Byte drillWay;
-
+ //保险措施
private String insuranceMeasures;
-
+ //备注
private String remark;
-
+ //演练目的
private String purpose;
-
+ //文件列表
private List<EmergencyDrillPlanFileReqDTO> fileList;
-
+ //人员列表
private List<EmergencyDrillPlanUserReqDTO> userList;
public Long getId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanLogReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanLogReqDTO.java
index afd564c..364e182 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanLogReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanLogReqDTO.java
@@ -6,9 +6,9 @@
public class EmergencyPlanLogReqDTO {
private Long id;
-
+ //预案id
private Long planId;
-
+ //备注
private String remark;
public Long getId() {
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 344ac75..d3dcde0 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
@@ -6,7 +6,7 @@
import java.util.List;
public class EmergencyPlanReqDTO {
-
+ //编写人名称
private String authorName;
public String getAuthorName() {
@@ -18,30 +18,30 @@
}
private Long id;
-
+ //状态
private Integer status;
-
+ //发布实施日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date releaseDate;
-
+ //编写人uid
private Long authorUid;
-
+ //编写部门id
private Long authorDeptId;
-
+ //危险源关联：0否1是
private Boolean associatedDanger;
-
+ //预案类型（数据字典）
private Byte type;
-
+ //预案级别（数据字典）
private Byte level;
-
+ //预案名称
private String name ;
private List<EmergencyPlanAreaReqDTO> areaList;
-
+ //部门列表
private List<EmergencyPlanDepartmentReqDTO> deptList;
-
+ //文件列表
private List<EmergencyPlanFileReqDTO> fileList;
-
+ //队伍列表
private List<EmergencyPlanTeamReqDTO> teamList;
public Long getId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java
index f8f63a1..01de9ff 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java
@@ -10,12 +10,14 @@
public class EmergencySuppliesInspectReqDTO {
private Long id;
-
+ //物资id
private Long suppliesId;
+ //检查结果
private String inspectResult;
+ //检查时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inspectTime;
-
+ //检查人列表
private List<EmergencySuppliesInspectUserReqDTO> userList;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java
index c1bc3af..8d217e4 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java
@@ -2,7 +2,7 @@
public class EmergencySuppliesInspectUserReqDTO {
-
+ //人员名称
private String userName;
public String getUserName() {
@@ -14,8 +14,9 @@
}
private Long id;
-
+ //检查id
private Long inspectId;
+ //人员uid
private Long userUid;
public Long getId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java
index 0a104f1..744d566 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java
@@ -8,12 +8,14 @@
public class EmergencySuppliesMaintainReqDTO {
private Long id;
-
+ //物资id
private Long suppliesId;
+ //保养结果
private String maintainResult;
+ //保养时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date maintainTime;
-
+ //包养人列表
private List<EmergencySuppliesMaintainUserReqDTO> userList;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java
index f694486..2b31934 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java
@@ -2,7 +2,7 @@
public class EmergencySuppliesMaintainUserReqDTO {
-
+ //人员名称
private String userName;
public String getUserName() {
@@ -14,8 +14,9 @@
}
private Long id;
-
+ //保养id
private Long maintainId;
+ //人员uid
private Long userUid;
public Long getId() {
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 3283421..aa3a2e3 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
@@ -8,7 +8,7 @@
import java.util.Date;
public class EmergencySuppliesReqDTO {
-
+ //负责人名称
private String principalUserName;
public String getPrincipalUserName() {
@@ -20,29 +20,49 @@
}
private Long id;
+ //生产日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date productionDate;
+ //投用日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date useDate;
+ //检查日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inspectDate;
+ //下次检查日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date nextInspectDate;
+ //检查周期/月
private Integer inspectPeriod;
+ //存储数量
private Integer count;
+ //使用期限/天
private Integer usePeriod;
+ //负责部门id
private Long departmentId;
+ //负责人uid
private Long principalUserUid;
+ //状态（数据字典）
private Byte status;
+ //分类（数据字典）
private Byte classification;
+ //名称
private String name;
+ //编号
private String number;
+ //型号
private String model;
+ //经度
private String longitude;
+ //维度
private String latitude;
+ //用途
private String use;
+ //所属区域
private Long areaId;
+ //存放位置
private String place;
+ //使用说明
private String useExplain;
public Long getId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java
index ac9ad09..58c4b41 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java
@@ -4,19 +4,19 @@
public class EmergencyTeamMemberReqDTO {
private Long id;
-
+ //队伍id
private Long teamId;
-
+ //人员uid
private Long userUid;
-
+ //人员性别
private Boolean gender;
-
+ //人员工号
private String jobNumber;
-
+ //人员名称
private String name;
-
+ //手机号码
private String phone;
-
+ //职位
private String position;
public Long getId() {
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 278bd53..9bffcb7 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
@@ -4,6 +4,7 @@
public class EmergencyTeamReqDTO {
+ //负责人名称
private String principalName;
public String getPrincipalName() {
@@ -16,22 +17,31 @@
private Long id;
+ //负责人uid
private Long principalUid;
+ //负责人部门id
private Long principalDepartmentId;
+ //队伍级别（数据字典）
private Byte teamLevel;
+ //队伍名称
private String teamName;
+ //负责人手机
private String principalPhone;
+ //固定电话
private String telephoneNumber;
+ //队伍描述
private String teamDesc;
+ //文件列表
private List<EmergencyTeamFileReqDTO> fileList;
+ //人员列表
private List<EmergencyTeamMemberReqDTO> memberList;
public Long getId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
index 960dd60..b1ab4b1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.model.dto.req;
public class EmergencyWorkApproveReqDTO {
-
+ //排序
private Integer sort ;
public Integer getSort() {
@@ -28,7 +28,7 @@
private String approvePersonName;
//审批状态 1：未审批 2：审批中 3：审批完成
private Integer approveStatus;
- //审批意见
+ //审批结果 0不通过 1通过
private Boolean approveResult;
//审批意见
private String approveMemo;
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 66d765f..47fcd80 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
@@ -8,9 +8,9 @@
public class EmergencyDrillEvaluationDetailRespDTO {
- // 应急演练计划
+ // 应急预案名称
private String emergencyPlanName;
-
+ // 计划制定人名称
private String makingUserName;
public String getEmergencyPlanName() {
@@ -28,39 +28,39 @@
public void setMakingUserName(String makingUserName) {
this.makingUserName = makingUserName;
}
-
+ //计划制定日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date makingPlanDate;
-
+ //计划演练日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date drillPlanDate;
-
+ //计划制定人uid
private Long makingUserUid;
-
+ //计划制定部门ID
private Long makingDepartmentId;
-
+ //主办部门ID
private Long departmentId;
-
+ //演练经费
private BigDecimal drillExpense;
-
+ //演练级别（数据字典）
private Byte drillLevel;
-
+ //演练地点
private String drillAddress;
-
+ //演练名称
private String drillName;
-
+ //演练方式（数据字典）
private Byte drillWay;
-
+ //保险措施
private String insuranceMeasures;
-
+ //备注
private String remark;
-
+ //演练目的
private String purpose;
-
+ //演练计划文件列表
private List<EmergencyDrillPlanFileRespDTO> planFileList;
-
+ //演练计划人员列表
private List<EmergencyDrillPlanUserRespDTO> planUserList;
-
+ //演练计划负责人人员列表
private List<EmergencyDrillPlanUserRespDTO> planChargeUserList;
public List<EmergencyDrillPlanUserRespDTO> getPlanChargeUserList() {
@@ -73,6 +73,7 @@
// 应急演练实施
+ //记录人名称
private String recordUserName;
public String getRecordUserName() {
@@ -82,55 +83,55 @@
public void setRecordUserName(String recordUserName) {
this.recordUserName = recordUserName;
}
-
+ //演练计划id
private Long drillPlanId;
-
+ //演练记录时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date drillRecordDate;
-
+ //记录人uid
private Long recordUserUid;
-
+ //演练过程描述
private String processDesc;
-
+ //演练计划实施人员列表
private List<EmergencyDrillExecuteUserRespDTO> executeUserList;
- // 评价
+ // 评价id
private Long id;
-
+ //演练实施ID
private Long drillExecuteId;
-
+ //适宜性
private Byte suitable;
-
+ //充分性
private Byte sufficient;
-
+ //人员到位情况
private Byte arrival;
-
+ //物资到位情况-现场物资
private Byte supplies;
-
+ //物资到位情况-个人防护
private Byte protection;
-
+ //协调组织情况-整体组织
private Byte whole;
-
+ //协调组织情况-疏散组分工
private Byte division;
-
+ //实战效果评价
private Byte effect;
-
+ //支援部门和协作有效性-报告上级
private Byte report;
-
+ //支援部门和协作有效性-安全部门
private Byte safety;
-
+ //支援部门和协作有效性-救援后勤部门
private Byte rescue;
-
+ //支援部门和协作有效性-警戒撤离配合
private Byte evacuate;
-
+ //是否需要修改应急预案：0否1是
private Boolean needModify;
-
+ //存在问题和改进措施
private String questionAndImprove;
-
+ //修改内容
private String modifyContent;
-
+ //评价文件列表
private List<EmergencyDrillEvaluationFileRespDTO> evaluationFileList;
-
+ //评价人员列表
private List<EmergencyDrillEvaluationUserRespDTO> evaluationUserList;
public Date getMakingPlanDate() {
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 ec5ba03..1624463 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
@@ -5,7 +5,7 @@
import java.util.Date;
public class EmergencyDrillEvaluationPageRespDTO {
-
+ //应急预案名称
private String emergencyPlanName;
public String getEmergencyPlanName() {
@@ -15,18 +15,18 @@
public void setEmergencyPlanName(String emergencyPlanName) {
this.emergencyPlanName = emergencyPlanName;
}
-
+ //演练名称
private String drillName;
-
+ //演练地点
private String drillAddress;
-
+ //演练方式
private Byte drillWay;
-
+ //演练级别
private Byte drillLevel;
-
+ //计划演练日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillPlanDate;
-
+ //演练记录时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillRecordDate;
@@ -79,7 +79,7 @@
}
private Long id;
-
+ //演练实施id
private Long drillExecuteId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java
index 70309b5..c34e629 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java
@@ -7,7 +7,7 @@
import java.util.List;
public class EmergencyDrillExecuteDetailRespDTO {
-
+ //记录人名称
private String recordUserName;
public String getRecordUserName() {
@@ -17,7 +17,7 @@
public void setRecordUserName(String recordUserName) {
this.recordUserName = recordUserName;
}
-
+ // 演练名称
private String drillName;
public String getDrillName() {
@@ -29,18 +29,18 @@
}
private Long id;
-
+ //状态 0：待评价 1 ：已评价
private Boolean status;
-
+ //演练记录时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillRecordDate;
-
+ //演练计划id
private Long drillPlanId;
-
+ //记录人uid
private Long recordUserUid;
-
+ //演练过程描述
private String processDesc;
-
+ //人员列表
private List<EmergencyDrillExecuteUserRespDTO> userList;
public Long getId() {
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 08ff5e3..09f2847 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
@@ -5,18 +5,18 @@
import java.util.Date;
public class EmergencyDrillExecutePageRespDTO {
-
+ //演练名称
private String drillName;
-
+ //演练地点
private String drillAddress;
-
+ //演练方式
private Byte drillWay;
-
+ //演练级别
private Byte drillLevel;
-
+ //计划演练日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillPlanDate;
-
+ //预案名称
private String emergencyPlanName;
public String getDrillName() {
@@ -68,12 +68,12 @@
}
private Long id;
-
+ //状态 0：待评价 1 ：已评价
private Boolean status;
-
+ //演练记录时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillRecordDate;
-
+ //演练计划id
private Long drillPlanId;
public Long getId() {
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 797e677..5c0ea9c 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
@@ -7,7 +7,7 @@
import java.util.List;
public class EmergencyDrillPlanDetailRespDTO {
-
+ //预案名称
private String planName;
public String getPlanName() {
@@ -17,7 +17,7 @@
public void setPlanName(String planName) {
this.planName = planName;
}
-
+ //计划制定人名称
private String makingUserName;
public String getMakingUserName() {
@@ -29,46 +29,46 @@
}
private Long id;
-
+ //更新日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gmtModitify;
-
+ //状态
private Integer status;
-
+ //计划制定日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date makingPlanDate;
-
+ //计划演练日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillPlanDate;
-
+ //计划制定人uid
private Long makingUserUid;
-
+ //计划制定部门ID
private Long makingDepartmentId;
-
+ //应急预案ID
private Long planId;
-
+ //主办部门ID
private Long departmentId;
-
+ //演练经费
private BigDecimal drillExpense;
-
+ //演练级别（数据字典）
private Byte drillLevel;
-
+ //演练地点
private String drillAddress;
-
+ //演练名称
private String drillName;
-
+ //演练方式（数据字典）
private Byte drillWay;
-
+ //保险措施
private String insuranceMeasures;
-
+ //备注
private String remark;
-
+ //演练目的
private String purpose;
-
+ //文件列表
private List<EmergencyDrillPlanFileRespDTO> fileList;
-
+ //人员列表
private List<EmergencyDrillPlanUserRespDTO> userList;
-
+ //负责人列表
private List<EmergencyDrillPlanUserRespDTO> chargeUserList;
public List<EmergencyDrillPlanUserRespDTO> getChargeUserList() {
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 e377a0a..1781dba 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
@@ -7,18 +7,18 @@
public class EmergencyDrillPlanPageRespDTO {
private Long id;
-
+ //预案名称
private String drillName;
-
+ //演练地点
private String drillAddress;
-
+ //演练方式（数据字典）
private Byte drillWay;
-
+ //演练级别（数据字典）
private Byte drillLevel;
-
+ //计划演练日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillPlanDate;
-
+ //更新日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gmtModitify;
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 ab4d622..7c2e4f3 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
@@ -6,7 +6,7 @@
import java.util.List;
public class EmergencyPlanDetailRespDTO {
-
+ //编写人名称
private String authorName;
public String getAuthorName() {
@@ -18,30 +18,30 @@
}
private Long id;
-
+ //状态
private Integer status;
-
+ //发布实施日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date releaseDate;
-
+ //编写人uid
private Long authorUid;
-
+ //编写部门id
private Long authorDeptId;
-
+ //危险源关联：0否1是
private Boolean associatedDanger;
-
+ //预案类型（数据字典）
private Byte type;
-
+ //预案级别（数据字典）
private Byte level;
-
+ //预案名称
private String name ;
private List<EmergencyPlanAreaRespDTO> areaList;
-
+ //部门列表
private List<EmergencyPlanDepartmentRespDTO> deptList;
-
+ //文件列表
private List<EmergencyPlanFileRespDTO> fileList;
-
+ //队伍列表
private List<EmergencyPlanTeamRespDTO> teamList;
public Long getId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java
index 8f8793b..39f2d0b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java
@@ -6,6 +6,7 @@
public class EmergencyPlanLogRespDTO {
+ //预案名称
private String planName;
public String getPlanName() {
@@ -15,7 +16,7 @@
public void setPlanName(String planName) {
this.planName = planName;
}
-
+ //启动人名称
private String userName;
public String getUserName() {
@@ -27,14 +28,14 @@
}
private Long id;
-
+ //预案id
private Long planId;
-
+ //启动人id
private Long userUid;
-
+ //启动时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startCreate;
-
+ //备注
private String remark;
public Long getId() {
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 811526b..5aeda83 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
@@ -50,6 +50,7 @@
this.checkApprove = checkApprove;
}
+ //编写人名称
private String authorName;
public String getAuthorName() {
@@ -61,15 +62,15 @@
}
private Long id;
-
+ // 预案名称
private String name ;
-
+ //预案状态
private Integer status ;
-
+ //预案类型（数据字典）
private Byte type;
-
+ //预案级别（数据字典）
private Byte level;
-
+ //发布实施日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date releaseDate;
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 caa1e94..2b5fc0c 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
@@ -12,9 +12,9 @@
import java.util.List;
public class EmergencySuppliesDetailRespDTO {
-
+ //保养列表
private List<EmergencySuppliesMaintainDetailRespDTO> maintainList;
-
+ //检查列表
private List<EmergencySuppliesInspectDetailRespDTO> inspectList;
public List<EmergencySuppliesMaintainDetailRespDTO> getMaintainList() {
@@ -32,7 +32,7 @@
public void setInspectList(List<EmergencySuppliesInspectDetailRespDTO> inspectList) {
this.inspectList = inspectList;
}
-
+ //负责人名称
private String principalUserName;
public String getPrincipalUserName() {
@@ -45,29 +45,49 @@
@TableId(type = IdType.AUTO)
private Long id;
+ //生产日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date productionDate;
+ //投用日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date useDate;
+ //检查日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inspectDate;
+ //下次检查日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date nextInspectDate;
+ //检查周期/月
private Integer inspectPeriod;
+ //存储数量
private Integer count;
+ //使用期限/天
private Integer usePeriod;
+ //负责部门id
private Long departmentId;
+ //负责人uid
private Long principalUserUid;
+ //状态（数据字典）
private Byte status;
+ //分类（数据字典）
private Byte classification;
+ //名称
private String name;
+ //编号
private String number;
+ //型号
private String model;
+ //经度
private String longitude;
+ //维度
private String latitude;
+ //用途
private String use;
+ //所属区域
private Long areaId;
+ //存放位置
private String place;
+ //使用说明
private String useExplain;
public Long getId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java
index edab939..2d311b1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java
@@ -8,7 +8,7 @@
import java.util.List;
public class EmergencySuppliesInspectDetailRespDTO {
-
+ //物资名称
private String suppliesName;
public String getSuppliesName() {
@@ -20,12 +20,14 @@
}
private Long id;
-
+ //物资id
private Long suppliesId;
+ //检查结果
private String inspectResult;
+ //检查日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inspectTime;
-
+ //检查人列表
private List<EmergencySuppliesInspectUserRespDTO> userList;
public Long getId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java
index 2044c09..40b0f42 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java
@@ -7,7 +7,7 @@
import java.util.Date;
public class EmergencySuppliesInspectPageRespDTO {
-
+ //物资名称
private String suppliesName;
public String getSuppliesName() {
@@ -19,9 +19,11 @@
}
private Long id;
-
+ //物资id
private Long suppliesId;
+ //检查结果
private String inspectResult;
+ //检查时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inspectTime;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java
index c25d519..25ee0fa 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java
@@ -3,7 +3,7 @@
import java.util.Date;
public class EmergencySuppliesInspectUserRespDTO {
-
+ //物资名称
private String userName;
public String getUserName() {
@@ -15,8 +15,9 @@
}
private Long id;
-
+ //物资id
private Long inspectId;
+ //人员uid
private Long userUid;
public Long getId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java
index 9bbbfb6..807fb4b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java
@@ -8,7 +8,7 @@
import java.util.List;
public class EmergencySuppliesMaintainDetailRespDTO {
-
+ //物资名称
private String suppliesName;
public String getSuppliesName() {
@@ -20,12 +20,14 @@
}
private Long id;
-
+ //物资id
private Long suppliesId;
+ //保养id
private String maintainResult;
+ //保养时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date maintainTime;
-
+ //保养人id
private List<EmergencySuppliesMaintainUserRespDTO> userList;
public Long getId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java
index 469e1bc..729578b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java
@@ -7,7 +7,7 @@
import java.util.Date;
public class EmergencySuppliesMaintainPageRespDTO {
-
+ //物资名称
private String suppliesName;
public String getSuppliesName() {
@@ -19,9 +19,11 @@
}
private Long id;
-
+ //物资id
private Long suppliesId;
+ //保养结果
private String maintainResult;
+ //保养时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date maintainTime;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java
index 1434f85..1456c36 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java
@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;
public class EmergencySuppliesMaintainUserRespDTO {
-
+ //人呀名称
private String userName;
public String getUserName() {
@@ -13,8 +13,9 @@
}
private Long id;
-
+ //保养id
private Long maintainId;
+ //保养人uid
private Long userUid;
public Long getId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java
index a7b57b6..dd2b755 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
public class EmergencySuppliesPageRespDTO {
-
+ //部门名称
private String deptName;
public String getDeptName() {
@@ -17,12 +17,17 @@
}
private Long id;
-
+ //名称
private String name;
+ //编号
private String number;
+ //负责部门id
private Long departmentId;
+ //分类（数据字典）
private String classification;
+ //存放位置
private String place;
+ //存储数量
private Integer count;
public Long getId() {
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 6cabaae..29fb664 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
@@ -4,7 +4,7 @@
import java.util.List;
public class EmergencyTeamDetailRespDTO {
-
+ //负责人名称
private String principalName;
public String getPrincipalName() {
@@ -16,23 +16,23 @@
}
private Long id;
-
+ //负责人uid
private Long principalUid;
-
+ //负责人部门id
private Long principalDepartmentId;
-
+ //队伍级别（数据字典）
private Byte teamLevel;
-
+ //队伍名称
private String teamName;
-
+ //负责人手机
private String principalPhone;
-
+ //固定电话
private String telephoneNumber;
-
+ //队伍描述
private String teamDesc;
-
+ //文件列表
private List<EmergencyTeamFileRespDTO> fileList;
-
+ //人员列表
private List<EmergencyTeamMemberRespDTO> memberList;
public Long getId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java
index 7ff981f..38c50bb 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java
@@ -4,19 +4,19 @@
public class EmergencyTeamMemberRespDTO {
private Long id;
-
+ //队伍id
private Long teamId;
-
+ //用户uid
private Long userUid;
-
+ //性别 0男1女
private Boolean gender;
-
+ //人员工号
private String jobNumber;
-
+ //人员名称
private String name;
-
+ //手机号码
private String phone;
-
+ //职位
private String position;
public Long getId() {
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 e9032f5..2278ada 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
@@ -6,15 +6,15 @@
public class EmergencyTeamPageRespDTO {
private Long id;
-
+ //队伍级别（数据字典）
private Byte teamLevel;
-
+ //队伍名称
private String teamName;
-
+ //负责人手机
private String principalPhone;
-
+ //队伍描述
private String teamDesc;
-
+ //文件列表
private List<EmergencyTeamFileRespDTO> fileList;
public Long getId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java
index c391e9a..8dd1990 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java
@@ -5,7 +5,7 @@
import java.util.Date;
public class EmergencyWorkApproveDetailRespDTO {
-
+ //排序
private Integer sort ;
public Integer getSort() {
@@ -17,7 +17,7 @@
}
private Long id;
-
+ //更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gmtCreate;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
index b3ea6ab..7066295 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
@@ -5,7 +5,7 @@
import java.util.Date;
public class EmergencyWorkApprovePageRespDTO {
-
+ //排序
private Integer sort ;
public Integer getSort() {
@@ -17,6 +17,7 @@
}
private Long id;
+ //更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gmtCreate;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java
index 4fd2132..5e001b9 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java
@@ -2,6 +2,7 @@
public class EmergencyDrillExecuteQuery {
+ //状态 0：待评价 1 ：已评价
private Boolean status;
public Boolean getStatus() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java
index 97c8a64..dad4550 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java
@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.query;
public class EmergencyDrillPlanQuery {
-
+ //演练名称
private String drillName;
public String getDrillName() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanLogQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanLogQuery.java
index 03d7abc..e810c28 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanLogQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanLogQuery.java
@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.query;
public class EmergencyPlanLogQuery {
-
+ //预案id
private Long planId ;
public Long getPlanId() {
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 3d330a8..ba91662 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
@@ -2,6 +2,7 @@
public class EmergencyPlanQuery {
+ //废止状态 0：未废止 1：已废止
private Boolean abolishStatus;
public Boolean getAbolishStatus() {
@@ -12,8 +13,9 @@
this.abolishStatus = abolishStatus;
}
+ //预案名称
private String name ;
-
+ //预案类型
private Byte type ;
public String getName() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesInspectQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesInspectQuery.java
index f50e583..1e8e894 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesInspectQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesInspectQuery.java
@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.query;
public class EmergencySuppliesInspectQuery {
-
+ //物资id
private Long suppliesId ;
public Long getSuppliesId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesMaintainQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesMaintainQuery.java
index 42c5eea..8535bfd 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesMaintainQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesMaintainQuery.java
@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.query;
public class EmergencySuppliesMaintainQuery {
-
+ //物资id
private Long suppliesId ;
public Long getSuppliesId() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesQuery.java
index cd8ec69..ac74509 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesQuery.java
@@ -2,6 +2,7 @@
public class EmergencySuppliesQuery {
+ //物资名称
private String name ;
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 09036e8..89ceceb 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
@@ -2,8 +2,10 @@
public class EmergencyTeamQuery {
+ //队伍名称
private String teamName ;
+ //队伍级别
private Byte teamLevel ;
public String getTeamName() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java
index 2c5c53b..44e06e5 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java
@@ -5,9 +5,9 @@
import java.util.Date;
public class EmergencyWorkApproveQuery {
-
+ //关联业务类型 1:应急预案
private Integer relateType;
-
+ //业务id
private Long relateId;
public Integer getRelateType() {
@@ -25,10 +25,10 @@
public void setRelateId(Long relateId) {
this.relateId = relateId;
}
-
+ //开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
-
+ //结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
diff --git a/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
index 9da404b..1fa5e29 100644
--- a/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
@@ -197,7 +197,8 @@
</foreach>
</if>
GROUP BY
- DATE_FORMAT( a.gmt_create, '%Y-%m-%d' )
+ DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ),
+ DATE_FORMAT( a.gmt_create, '%d' )
</select>
<select id="selectByMonthAndDeptForIntegerMonth" resultMap="emergencyDrillExecuteCountRPC">
@@ -218,7 +219,8 @@
</foreach>
</if>
GROUP BY
- DATE_FORMAT( a.gmt_create, '%Y-%m' )
+ DATE_FORMAT( a.gmt_create, '%Y-%m' ),
+ DATE_FORMAT( a.gmt_create, '%m' )
</select>
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java
index a883d88..5658e24 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java
@@ -65,7 +65,7 @@
public ResultVO selectAll(@RequestBody PageQuery<EquipmentInfoQueryCriteria> pageQuery){
return this.equipmentInfoService.queryAll(pageQuery);
}
-
+
/**
* 通过主键查询单条数据
@@ -162,7 +162,7 @@
repairDetail.setRepairEndDate(new Timestamp(new java.util.Date().getTime()));
repairDetail.setRepairPersonDepartmentId(0L);
repairDetail.setRepairMemo("");
- repairDetail.setRepairStatus(0);
+ repairDetail.setRepairStatus((byte)0);
repairDetail.setExceptionInfo("");
repairDetails.add(repairDetail);
infoDto.setRepaireDetailList(repairDetails);
@@ -223,10 +223,10 @@
infoDto.setSetPart("");
infoDto.setProduceTime(new Timestamp(new java.util.Date().getTime()));
infoDto.setUseEndDay("");
- infoDto.setLifeCycle(0);
+ infoDto.setLifeCycle((byte)0);
infoDto.setUseDate(new Timestamp(new java.util.Date().getTime()));
- infoDto.setRepairStatus(0);
- infoDto.setStopStatus(0);
+ infoDto.setRepairStatus((byte)0);
+ infoDto.setStopStatus((byte)0);
infoDto.setPreviousCheckDate(new Timestamp(new java.util.Date().getTime()));
infoDto.setPreviousTestDate(new Timestamp(new java.util.Date().getTime()));
infoDto.setPreviousTakecareDate(new Timestamp(new java.util.Date().getTime()));
@@ -264,4 +264,4 @@
System.out.println(JSONObject.toJSONString(infoDto));
}
-}
\ No newline at end of file
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java
index 54629c8..a82e0f9 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java
@@ -63,7 +63,7 @@
PageUtils.checkCheck(pageQuery);
return this.keypointEquipmentInfoService.queryAll(pageQuery);
}
-
+
/**
* 通过主键查询单条数据
@@ -149,7 +149,7 @@
repairDetail.setRepairEndDate(new Timestamp(new java.util.Date().getTime()));
repairDetail.setRepairPersonDepartmentId(0L);
repairDetail.setRepairMemo("");
- repairDetail.setRepairStatus(0);
+ repairDetail.setRepairStatus((byte)0);
repairDetail.setExceptionInfo("");
repairDetails.add(repairDetail);
infoDto.setRepaireDetailList(repairDetails);
@@ -205,7 +205,7 @@
infoDto.setConnectPersonId(0L);
infoDto.setInputPersonId(0L);
infoDto.setResponsibilityPersonId(0L);
- infoDto.setPartType(0);
+ infoDto.setPartType((byte)0);
infoDto.setCheckCycle("");
infoDto.setEmergencePlanId(0L);
infoDto.setDangerousElement("");
@@ -216,4 +216,4 @@
}
-}
\ No newline at end of file
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
index 409b5d5..c82dddb 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
@@ -16,8 +16,8 @@
@SuppressWarnings("serial")
@TableName("equipment_info")
public class EquipmentInfo extends BaseDomain {
-
-
+
+
@TableId(type = IdType.AUTO)
private Long id;
public Long getId() {
@@ -30,7 +30,7 @@
//类型/类别外键
private Long equipmentTypeId;
-
+
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
@@ -38,9 +38,9 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
private Integer infoType;
-
+
public Integer getInfoType() {
return infoType;
}
@@ -50,7 +50,7 @@
}
//名称
private String qName;
-
+
public String getQName() {
return qName;
}
@@ -60,7 +60,7 @@
}
//位号
private String positionNum;
-
+
public String getPositionNum() {
return positionNum;
}
@@ -70,7 +70,7 @@
}
//用途
private String qUsage;
-
+
public String getQUsage() {
return qUsage;
}
@@ -80,7 +80,7 @@
}
//型号
private String model;
-
+
public String getModel() {
return model;
}
@@ -90,7 +90,7 @@
}
//单位部门外键
private Long departmentId;
-
+
public Long getDepartmentId() {
return departmentId;
}
@@ -100,7 +100,7 @@
}
//设置部位
private String setPart;
-
+
public String getSetPart() {
return setPart;
}
@@ -111,7 +111,7 @@
//生产日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp produceTime;
-
+
public Timestamp getProduceTime() {
return produceTime;
}
@@ -121,7 +121,7 @@
}
//使用期限(天)
private String useEndDay;
-
+
public String getUseEndDay() {
return useEndDay;
}
@@ -130,19 +130,19 @@
this.useEndDay = useEndDay;
}
//生命周期 1：已使用 2：库存中 3：报废
- private Integer lifeCycle;
-
- public Integer getLifeCycle() {
+ private Byte lifeCycle;
+
+ public Byte getLifeCycle() {
return lifeCycle;
}
- public void setLifeCycle(Integer lifeCycle) {
+ public void setLifeCycle(Byte lifeCycle) {
this.lifeCycle = lifeCycle;
}
//投用日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp useDate;
-
+
public Timestamp getUseDate() {
return useDate;
}
@@ -151,29 +151,29 @@
this.useDate = useDate;
}
//维修状态 1:维修中 2：已修好
- private Integer repairStatus;
-
- public Integer getRepairStatus() {
+ private Byte repairStatus;
+
+ public Byte getRepairStatus() {
return repairStatus;
}
- public void setRepairStatus(Integer repairStatus) {
+ public void setRepairStatus(Byte repairStatus) {
this.repairStatus = repairStatus;
}
//停用状态 1:停用 2.在用 3.维修 4.报废
- private Integer stopStatus;
-
- public Integer getStopStatus() {
+ private Byte stopStatus;
+
+ public Byte getStopStatus() {
return stopStatus;
}
- public void setStopStatus(Integer stopStatus) {
+ public void setStopStatus(Byte stopStatus) {
this.stopStatus = stopStatus;
}
//上次检查日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp previousCheckDate;
-
+
public Timestamp getPreviousCheckDate() {
return previousCheckDate;
}
@@ -184,7 +184,7 @@
//上次检测日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp previousTestDate;
-
+
public Timestamp getPreviousTestDate() {
return previousTestDate;
}
@@ -195,7 +195,7 @@
//上次保养日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp previousTakecareDate;
-
+
public Timestamp getPreviousTakecareDate() {
return previousTakecareDate;
}
@@ -206,7 +206,7 @@
//下次检查日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp nextCheckDate;
-
+
public Timestamp getNextCheckDate() {
return nextCheckDate;
}
@@ -217,7 +217,7 @@
//下次检测日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp nextTestDate;
-
+
public Timestamp getNextTestDate() {
return nextTestDate;
}
@@ -228,7 +228,7 @@
//下次保养日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp nextTakecareDate;
-
+
public Timestamp getNextTakecareDate() {
return nextTakecareDate;
}
@@ -238,7 +238,7 @@
}
//负责人ID外键
private Long leadingPersonId;
-
+
public Long getLeadingPersonId() {
return leadingPersonId;
}
@@ -248,7 +248,7 @@
}
//负责人名称
private String leadingPersonName;
-
+
public String getLeadingPersonName() {
return leadingPersonName;
}
@@ -258,7 +258,7 @@
}
//负责人部门外键
private Long leadingPersonDepartmentId;
-
+
public Long getLeadingPersonDepartmentId() {
return leadingPersonDepartmentId;
}
@@ -268,7 +268,7 @@
}
//供应商
private String supplyName;
-
+
public String getSupplyName() {
return supplyName;
}
@@ -278,7 +278,7 @@
}
//使用说明
private String useMemo;
-
+
public String getUseMemo() {
return useMemo;
}
@@ -288,7 +288,7 @@
}
//是否检查 1：是 2：否
private Integer isNeedCheck;
-
+
public Integer getIsNeedCheck() {
return isNeedCheck;
}
@@ -298,7 +298,7 @@
}
//检查周期
private String checkCycle;
-
+
public String getCheckCycle() {
return checkCycle;
}
@@ -308,7 +308,7 @@
}
//检查提前提醒
private String checkWarn;
-
+
public String getCheckWarn() {
return checkWarn;
}
@@ -318,7 +318,7 @@
}
//是否检测 1：是 2：否
private Integer isNeedTest;
-
+
public Integer getIsNeedTest() {
return isNeedTest;
}
@@ -328,7 +328,7 @@
}
//检测周期
private String testCycle;
-
+
public String getTestCycle() {
return testCycle;
}
@@ -338,7 +338,7 @@
}
//检测提前提醒
private String testWarn;
-
+
public String getTestWarn() {
return testWarn;
}
@@ -348,7 +348,7 @@
}
//是否保养 1：是 2：否
private Integer isNeedTakecare;
-
+
public Integer getIsNeedTakecare() {
return isNeedTakecare;
}
@@ -358,7 +358,7 @@
}
//检查内容
private String checkContent;
-
+
public String getCheckContent() {
return checkContent;
}
@@ -368,7 +368,7 @@
}
//负责部门/外键
private Long leadingDepartmentId;
-
+
public Long getLeadingDepartmentId() {
return leadingDepartmentId;
}
@@ -378,7 +378,7 @@
}
//检查指标
private String checkPoint;
-
+
public String getCheckPoint() {
return checkPoint;
}
@@ -388,7 +388,7 @@
}
//预警值
private String alertNum;
-
+
public String getAlertNum() {
return alertNum;
}
@@ -398,7 +398,7 @@
}
//联锁值
private String lockNum;
-
+
public String getLockNum() {
return lockNum;
}
@@ -408,7 +408,7 @@
}
//停用理由
private String stopReason;
-
+
public String getStopReason() {
return stopReason;
}
@@ -418,7 +418,7 @@
}
//停用后措施
private String afterStopStep;
-
+
public String getAfterStopStep() {
return afterStopStep;
}
@@ -429,7 +429,7 @@
//实际停用日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualStopDate;
-
+
public Timestamp getActualStopDate() {
return actualStopDate;
}
@@ -439,7 +439,7 @@
}
//停用提交人/外键
private Long stopSubmitPersonId;
-
+
public Long getStopSubmitPersonId() {
return stopSubmitPersonId;
}
@@ -449,7 +449,7 @@
}
//停用提交人名称
private String stopSubmitPersonName;
-
+
public String getStopSubmitPersonName() {
return stopSubmitPersonName;
}
@@ -460,7 +460,7 @@
//停用提交日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp stopSubmitDate;
-
+
public Timestamp getStopSubmitDate() {
return stopSubmitDate;
}
@@ -470,7 +470,7 @@
}
//恢复理由
private String recoveryReason;
-
+
public String getRecoveryReason() {
return recoveryReason;
}
@@ -481,7 +481,7 @@
//恢复填报日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp recoverySubmitDate;
-
+
public Timestamp getRecoverySubmitDate() {
return recoverySubmitDate;
}
@@ -492,7 +492,7 @@
//实际恢复日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualRecoveryDate;
-
+
public Timestamp getActualRecoveryDate() {
return actualRecoveryDate;
}
@@ -502,7 +502,7 @@
}
//报废理由
private String destoryReason;
-
+
public String getDestoryReason() {
return destoryReason;
}
@@ -513,7 +513,7 @@
//报废填报日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp destorySubmitDate;
-
+
public Timestamp getDestorySubmitDate() {
return destorySubmitDate;
}
@@ -524,7 +524,7 @@
//实际报废日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualDestoryDate;
-
+
public Timestamp getActualDestoryDate() {
return actualDestoryDate;
}
@@ -534,7 +534,7 @@
}
//区域ID
private Long areaId;
-
+
public Long getAreaId() {
return areaId;
}
@@ -544,7 +544,7 @@
}
//区域名称
private String areaName;
-
+
public String getAreaName() {
return areaName;
}
@@ -554,7 +554,7 @@
}
//保养周期
private String takecareCycle;
-
+
public String getTakecareCycle() {
return takecareCycle;
}
@@ -564,7 +564,7 @@
}
//是否删除 0:未删除 1:删除
private Integer delFlag;
-
+
public Integer getDelFlag() {
return delFlag;
}
@@ -572,5 +572,5 @@
public void setDelFlag(Integer delFlag) {
this.delFlag = delFlag;
}
-
-}
\ No newline at end of file
+
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
index 572afcb..4de2c16 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
@@ -16,8 +16,8 @@
@SuppressWarnings("serial")
@TableName("equipment_repair_detail")
public class EquipmentRepairDetail extends BaseDomain {
-
-
+
+
@TableId(type = IdType.AUTO)
private Long id;
public Long getId() {
@@ -30,7 +30,7 @@
//具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
private Integer infoTpe;
-
+
public Integer getInfoTpe() {
return infoTpe;
}
@@ -40,7 +40,7 @@
}
//设备ID/外键
private Long equipmentId;
-
+
public Long getEquipmentId() {
return equipmentId;
}
@@ -50,7 +50,7 @@
}
//维修负责人/外键
private Long repairPersonId;
-
+
public Long getRepairPersonId() {
return repairPersonId;
}
@@ -60,7 +60,7 @@
}
//维修负责人名称
private String repairPersonName;
-
+
public String getRepairPersonName() {
return repairPersonName;
}
@@ -71,7 +71,7 @@
//维修开始日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp repairStartDate;
-
+
public Timestamp getRepairStartDate() {
return repairStartDate;
}
@@ -82,7 +82,7 @@
//维修结束日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp repairEndDate;
-
+
public Timestamp getRepairEndDate() {
return repairEndDate;
}
@@ -92,7 +92,7 @@
}
//维修负责人单位/外键
private Long repairPersonDepartmentId;
-
+
public Long getRepairPersonDepartmentId() {
return repairPersonDepartmentId;
}
@@ -102,7 +102,7 @@
}
//维修负责人单位名称
private String repairPersonDepartmentName;
-
+
public String getRepairPersonDepartmentName() {
return repairPersonDepartmentName;
}
@@ -112,7 +112,7 @@
}
//维修情况
private String repairMemo;
-
+
public String getRepairMemo() {
return repairMemo;
}
@@ -121,18 +121,18 @@
this.repairMemo = repairMemo;
}
//维修状态 1：维修中 2：已修好
- private Integer repairStatus;
-
- public Integer getRepairStatus() {
+ private Byte repairStatus;
+
+ public Byte getRepairStatus() {
return repairStatus;
}
- public void setRepairStatus(Integer repairStatus) {
+ public void setRepairStatus(Byte repairStatus) {
this.repairStatus = repairStatus;
}
//设施异常项
private String exceptionInfo;
-
+
public String getExceptionInfo() {
return exceptionInfo;
}
@@ -142,7 +142,7 @@
}
//是否删除 0:未删除 1:删除
private Integer delFlag;
-
+
public Integer getDelFlag() {
return delFlag;
}
@@ -150,5 +150,5 @@
public void setDelFlag(Integer delFlag) {
this.delFlag = delFlag;
}
-
-}
\ No newline at end of file
+
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
index e778692..406f294 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
@@ -139,13 +139,13 @@
this.responsibilityPersonName = responsibilityPersonName;
}
//装置部位分类 1：关键装置 2：重点部位
- private Integer partType;
+ private Byte partType;
- public Integer getPartType() {
+ public Byte getPartType() {
return partType;
}
- public void setPartType(Integer partType) {
+ public void setPartType(Byte partType) {
this.partType = partType;
}
//检查周期
@@ -229,4 +229,4 @@
this.delFlag = delFlag;
}
-}
\ No newline at end of file
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentLifeCycleEnum.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentLifeCycleEnum.java
new file mode 100644
index 0000000..24b2a5a
--- /dev/null
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentLifeCycleEnum.java
@@ -0,0 +1,48 @@
+package com.gkhy.safePlatform.equipment.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum EquipmentLifeCycleEnum {
+
+ LIVE_CYCLE_ONE((byte) 1, "已投用"),
+ LIVE_CYCLE_TWO((byte) 2, "库存中"),
+ LIVE_CYCLE_THREE((byte) 3, "报废");
+
+
+ private Byte code;
+ private String value;
+
+ EquipmentLifeCycleEnum(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, EquipmentLifeCycleEnum> toMap() {
+ Map<Byte, EquipmentLifeCycleEnum> map = new HashMap();
+ for (EquipmentLifeCycleEnum accidentExpressEnum : EquipmentLifeCycleEnum.values()) {
+ map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
+ }
+ return map;
+ }
+ public static EquipmentLifeCycleEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentRepairStatusEnum.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentRepairStatusEnum.java
new file mode 100644
index 0000000..19d7961
--- /dev/null
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentRepairStatusEnum.java
@@ -0,0 +1,47 @@
+package com.gkhy.safePlatform.equipment.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum EquipmentRepairStatusEnum {
+
+ REPAIR_STATUS_ONE((byte) 1, "维修中"),
+ REPAIR_STATUS_TWO((byte) 2, "已修好");
+
+
+ private Byte code;
+ private String value;
+
+ EquipmentRepairStatusEnum(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, EquipmentRepairStatusEnum> toMap() {
+ Map<Byte, EquipmentRepairStatusEnum> map = new HashMap();
+ for (EquipmentRepairStatusEnum accidentExpressEnum : EquipmentRepairStatusEnum.values()) {
+ map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
+ }
+ return map;
+ }
+ public static EquipmentRepairStatusEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentResultCodes.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentResultCodes.java
index fdf6802..e9f115c 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentResultCodes.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentResultCodes.java
@@ -2,6 +2,13 @@
public enum EquipmentResultCodes {
+ EQUIPMENT_ENUM_LIFE_CYCLE_NOT_EXIST("E1001","设备生命周期类型异常"),
+
+ EQUIPMENT_ENUM_STOP_STATUS_NOT_EXIST("E1002","设备停用状态类型异常"),
+
+ EQUIPMENT_ENUM_REPAIR_STATUS_NOT_EXIST("E1003","设备维修状态类型异常"),
+
+ KEYPOINT_EQUIPMENT_ENUM_PART_TYPE_NOT_EXIST("K1001","重点设备装置部位分类类型异常"),
ERROR("A3000", "未知错误");
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentStopStatusEnum.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentStopStatusEnum.java
new file mode 100644
index 0000000..18c284b
--- /dev/null
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentStopStatusEnum.java
@@ -0,0 +1,49 @@
+package com.gkhy.safePlatform.equipment.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum EquipmentStopStatusEnum {
+
+ STOP_STATUS_ONE((byte) 1, "停用"),
+ STOP_STATUS_TWO((byte) 2, "在用"),
+ STOP_STATUS_THREE((byte) 3, "维修"),
+ STOP_STATUS_FOUR((byte) 4, "报废");
+
+
+ private Byte code;
+ private String value;
+
+ EquipmentStopStatusEnum(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, EquipmentStopStatusEnum> toMap() {
+ Map<Byte, EquipmentStopStatusEnum> map = new HashMap();
+ for (EquipmentStopStatusEnum accidentExpressEnum : EquipmentStopStatusEnum.values()) {
+ map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
+ }
+ return map;
+ }
+ public static EquipmentStopStatusEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/KeypointEquipmentPartTypeEnum.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/KeypointEquipmentPartTypeEnum.java
new file mode 100644
index 0000000..3a4a763
--- /dev/null
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/KeypointEquipmentPartTypeEnum.java
@@ -0,0 +1,47 @@
+package com.gkhy.safePlatform.equipment.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum KeypointEquipmentPartTypeEnum {
+
+ PART_TYPE_ONE((byte) 1, "关键装置"),
+ PART_TYPE_TWO((byte) 2, "重点部位");
+
+
+ private Byte code;
+ private String value;
+
+ KeypointEquipmentPartTypeEnum(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, KeypointEquipmentPartTypeEnum> toMap() {
+ Map<Byte, KeypointEquipmentPartTypeEnum> map = new HashMap();
+ for (KeypointEquipmentPartTypeEnum accidentExpressEnum : KeypointEquipmentPartTypeEnum.values()) {
+ map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
+ }
+ return map;
+ }
+ public static KeypointEquipmentPartTypeEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java
index 94536de..7958b2a 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java
@@ -38,16 +38,16 @@
private String useEndDay;
//生命周期 1：已使用 2：库存中 3：报废
@ExcelCell(index = 11)
- private Integer lifeCycle;
+ private Byte lifeCycle;
//投用日期
@ExcelCell(index = 12)
private Timestamp useDate;
//维修状态 1:维修中 2：已修好
@ExcelCell(index = 13)
- private Integer repairStatus;
+ private Byte repairStatus;
//停用状态 1:停用 2.在用 3.维修 4.报废
@ExcelCell(index = 14)
- private Integer stopStatus;
+ private Byte stopStatus;
//上次检查日期
@ExcelCell(index = 15)
private Timestamp previousCheckDate;
@@ -168,7 +168,7 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
public Integer getInfoType() {
return infoType;
}
@@ -209,7 +209,7 @@
public void setModel(String model) {
this.model = model;
}
- //单位部门外键
+ //单位部门外键
public Long getDepartmentId() {
return departmentId;
}
@@ -217,7 +217,7 @@
public void setDepartmentId(Long departmentId) {
this.departmentId = departmentId;
}
- //设置部位
+ //设置部位
public String getSetPart() {
return setPart;
}
@@ -225,7 +225,7 @@
public void setSetPart(String setPart) {
this.setPart = setPart;
}
- //生产日期
+ //生产日期
public Timestamp getProduceTime() {
return produceTime;
}
@@ -233,7 +233,7 @@
public void setProduceTime(Timestamp produceTime) {
this.produceTime = produceTime;
}
- //使用期限(天)
+ //使用期限(天)
public String getUseEndDay() {
return useEndDay;
}
@@ -241,15 +241,15 @@
public void setUseEndDay(String useEndDay) {
this.useEndDay = useEndDay;
}
- //生命周期 1：已使用 2：库存中 3：报废
- public Integer getLifeCycle() {
+ //生命周期 1：已使用 2：库存中 3：报废
+ public Byte getLifeCycle() {
return lifeCycle;
}
- public void setLifeCycle(Integer lifeCycle) {
+ public void setLifeCycle(Byte lifeCycle) {
this.lifeCycle = lifeCycle;
}
- //投用日期
+ //投用日期
public Timestamp getUseDate() {
return useDate;
}
@@ -257,23 +257,23 @@
public void setUseDate(Timestamp useDate) {
this.useDate = useDate;
}
- //维修状态 1:维修中 2：已修好
- public Integer getRepairStatus() {
+ //维修状态 1:维修中 2：已修好
+ public Byte getRepairStatus() {
return repairStatus;
}
- public void setRepairStatus(Integer repairStatus) {
+ public void setRepairStatus(Byte repairStatus) {
this.repairStatus = repairStatus;
}
- //停用状态 1:停用 2.在用 3.维修 4.报废
- public Integer getStopStatus() {
+ //停用状态 1:停用 2.在用 3.维修 4.报废
+ public Byte getStopStatus() {
return stopStatus;
}
- public void setStopStatus(Integer stopStatus) {
+ public void setStopStatus(Byte stopStatus) {
this.stopStatus = stopStatus;
}
- //上次检查日期
+ //上次检查日期
public Timestamp getPreviousCheckDate() {
return previousCheckDate;
}
@@ -281,7 +281,7 @@
public void setPreviousCheckDate(Timestamp previousCheckDate) {
this.previousCheckDate = previousCheckDate;
}
- //上次检测日期
+ //上次检测日期
public Timestamp getPreviousTestDate() {
return previousTestDate;
}
@@ -289,7 +289,7 @@
public void setPreviousTestDate(Timestamp previousTestDate) {
this.previousTestDate = previousTestDate;
}
- //上次保养日期
+ //上次保养日期
public Timestamp getPreviousTakecareDate() {
return previousTakecareDate;
}
@@ -297,7 +297,7 @@
public void setPreviousTakecareDate(Timestamp previousTakecareDate) {
this.previousTakecareDate = previousTakecareDate;
}
- //下次检查日期
+ //下次检查日期
public Timestamp getNextCheckDate() {
return nextCheckDate;
}
@@ -305,7 +305,7 @@
public void setNextCheckDate(Timestamp nextCheckDate) {
this.nextCheckDate = nextCheckDate;
}
- //下次检测日期
+ //下次检测日期
public Timestamp getNextTestDate() {
return nextTestDate;
}
@@ -313,7 +313,7 @@
public void setNextTestDate(Timestamp nextTestDate) {
this.nextTestDate = nextTestDate;
}
- //下次保养日期
+ //下次保养日期
public Timestamp getNextTakecareDate() {
return nextTakecareDate;
}
@@ -321,7 +321,7 @@
public void setNextTakecareDate(Timestamp nextTakecareDate) {
this.nextTakecareDate = nextTakecareDate;
}
- //负责人ID外键
+ //负责人ID外键
public Long getLeadingPersonId() {
return leadingPersonId;
}
@@ -329,7 +329,7 @@
public void setLeadingPersonId(Long leadingPersonId) {
this.leadingPersonId = leadingPersonId;
}
- //负责人部门外键
+ //负责人部门外键
public Long getLeadingPersonDepartmentId() {
return leadingPersonDepartmentId;
}
@@ -337,7 +337,7 @@
public void setLeadingPersonDepartmentId(Long leadingPersonDepartmentId) {
this.leadingPersonDepartmentId = leadingPersonDepartmentId;
}
- //供应商
+ //供应商
public String getSupplyName() {
return supplyName;
}
@@ -345,7 +345,7 @@
public void setSupplyName(String supplyName) {
this.supplyName = supplyName;
}
- //使用说明
+ //使用说明
public String getUseMemo() {
return useMemo;
}
@@ -353,7 +353,7 @@
public void setUseMemo(String useMemo) {
this.useMemo = useMemo;
}
- //是否检查 1：是 2：否
+ //是否检查 1：是 2：否
public Integer getIsNeedCheck() {
return isNeedCheck;
}
@@ -361,7 +361,7 @@
public void setIsNeedCheck(Integer isNeedCheck) {
this.isNeedCheck = isNeedCheck;
}
- //检查周期
+ //检查周期
public String getCheckCycle() {
return checkCycle;
}
@@ -369,7 +369,7 @@
public void setCheckCycle(String checkCycle) {
this.checkCycle = checkCycle;
}
- //检查提前提醒
+ //检查提前提醒
public String getCheckWarn() {
return checkWarn;
}
@@ -377,7 +377,7 @@
public void setCheckWarn(String checkWarn) {
this.checkWarn = checkWarn;
}
- //是否检测 1：是 2：否
+ //是否检测 1：是 2：否
public Integer getIsNeedTest() {
return isNeedTest;
}
@@ -385,7 +385,7 @@
public void setIsNeedTest(Integer isNeedTest) {
this.isNeedTest = isNeedTest;
}
- //检测周期
+ //检测周期
public String getTestCycle() {
return testCycle;
}
@@ -393,7 +393,7 @@
public void setTestCycle(String testCycle) {
this.testCycle = testCycle;
}
- //检测提前提醒
+ //检测提前提醒
public String getTestWarn() {
return testWarn;
}
@@ -401,7 +401,7 @@
public void setTestWarn(String testWarn) {
this.testWarn = testWarn;
}
- //是否保养 1：是 2：否
+ //是否保养 1：是 2：否
public Integer getIsNeedTakecare() {
return isNeedTakecare;
}
@@ -409,7 +409,7 @@
public void setIsNeedTakecare(Integer isNeedTakecare) {
this.isNeedTakecare = isNeedTakecare;
}
- //检查内容
+ //检查内容
public String getCheckContent() {
return checkContent;
}
@@ -417,7 +417,7 @@
public void setCheckContent(String checkContent) {
this.checkContent = checkContent;
}
- //负责部门/外键
+ //负责部门/外键
public Long getLeadingDepartmentId() {
return leadingDepartmentId;
}
@@ -425,7 +425,7 @@
public void setLeadingDepartmentId(Long leadingDepartmentId) {
this.leadingDepartmentId = leadingDepartmentId;
}
- //检查指标
+ //检查指标
public String getCheckPoint() {
return checkPoint;
}
@@ -433,7 +433,7 @@
public void setCheckPoint(String checkPoint) {
this.checkPoint = checkPoint;
}
- //预警值
+ //预警值
public String getAlertNum() {
return alertNum;
}
@@ -441,7 +441,7 @@
public void setAlertNum(String alertNum) {
this.alertNum = alertNum;
}
- //联锁值
+ //联锁值
public String getLockNum() {
return lockNum;
}
@@ -449,7 +449,7 @@
public void setLockNum(String lockNum) {
this.lockNum = lockNum;
}
- //停用理由
+ //停用理由
public String getStopReason() {
return stopReason;
}
@@ -457,7 +457,7 @@
public void setStopReason(String stopReason) {
this.stopReason = stopReason;
}
- //停用后措施
+ //停用后措施
public String getAfterStopStep() {
return afterStopStep;
}
@@ -465,7 +465,7 @@
public void setAfterStopStep(String afterStopStep) {
this.afterStopStep = afterStopStep;
}
- //实际停用日期
+ //实际停用日期
public Timestamp getActualStopDate() {
return actualStopDate;
}
@@ -473,7 +473,7 @@
public void setActualStopDate(Timestamp actualStopDate) {
this.actualStopDate = actualStopDate;
}
- //停用提交人/外键
+ //停用提交人/外键
public Long getStopSubmitPersonId() {
return stopSubmitPersonId;
}
@@ -481,7 +481,7 @@
public void setStopSubmitPersonId(Long stopSubmitPersonId) {
this.stopSubmitPersonId = stopSubmitPersonId;
}
- //停用提交日期
+ //停用提交日期
public Timestamp getStopSubmitDate() {
return stopSubmitDate;
}
@@ -489,7 +489,7 @@
public void setStopSubmitDate(Timestamp stopSubmitDate) {
this.stopSubmitDate = stopSubmitDate;
}
- //恢复理由
+ //恢复理由
public String getRecoveryReason() {
return recoveryReason;
}
@@ -497,7 +497,7 @@
public void setRecoveryReason(String recoveryReason) {
this.recoveryReason = recoveryReason;
}
- //恢复填报日期
+ //恢复填报日期
public Timestamp getRecoverySubmitDate() {
return recoverySubmitDate;
}
@@ -505,7 +505,7 @@
public void setRecoverySubmitDate(Timestamp recoverySubmitDate) {
this.recoverySubmitDate = recoverySubmitDate;
}
- //实际恢复日期
+ //实际恢复日期
public Timestamp getActualRecoveryDate() {
return actualRecoveryDate;
}
@@ -513,7 +513,7 @@
public void setActualRecoveryDate(Timestamp actualRecoveryDate) {
this.actualRecoveryDate = actualRecoveryDate;
}
- //报废理由
+ //报废理由
public String getDestoryReason() {
return destoryReason;
}
@@ -521,7 +521,7 @@
public void setDestoryReason(String destoryReason) {
this.destoryReason = destoryReason;
}
- //报废填报日期
+ //报废填报日期
public Timestamp getDestorySubmitDate() {
return destorySubmitDate;
}
@@ -529,7 +529,7 @@
public void setDestorySubmitDate(Timestamp destorySubmitDate) {
this.destorySubmitDate = destorySubmitDate;
}
- //实际报废日期
+ //实际报废日期
public Timestamp getActualDestoryDate() {
return actualDestoryDate;
}
@@ -537,5 +537,5 @@
public void setActualDestoryDate(Timestamp actualDestoryDate) {
this.actualDestoryDate = actualDestoryDate;
}
-
-}
\ No newline at end of file
+
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java
index c37834a..f4fc4f4 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java
@@ -9,38 +9,38 @@
import java.util.List;
public class EquipmentInfoSaveOrUpdate implements Serializable {
- //ID
+ //ID
private Long id;
- //类型/类别外键
+ //类型/类别外键
private Long equipmentTypeId;
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
private Integer infoType;
- //名称
+ //名称
private String qName;
- //位号
+ //位号
private String positionNum;
- //用途
+ //用途
private String qUsage;
- //型号
+ //型号
private String model;
- //单位部门外键
+ //单位部门外键
private Long departmentId;
- //设置部位
+ //设置部位
private String setPart;
//生产日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp produceTime;
- //使用期限(天)
+ //使用期限(天)
private String useEndDay;
- //生命周期 1：已使用 2：库存中 3：报废
- private Integer lifeCycle;
+ //生命周期 1：已使用 2：库存中 3：报废
+ private Byte lifeCycle;
//投用日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp useDate;
- //维修状态 1:维修中 2：已修好
- private Integer repairStatus;
- //停用状态 1:停用 2.在用 3.维修 4.报废
- private Integer stopStatus;
+ //维修状态 1:维修中 2：已修好
+ private Byte repairStatus;
+ //停用状态 1:停用 2.在用 3.维修 4.报废
+ private Byte stopStatus;
//上次检查日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp previousCheckDate;
@@ -59,55 +59,55 @@
//下次保养日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp nextTakecareDate;
- //负责人ID外键
+ //负责人ID外键
private Long leadingPersonId;
//负责人名称
private String leadingPersonName;
- //负责人部门外键
+ //负责人部门外键
private Long leadingPersonDepartmentId;
- //供应商
+ //供应商
private String supplyName;
- //使用说明
+ //使用说明
private String useMemo;
- //是否检查 1：是 2：否
+ //是否检查 1：是 2：否
private Integer isNeedCheck;
- //检查周期
+ //检查周期
private String checkCycle;
- //检查提前提醒
+ //检查提前提醒
private String checkWarn;
- //是否检测 1：是 2：否
+ //是否检测 1：是 2：否
private Integer isNeedTest;
- //检测周期
+ //检测周期
private String testCycle;
- //检测提前提醒
+ //检测提前提醒
private String testWarn;
- //是否保养 1：是 2：否
+ //是否保养 1：是 2：否
private Integer isNeedTakecare;
- //检查内容
+ //检查内容
private String checkContent;
- //负责部门/外键
+ //负责部门/外键
private Long leadingDepartmentId;
- //检查指标
+ //检查指标
private String checkPoint;
- //预警值
+ //预警值
private String alertNum;
- //联锁值
+ //联锁值
private String lockNum;
- //停用理由
+ //停用理由
private String stopReason;
- //停用后措施
+ //停用后措施
private String afterStopStep;
//实际停用日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualStopDate;
- //停用提交人/外键
+ //停用提交人/外键
private Long stopSubmitPersonId;
//停用提交人名称
private String stopSubmitPersonName;
//停用提交日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp stopSubmitDate;
- //恢复理由
+ //恢复理由
private String recoveryReason;
//恢复填报日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -115,7 +115,7 @@
//实际恢复日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualRecoveryDate;
- //报废理由
+ //报废理由
private String destoryReason;
//报废填报日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -272,7 +272,7 @@
public void setId(Long id) {
this.id = id;
}
- //类型/类别外键
+ //类型/类别外键
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
@@ -280,7 +280,7 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
public Integer getInfoType() {
return infoType;
}
@@ -321,7 +321,7 @@
public void setModel(String model) {
this.model = model;
}
- //单位部门外键
+ //单位部门外键
public Long getDepartmentId() {
return departmentId;
}
@@ -329,7 +329,7 @@
public void setDepartmentId(Long departmentId) {
this.departmentId = departmentId;
}
- //设置部位
+ //设置部位
public String getSetPart() {
return setPart;
}
@@ -337,7 +337,7 @@
public void setSetPart(String setPart) {
this.setPart = setPart;
}
- //生产日期
+ //生产日期
public Timestamp getProduceTime() {
return produceTime;
}
@@ -345,7 +345,7 @@
public void setProduceTime(Timestamp produceTime) {
this.produceTime = produceTime;
}
- //使用期限(天)
+ //使用期限(天)
public String getUseEndDay() {
return useEndDay;
}
@@ -353,15 +353,15 @@
public void setUseEndDay(String useEndDay) {
this.useEndDay = useEndDay;
}
- //生命周期 1：已使用 2：库存中 3：报废
- public Integer getLifeCycle() {
+ //生命周期 1：已使用 2：库存中 3：报废
+ public Byte getLifeCycle() {
return lifeCycle;
}
- public void setLifeCycle(Integer lifeCycle) {
+ public void setLifeCycle(Byte lifeCycle) {
this.lifeCycle = lifeCycle;
}
- //投用日期
+ //投用日期
public Timestamp getUseDate() {
return useDate;
}
@@ -369,23 +369,23 @@
public void setUseDate(Timestamp useDate) {
this.useDate = useDate;
}
- //维修状态 1:维修中 2：已修好
- public Integer getRepairStatus() {
+ //维修状态 1:维修中 2：已修好
+ public Byte getRepairStatus() {
return repairStatus;
}
- public void setRepairStatus(Integer repairStatus) {
+ public void setRepairStatus(Byte repairStatus) {
this.repairStatus = repairStatus;
}
- //停用状态 1:停用 2.在用 3.维修 4.报废
- public Integer getStopStatus() {
+ //停用状态 1:停用 2.在用 3.维修 4.报废
+ public Byte getStopStatus() {
return stopStatus;
}
- public void setStopStatus(Integer stopStatus) {
+ public void setStopStatus(Byte stopStatus) {
this.stopStatus = stopStatus;
}
- //上次检查日期
+ //上次检查日期
public Timestamp getPreviousCheckDate() {
return previousCheckDate;
}
@@ -393,7 +393,7 @@
public void setPreviousCheckDate(Timestamp previousCheckDate) {
this.previousCheckDate = previousCheckDate;
}
- //上次检测日期
+ //上次检测日期
public Timestamp getPreviousTestDate() {
return previousTestDate;
}
@@ -401,7 +401,7 @@
public void setPreviousTestDate(Timestamp previousTestDate) {
this.previousTestDate = previousTestDate;
}
- //上次保养日期
+ //上次保养日期
public Timestamp getPreviousTakecareDate() {
return previousTakecareDate;
}
@@ -409,7 +409,7 @@
public void setPreviousTakecareDate(Timestamp previousTakecareDate) {
this.previousTakecareDate = previousTakecareDate;
}
- //下次检查日期
+ //下次检查日期
public Timestamp getNextCheckDate() {
return nextCheckDate;
}
@@ -417,7 +417,7 @@
public void setNextCheckDate(Timestamp nextCheckDate) {
this.nextCheckDate = nextCheckDate;
}
- //下次检测日期
+ //下次检测日期
public Timestamp getNextTestDate() {
return nextTestDate;
}
@@ -425,7 +425,7 @@
public void setNextTestDate(Timestamp nextTestDate) {
this.nextTestDate = nextTestDate;
}
- //下次保养日期
+ //下次保养日期
public Timestamp getNextTakecareDate() {
return nextTakecareDate;
}
@@ -433,7 +433,7 @@
public void setNextTakecareDate(Timestamp nextTakecareDate) {
this.nextTakecareDate = nextTakecareDate;
}
- //负责人ID外键
+ //负责人ID外键
public Long getLeadingPersonId() {
return leadingPersonId;
}
@@ -441,7 +441,7 @@
public void setLeadingPersonId(Long leadingPersonId) {
this.leadingPersonId = leadingPersonId;
}
- //负责人部门外键
+ //负责人部门外键
public Long getLeadingPersonDepartmentId() {
return leadingPersonDepartmentId;
}
@@ -449,7 +449,7 @@
public void setLeadingPersonDepartmentId(Long leadingPersonDepartmentId) {
this.leadingPersonDepartmentId = leadingPersonDepartmentId;
}
- //供应商
+ //供应商
public String getSupplyName() {
return supplyName;
}
@@ -457,7 +457,7 @@
public void setSupplyName(String supplyName) {
this.supplyName = supplyName;
}
- //使用说明
+ //使用说明
public String getUseMemo() {
return useMemo;
}
@@ -465,7 +465,7 @@
public void setUseMemo(String useMemo) {
this.useMemo = useMemo;
}
- //是否检查 1：是 2：否
+ //是否检查 1：是 2：否
public Integer getIsNeedCheck() {
return isNeedCheck;
}
@@ -473,7 +473,7 @@
public void setIsNeedCheck(Integer isNeedCheck) {
this.isNeedCheck = isNeedCheck;
}
- //检查周期
+ //检查周期
public String getCheckCycle() {
return checkCycle;
}
@@ -481,7 +481,7 @@
public void setCheckCycle(String checkCycle) {
this.checkCycle = checkCycle;
}
- //检查提前提醒
+ //检查提前提醒
public String getCheckWarn() {
return checkWarn;
}
@@ -489,7 +489,7 @@
public void setCheckWarn(String checkWarn) {
this.checkWarn = checkWarn;
}
- //是否检测 1：是 2：否
+ //是否检测 1：是 2：否
public Integer getIsNeedTest() {
return isNeedTest;
}
@@ -497,7 +497,7 @@
public void setIsNeedTest(Integer isNeedTest) {
this.isNeedTest = isNeedTest;
}
- //检测周期
+ //检测周期
public String getTestCycle() {
return testCycle;
}
@@ -505,7 +505,7 @@
public void setTestCycle(String testCycle) {
this.testCycle = testCycle;
}
- //检测提前提醒
+ //检测提前提醒
public String getTestWarn() {
return testWarn;
}
@@ -513,7 +513,7 @@
public void setTestWarn(String testWarn) {
this.testWarn = testWarn;
}
- //是否保养 1：是 2：否
+ //是否保养 1：是 2：否
public Integer getIsNeedTakecare() {
return isNeedTakecare;
}
@@ -521,7 +521,7 @@
public void setIsNeedTakecare(Integer isNeedTakecare) {
this.isNeedTakecare = isNeedTakecare;
}
- //检查内容
+ //检查内容
public String getCheckContent() {
return checkContent;
}
@@ -529,7 +529,7 @@
public void setCheckContent(String checkContent) {
this.checkContent = checkContent;
}
- //负责部门/外键
+ //负责部门/外键
public Long getLeadingDepartmentId() {
return leadingDepartmentId;
}
@@ -537,7 +537,7 @@
public void setLeadingDepartmentId(Long leadingDepartmentId) {
this.leadingDepartmentId = leadingDepartmentId;
}
- //检查指标
+ //检查指标
public String getCheckPoint() {
return checkPoint;
}
@@ -545,7 +545,7 @@
public void setCheckPoint(String checkPoint) {
this.checkPoint = checkPoint;
}
- //预警值
+ //预警值
public String getAlertNum() {
return alertNum;
}
@@ -553,7 +553,7 @@
public void setAlertNum(String alertNum) {
this.alertNum = alertNum;
}
- //联锁值
+ //联锁值
public String getLockNum() {
return lockNum;
}
@@ -561,7 +561,7 @@
public void setLockNum(String lockNum) {
this.lockNum = lockNum;
}
- //停用理由
+ //停用理由
public String getStopReason() {
return stopReason;
}
@@ -569,7 +569,7 @@
public void setStopReason(String stopReason) {
this.stopReason = stopReason;
}
- //停用后措施
+ //停用后措施
public String getAfterStopStep() {
return afterStopStep;
}
@@ -577,7 +577,7 @@
public void setAfterStopStep(String afterStopStep) {
this.afterStopStep = afterStopStep;
}
- //实际停用日期
+ //实际停用日期
public Timestamp getActualStopDate() {
return actualStopDate;
}
@@ -585,7 +585,7 @@
public void setActualStopDate(Timestamp actualStopDate) {
this.actualStopDate = actualStopDate;
}
- //停用提交人/外键
+ //停用提交人/外键
public Long getStopSubmitPersonId() {
return stopSubmitPersonId;
}
@@ -593,7 +593,7 @@
public void setStopSubmitPersonId(Long stopSubmitPersonId) {
this.stopSubmitPersonId = stopSubmitPersonId;
}
- //停用提交日期
+ //停用提交日期
public Timestamp getStopSubmitDate() {
return stopSubmitDate;
}
@@ -601,7 +601,7 @@
public void setStopSubmitDate(Timestamp stopSubmitDate) {
this.stopSubmitDate = stopSubmitDate;
}
- //恢复理由
+ //恢复理由
public String getRecoveryReason() {
return recoveryReason;
}
@@ -609,7 +609,7 @@
public void setRecoveryReason(String recoveryReason) {
this.recoveryReason = recoveryReason;
}
- //恢复填报日期
+ //恢复填报日期
public Timestamp getRecoverySubmitDate() {
return recoverySubmitDate;
}
@@ -617,7 +617,7 @@
public void setRecoverySubmitDate(Timestamp recoverySubmitDate) {
this.recoverySubmitDate = recoverySubmitDate;
}
- //实际恢复日期
+ //实际恢复日期
public Timestamp getActualRecoveryDate() {
return actualRecoveryDate;
}
@@ -625,7 +625,7 @@
public void setActualRecoveryDate(Timestamp actualRecoveryDate) {
this.actualRecoveryDate = actualRecoveryDate;
}
- //报废理由
+ //报废理由
public String getDestoryReason() {
return destoryReason;
}
@@ -633,7 +633,7 @@
public void setDestoryReason(String destoryReason) {
this.destoryReason = destoryReason;
}
- //报废填报日期
+ //报废填报日期
public Timestamp getDestorySubmitDate() {
return destorySubmitDate;
}
@@ -641,7 +641,7 @@
public void setDestorySubmitDate(Timestamp destorySubmitDate) {
this.destorySubmitDate = destorySubmitDate;
}
- //实际报废日期
+ //实际报废日期
public Timestamp getActualDestoryDate() {
return actualDestoryDate;
}
@@ -649,7 +649,7 @@
public void setActualDestoryDate(Timestamp actualDestoryDate) {
this.actualDestoryDate = actualDestoryDate;
}
-
+
public Timestamp getCreateTime() {
return createTime;
}
@@ -657,7 +657,7 @@
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
}
-
+
public Timestamp getUpdateTime() {
return updateTime;
}
@@ -704,4 +704,4 @@
public void setAreaName(String areaName) {
this.areaName = areaName;
}
-}
\ No newline at end of file
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java
index 8728c5d..f0ac251 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java
@@ -6,43 +6,43 @@
import com.gkhy.safePlatform.equipment.annotation.Query;
public class EquipmentRepairDetailQueryCriteria {
-
+
@Query()
private Long id;
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
@Query()
private Integer infoTpe;
- //设备ID/外键
+ //设备ID/外键
@Query()
private Long equipmentId;
- //维修负责人/外键
+ //维修负责人/外键
@Query()
private Long repairPersonId;
- //维修开始日期
+ //维修开始日期
@Query()
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp repairStartDate;
- //维修结束日期
+ //维修结束日期
@Query()
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp repairEndDate;
- //维修负责人单位/外键
+ //维修负责人单位/外键
@Query()
private Long repairPersonDepartmentId;
- //维修情况
+ //维修情况
@Query()
private String repairMemo;
- //维修状态 1：维修中 2：已修好
+ //维修状态 1：维修中 2：已修好
@Query()
- private Integer repairStatus;
- //设施异常项
+ private Byte repairStatus;
+ //设施异常项
@Query()
private String exceptionInfo;
- //创建日期
+ //创建日期
@Query()
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp createTime;
- //更新日期
+ //更新日期
@Query()
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp updateTime;
@@ -57,7 +57,7 @@
this.delFlag = delFlag;
}
-
+
public Long getId() {
return id;
}
@@ -65,7 +65,7 @@
public void setId(Long id) {
this.id = id;
}
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
public Integer getInfoTpe() {
return infoTpe;
}
@@ -73,7 +73,7 @@
public void setInfoTpe(Integer infoTpe) {
this.infoTpe = infoTpe;
}
- //设备ID/外键
+ //设备ID/外键
public Long getEquipmentId() {
return equipmentId;
}
@@ -81,7 +81,7 @@
public void setEquipmentId(Long equipmentId) {
this.equipmentId = equipmentId;
}
- //维修负责人/外键
+ //维修负责人/外键
public Long getRepairPersonId() {
return repairPersonId;
}
@@ -89,7 +89,7 @@
public void setRepairPersonId(Long repairPersonId) {
this.repairPersonId = repairPersonId;
}
- //维修开始日期
+ //维修开始日期
public Timestamp getRepairStartDate() {
return repairStartDate;
}
@@ -97,7 +97,7 @@
public void setRepairStartDate(Timestamp repairStartDate) {
this.repairStartDate = repairStartDate;
}
- //维修结束日期
+ //维修结束日期
public Timestamp getRepairEndDate() {
return repairEndDate;
}
@@ -105,7 +105,7 @@
public void setRepairEndDate(Timestamp repairEndDate) {
this.repairEndDate = repairEndDate;
}
- //维修负责人单位/外键
+ //维修负责人单位/外键
public Long getRepairPersonDepartmentId() {
return repairPersonDepartmentId;
}
@@ -113,7 +113,7 @@
public void setRepairPersonDepartmentId(Long repairPersonDepartmentId) {
this.repairPersonDepartmentId = repairPersonDepartmentId;
}
- //维修情况
+ //维修情况
public String getRepairMemo() {
return repairMemo;
}
@@ -121,15 +121,15 @@
public void setRepairMemo(String repairMemo) {
this.repairMemo = repairMemo;
}
- //维修状态 1：维修中 2：已修好
- public Integer getRepairStatus() {
+ //维修状态 1：维修中 2：已修好
+ public Byte getRepairStatus() {
return repairStatus;
}
- public void setRepairStatus(Integer repairStatus) {
+ public void setRepairStatus(Byte repairStatus) {
this.repairStatus = repairStatus;
}
- //设施异常项
+ //设施异常项
public String getExceptionInfo() {
return exceptionInfo;
}
@@ -137,7 +137,7 @@
public void setExceptionInfo(String exceptionInfo) {
this.exceptionInfo = exceptionInfo;
}
- //创建日期
+ //创建日期
public Timestamp getCreateTime() {
return createTime;
}
@@ -145,7 +145,7 @@
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
}
- //更新日期
+ //更新日期
public Timestamp getUpdateTime() {
return updateTime;
}
@@ -153,4 +153,4 @@
public void setUpdateTime(Timestamp updateTime) {
this.updateTime = updateTime;
}
-}
\ No newline at end of file
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoImportExcel.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoImportExcel.java
index 9217946..0e8f8fc 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoImportExcel.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoImportExcel.java
@@ -33,7 +33,7 @@
private Long responsibilityPersonId;
//装置部位分类 1：关键装置 2：重点部位
@ExcelCell(index = 9)
- private Integer partType;
+ private Byte partType;
//检查周期
@ExcelCell(index = 10)
private String checkCycle;
@@ -68,7 +68,7 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //名称
+ //名称
public String getName() {
return name;
}
@@ -76,7 +76,7 @@
public void setName(String name) {
this.name = name;
}
- //单位部门外键
+ //单位部门外键
public Long getDepartmentId() {
return departmentId;
}
@@ -84,7 +84,7 @@
public void setDepartmentId(Long departmentId) {
this.departmentId = departmentId;
}
- //具体位置
+ //具体位置
public String getPosition() {
return position;
}
@@ -92,7 +92,7 @@
public void setPosition(String position) {
this.position = position;
}
- //负责人姓名
+ //负责人姓名
public String getLeadingPersonName() {
return leadingPersonName;
}
@@ -100,7 +100,7 @@
public void setLeadingPersonName(String leadingPersonName) {
this.leadingPersonName = leadingPersonName;
}
- //联系人/外键
+ //联系人/外键
public Long getConnectPersonId() {
return connectPersonId;
}
@@ -108,7 +108,7 @@
public void setConnectPersonId(Long connectPersonId) {
this.connectPersonId = connectPersonId;
}
- //录入人/外键
+ //录入人/外键
public Long getInputPersonId() {
return inputPersonId;
}
@@ -116,7 +116,7 @@
public void setInputPersonId(Long inputPersonId) {
this.inputPersonId = inputPersonId;
}
- //责任人/外键
+ //责任人/外键
public Long getResponsibilityPersonId() {
return responsibilityPersonId;
}
@@ -124,15 +124,15 @@
public void setResponsibilityPersonId(Long responsibilityPersonId) {
this.responsibilityPersonId = responsibilityPersonId;
}
- //装置部位分类 1：关键装置 2：重点部位
- public Integer getPartType() {
+ //装置部位分类 1：关键装置 2：重点部位
+ public Byte getPartType() {
return partType;
}
- public void setPartType(Integer partType) {
+ public void setPartType(Byte partType) {
this.partType = partType;
}
- //检查周期
+ //检查周期
public String getCheckCycle() {
return checkCycle;
}
@@ -140,7 +140,7 @@
public void setCheckCycle(String checkCycle) {
this.checkCycle = checkCycle;
}
- //应急预案/外键
+ //应急预案/外键
public Long getEmergencePlanId() {
return emergencePlanId;
}
@@ -148,7 +148,7 @@
public void setEmergencePlanId(Long emergencePlanId) {
this.emergencePlanId = emergencePlanId;
}
- //主要危险有害因素
+ //主要危险有害因素
public String getDangerousElement() {
return dangerousElement;
}
@@ -156,7 +156,7 @@
public void setDangerousElement(String dangerousElement) {
this.dangerousElement = dangerousElement;
}
- //易导致风险
+ //易导致风险
public String getToDangerous() {
return toDangerous;
}
@@ -164,7 +164,7 @@
public void setToDangerous(String toDangerous) {
this.toDangerous = toDangerous;
}
- //应急处置措施
+ //应急处置措施
public String getTreatment() {
return treatment;
}
@@ -172,7 +172,7 @@
public void setTreatment(String treatment) {
this.treatment = treatment;
}
- //现场图片
+ //现场图片
public String getScenePic() {
return scenePic;
}
@@ -180,5 +180,5 @@
public void setScenePic(String scenePic) {
this.scenePic = scenePic;
}
-
-}
\ No newline at end of file
+
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
index 401642c..7b07faa 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
@@ -8,117 +8,117 @@
import java.util.List;
public class EquipmentInfoDto implements Serializable {
- //ID
+ //ID
private Long id;
- //类型/类别外键
+ //类型/类别外键
private Long equipmentTypeId;
//类型/类别名称
private String equipmentTypeName;
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
private Integer infoType;
- //名称
+ //名称
private String qName;
- //位号
+ //位号
private String positionNum;
- //用途
+ //用途
private String qUsage;
- //型号
+ //型号
private String model;
- //单位部门外键
+ //单位部门外键
private Long departmentId;
//单位部门名称
private String departmentName;
- //设置部位
+ //设置部位
private String setPart;
- //生产日期
+ //生产日期
private Timestamp produceTime;
- //使用期限(天)
+ //使用期限(天)
private String useEndDay;
- //生命周期 1：已使用 2：库存中 3：报废
- private Integer lifeCycle;
- //投用日期
+ //生命周期 1：已使用 2：库存中 3：报废
+ private Byte lifeCycle;
+ //投用日期
private Timestamp useDate;
- //维修状态 1:维修中 2：已修好
- private Integer repairStatus;
- //停用状态 1:停用 2.在用 3.维修 4.报废
- private Integer stopStatus;
- //上次检查日期
+ //维修状态 1:维修中 2：已修好
+ private Byte repairStatus;
+ //停用状态 1:停用 2.在用 3.维修 4.报废
+ private Byte stopStatus;
+ //上次检查日期
private Timestamp previousCheckDate;
- //上次检测日期
+ //上次检测日期
private Timestamp previousTestDate;
- //上次保养日期
+ //上次保养日期
private Timestamp previousTakecareDate;
- //下次检查日期
+ //下次检查日期
private Timestamp nextCheckDate;
- //下次检测日期
+ //下次检测日期
private Timestamp nextTestDate;
- //下次保养日期
+ //下次保养日期
private Timestamp nextTakecareDate;
- //负责人ID外键
+ //负责人ID外键
private Long leadingPersonId;
//负责人姓名
private String leadingPersonName;
- //负责人部门外键
+ //负责人部门外键
private Long leadingPersonDepartmentId;
//负责人部门名称
private String leadingPersonDepartmentName;
- //供应商
+ //供应商
private String supplyName;
- //使用说明
+ //使用说明
private String useMemo;
- //是否检查 1：是 2：否
+ //是否检查 1：是 2：否
private Integer isNeedCheck;
- //检查周期
+ //检查周期
private String checkCycle;
- //检查提前提醒
+ //检查提前提醒
private String checkWarn;
- //是否检测 1：是 2：否
+ //是否检测 1：是 2：否
private Integer isNeedTest;
- //检测周期
+ //检测周期
private String testCycle;
- //检测提前提醒
+ //检测提前提醒
private String testWarn;
- //是否保养 1：是 2：否
+ //是否保养 1：是 2：否
private Integer isNeedTakecare;
- //检查内容
+ //检查内容
private String checkContent;
- //负责部门/外键
+ //负责部门/外键
private Long leadingDepartmentId;
//负责部门名称
private String leadingDepartmentName;
- //检查指标
+ //检查指标
private String checkPoint;
- //预警值
+ //预警值
private String alertNum;
- //联锁值
+ //联锁值
private String lockNum;
- //停用理由
+ //停用理由
private String stopReason;
- //停用后措施
+ //停用后措施
private String afterStopStep;
- //实际停用日期
+ //实际停用日期
private Timestamp actualStopDate;
- //停用提交人/外键
+ //停用提交人/外键
private Long stopSubmitPersonId;
//停用提交人名称
private String stopSubmitPersonName;
//停用提交日期
private Timestamp stopSubmitDate;
- //恢复理由
+ //恢复理由
private String recoveryReason;
- //恢复填报日期
+ //恢复填报日期
private Timestamp recoverySubmitDate;
- //实际恢复日期
+ //实际恢复日期
private Timestamp actualRecoveryDate;
- //报废理由
+ //报废理由
private String destoryReason;
- //报废填报日期
+ //报废填报日期
private Timestamp destorySubmitDate;
- //实际报废日期
+ //实际报废日期
private Timestamp actualDestoryDate;
-
+
private Timestamp createTime;
-
+
private Timestamp updateTime;
//设备保养
@@ -230,7 +230,7 @@
public void setId(Long id) {
this.id = id;
}
- //类型/类别外键
+ //类型/类别外键
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
@@ -238,7 +238,7 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
public Integer getInfoType() {
return infoType;
}
@@ -279,7 +279,7 @@
public void setModel(String model) {
this.model = model;
}
- //单位部门外键
+ //单位部门外键
public Long getDepartmentId() {
return departmentId;
}
@@ -287,7 +287,7 @@
public void setDepartmentId(Long departmentId) {
this.departmentId = departmentId;
}
- //设置部位
+ //设置部位
public String getSetPart() {
return setPart;
}
@@ -295,7 +295,7 @@
public void setSetPart(String setPart) {
this.setPart = setPart;
}
- //生产日期
+ //生产日期
public Timestamp getProduceTime() {
return produceTime;
}
@@ -303,7 +303,7 @@
public void setProduceTime(Timestamp produceTime) {
this.produceTime = produceTime;
}
- //使用期限(天)
+ //使用期限(天)
public String getUseEndDay() {
return useEndDay;
}
@@ -311,15 +311,15 @@
public void setUseEndDay(String useEndDay) {
this.useEndDay = useEndDay;
}
- //生命周期 1：已使用 2：库存中 3：报废
- public Integer getLifeCycle() {
+ //生命周期 1：已使用 2：库存中 3：报废
+ public Byte getLifeCycle() {
return lifeCycle;
}
- public void setLifeCycle(Integer lifeCycle) {
+ public void setLifeCycle(Byte lifeCycle) {
this.lifeCycle = lifeCycle;
}
- //投用日期
+ //投用日期
public Timestamp getUseDate() {
return useDate;
}
@@ -327,23 +327,23 @@
public void setUseDate(Timestamp useDate) {
this.useDate = useDate;
}
- //维修状态 1:维修中 2：已修好
- public Integer getRepairStatus() {
+ //维修状态 1:维修中 2：已修好
+ public Byte getRepairStatus() {
return repairStatus;
}
- public void setRepairStatus(Integer repairStatus) {
+ public void setRepairStatus(Byte repairStatus) {
this.repairStatus = repairStatus;
}
- //停用状态 1:停用 2.在用 3.维修 4.报废
- public Integer getStopStatus() {
+ //停用状态 1:停用 2.在用 3.维修 4.报废
+ public Byte getStopStatus() {
return stopStatus;
}
- public void setStopStatus(Integer stopStatus) {
+ public void setStopStatus(Byte stopStatus) {
this.stopStatus = stopStatus;
}
- //上次检查日期
+ //上次检查日期
public Timestamp getPreviousCheckDate() {
return previousCheckDate;
}
@@ -351,7 +351,7 @@
public void setPreviousCheckDate(Timestamp previousCheckDate) {
this.previousCheckDate = previousCheckDate;
}
- //上次检测日期
+ //上次检测日期
public Timestamp getPreviousTestDate() {
return previousTestDate;
}
@@ -359,7 +359,7 @@
public void setPreviousTestDate(Timestamp previousTestDate) {
this.previousTestDate = previousTestDate;
}
- //上次保养日期
+ //上次保养日期
public Timestamp getPreviousTakecareDate() {
return previousTakecareDate;
}
@@ -367,7 +367,7 @@
public void setPreviousTakecareDate(Timestamp previousTakecareDate) {
this.previousTakecareDate = previousTakecareDate;
}
- //下次检查日期
+ //下次检查日期
public Timestamp getNextCheckDate() {
return nextCheckDate;
}
@@ -375,7 +375,7 @@
public void setNextCheckDate(Timestamp nextCheckDate) {
this.nextCheckDate = nextCheckDate;
}
- //下次检测日期
+ //下次检测日期
public Timestamp getNextTestDate() {
return nextTestDate;
}
@@ -383,7 +383,7 @@
public void setNextTestDate(Timestamp nextTestDate) {
this.nextTestDate = nextTestDate;
}
- //下次保养日期
+ //下次保养日期
public Timestamp getNextTakecareDate() {
return nextTakecareDate;
}
@@ -391,7 +391,7 @@
public void setNextTakecareDate(Timestamp nextTakecareDate) {
this.nextTakecareDate = nextTakecareDate;
}
- //负责人ID外键
+ //负责人ID外键
public Long getLeadingPersonId() {
return leadingPersonId;
}
@@ -399,7 +399,7 @@
public void setLeadingPersonId(Long leadingPersonId) {
this.leadingPersonId = leadingPersonId;
}
- //负责人部门外键
+ //负责人部门外键
public Long getLeadingPersonDepartmentId() {
return leadingPersonDepartmentId;
}
@@ -407,7 +407,7 @@
public void setLeadingPersonDepartmentId(Long leadingPersonDepartmentId) {
this.leadingPersonDepartmentId = leadingPersonDepartmentId;
}
- //供应商
+ //供应商
public String getSupplyName() {
return supplyName;
}
@@ -415,7 +415,7 @@
public void setSupplyName(String supplyName) {
this.supplyName = supplyName;
}
- //使用说明
+ //使用说明
public String getUseMemo() {
return useMemo;
}
@@ -423,7 +423,7 @@
public void setUseMemo(String useMemo) {
this.useMemo = useMemo;
}
- //是否检查 1：是 2：否
+ //是否检查 1：是 2：否
public Integer getIsNeedCheck() {
return isNeedCheck;
}
@@ -431,7 +431,7 @@
public void setIsNeedCheck(Integer isNeedCheck) {
this.isNeedCheck = isNeedCheck;
}
- //检查周期
+ //检查周期
public String getCheckCycle() {
return checkCycle;
}
@@ -439,7 +439,7 @@
public void setCheckCycle(String checkCycle) {
this.checkCycle = checkCycle;
}
- //检查提前提醒
+ //检查提前提醒
public String getCheckWarn() {
return checkWarn;
}
@@ -447,7 +447,7 @@
public void setCheckWarn(String checkWarn) {
this.checkWarn = checkWarn;
}
- //是否检测 1：是 2：否
+ //是否检测 1：是 2：否
public Integer getIsNeedTest() {
return isNeedTest;
}
@@ -455,7 +455,7 @@
public void setIsNeedTest(Integer isNeedTest) {
this.isNeedTest = isNeedTest;
}
- //检测周期
+ //检测周期
public String getTestCycle() {
return testCycle;
}
@@ -463,7 +463,7 @@
public void setTestCycle(String testCycle) {
this.testCycle = testCycle;
}
- //检测提前提醒
+ //检测提前提醒
public String getTestWarn() {
return testWarn;
}
@@ -471,7 +471,7 @@
public void setTestWarn(String testWarn) {
this.testWarn = testWarn;
}
- //是否保养 1：是 2：否
+ //是否保养 1：是 2：否
public Integer getIsNeedTakecare() {
return isNeedTakecare;
}
@@ -479,7 +479,7 @@
public void setIsNeedTakecare(Integer isNeedTakecare) {
this.isNeedTakecare = isNeedTakecare;
}
- //检查内容
+ //检查内容
public String getCheckContent() {
return checkContent;
}
@@ -487,7 +487,7 @@
public void setCheckContent(String checkContent) {
this.checkContent = checkContent;
}
- //负责部门/外键
+ //负责部门/外键
public Long getLeadingDepartmentId() {
return leadingDepartmentId;
}
@@ -495,7 +495,7 @@
public void setLeadingDepartmentId(Long leadingDepartmentId) {
this.leadingDepartmentId = leadingDepartmentId;
}
- //检查指标
+ //检查指标
public String getCheckPoint() {
return checkPoint;
}
@@ -503,7 +503,7 @@
public void setCheckPoint(String checkPoint) {
this.checkPoint = checkPoint;
}
- //预警值
+ //预警值
public String getAlertNum() {
return alertNum;
}
@@ -511,7 +511,7 @@
public void setAlertNum(String alertNum) {
this.alertNum = alertNum;
}
- //联锁值
+ //联锁值
public String getLockNum() {
return lockNum;
}
@@ -519,7 +519,7 @@
public void setLockNum(String lockNum) {
this.lockNum = lockNum;
}
- //停用理由
+ //停用理由
public String getStopReason() {
return stopReason;
}
@@ -527,7 +527,7 @@
public void setStopReason(String stopReason) {
this.stopReason = stopReason;
}
- //停用后措施
+ //停用后措施
public String getAfterStopStep() {
return afterStopStep;
}
@@ -535,7 +535,7 @@
public void setAfterStopStep(String afterStopStep) {
this.afterStopStep = afterStopStep;
}
- //实际停用日期
+ //实际停用日期
public Timestamp getActualStopDate() {
return actualStopDate;
}
@@ -543,7 +543,7 @@
public void setActualStopDate(Timestamp actualStopDate) {
this.actualStopDate = actualStopDate;
}
- //停用提交人/外键
+ //停用提交人/外键
public Long getStopSubmitPersonId() {
return stopSubmitPersonId;
}
@@ -551,7 +551,7 @@
public void setStopSubmitPersonId(Long stopSubmitPersonId) {
this.stopSubmitPersonId = stopSubmitPersonId;
}
- //停用提交日期
+ //停用提交日期
public Timestamp getStopSubmitDate() {
return stopSubmitDate;
}
@@ -559,7 +559,7 @@
public void setStopSubmitDate(Timestamp stopSubmitDate) {
this.stopSubmitDate = stopSubmitDate;
}
- //恢复理由
+ //恢复理由
public String getRecoveryReason() {
return recoveryReason;
}
@@ -567,7 +567,7 @@
public void setRecoveryReason(String recoveryReason) {
this.recoveryReason = recoveryReason;
}
- //恢复填报日期
+ //恢复填报日期
public Timestamp getRecoverySubmitDate() {
return recoverySubmitDate;
}
@@ -575,7 +575,7 @@
public void setRecoverySubmitDate(Timestamp recoverySubmitDate) {
this.recoverySubmitDate = recoverySubmitDate;
}
- //实际恢复日期
+ //实际恢复日期
public Timestamp getActualRecoveryDate() {
return actualRecoveryDate;
}
@@ -583,7 +583,7 @@
public void setActualRecoveryDate(Timestamp actualRecoveryDate) {
this.actualRecoveryDate = actualRecoveryDate;
}
- //报废理由
+ //报废理由
public String getDestoryReason() {
return destoryReason;
}
@@ -591,7 +591,7 @@
public void setDestoryReason(String destoryReason) {
this.destoryReason = destoryReason;
}
- //报废填报日期
+ //报废填报日期
public Timestamp getDestorySubmitDate() {
return destorySubmitDate;
}
@@ -599,7 +599,7 @@
public void setDestorySubmitDate(Timestamp destorySubmitDate) {
this.destorySubmitDate = destorySubmitDate;
}
- //实际报废日期
+ //实际报废日期
public Timestamp getActualDestoryDate() {
return actualDestoryDate;
}
@@ -607,7 +607,7 @@
public void setActualDestoryDate(Timestamp actualDestoryDate) {
this.actualDestoryDate = actualDestoryDate;
}
-
+
public Timestamp getCreateTime() {
return createTime;
}
@@ -615,7 +615,7 @@
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
}
-
+
public Timestamp getUpdateTime() {
return updateTime;
}
@@ -671,4 +671,4 @@
public void setEquipmentTypeName(String equipmentTypeName) {
this.equipmentTypeName = equipmentTypeName;
}
-}
\ No newline at end of file
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoExcel.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoExcel.java
index 7046adc..6b0b7c6 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoExcel.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoExcel.java
@@ -12,7 +12,7 @@
//类型/类别外键
@ExcelCell(index = 1)
private Long equipmentTypeId;
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
@ExcelCell(index = 2)
private Integer infoType;
//名称
@@ -41,16 +41,16 @@
private String useEndDay;
//生命周期 1：已使用 2：库存中 3：报废
@ExcelCell(index = 11)
- private Integer lifeCycle;
+ private Byte lifeCycle;
//投用日期
@ExcelCell(index = 12)
private Timestamp useDate;
//维修状态 1:维修中 2：已修好
@ExcelCell(index = 13)
- private Integer repairStatus;
- //停用状态 1:停用 2.在用 3.维修 4.报废
+ private Byte repairStatus;
+ //停用状态 1:停用 2.在用 3.维修 4.报废
@ExcelCell(index = 14)
- private Integer stopStatus;
+ private Byte stopStatus;
//上次检查日期
@ExcelCell(index = 15)
private Timestamp previousCheckDate;
@@ -171,7 +171,7 @@
public void setId(Long id) {
this.id = id;
}
- //类型/类别外键
+ //类型/类别外键
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
@@ -179,7 +179,7 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
public Integer getInfoType() {
return infoType;
}
@@ -220,7 +220,7 @@
public void setModel(String model) {
this.model = model;
}
- //单位部门外键
+ //单位部门外键
public Long getDepartmentId() {
return departmentId;
}
@@ -228,7 +228,7 @@
public void setDepartmentId(Long departmentId) {
this.departmentId = departmentId;
}
- //设置部位
+ //设置部位
public String getSetPart() {
return setPart;
}
@@ -236,7 +236,7 @@
public void setSetPart(String setPart) {
this.setPart = setPart;
}
- //生产日期
+ //生产日期
public Timestamp getProduceTime() {
return produceTime;
}
@@ -244,7 +244,7 @@
public void setProduceTime(Timestamp produceTime) {
this.produceTime = produceTime;
}
- //使用期限(天)
+ //使用期限(天)
public String getUseEndDay() {
return useEndDay;
}
@@ -252,15 +252,15 @@
public void setUseEndDay(String useEndDay) {
this.useEndDay = useEndDay;
}
- //生命周期 1：已使用 2：库存中 3：报废
- public Integer getLifeCycle() {
+ //生命周期 1：已使用 2：库存中 3：报废
+ public Byte getLifeCycle() {
return lifeCycle;
}
- public void setLifeCycle(Integer lifeCycle) {
+ public void setLifeCycle(Byte lifeCycle) {
this.lifeCycle = lifeCycle;
}
- //投用日期
+ //投用日期
public Timestamp getUseDate() {
return useDate;
}
@@ -268,23 +268,23 @@
public void setUseDate(Timestamp useDate) {
this.useDate = useDate;
}
- //维修状态 1:维修中 2：已修好
- public Integer getRepairStatus() {
+ //维修状态 1:维修中 2：已修好
+ public Byte getRepairStatus() {
return repairStatus;
}
- public void setRepairStatus(Integer repairStatus) {
+ public void setRepairStatus(Byte repairStatus) {
this.repairStatus = repairStatus;
}
- //停用状态 1:停用 2.在用 3.维修 4.报废
- public Integer getStopStatus() {
+ //停用状态 1:停用 2.在用 3.维修 4.报废
+ public Byte getStopStatus() {
return stopStatus;
}
- public void setStopStatus(Integer stopStatus) {
+ public void setStopStatus(Byte stopStatus) {
this.stopStatus = stopStatus;
}
- //上次检查日期
+ //上次检查日期
public Timestamp getPreviousCheckDate() {
return previousCheckDate;
}
@@ -292,7 +292,7 @@
public void setPreviousCheckDate(Timestamp previousCheckDate) {
this.previousCheckDate = previousCheckDate;
}
- //上次检测日期
+ //上次检测日期
public Timestamp getPreviousTestDate() {
return previousTestDate;
}
@@ -300,7 +300,7 @@
public void setPreviousTestDate(Timestamp previousTestDate) {
this.previousTestDate = previousTestDate;
}
- //上次保养日期
+ //上次保养日期
public Timestamp getPreviousTakecareDate() {
return previousTakecareDate;
}
@@ -308,7 +308,7 @@
public void setPreviousTakecareDate(Timestamp previousTakecareDate) {
this.previousTakecareDate = previousTakecareDate;
}
- //下次检查日期
+ //下次检查日期
public Timestamp getNextCheckDate() {
return nextCheckDate;
}
@@ -316,7 +316,7 @@
public void setNextCheckDate(Timestamp nextCheckDate) {
this.nextCheckDate = nextCheckDate;
}
- //下次检测日期
+ //下次检测日期
public Timestamp getNextTestDate() {
return nextTestDate;
}
@@ -324,7 +324,7 @@
public void setNextTestDate(Timestamp nextTestDate) {
this.nextTestDate = nextTestDate;
}
- //下次保养日期
+ //下次保养日期
public Timestamp getNextTakecareDate() {
return nextTakecareDate;
}
@@ -332,7 +332,7 @@
public void setNextTakecareDate(Timestamp nextTakecareDate) {
this.nextTakecareDate = nextTakecareDate;
}
- //负责人ID外键
+ //负责人ID外键
public Long getLeadingPersonId() {
return leadingPersonId;
}
@@ -340,7 +340,7 @@
public void setLeadingPersonId(Long leadingPersonId) {
this.leadingPersonId = leadingPersonId;
}
- //负责人部门外键
+ //负责人部门外键
public Long getLeadingPersonDepartmentId() {
return leadingPersonDepartmentId;
}
@@ -348,7 +348,7 @@
public void setLeadingPersonDepartmentId(Long leadingPersonDepartmentId) {
this.leadingPersonDepartmentId = leadingPersonDepartmentId;
}
- //供应商
+ //供应商
public String getSupplyName() {
return supplyName;
}
@@ -356,7 +356,7 @@
public void setSupplyName(String supplyName) {
this.supplyName = supplyName;
}
- //使用说明
+ //使用说明
public String getUseMemo() {
return useMemo;
}
@@ -364,7 +364,7 @@
public void setUseMemo(String useMemo) {
this.useMemo = useMemo;
}
- //是否检查 1：是 2：否
+ //是否检查 1：是 2：否
public Integer getIsNeedCheck() {
return isNeedCheck;
}
@@ -372,7 +372,7 @@
public void setIsNeedCheck(Integer isNeedCheck) {
this.isNeedCheck = isNeedCheck;
}
- //检查周期
+ //检查周期
public String getCheckCycle() {
return checkCycle;
}
@@ -380,7 +380,7 @@
public void setCheckCycle(String checkCycle) {
this.checkCycle = checkCycle;
}
- //检查提前提醒
+ //检查提前提醒
public String getCheckWarn() {
return checkWarn;
}
@@ -388,7 +388,7 @@
public void setCheckWarn(String checkWarn) {
this.checkWarn = checkWarn;
}
- //是否检测 1：是 2：否
+ //是否检测 1：是 2：否
public Integer getIsNeedTest() {
return isNeedTest;
}
@@ -396,7 +396,7 @@
public void setIsNeedTest(Integer isNeedTest) {
this.isNeedTest = isNeedTest;
}
- //检测周期
+ //检测周期
public String getTestCycle() {
return testCycle;
}
@@ -404,7 +404,7 @@
public void setTestCycle(String testCycle) {
this.testCycle = testCycle;
}
- //检测提前提醒
+ //检测提前提醒
public String getTestWarn() {
return testWarn;
}
@@ -412,7 +412,7 @@
public void setTestWarn(String testWarn) {
this.testWarn = testWarn;
}
- //是否保养 1：是 2：否
+ //是否保养 1：是 2：否
public Integer getIsNeedTakecare() {
return isNeedTakecare;
}
@@ -420,7 +420,7 @@
public void setIsNeedTakecare(Integer isNeedTakecare) {
this.isNeedTakecare = isNeedTakecare;
}
- //检查内容
+ //检查内容
public String getCheckContent() {
return checkContent;
}
@@ -428,7 +428,7 @@
public void setCheckContent(String checkContent) {
this.checkContent = checkContent;
}
- //负责部门/外键
+ //负责部门/外键
public Long getLeadingDepartmentId() {
return leadingDepartmentId;
}
@@ -436,7 +436,7 @@
public void setLeadingDepartmentId(Long leadingDepartmentId) {
this.leadingDepartmentId = leadingDepartmentId;
}
- //检查指标
+ //检查指标
public String getCheckPoint() {
return checkPoint;
}
@@ -444,7 +444,7 @@
public void setCheckPoint(String checkPoint) {
this.checkPoint = checkPoint;
}
- //预警值
+ //预警值
public String getAlertNum() {
return alertNum;
}
@@ -452,7 +452,7 @@
public void setAlertNum(String alertNum) {
this.alertNum = alertNum;
}
- //联锁值
+ //联锁值
public String getLockNum() {
return lockNum;
}
@@ -460,7 +460,7 @@
public void setLockNum(String lockNum) {
this.lockNum = lockNum;
}
- //停用理由
+ //停用理由
public String getStopReason() {
return stopReason;
}
@@ -468,7 +468,7 @@
public void setStopReason(String stopReason) {
this.stopReason = stopReason;
}
- //停用后措施
+ //停用后措施
public String getAfterStopStep() {
return afterStopStep;
}
@@ -476,7 +476,7 @@
public void setAfterStopStep(String afterStopStep) {
this.afterStopStep = afterStopStep;
}
- //实际停用日期
+ //实际停用日期
public Timestamp getActualStopDate() {
return actualStopDate;
}
@@ -484,7 +484,7 @@
public void setActualStopDate(Timestamp actualStopDate) {
this.actualStopDate = actualStopDate;
}
- //停用提交人/外键
+ //停用提交人/外键
public Long getStopSubmitPersonId() {
return stopSubmitPersonId;
}
@@ -492,7 +492,7 @@
public void setStopSubmitPersonId(Long stopSubmitPersonId) {
this.stopSubmitPersonId = stopSubmitPersonId;
}
- //停用提交日期
+ //停用提交日期
public Timestamp getStopSubmitDate() {
return stopSubmitDate;
}
@@ -500,7 +500,7 @@
public void setStopSubmitDate(Timestamp stopSubmitDate) {
this.stopSubmitDate = stopSubmitDate;
}
- //恢复理由
+ //恢复理由
public String getRecoveryReason() {
return recoveryReason;
}
@@ -508,7 +508,7 @@
public void setRecoveryReason(String recoveryReason) {
this.recoveryReason = recoveryReason;
}
- //恢复填报日期
+ //恢复填报日期
public Timestamp getRecoverySubmitDate() {
return recoverySubmitDate;
}
@@ -516,7 +516,7 @@
public void setRecoverySubmitDate(Timestamp recoverySubmitDate) {
this.recoverySubmitDate = recoverySubmitDate;
}
- //实际恢复日期
+ //实际恢复日期
public Timestamp getActualRecoveryDate() {
return actualRecoveryDate;
}
@@ -524,7 +524,7 @@
public void setActualRecoveryDate(Timestamp actualRecoveryDate) {
this.actualRecoveryDate = actualRecoveryDate;
}
- //报废理由
+ //报废理由
public String getDestoryReason() {
return destoryReason;
}
@@ -532,7 +532,7 @@
public void setDestoryReason(String destoryReason) {
this.destoryReason = destoryReason;
}
- //报废填报日期
+ //报废填报日期
public Timestamp getDestorySubmitDate() {
return destorySubmitDate;
}
@@ -540,7 +540,7 @@
public void setDestorySubmitDate(Timestamp destorySubmitDate) {
this.destorySubmitDate = destorySubmitDate;
}
- //实际报废日期
+ //实际报废日期
public Timestamp getActualDestoryDate() {
return actualDestoryDate;
}
@@ -548,5 +548,5 @@
public void setActualDestoryDate(Timestamp actualDestoryDate) {
this.actualDestoryDate = actualDestoryDate;
}
-
-}
\ No newline at end of file
+
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentRepairDetailDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentRepairDetailDto.java
index f27d47d..ec70d53 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentRepairDetailDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentRepairDetailDto.java
@@ -4,32 +4,32 @@
import java.io.Serializable;
public class EquipmentRepairDetailDto implements Serializable {
-
+
private Long id;
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
private Integer infoTpe;
- //设备ID/外键
+ //设备ID/外键
private Long equipmentId;
- //维修负责人/外键
+ //维修负责人/外键
private Long repairPersonId;
- //维修开始日期
+ //维修开始日期
private Timestamp repairStartDate;
- //维修结束日期
+ //维修结束日期
private Timestamp repairEndDate;
- //维修负责人单位/外键
+ //维修负责人单位/外键
private Long repairPersonDepartmentId;
- //维修情况
+ //维修情况
private String repairMemo;
- //维修状态 1：维修中 2：已修好
- private Integer repairStatus;
- //设施异常项
+ //维修状态 1：维修中 2：已修好
+ private Byte repairStatus;
+ //设施异常项
private String exceptionInfo;
- //创建日期
+ //创建日期
private Timestamp createTime;
- //更新日期
+ //更新日期
private Timestamp updateTime;
-
+
public Long getId() {
return id;
}
@@ -37,7 +37,7 @@
public void setId(Long id) {
this.id = id;
}
- //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
+ //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
public Integer getInfoTpe() {
return infoTpe;
}
@@ -45,7 +45,7 @@
public void setInfoTpe(Integer infoTpe) {
this.infoTpe = infoTpe;
}
- //设备ID/外键
+ //设备ID/外键
public Long getEquipmentId() {
return equipmentId;
}
@@ -53,7 +53,7 @@
public void setEquipmentId(Long equipmentId) {
this.equipmentId = equipmentId;
}
- //维修负责人/外键
+ //维修负责人/外键
public Long getRepairPersonId() {
return repairPersonId;
}
@@ -61,7 +61,7 @@
public void setRepairPersonId(Long repairPersonId) {
this.repairPersonId = repairPersonId;
}
- //维修开始日期
+ //维修开始日期
public Timestamp getRepairStartDate() {
return repairStartDate;
}
@@ -69,7 +69,7 @@
public void setRepairStartDate(Timestamp repairStartDate) {
this.repairStartDate = repairStartDate;
}
- //维修结束日期
+ //维修结束日期
public Timestamp getRepairEndDate() {
return repairEndDate;
}
@@ -77,7 +77,7 @@
public void setRepairEndDate(Timestamp repairEndDate) {
this.repairEndDate = repairEndDate;
}
- //维修负责人单位/外键
+ //维修负责人单位/外键
public Long getRepairPersonDepartmentId() {
return repairPersonDepartmentId;
}
@@ -85,7 +85,7 @@
public void setRepairPersonDepartmentId(Long repairPersonDepartmentId) {
this.repairPersonDepartmentId = repairPersonDepartmentId;
}
- //维修情况
+ //维修情况
public String getRepairMemo() {
return repairMemo;
}
@@ -93,15 +93,15 @@
public void setRepairMemo(String repairMemo) {
this.repairMemo = repairMemo;
}
- //维修状态 1：维修中 2：已修好
- public Integer getRepairStatus() {
+ //维修状态 1：维修中 2：已修好
+ public Byte getRepairStatus() {
return repairStatus;
}
- public void setRepairStatus(Integer repairStatus) {
+ public void setRepairStatus(Byte repairStatus) {
this.repairStatus = repairStatus;
}
- //设施异常项
+ //设施异常项
public String getExceptionInfo() {
return exceptionInfo;
}
@@ -109,7 +109,7 @@
public void setExceptionInfo(String exceptionInfo) {
this.exceptionInfo = exceptionInfo;
}
- //创建日期
+ //创建日期
public Timestamp getCreateTime() {
return createTime;
}
@@ -117,7 +117,7 @@
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
}
- //更新日期
+ //更新日期
public Timestamp getUpdateTime() {
return updateTime;
}
@@ -125,4 +125,4 @@
public void setUpdateTime(Timestamp updateTime) {
this.updateTime = updateTime;
}
-}
\ No newline at end of file
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java
index ad08837..dc9ab22 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java
@@ -8,21 +8,21 @@
import java.util.List;
public class KeypointEquipmentInfoDto implements Serializable {
- //ID
+ //ID
private Long id;
- //类型/类别外键
+ //类型/类别外键
private Long equipmentTypeId;
//类型名称
private String equipmentTypeName;
- //名称
+ //名称
private String name;
- //单位部门外键
+ //单位部门外键
private Long departmentId;
//所属部门名称
private String departmentName;
//具体位置
private String position;
- //负责人姓名
+ //负责人姓名
private String leadingPersonName;
//联系人/外键
private Long connectPersonId;
@@ -61,25 +61,25 @@
public void setResponsibilityPersonName(String responsibilityPersonName) {
this.responsibilityPersonName = responsibilityPersonName;
}
- //装置部位分类 1：关键装置 2：重点部位
- private Integer partType;
- //检查周期
+ //装置部位分类 1：关键装置 2：重点部位
+ private Byte partType;
+ //检查周期
private String checkCycle;
- //应急预案/外键
+ //应急预案/外键
private Long emergencePlanId;
//应急预案名称
private String emergencePlanName;
- //主要危险有害因素
+ //主要危险有害因素
private String dangerousElement;
- //易导致风险
+ //易导致风险
private String toDangerous;
- //应急处置措施
+ //应急处置措施
private String treatment;
- //现场图片
+ //现场图片
private String scenePic;
-
+
private Date createTime;
-
+
private Date updateTime;
public String getDepartmentName() {
@@ -224,7 +224,7 @@
public void setId(Long id) {
this.id = id;
}
- //类型/类别外键
+ //类型/类别外键
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
@@ -232,7 +232,7 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //名称
+ //名称
public String getName() {
return name;
}
@@ -240,7 +240,7 @@
public void setName(String name) {
this.name = name;
}
- //单位部门外键
+ //单位部门外键
public Long getDepartmentId() {
return departmentId;
}
@@ -248,7 +248,7 @@
public void setDepartmentId(Long departmentId) {
this.departmentId = departmentId;
}
- //具体位置
+ //具体位置
public String getPosition() {
return position;
}
@@ -256,7 +256,7 @@
public void setPosition(String position) {
this.position = position;
}
- //负责人姓名
+ //负责人姓名
public String getLeadingPersonName() {
return leadingPersonName;
}
@@ -264,7 +264,7 @@
public void setLeadingPersonName(String leadingPersonName) {
this.leadingPersonName = leadingPersonName;
}
- //联系人/外键
+ //联系人/外键
public Long getConnectPersonId() {
return connectPersonId;
}
@@ -272,7 +272,7 @@
public void setConnectPersonId(Long connectPersonId) {
this.connectPersonId = connectPersonId;
}
- //录入人/外键
+ //录入人/外键
public Long getInputPersonId() {
return inputPersonId;
}
@@ -280,7 +280,7 @@
public void setInputPersonId(Long inputPersonId) {
this.inputPersonId = inputPersonId;
}
- //责任人/外键
+ //责任人/外键
public Long getResponsibilityPersonId() {
return responsibilityPersonId;
}
@@ -288,15 +288,15 @@
public void setResponsibilityPersonId(Long responsibilityPersonId) {
this.responsibilityPersonId = responsibilityPersonId;
}
- //装置部位分类 1：关键装置 2：重点部位
- public Integer getPartType() {
+ //装置部位分类 1：关键装置 2：重点部位
+ public Byte getPartType() {
return partType;
}
- public void setPartType(Integer partType) {
+ public void setPartType(Byte partType) {
this.partType = partType;
}
- //检查周期
+ //检查周期
public String getCheckCycle() {
return checkCycle;
}
@@ -304,7 +304,7 @@
public void setCheckCycle(String checkCycle) {
this.checkCycle = checkCycle;
}
- //应急预案/外键
+ //应急预案/外键
public Long getEmergencePlanId() {
return emergencePlanId;
}
@@ -312,7 +312,7 @@
public void setEmergencePlanId(Long emergencePlanId) {
this.emergencePlanId = emergencePlanId;
}
- //主要危险有害因素
+ //主要危险有害因素
public String getDangerousElement() {
return dangerousElement;
}
@@ -320,7 +320,7 @@
public void setDangerousElement(String dangerousElement) {
this.dangerousElement = dangerousElement;
}
- //易导致风险
+ //易导致风险
public String getToDangerous() {
return toDangerous;
}
@@ -328,7 +328,7 @@
public void setToDangerous(String toDangerous) {
this.toDangerous = toDangerous;
}
- //应急处置措施
+ //应急处置措施
public String getTreatment() {
return treatment;
}
@@ -336,7 +336,7 @@
public void setTreatment(String treatment) {
this.treatment = treatment;
}
- //现场图片
+ //现场图片
public String getScenePic() {
return scenePic;
}
@@ -344,7 +344,7 @@
public void setScenePic(String scenePic) {
this.scenePic = scenePic;
}
-
+
public Date getCreateTime() {
return createTime;
}
@@ -352,7 +352,7 @@
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
-
+
public Date getUpdateTime() {
return updateTime;
}
@@ -387,4 +387,4 @@
this.memo = memo;
}
-}
\ No newline at end of file
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoExcel.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoExcel.java
index a021dfa..e26bc0a 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoExcel.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoExcel.java
@@ -40,7 +40,7 @@
private Long responsibilityPersonId;
//装置部位分类 1：关键装置 2：重点部位
@ExcelCell(index = 9)
- private Integer partType;
+ private Byte partType;
//检查周期
@ExcelCell(index = 10)
private String checkCycle;
@@ -59,9 +59,9 @@
//现场图片
@ExcelCell(index = 15)
private String scenePic;
-
+
private Date createTime;
-
+
private Date updateTime;
public String getDepartmentName() {
@@ -206,7 +206,7 @@
public void setId(Long id) {
this.id = id;
}
- //类型/类别外键
+ //类型/类别外键
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
@@ -214,7 +214,7 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //名称
+ //名称
public String getName() {
return name;
}
@@ -222,7 +222,7 @@
public void setName(String name) {
this.name = name;
}
- //单位部门外键
+ //单位部门外键
public Long getDepartmentId() {
return departmentId;
}
@@ -230,7 +230,7 @@
public void setDepartmentId(Long departmentId) {
this.departmentId = departmentId;
}
- //具体位置
+ //具体位置
public String getPosition() {
return position;
}
@@ -238,7 +238,7 @@
public void setPosition(String position) {
this.position = position;
}
- //负责人姓名
+ //负责人姓名
public String getLeadingPersonName() {
return leadingPersonName;
}
@@ -246,7 +246,7 @@
public void setLeadingPersonName(String leadingPersonName) {
this.leadingPersonName = leadingPersonName;
}
- //联系人/外键
+ //联系人/外键
public Long getConnectPersonId() {
return connectPersonId;
}
@@ -254,7 +254,7 @@
public void setConnectPersonId(Long connectPersonId) {
this.connectPersonId = connectPersonId;
}
- //录入人/外键
+ //录入人/外键
public Long getInputPersonId() {
return inputPersonId;
}
@@ -262,7 +262,7 @@
public void setInputPersonId(Long inputPersonId) {
this.inputPersonId = inputPersonId;
}
- //责任人/外键
+ //责任人/外键
public Long getResponsibilityPersonId() {
return responsibilityPersonId;
}
@@ -270,15 +270,15 @@
public void setResponsibilityPersonId(Long responsibilityPersonId) {
this.responsibilityPersonId = responsibilityPersonId;
}
- //装置部位分类 1：关键装置 2：重点部位
- public Integer getPartType() {
+ //装置部位分类 1：关键装置 2：重点部位
+ public Byte getPartType() {
return partType;
}
- public void setPartType(Integer partType) {
+ public void setPartType(Byte partType) {
this.partType = partType;
}
- //检查周期
+ //检查周期
public String getCheckCycle() {
return checkCycle;
}
@@ -286,7 +286,7 @@
public void setCheckCycle(String checkCycle) {
this.checkCycle = checkCycle;
}
- //应急预案/外键
+ //应急预案/外键
public Long getEmergencePlanId() {
return emergencePlanId;
}
@@ -294,7 +294,7 @@
public void setEmergencePlanId(Long emergencePlanId) {
this.emergencePlanId = emergencePlanId;
}
- //主要危险有害因素
+ //主要危险有害因素
public String getDangerousElement() {
return dangerousElement;
}
@@ -302,7 +302,7 @@
public void setDangerousElement(String dangerousElement) {
this.dangerousElement = dangerousElement;
}
- //易导致风险
+ //易导致风险
public String getToDangerous() {
return toDangerous;
}
@@ -310,7 +310,7 @@
public void setToDangerous(String toDangerous) {
this.toDangerous = toDangerous;
}
- //应急处置措施
+ //应急处置措施
public String getTreatment() {
return treatment;
}
@@ -318,7 +318,7 @@
public void setTreatment(String treatment) {
this.treatment = treatment;
}
- //现场图片
+ //现场图片
public String getScenePic() {
return scenePic;
}
@@ -326,7 +326,7 @@
public void setScenePic(String scenePic) {
this.scenePic = scenePic;
}
-
+
public Date getCreateTime() {
return createTime;
}
@@ -334,7 +334,7 @@
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
-
+
public Date getUpdateTime() {
return updateTime;
}
@@ -342,4 +342,4 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
-}
\ No newline at end of file
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
index e59c480..9ce8518 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
@@ -14,6 +14,10 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.equipment.entity.*;
+import com.gkhy.safePlatform.equipment.enums.EquipmentLifeCycleEnum;
+import com.gkhy.safePlatform.equipment.enums.EquipmentRepairStatusEnum;
+import com.gkhy.safePlatform.equipment.enums.EquipmentResultCodes;
+import com.gkhy.safePlatform.equipment.enums.EquipmentStopStatusEnum;
import com.gkhy.safePlatform.equipment.excepiton.EquipmentException;
import com.gkhy.safePlatform.equipment.model.dto.req.*;
import com.gkhy.safePlatform.equipment.model.dto.resp.EquipmentInfoDto;
@@ -235,6 +239,10 @@
@Override
public void addOrUpdate(EquipmentInfoSaveOrUpdate infoDto) {
+
+ // 验证枚举
+ checkEnum(infoDto);
+
if(infoDto.getInfoType() == null || infoDto.getEquipmentTypeId() == null){
throw new EquipmentException(ResultCodes.CLIENT_PARAM_ILLEGAL);
}
@@ -559,4 +567,23 @@
ExcelUtil.exportExcel(map,respList , response.getOutputStream(),DateUtils.PATTERN_STANDARD);
response.getOutputStream().close();
}
-}
\ No newline at end of file
+
+
+ /**
+ * 枚举验证
+ * @param infoDto
+ */
+ public void checkEnum(EquipmentInfoSaveOrUpdate infoDto){
+ if (EquipmentLifeCycleEnum.getByCode(infoDto.getLifeCycle()) == null) {
+ throw new EquipmentException(EquipmentResultCodes.EQUIPMENT_ENUM_LIFE_CYCLE_NOT_EXIST);
+ }
+
+ if (EquipmentRepairStatusEnum.getByCode(infoDto.getRepairStatus()) == null) {
+ throw new EquipmentException(EquipmentResultCodes.EQUIPMENT_ENUM_STOP_STATUS_NOT_EXIST);
+ }
+
+ if (EquipmentStopStatusEnum.getByCode(infoDto.getStopStatus()) == null) {
+ throw new EquipmentException(EquipmentResultCodes.EQUIPMENT_ENUM_REPAIR_STATUS_NOT_EXIST);
+ }
+ }
+}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
index 160a22a..b17ee7e 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
import com.gkhy.safePlatform.equipment.entity.*;
+import com.gkhy.safePlatform.equipment.enums.EquipmentResultCodes;
+import com.gkhy.safePlatform.equipment.enums.KeypointEquipmentPartTypeEnum;
import com.gkhy.safePlatform.equipment.excepiton.EquipmentException;
import com.gkhy.safePlatform.equipment.model.dto.req.*;
import com.gkhy.safePlatform.equipment.model.dto.resp.KeypointEquipmentInfoExcel;
@@ -77,7 +79,7 @@
@Autowired
public HttpServletResponse response;
-
+
@Override
public ResultVO queryAll(PageQuery<KeypointEquipmentInfoQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
@@ -241,6 +243,10 @@
@Override
public void addOrUpdate(KeypointEquipmentInfoDto infoDto) {
+
+ // 验证枚举
+ checkEnum(infoDto);
+
KeypointEquipmentInfo equipmentInfo = BeanCopyUtils.copyBean(infoDto, KeypointEquipmentInfo.class);
//保存主数据
if (infoDto.getId() == null) { //新增
@@ -453,4 +459,14 @@
ExcelUtil.exportExcel(map,respList , response.getOutputStream(),DateUtils.PATTERN_STANDARD);
response.getOutputStream().close();
}
-}
\ No newline at end of file
+
+ /**
+ * 枚举验证
+ * @param infoDto
+ */
+ public void checkEnum(KeypointEquipmentInfoDto infoDto){
+ if (KeypointEquipmentPartTypeEnum.getByCode(infoDto.getPartType()) == null) {
+ throw new EquipmentException(EquipmentResultCodes.KEYPOINT_EQUIPMENT_ENUM_PART_TYPE_NOT_EXIST);
+ }
+ }
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java
index 17e5f19..83a5405 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java
@@ -53,7 +53,7 @@
return this.examineMngService.queryAll(pageQuery);
}
-
+
/**
* 通过主键查询单条数据
@@ -76,9 +76,9 @@
@PostMapping(value = "/addOrUpdate")
public ResultVO update(Authentication authentication, @RequestBody ExamineMng examineMng) {
// 获取当前用户
- ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+/* ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
examineMng.setExamineDepartmentId(currentUser.getDepId());
- examineMng.setExaminePersonId(currentUser.getUid());
+ examineMng.setExaminePersonId(currentUser.getUid());*/
if (examineMng.getId() == null) {
return new ResultVO<>(ResultCodes.OK,examineMngBaseService.save(examineMng));
} else {
@@ -117,4 +117,4 @@
System.out.println(JSONObject.toJSONString(examineTemplateSaveOrUpdate));
}
-}
\ No newline at end of file
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java
index 61f10a3..dfd8048 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java
@@ -64,7 +64,7 @@
return this.rewardPunishmentDetailService.queryAll(pageQuery);
}
-
+
/**
* 通过主键查询单条数据
@@ -134,4 +134,4 @@
rewardPunishmentDetailService.exportData(queryCriteria);
}
-}
\ No newline at end of file
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
index e8904ce..a3f24ba 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
@@ -11,6 +11,9 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.targetDuty.entity.TargetDivideDetail;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
+import com.gkhy.safePlatform.targetDuty.enums.TargetDutyResultCodes;
+import com.gkhy.safePlatform.targetDuty.enums.TargetMngLevelEnum;
+import com.gkhy.safePlatform.targetDuty.excepiton.TargetDutyException;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetCheckAndSubmitQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetMngImportExcel;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetMngQueryCriteria;
@@ -72,7 +75,7 @@
return this.targetMngService.queryAll(pageQuery);
}
-
+
/**
* 通过主键查询单条数据
@@ -93,6 +96,10 @@
*/
@PostMapping(value = "/addOrUpdate")
public ResultVO update(@RequestBody TargetMng targetMng) {
+
+ if (TargetMngLevelEnum.getByCode(targetMng.getLevel())==null){
+ throw new TargetDutyException(TargetDutyResultCodes.TARGET_MNG_ENUM_LEVEL_NOT_EXIST);
+ }
if( !StringUtils.hasText(targetMng.getqName()) || !StringUtils.hasText(targetMng.getIndexNum())
|| !StringUtils.hasText(targetMng.getYear()) || !StringUtils.hasText(targetMng.getValue())
@@ -182,7 +189,7 @@
mng.setIndexNum("3");
mng.setYear("2021");
mng.setValue("312");
- mng.setLevel(1);
+ mng.setLevel((byte)1);
mng.setCompleteDate(new Timestamp(new java.util.Date().getTime()));
mng.setMemo("发发发");
mng.setTargetType(0);
@@ -190,4 +197,4 @@
System.out.println(JSONObject.toJSONString(mng));
}
-}
\ No newline at end of file
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
index 1f678ee..1788346 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
@@ -16,8 +16,8 @@
@SuppressWarnings("serial")
@TableName("target_mng")
public class TargetMng extends BaseDomain {
-
-
+
+
@TableId(type = IdType.AUTO)
private Long id;
public Long getId() {
@@ -41,7 +41,7 @@
//目标指标编号
private String indexNum;
-
+
public String getIndexNum() {
return indexNum;
}
@@ -51,7 +51,7 @@
}
//年度
private String year;
-
+
public String getYear() {
return year;
}
@@ -61,7 +61,7 @@
}
//指标值
private String value;
-
+
public String getValue() {
return value;
}
@@ -71,7 +71,7 @@
}
//1:大于 2：等于 3：小于
private Integer valueSign;
-
+
public Integer getValueSign() {
return valueSign;
}
@@ -80,19 +80,19 @@
this.valueSign = valueSign;
}
//指标级别 1:公司级 2:部门分厂级 3:工段班组级
- private Integer level;
-
- public Integer getLevel() {
+ private Byte level;
+
+ public Byte getLevel() {
return level;
}
- public void setLevel(Integer level) {
+ public void setLevel(Byte level) {
this.level = level;
}
//完成期限
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp completeDate;
-
+
public Timestamp getCompleteDate() {
return completeDate;
}
@@ -102,7 +102,7 @@
}
//备注信息
private String memo;
-
+
public String getMemo() {
return memo;
}
@@ -112,7 +112,7 @@
}
//指标类型 1:年指标 2:月指标 3:半年 4:季度
private Integer targetType;
-
+
public Integer getTargetType() {
return targetType;
}
@@ -122,7 +122,7 @@
}
//分解状态 1:已分解 2:未分解
private Integer divideStatus;
-
+
public Integer getDivideStatus() {
return divideStatus;
}
@@ -132,7 +132,7 @@
}
//目标制定部门
private Long makerDepartmentId;
-
+
public Long getMakerDepartmentId() {
return makerDepartmentId;
}
@@ -142,7 +142,7 @@
}
//是否删除 0:未删除 1:删除
private Integer delFlag;
-
+
public Integer getDelFlag() {
return delFlag;
}
@@ -150,5 +150,5 @@
public void setDelFlag(Integer delFlag) {
this.delFlag = delFlag;
}
-
-}
\ No newline at end of file
+
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java
index e268017..2f09e43 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java
@@ -14,6 +14,9 @@
APPROVE_NOT_EXIST("A1005" , "审批记录不存在"),
+ TARGET_MNG_ENUM_LEVEL_NOT_EXIST("T1000","目标设置指标级别类型异常"),
+
+
ERROR("A3000", "未知错误");
private String code;
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetMngLevelEnum.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetMngLevelEnum.java
new file mode 100644
index 0000000..cc29aee
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetMngLevelEnum.java
@@ -0,0 +1,49 @@
+package com.gkhy.safePlatform.targetDuty.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum TargetMngLevelEnum {
+
+
+ Level_ONE((byte) 1, "公司级"),
+ Level_TWO((byte) 2, "部门分厂级"),
+ Level_THREE((byte) 3, "工段班组级");
+
+
+ private Byte code;
+ private String value;
+
+ TargetMngLevelEnum(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, TargetMngLevelEnum> toMap() {
+ Map<Byte, TargetMngLevelEnum> map = new HashMap();
+ for (TargetMngLevelEnum accidentExpressEnum : TargetMngLevelEnum.values()) {
+ map.put(accidentExpressEnum.getCode(), accidentExpressEnum);
+ }
+ return map;
+ }
+ public static TargetMngLevelEnum getByCode(Byte code){
+ return toMap().get(code);
+ }
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java
index 9f172e8..61e6c6b 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java
@@ -8,29 +8,29 @@
import java.util.List;
public class TargetMngDto implements Serializable {
-
+
private Long id;
- //安全目标指标
+ //安全目标指标
private String qName;
- //目标指标编号
+ //目标指标编号
private String indexNum;
- //年度
+ //年度
private String year;
- //指标值
+ //指标值
private String value;
- //指标级别 1:公司级 2:部门分厂级 3:工段班组级
- private Integer level;
- //完成期限
+ //指标级别 1:公司级 2:部门分厂级 3:工段班组级
+ private Byte level;
+ //完成期限
private Timestamp completeDate;
- //备注信息
+ //备注信息
private String memo;
- //指标类型 1:年指标 2:月指标
+ //指标类型 1:年指标 2:月指标
private Integer targetType;
- //分解状态 1:已分解 2:未分解
+ //分解状态 1:已分解 2:未分解
private Integer divideStatus;
-
+
private Timestamp createTime;
-
+
private Timestamp updateTime;
//目标指标分解列表
@@ -68,7 +68,7 @@
public void setIndexNum(String indexNum) {
this.indexNum = indexNum;
}
- //年度
+ //年度
public String getYear() {
return year;
}
@@ -76,7 +76,7 @@
public void setYear(String year) {
this.year = year;
}
- //指标值
+ //指标值
public String getValue() {
return value;
}
@@ -84,15 +84,15 @@
public void setValue(String value) {
this.value = value;
}
- //指标级别 1:公司级 2:部门分厂级 3:工段班组级
- public Integer getLevel() {
+ //指标级别 1:公司级 2:部门分厂级 3:工段班组级
+ public Byte getLevel() {
return level;
}
- public void setLevel(Integer level) {
+ public void setLevel(Byte level) {
this.level = level;
}
- //完成期限
+ //完成期限
public Timestamp getCompleteDate() {
return completeDate;
}
@@ -100,7 +100,7 @@
public void setCompleteDate(Timestamp completeDate) {
this.completeDate = completeDate;
}
- //备注信息
+ //备注信息
public String getMemo() {
return memo;
}
@@ -108,7 +108,7 @@
public void setMemo(String memo) {
this.memo = memo;
}
- //指标类型 1:年指标 2:月指标
+ //指标类型 1:年指标 2:月指标
public Integer getTargetType() {
return targetType;
}
@@ -116,7 +116,7 @@
public void setTargetType(Integer targetType) {
this.targetType = targetType;
}
- //分解状态 1:已分解 2:未分解
+ //分解状态 1:已分解 2:未分解
public Integer getDivideStatus() {
return divideStatus;
}
@@ -124,7 +124,7 @@
public void setDivideStatus(Integer divideStatus) {
this.divideStatus = divideStatus;
}
-
+
public Timestamp getCreateTime() {
return createTime;
}
@@ -132,7 +132,7 @@
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
}
-
+
public Timestamp getUpdateTime() {
return updateTime;
}
@@ -174,4 +174,4 @@
public void setValueSign(Integer valueSign) {
this.valueSign = valueSign;
}
-}
\ No newline at end of file
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java
index 4e6e41e..37da8c6 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java
@@ -1,6 +1,7 @@
package com.gkhy.safePlatform.targetDuty.schedule;
import com.gkhy.safePlatform.targetDuty.service.TargetTypeService;
+import com.gkhy.safePlatform.targetDuty.service.baseService.TargetTypeBaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.EnableScheduling;
@@ -14,14 +15,13 @@
public class KeepAliveRobot {
@Autowired
- private TargetTypeService targetTypeService;
+ private TargetTypeBaseService targetTypeBaseService;
// 30m
@Scheduled(cron = "0 0/30 * * * ?")
public void keepAlive(){
//
-// targetTypeService.getById(-1L);
-
+ targetTypeBaseService.getById(1L);
}
}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
index dbb18c1..c22edb7 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
@@ -51,8 +51,8 @@
@Resource
private CommonService commonService;
-
-
+
+
@Override
public ResultVO queryAll(PageQuery<ExamineMngQueryCriteria> pageQuery) {
PageUtils.checkCheck(pageQuery);
@@ -135,19 +135,21 @@
List<CurrentExamineDto> list = JSONObject.parseArray( examineMng.getNumberDetailJson(), CurrentExamineDto.class);
List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList());
- List<ExamineItem> itemList = examineItemBaseService.selectBatchIds(idList);
- Map<Long,ExamineItem> itemMap = itemList.stream().collect(
- Collectors.toMap(ExamineItem::getId, Function.identity(),(k1, k2)->k1));
+ if(!idList.isEmpty()) {
+ List<ExamineItem> itemList = examineItemBaseService.selectBatchIds(idList);
+ Map<Long, ExamineItem> itemMap = itemList.stream().collect(
+ Collectors.toMap(ExamineItem::getId, Function.identity(), (k1, k2) -> k1));
- if(itemMap != null){
- list.forEach(f->{
- ExamineItem item = itemMap.get(f.getId());
- if(item != null){
- f.setItemDetail(item.getItemDetail());
- f.setContent(item.getContent());
- f.setJudgeStandard(item.getJudgeStandard());
- }
- });
+ if (itemMap != null) {
+ list.forEach(f -> {
+ ExamineItem item = itemMap.get(f.getId());
+ if (item != null) {
+ f.setItemDetail(item.getItemDetail());
+ f.setContent(item.getContent());
+ f.setJudgeStandard(item.getJudgeStandard());
+ }
+ });
+ }
}
dto.setCurrentExamineDtoList(list);
@@ -177,4 +179,4 @@
});
examineMngBaseService.updateBatchById(delList);
}
-}
\ No newline at end of file
+}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
index 5e23054..19ecf01 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
@@ -386,5 +386,9 @@
response.getOutputStream().close();
}
+ public void checkEnum(){
+
+ }
+
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java
index 7383f51..afcdf3b 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java
@@ -87,8 +87,8 @@
* 事故快报伤亡人员删除
*/
@RequestMapping(value = "/casualty/del/{accidentExpressId}",method = RequestMethod.GET)
- public ResultVO delAccidentExpressCasualty(@PathVariable("accidentExpressId")Long accidentExpressId){
- return accidentExpressService.delAccidentExpressCasualty(accidentExpressId);
+ public ResultVO delAccidentExpressCasualty(@PathVariable("accidentExpressId")Long id){
+ return accidentExpressService.delAccidentExpressCasualty(id);
}
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java
index 90cd55d..d2b79c2 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java
@@ -28,5 +28,5 @@
ResultVO addAccidentExpressCasualty(Long uid, AccidentExpressCasualtyReqDTO accidentExpressCasualtyReqDTO);
- ResultVO delAccidentExpressCasualty(Long accidentExpressId);
+ ResultVO delAccidentExpressCasualty(Long id);
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
index f67fef8..07305fb 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
@@ -273,8 +273,8 @@
}
@Override
- public ResultVO delAccidentExpressCasualty(Long accidentExpressId) {
- accidentExpressCasualtyInfoService.deleteAccidentExpressCasualtyById(accidentExpressId);
+ public ResultVO delAccidentExpressCasualty(Long id) {
+ accidentExpressCasualtyInfoService.deleteAccidentExpressCasualtyById(id);
return new ResultVO(ResultCodes.OK);
}
diff --git a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
index 22d4d4c..2a78a57 100644
--- a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
+++ b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
@@ -249,7 +249,8 @@
AND a.gmt_create <![CDATA[ <= ]]> #{endTime}
GROUP BY
DATE_FORMAT( a.gmt_create, '%Y-%m' ),
- a.accident_level
+ a.accident_level,
+ DATE_FORMAT( a.gmt_create, '%m' )
</select>
<select id="getCountForRPCByDeptIdAndDay" resultMap="accidentReportCountRPC">
@@ -271,6 +272,7 @@
AND a.gmt_create <![CDATA[ <= ]]> #{endTime}
GROUP BY
DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ),
- a.accident_level
+ a.accident_level,
+ DATE_FORMAT( a.gmt_create, '%d' )
</select>
</mapper>
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
index 34b0627..1f344b6 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -32,7 +32,7 @@
type: com.alibaba.druid.pool.DruidDataSource
equipment:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.dev?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: gkhy_dev_out_team
password: Adsdf675T6AC7yga
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/safePlatfrom-out-web/src/main/resources/config/application.yaml b/safePlatfrom-out-web/src/main/resources/config/application.yaml
index 017f989..8f11917 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application.yaml
@@ -2,7 +2,7 @@
application:
name: safeplatform-out
profiles:
- active: guotai-uat
+ active: dev
# active: guotai-demo
#### test uat guotai-demo guotai-uat
# active: test
--
Gitblit v1.9.2