工业级后台API v2
parent: 8beab9 | patch | commitdiff
kaiyu
2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1
refs
author kaiyu <404897439@qq.com>
Wednesday, November 18, 2020 14:18 +0800
committer kaiyu <404897439@qq.com>
Wednesday, November 18, 2020 14:18 +0800
commit8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1
tree d2c5d6fc6b729f576f6d842a239698143edf3d36 tree | zip | gz
parent 8beab91730f3e3cd6b53e4d498f763ff9dc65ef5 view | diff
7e25fda3cfb8a7fc785cb6261a888671fb146fbe view | diff 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java
13 files modified
2720 ■■■■■ changed files
src/main/java/com/moral/controller/DeviceController.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/ScreenController.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/SensorController.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/HistoryMapper.java 51 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/SensorMapper.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/SensorService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/DeviceServiceImpl.java 2264 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java 216 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/HistoryServiceImpl.java 112 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/SensorServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/HistoryHourlyMapper.xml 7 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/HistoryMapper.xml 29 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/SensorMapper.xml 9 ●●●●● diff | view | raw | blame | history