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
dev
commit 8d022fcbfedb49e17c747f1682a7b0fa53e22a09
2 parents d3228fd + 1d31d4e
casic_zt authored on 5 Jul 2024
Showing 69 changed files
View
casic-common/pom.xml
View
casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
View
casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java
View
casic-common/src/main/java/com/casic/missiles/enums/ExportEnum.java 0 → 100644
View
casic-common/src/main/java/com/casic/missiles/enums/StatusEnum.java
View
casic-common/src/main/java/com/casic/missiles/es/ElasticSearchQuery.java
View
casic-common/src/main/java/com/casic/missiles/es/ElasticSearchUtil.java
View
casic-common/src/main/java/com/casic/missiles/es/EsDataFactory.java 0 → 100644
View
casic-data/pom.xml
View
casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
View
casic-data/src/main/java/com/casic/missiles/modular/system/controller/BusPatrolLogController.java
View
casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
View
casic-data/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordMapper.java
View
casic-data/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordMapper.xml
View
casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java 0 → 100644
View
casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmCancelRequest.java
View
casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmRecordResponse.java
View
casic-data/src/main/java/com/casic/missiles/modular/system/dto/BusPatrolLogResponse.java 0 → 100644
View
casic-data/src/main/java/com/casic/missiles/modular/system/model/AlarmRecord.java
View
casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java
View
casic-data/src/main/java/com/casic/missiles/modular/system/service/IBusPatrolLogService.java
View
casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java
View
casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
View
casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/BusPatrolLogServiceImpl.java
View
casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/DataGasServiceImpl.java
View
casic-server/src/main/java/com/casic/missiles/config/WebSocketConfig.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/controller/ReceptionController.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
View
casic-server/src/main/java/com/casic/missiles/modular/system/dto/TaskCommon.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/job/StartTaskJob.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/job/StopTaskJob.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/model/BusPlan.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/service/IHCNetService.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/service/IReceptionService.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
View
casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ReceptionServiceImpl.java 0 → 100644
View
casic-server/src/main/java/com/casic/missiles/modular/system/util/PoolConfig.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
View
casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
View
casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml
View
casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/BusMonipoiInfoResponse.java 0 → 100644
View
casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorBaseInfo.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorOverviewMap.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorPointList.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusObserpoiInfoService.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java
View
casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java
View
casic-web/pom.xml
View
casic-web/src/main/java/com/casic/missiles/config/WebMvcConfig.java 0 → 100644
View
casic-web/src/main/resources/config/application-dev.yml
View
casic-web/src/main/resources/config/application.yml
View
casic-web/src/main/resources/logback-spring.xml