parent: 60869e | patch | commitdiff
kaiyu
2021-06-24 eb51b2364e9a3fbe806fde61fa255660a098fc8b
refs
author kaiyu <404897439@qq.com>
Thursday, June 24, 2021 14:06 +0800
committer kaiyu <404897439@qq.com>
Thursday, June 24, 2021 14:06 +0800
commiteb51b2364e9a3fbe806fde61fa255660a098fc8b
tree d529a04e467bc8223cf57e2fdbc34425efffcd4f tree | zip | gz
parent 60869e5b6aa78421766d4bd781f30ad2f4032999 view | diff
ec95e52c6f84c0a6cbdcbaecc2465b00ede6696d view | diff 
Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
3 files deleted
43 files added
39 files modified
2820 ■■■■■ changed files
.gitignore 5 ●●●●● diff | view | raw | blame | history
myBatisPlusGenerator/myBatisPlusGenerator.iml 137 ●●●●● diff | view | raw | blame | history
myBatisPlusGenerator/src/main/java/com/moral/CodeGenerator.java 3 ●●●●● diff | view | raw | blame | history
pom.xml 9 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/GroupController.java 37 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/LoginController.java 32 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/MenuController.java 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/UserController.java 31 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/Group.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/User.java 7 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondsDataConsumer.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/GroupMenuService.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/GroupService.java 9 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/UserGroupService.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/UserService.java 12 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java 32 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java 16 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java 83 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/application-dev.yml 13 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/GroupMapper.xml 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/GroupMenuMapper.xml 22 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/MenuMapper.xml 17 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/Constants.java 5 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/KafkaConstants.java 16 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/RedisConstants.java 32 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/util/DateUtils.java 42 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/config/redis/RedisConfig.java 67 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/config/xxl/XxlJobConfig.java 135 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/config/xxljob/XxlJobConfig.java 68 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/entity/CityAqiConfig.java 50 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/entity/Device.java 132 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/entity/HistoryAqi.java 45 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/entity/HistoryDaily.java 36 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/jobHandler/TestHandler.java 21 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/mapper/CityAqiConfigMapper.java 16 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/mapper/DeviceMapper.java 16 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/mapper/HistoryAqiMapper.java 17 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/mapper/HistoryDailyMapper.java 21 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/mapper/HistoryFiveMinutelyMapper.java 15 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java 11 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/CityAqiConfigService.java 20 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/DeviceService.java 20 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java 10 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/HistoryDailyService.java 21 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java 9 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/HistoryMinutelyService.java 12 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/Test.java 4 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/CityAqiConfigServiceImpl.java 31 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 69 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java 77 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java 33 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java 64 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java 27 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/task/CreateTableTask.java 52 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/task/HistoryAqiInsertTask.java 27 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/task/HistoryTableInsertTask.java 74 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/task/JudgeOffLineDeviceTask.java 28 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/application-dev.yml 1 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/logback-spring.xml 56 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/mapper/CityAqiConfigMapper.xml 13 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/mapper/DeviceMapper.xml 29 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/mapper/HistoryAqiMapper.xml 12 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/mapper/HistoryDailyMapper.xml 19 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml 25 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/mapper/HistoryMinutelyMapper.xml 50 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/config/kafka/KafkaConsumerConfig.java 13 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/config/kafka/KafkaProducerConfig.java 4 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java 2 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/TestController.java 25 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/entity/HistoryHourly.java 51 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java 123 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java 20 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/DeviceService.java 6 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/HistoryHourlyService.java 20 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/HistoryMinutelyService.java 2 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 175 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java 63 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java 34 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java 25 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/util/AdjustDataUtils.java 81 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/application-dev.yml 9 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/mapper/DeviceMapper.xml 8 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/mapper/HistoryHourlyMapper.xml 17 ●●●●● diff | view | raw | blame | history
screen.iml 125 ●●●●● diff | view | raw | blame | history