于紫祥_1901
2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5
refs
author 于紫祥_1901 <email@yuzixiang_1910>
Wednesday, December 23, 2020 13:55 +0800
committer 于紫祥_1901 <email@yuzixiang_1910>
Wednesday, December 23, 2020 13:55 +0800
commite745dd38c5a413eaa000c7c5434621fbcd1800d5
tree 4f727ea7e98edfd3829b9e1fcf7559ee11df33fe tree | zip | gz
parent 94d4a4e7600665f6b40b6d791b798b498196191b view | diff
78380a1efa78bd88f5d1be502971eae6fef07cd0 view | diff
Merge remote-tracking branch 'origin/master'
4 files added
10 files modified
1671 ■■■■ changed files
src/main/java/com/moral/config/WebSocketConfig.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/AlarmController.java 4 ●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/DeviceController.java 4 ●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/ScreenController.java 615 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/HistoryFiveMinutelyMapper.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/HistoryFiveMinutelyService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/HistoryFiveMinutelyServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/HistoryServiceImpl.java 14 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/util/WindUtils.java 58 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/webSocketServer/BSAQIWebSocketServerTest.java 173 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/HistoryFiveMinutelyMapper.xml 15 ●●●●● diff | view | raw | blame | history
src/main/webapp/img/sensorLevel.png diff | view | raw | blame | history
src/main/webapp/view/cartrajectoryNew.jsp 566 ●●●●● diff | view | raw | blame | history
src/main/webapp/view/unorganizedMapV2.jsp 209 ●●●●● diff | view | raw | blame | history