Browse code Merge branch 'master' of http://111.198.10.15:12003/gitbucket/git/smartwell2.0/casic-smartcity dz gz master zq
commit 2874102d661bac4b4c04eee2100e13fb555edf2b 2 parents 027c1ab + bf1f614 liwenhao authored on 12 Jul 2022

Showing 66 changed files

• casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
• casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
• casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
• casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java
• casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
• casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java
• casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
• casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java
• casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
• casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
• casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java
• casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java
• casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
• casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
• casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java
• casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
• casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
• casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
• casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
• casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
• casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
• casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
• casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
• casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
• casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
• casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
• casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
• casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
• casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
• casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java
• casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
• casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java
• casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
• casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java
• casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
• casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java
• casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java
• casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
• casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
• casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
• casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java
• casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java
• casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java
• casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java
• casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java
• casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java
• casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
• casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
• casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
• casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
• casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
• casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
• casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
• casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java
• casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
• casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
• casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
• casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
• casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
• casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
• casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
• casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
• casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
• casic-web/src/main/resources/config/temp/device_template.xlsx
• casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx
• casic-web/src/main/resources/config/temp/sluicewell_template.xlsx

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java 0 → 100644

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml 0 → 100644

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java

Ignore Space Show notes View casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java

Ignore Space Show notes View casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java

Ignore Space Show notes View casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java

Ignore Space Show notes View casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java 0 → 100644

Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java 100644 → 0

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java 0 → 100644

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceImeiMapper.java 0 → 100644

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTypeMapper.java

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml 0 → 100644

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceImei.java 0 → 100644

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java 0 → 100644

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java 0 → 100644

Ignore Space Show notes View casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java

Ignore Space Show notes View casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java

Ignore Space Show notes View casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java

Ignore Space Show notes View casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java

Ignore Space Show notes View casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java

Ignore Space Show notes View casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java

Ignore Space Show notes View casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java

Ignore Space Show notes View casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java

Ignore Space Show notes View casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java

Ignore Space Show notes View casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java

Ignore Space Show notes View casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java 0 → 100644

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java 0 → 100644

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml 0 → 100644

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java 0 → 100644

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java 0 → 100644

Ignore Space Show notes View casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java

Ignore Space Show notes View casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml

Ignore Space Show notes View casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx
Not supported

Ignore Space Show notes View casic-web/src/main/resources/config/temp/device_template.xlsx
Not supported

Ignore Space Show notes View casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx
Not supported

Ignore Space Show notes View casic-web/src/main/resources/config/temp/sluicewell_template.xlsx
Not supported

Show line notes below