safePlatform-out.git

Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-09-21 fee66fde68610850d4c8c52df022b9d53a0cd3f7

分支
用户	zhangfeng <1603559716@qq.com>
	星期三, 九月 21, 2022 14:40 +0800
提交者	zhangfeng <1603559716@qq.com>
	星期三, 九月 21, 2022 14:40 +0800
提交	fee66fde68610850d4c8c52df022b9d53a0cd3f7
目录	0b0bebfda05ab850d6f2f2a7e8971cc9de10db40 目录 \| zip \| gz
上一版本	35efe5ba67712e6f850759ccfca9c5b4c0ed31c7 查看 \| 对比 9f122a41255d18f04a82d8be3b038a95c2c18d95 查看 \| 对比

Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

 Conflicts:
	safePlatfrom-out-web/src/main/resources/config/application-dev.yaml

已修改80个文件

已添加5个文件

	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java	37 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanLogReqDTO.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java	22 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java	85 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java	42 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanPageRespDTO.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java	26 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java	9 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java	14 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanLogQuery.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesInspectQuery.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesMaintainQuery.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesQuery.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java	134 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java	38 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentLifeCycleEnum.java	48 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentRepairStatusEnum.java	47 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentResultCodes.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentStopStatusEnum.java	49 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/KeypointEquipmentPartTypeEnum.java	47 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java	106 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java	178 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java	56 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoImportExcel.java	38 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java	208 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoExcel.java	112 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentRepairDetailDto.java	56 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java	70 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoExcel.java	46 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java	29 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java	36 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetMngLevelEnum.java	49 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java	50 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java	32 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	safePlatfrom-out-web/src/main/resources/config/application-dev.yaml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	safePlatfrom-out-web/src/main/resources/config/application.yaml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史