parent: 9e5077 | patch | commitdiff
cjl
2023-10-07 8b5439ba2748f91720975f73e7479a751d6a452b
refs
author cjl <276999030@qq.com>
Saturday, October 7, 2023 14:55 +0800
committer cjl <276999030@qq.com>
Saturday, October 7, 2023 14:55 +0800
commit8b5439ba2748f91720975f73e7479a751d6a452b
tree 77ab7218716b6a9a81ea31d1e2baf41af589c575 tree | zip | gz
parent 9e50775009199ee04ac7bbd67fb0ef91b195c701 view | diff
f4e06be2e50d54a956ccd26c93661c4ab9d19bf6 view | diff 
Merge branch 'cjl' into qa

# Conflicts:
#	screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java
#	screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
16 files modified
225 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/config/mybatis/MybatisPlusConfig.java 18 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/HistoryFiveMinutelyMapper.java 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 32 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java 33 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml 11 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml 18 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/ManageCoordinateController.java 27 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/entity/SysDictType.java 1 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java 11 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/mapper/SysDictTypeMapper.java 2 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java 42 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/mapper/SysDictTypeMapper.xml 14 ●●●●● diff | view | raw | blame | history