工业级后台API v2
parent: 11bb93 | patch | commitdiff
kaiyu
2020-12-15 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b
refs
author kaiyu <404897439@qq.com>
Tuesday, December 15, 2020 14:08 +0800
committer kaiyu <404897439@qq.com>
Tuesday, December 15, 2020 14:08 +0800
commit3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b
tree dd9181bd21c597f7ca667acd9888eeeb72ca7a40 tree | zip | gz
parent 11bb93e34b91a8ba4c5588dbe907988a1f279859 view | diff
69e2f9472465cfe4e35356da3f550f13812fdf83 view | diff 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/moral/config/WebSocketConfig.java
2 files added
6 files modified
446 ■■■■■ changed files
src/main/java/com/moral/config/WebSocketConfig.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/controller/ScreenController.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/mapper/DeviceMapper.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/moral/service/DeviceService.java 3 ●●●●● 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/webSocketServer/ElectronicSWebSocketServer.java 224 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/DeviceMapper.xml 6 ●●●●● diff | view | raw | blame | history
src/main/webapp/view/unorganizedMapV2.jsp 193 ●●●●● diff | view | raw | blame | history