parent: 3aa5ac | patch | commitdiff
cjl
2023-10-13 f976feb7ae339c006af150b30802f7edfc8d966f
refs
author cjl <276999030@qq.com>
Friday, October 13, 2023 09:05 +0800
committer cjl <276999030@qq.com>
Friday, October 13, 2023 09:05 +0800
commitf976feb7ae339c006af150b30802f7edfc8d966f
tree fa3524cac00cfaae1bc8ade17475006dad25366f tree | zip | gz
parent 3aa5acc2aff683ead0e2ca585a604f547b68dbf6 view | diff
b441506b6e6d9f82cb95df627a6c58ff16b5e236 view | diff 
Merge remote-tracking branch 'origin/cjl' into qa
1 files added
15 files modified
299 ■■■■■ changed files
screen-job/src/main/java/com/moral/api/controller/PubController.java 8 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/entity/Device.java 21 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/entity/Sensor.java 23 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/entity/Version.java 68 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java 2 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 13 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java 104 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/application-cjl.yml 12 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/application-dev.yml 3 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/application-qa.yml 3 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/mapper/HistoryMinutelyMapper.xml 16 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/entity/Device.java 1 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java 15 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/application-cjl.yml 3 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/application-dev.yml 3 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/application-qa.yml 4 ●●●●● diff | view | raw | blame | history