parent: 571872 | patch | commitdiff
jinpengyong
2023-08-22 6eb8f65d4a69a550945a92cc916d3c63dee739fa
refs
author jinpengyong <jpy123456>
Tuesday, August 22, 2023 16:55 +0800
committer jinpengyong <jpy123456>
Tuesday, August 22, 2023 16:55 +0800
commit6eb8f65d4a69a550945a92cc916d3c63dee739fa
tree 946f1ba068f1544cd472e2b620b6746fac37e0f6 tree | zip | gz
parent 571872dd803244bcef2b789e93f3061af00db402 view | diff
e6f974ca6eab798c2df5c09cdb8320ecf4ff4185 view | diff 
Merge remote-tracking branch 'origin/wb_21' into qa
1 files added
32 files modified
824 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java 10 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/dto/CityAqiDailyListDTO.java 27 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java 7 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java 10 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/AlarmInfoMapper.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/CityAqiDailyMapper.java 9 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/CityAqiMapper.java 10 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java 13 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/DeviceService.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/AlarmInfoServiceImpl.java 23 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java 86 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 19 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java 28 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java 7 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java 8 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/websocket/SingleDeviceServer.java 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/application-dev.yml 12 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/AlarmInfoMapper.xml 89 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/CityAqiDailyMapper.xml 18 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/CityAqiMapper.xml 12 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/DeviceMapper.xml 145 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/controller/PubController.java 6 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java 3 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java 131 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java 11 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/application-dev.yml 12 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/TestController.java 10 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java 16 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java 13 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java 68 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/application-dev.yml 12 ●●●●● diff | view | raw | blame | history