screen_job.git - Gitblit

lizijie

2021-11-29 d8310f6bc609440fa352c0e5a9436c7c78caa287

refs
author	lizijie <lzjiiie@163.com>
	Monday, November 29, 2021 11:09 +0800
committer	lizijie <lzjiiie@163.com>
	Monday, November 29, 2021 11:09 +0800
commit	d8310f6bc609440fa352c0e5a9436c7c78caa287
tree	3a30dfbf07e83f3425279cd78254c99bee2085e7 tree \| zip \| gz
parent	c9f5a0a5f631fec7d66ab263d381bd09107d45c6 view \| diff 6050927edf6c00f2f06b0b0775502d38eb5b7705 view \| diff

Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job

1 files added

7 files modified

	src/main/java/com/moral/mapper/DeviceMapper.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/mapper/HistoryHourlyMapper.java	6 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/service/DeviceService.java	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/service/impl/DeviceServiceImpl.java	121 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/task/OffLineDevicesTask.java	62 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/com/moral/task/SensorsAlarmTask.java	28 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/mapper/DeviceMapper.xml	9 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/mapper/HistoryHourlyMapper.xml	14 ●●●●● diff \| view \| raw \| blame \| history