parent: 9e5077 | patch | commitdiff
jinpengyong
2023-10-10 f0837ee21f7650d4413830d4ee90da02bcdd6d36
refs
author jinpengyong <jpy123456>
Tuesday, October 10, 2023 10:59 +0800
committer jinpengyong <jpy123456>
Tuesday, October 10, 2023 10:59 +0800
commitf0837ee21f7650d4413830d4ee90da02bcdd6d36
tree f763ffe9a6843f89099ea3470c542ec02bb30a7c tree | zip | gz
parent 9e50775009199ee04ac7bbd67fb0ef91b195c701 view | diff
24ed7d322c43caa4412ecc76597cc6789ff89b3c view | diff 
Merge remote-tracking branch 'origin/wb' 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
20 files modified
283 ■■■■■ 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 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.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/DustldServiceImpl.java 36 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java 39 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java 53 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/application-dev.yml 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/DeviceMapper.xml 4 ●●●●● 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 36 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml 4 ●●●●● 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/SysDictTypeServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/mapper/SysDictTypeMapper.xml 14 ●●●●● diff | view | raw | blame | history