parent: 68e750 | patch | commitdiff
cjl
2023-12-25 2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e
refs
author cjl <276999030@qq.com>
Monday, December 25, 2023 14:17 +0800
committer cjl <276999030@qq.com>
Monday, December 25, 2023 14:17 +0800
commit2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e
tree e1e9e2c79c98bce5dfa08fe334e1aea91bc1e710 tree | zip | gz
parent 68e750bf109efb0469704e54e48a29649512358c view | diff
fe447141d0d6fed55710983bba8f6ed5ee26aa6d view | diff 
Merge remote-tracking branch 'origin/dev' into cjl
3 files added
9 files modified
689 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/HeatMapController.java 148 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/OrganizationController.java 14 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/DeviceMapHierarchy.java 57 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/DeviceMapHierarchyMapper.java 9 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/HeatMapDTO.java 21 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/DataDisplayService.java 9 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/OrganizationService.java 9 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java 189 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java 30 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/utils/HeatMapTimeUtils.java 167 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/DeviceMapper.xml 33 ●●●●● diff | view | raw | blame | history