工业级后台API v2
parent: cd1675 | patch | commitdiff
fengxiang
2018-02-01 af8dd6eccb0aab770246ae44db1cde4e531416c5
refs
author fengxiang <110431245@qq.com>
Thursday, February 1, 2018 15:10 +0800
committer fengxiang <110431245@qq.com>
Thursday, February 1, 2018 15:10 +0800
commitaf8dd6eccb0aab770246ae44db1cde4e531416c5
tree 30fbac729d778b232225739f11eb82a9ebbdfa9b tree | zip | gz
parent cd16757f2cd963749850d6f8897381a8b7a849ef view | diff
a20095a98a3b968b10b390ba7b9ba99c2ddbd4d0 view | diff 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/moral/mapper/DeviceMapper.java
#	src/main/resources/mapper/DeviceMapper.xml
5 files added
12 files modified
1222 ■■■■■ changed files
pom.xml 12 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/common/xml/Version.java 41 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/ReportController.java 82 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/ScreenController.java 72 ●●●●● 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/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/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