工业级运维app手机api
parent: d072cf | patch | commitdiff
沈斌
2017-10-25 58f51c889aecd7065a82b99d29b3ef4aee891ec1
refs
author 沈斌 <bluelazysb@hotmail.com>
Wednesday, October 25, 2017 16:31 +0800
committer 沈斌 <bluelazysb@hotmail.com>
Wednesday, October 25, 2017 16:31 +0800
commit58f51c889aecd7065a82b99d29b3ef4aee891ec1
tree 04fdc4df76348a05c7ab3260c36d8b761dca2b5f tree | zip | gz
parent d072cf840b6e6d3afeac21a02050455b05744000 view | diff
50c85d94f82c0abad7b828e079ec8ba313a53f6a view | diff 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml
#	src/main/java/com/moral/monitor/listener/Listener.java
3 files deleted
18 files added
14 files modified
5449 ■■■■■ changed files
pom.xml 366 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/controller/ApiController.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/controller/Dashboard.java 16 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/controller/MgrController.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/controller/MonitorPointController.java 16 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/dao/EquipmentMapper.java 30 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/dao/HistoryMapper.java 30 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/dao/LoggerMapper.java 30 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/dao/MgrDao.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/dao/MonitorPointDao.java 24 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/dao/MonitorpointDao.java 30 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/dao/SensorMapper.java 30 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/dao/TaskDao.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/entity/Equipment.java 99 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/entity/EquipmentExample.java 1201 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/entity/History.java 53 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/entity/HistoryExample.java 591 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/entity/Logger.java 45 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/entity/LoggerExample.java 461 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/entity/MonitorPoint.java 73 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/entity/Monitorpoint.java 125 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/entity/MonitorpointExample.java 1011 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/entity/Sensor.java 143 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/entity/SensorExample.java 880 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/listener/MonitorListener.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/service/EquipmentService.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/service/HistoryService.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/service/LoggerService.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/service/MgrService.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/service/MonitorPointService.java 35 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/service/MonitorpointService.java 28 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/service/impl/LoggerServiceImpl.java 22 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java 45 ●●●●● diff | view | raw | blame | history
src/main/resources/application.xml 4 ●●●●● diff | view | raw | blame | history
src/main/resources/rabbitmq.xml 6 ●●●●● diff | view | raw | blame | history