~chenjialiang/moral.git

forked from moral

kaiyu

2021-07-28 11d10fc9ca90ec29159738c1eac5e2d9203d8bb6

screen-api
                kafka消费者组id从配置文件获取
screen-manage
                除admin角色外无法查看admin角色

10 files modified

	screen-api/src/main/java/com/moral/api/config/kafka/KafkaConsumerConfig.java	45 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java	2 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java	25 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/pojo/form/historyFiveMinutely/QueryDeviceAndFiveMinuteDataForm.java	2 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java	9 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java	2 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java	46 ●●●●● diff \| view \| raw \| blame \| history
	screen-api/src/main/resources/application-dev.yml	2 ●●●●● diff \| view \| raw \| blame \| history
	screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java	3 ●●●●● diff \| view \| raw \| blame \| history
	screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java	16 ●●●●● diff \| view \| raw \| blame \| history