章丘合并初始提交

Merge branch 'zq' ...

# Conflicts:
#	casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
#	casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java
#	casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
#	casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
#	casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java
#	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/StatisticMapper.xml
#	casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
#	casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
#	casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
#	casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
#	casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
#	casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
#	casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
#	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/rs/LiquidRequest.java
#	casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java
#	casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java
#	casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java
#	casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellCoverServiceImpl.java
#	casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellliquidServiceImpl.java
#	casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
#	casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
#	casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.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/impl/TenantDeptServiceImpl.java
#	casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
#	casic-web/pom.xml
#	casic-web/src/main/resources/config/application-dev.yml
#	casic-web/src/main/resources/config/temp/busConcentrator_template.xlsx
#	casic-web/src/main/resources/config/temp/sluicewell_template.xlsx
#	pom.xml

管线查询时间优化

20240418问题修改提交

泄漏分析增加下游阀门信息

泄漏分析增加下游阀门信息

泄漏分析数据录入后调整提交

合并后提交

Merge branch 'zq' of http://111.198.10.15:12003/gitbucket/git/smartwell2.0/casic-smartcity into zq ...

Conflicts:

	casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml

迭代测试提交

1.导出问题修复

关阀分析和管线录入功能提交

Merge branch 'zq' of http://111.198.10.15:12003/gitbucket/git/smartwell2.0/casic-smartcity into zq

管线增加经纬度接口

1.设备最新数据导出修改

Merge branch 'zq' of http://111.198.10.15:12003/gitbucket/git/smartwell2.0/casic-smartcity into zq

管线增加经纬度接口

1.代码优化

Merge branch 'zq' of http://111.198.10.15:12003/gitbucket/git/smartwell2.0/casic-smartcity into zq

1.设备数据上报情况导出添加

Merge branch 'zq' of http://111.198.10.15:12003/gitbucket/git/smartwell2.0/casic-smartcity into zq

imei号详情获取请求路径修改

1.告警数据导出接口添加

Merge branch 'zq' of http://111.198.10.15:12003/gitbucket/git/smartwell2.0/casic-smartcity into zq

1.sim卡导出添加 ...

2.设备最新数据导出添加

燃气添加信号强度字段

测试问题修改

测试问题修改

配置时间格式调整

添加燃气和压力自研设备相关功能模块