parent: f26786 | patch | commitdiff
cjl
2023-10-19 2a4a9ef52b0d76efb9712fd8d4268f658546f99f
refs
author cjl <276999030@qq.com>
Thursday, October 19, 2023 16:31 +0800
committer cjl <276999030@qq.com>
Thursday, October 19, 2023 16:31 +0800
commit2a4a9ef52b0d76efb9712fd8d4268f658546f99f
tree fcffdf41f19011ff614d45d8baa45d8cf5af89f6 tree | zip | gz
parent f26786e162241b6b803ada6d19d80e1f5fb615e5 view | diff
38db5aecdaf06a56875947759013070d57717de8 view | diff 
Merge remote-tracking branch 'origin/cjl' into qa
1 files added
13 files modified
367 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/SysDictTypeMapper.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/dto/Wind/WindData.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java 1 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/ext/wind/WindListExt.java 33 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java 254 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java 35 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/HistoryFiveMinutelyMapper.xml 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/SysDictTypeMapper.xml 12 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java 9 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java 5 ●●●●● diff | view | raw | blame | history