国泰新华安全平台-外包
parent: 35efe5 | patch | commitdiff
zhangfeng
2022-09-21 fee66fde68610850d4c8c52df022b9d53a0cd3f7
refs
author zhangfeng <1603559716@qq.com>
Wednesday, September 21, 2022 14:40 +0800
committer zhangfeng <1603559716@qq.com>
Wednesday, September 21, 2022 14:40 +0800
commitfee66fde68610850d4c8c52df022b9d53a0cd3f7
tree 0b0bebfda05ab850d6f2f2a7e8971cc9de10db40 tree | zip | gz
parent 35efe5ba67712e6f850759ccfca9c5b4c0ed31c7 view | diff
9f122a41255d18f04a82d8be3b038a95c2c18d95 view | diff 
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 files modified
5 files added
2135 ■■■■■ changed files
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java 3 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java 4 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java 10 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java 37 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java 14 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java 36 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanLogReqDTO.java 4 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java 24 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java 6 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java 5 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java 6 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java 5 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java 22 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java 14 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java 10 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java 4 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java 85 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java 16 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java 16 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java 18 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java 42 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanPageRespDTO.java 12 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java 24 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java 11 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java 11 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java 26 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java 8 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java 6 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java 5 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java 8 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java 6 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java 5 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java 9 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java 20 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java 14 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java 10 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java 4 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java 3 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java 1 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java 2 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanLogQuery.java 2 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java 4 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesInspectQuery.java 2 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesMaintainQuery.java 2 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesQuery.java 1 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java 2 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java 8 ●●●●● diff | view | raw | blame | history
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml 6 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java 12 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java 8 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java 134 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java 38 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java 8 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentLifeCycleEnum.java 48 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentRepairStatusEnum.java 47 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentResultCodes.java 7 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/EquipmentStopStatusEnum.java 49 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/enums/KeypointEquipmentPartTypeEnum.java 47 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoImportExcel.java 106 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoSaveOrUpdate.java 178 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java 56 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoImportExcel.java 38 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java 208 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoExcel.java 112 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentRepairDetailDto.java 56 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java 70 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoExcel.java 46 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java 29 ●●●●● diff | view | raw | blame | history
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java 20 ●●●●● diff | view | raw | blame | history
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java 8 ●●●●● diff | view | raw | blame | history
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java 4 ●●●●● diff | view | raw | blame | history
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java 13 ●●●●● diff | view | raw | blame | history
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java 36 ●●●●● diff | view | raw | blame | history
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java 3 ●●●●● diff | view | raw | blame | history
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetMngLevelEnum.java 49 ●●●●● diff | view | raw | blame | history
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetMngDto.java 50 ●●●●● diff | view | raw | blame | history
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java 6 ●●●●● diff | view | raw | blame | history
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java 32 ●●●●● diff | view | raw | blame | history
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java 4 ●●●●● diff | view | raw | blame | history
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java 2 ●●●●● diff | view | raw | blame | history
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml 6 ●●●●● diff | view | raw | blame | history
safePlatfrom-out-web/src/main/resources/config/application-dev.yaml 2 ●●●●● diff | view | raw | blame | history
safePlatfrom-out-web/src/main/resources/config/application.yaml 2 ●●●●● diff | view | raw | blame | history