工业级后台API v2
parent: e81c51 | patch | commitdiff
沈斌
2018-01-30 b4cabe178f1a36433270c79048beecfab0edc487
refs
author 沈斌 <bluelazysb@hotmail.com>
Tuesday, January 30, 2018 17:20 +0800
committer 沈斌 <bluelazysb@hotmail.com>
Tuesday, January 30, 2018 17:20 +0800
commitb4cabe178f1a36433270c79048beecfab0edc487
tree 59412dc5db0ff922684d400f18b534eaf8b4f546 tree | zip | gz
parent e81c5152ca27f66f264b30f2d36fd4082689ac79 view | diff
24b5764532e012274759d71ed02844ad2eb901e4 view | diff 
Merge remote-tracking branch 'origin/master'
4 files added
13 files modified
1145 ■■■■■ changed files
src/main/java/com/moral/controller/ReportController.java 82 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/ScreenController.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/DataMapper.java 12 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/DeviceMapper.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/HistoryMapper.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/SensorMapper.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/DataService.java 15 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/DeviceService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/HistoryService.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/DataServiceImpl.java 440 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/DeviceServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/impl/HistoryServiceImpl.java 125 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/DataMapper.xml 47 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/DeviceMapper.xml 30 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/HistoryMapper.xml 55 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/SensorMapper.xml 12 ●●●●● diff | view | raw | blame | history
src/main/resources/system/alarmLevels.json 289 ●●●●● diff | view | raw | blame | history