Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/zhoutian/casic-PTZ into dev
Conflicts: casic-common/src/main/java/com/casic/missiles/weigeng/CommDoorUtil.java casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java |
---|
casic-common/pom.xml |
---|
casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java |
---|
casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java |
---|
casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java 0 → 100644 |
---|
casic-common/src/main/java/com/casic/missiles/enums/StatusEnum.java |
---|
casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java |
---|
casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java |
---|
casic-common/src/main/java/com/casic/missiles/es/EsDataFactory.java 0 → 100644 |
---|
casic-data/pom.xml |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordMapper.java |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java 0 → 100644 |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmCancelRequest.java |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordResponse.java |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java 0 → 100644 |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java |
---|
casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/DataGasServiceImpl.java |
---|
casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceptionController.java 0 → 100644 |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/dto/TaskCommon.java |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/job/StartTaskJob.java |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/job/StopTaskJob.java |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/service/IReceptionService.java 0 → 100644 |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java 0 → 100644 |
---|
casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/BusMonipoiInfoResponse.java 0 → 100644 |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorBaseInfo.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorOverviewMap.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorPointList.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusObserpoiInfoService.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java |
---|
casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java |
---|
casic-web/pom.xml |
---|
casic-web/src/main/java/com/casic/missiles/config/WebMvcConfig.java 0 → 100644 |
---|
casic-web/src/main/resources/config/application-dev.yml |
---|
casic-web/src/main/resources/config/application.yml |
---|
casic-web/src/main/resources/logback-spring.xml |
---|