diff --git a/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/BasicUserMapperExt.java b/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/BasicUserMapperExt.java index 786272b..fa711dd 100644 --- a/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/BasicUserMapperExt.java +++ b/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/BasicUserMapperExt.java @@ -23,4 +23,6 @@ public interface BasicUserMapperExt extends BasicUserMapper{ UserInfoVO getAccountInfo(Map paramMap); Integer checkBuildingManager(Long userId); + + Integer checkLevelManager(Long userId); } diff --git a/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/LevelMapperExt.java b/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/LevelMapperExt.java index 9fd8346..4cba028 100644 --- a/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/LevelMapperExt.java +++ b/dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/LevelMapperExt.java @@ -4,6 +4,7 @@ import com.dongjian.dashboard.back.dto.level.LevelEntity; import com.dongjian.dashboard.back.dto.level.LevelRelationEntity; import com.dongjian.dashboard.back.dto.level.OptLevelParam; import com.dongjian.dashboard.back.dto.level.PageLevelSearchParam; +import com.dongjian.dashboard.back.vo.building.BindedBuildingVO; import com.dongjian.dashboard.back.vo.level.LevelPageDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,4 +33,6 @@ public interface LevelMapperExt { void deleteLevelRelationByIdList(@Param("param") LevelRelationEntity param, @Param("idList") List idList); List getListPage(PageLevelSearchParam pageSearchParam); + + List getBoundBuilding(Long userId); } \ No newline at end of file diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicUserMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicUserMapperExt.xml index 3623d9f..ed93cf8 100644 --- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicUserMapperExt.xml +++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicUserMapperExt.xml @@ -114,5 +114,15 @@ INNER JOIN data_center_aeon_admin.basic_role_menu_relation rmr ON br.id = rmr.role_id WHERE rmr.menu_id = 52 AND br.flag != 1 AND rru.user_id = #{userId} + + \ No newline at end of file diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/LevelMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/LevelMapperExt.xml index 077bfbc..bbeb1f6 100644 --- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/LevelMapperExt.xml +++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/LevelMapperExt.xml @@ -180,4 +180,17 @@ order BY base.`id` desc + + \ No newline at end of file diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/MonitoringPointCategoryGroupMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/MonitoringPointCategoryGroupMapperExt.xml index f7d00bf..f5f8838 100644 --- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/MonitoringPointCategoryGroupMapperExt.xml +++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/MonitoringPointCategoryGroupMapperExt.xml @@ -67,7 +67,7 @@ mpc.company_id, mpc.thumbnail_normal_base64, mpc.thumbnail_alarm_base64, - mpc.thumbnail_dis_base64, + mpc.`name`, mpc.remark FROM diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java index 92d030a..908e518 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java @@ -71,6 +71,8 @@ public class CommonOpt { @Autowired private UserBuildingRelationMapperExt userBuildingRelationMapperExt; @Autowired + private LevelMapperExt levelMapperExt; + @Autowired private DeviceRawdataRealtimeMapperExt deviceRawdataRealtimeMapperExt; @Autowired private DeviceInfoMapperExt deviceInfoMapperExt; @@ -253,6 +255,20 @@ public class CommonOpt { } } + public List getBindLevelBuildingIdList(Long userId) { + Integer levelManager = basicUserMapperExt.checkLevelManager(userId); + if (levelManager > 0) { + return null;//null表示不限制, sql里面判定bindedBuildingList=null的话,就不限制楼宇 + } else { + List bindedBuildingList = levelMapperExt.getBoundBuilding(userId); + if (CollectionUtils.isEmpty(bindedBuildingList)) { + return Collections.singletonList(-1L);//-1的话,表示没有绑定 + } else { + return bindedBuildingList; + } + } + } + public List getPreDay(int days) { // 日本时区 ZoneId JST = Constants.ZONE_TOKYO; diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java index 565b72c..b596a78 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java @@ -60,7 +60,7 @@ public class OverviewServiceImpl implements OverviewService { public SimpleDataResponse> getOverviewInfo(Long userId, Long companyId, Integer languageType, Integer utcOffset) { Map buildingMap = new HashMap<>(); buildingMap.put("companyId", companyId); - buildingMap.put("bindBuildingIdList", commonOpt.getBindBuildingIdList(userId)); + buildingMap.put("bindBuildingIdList", commonOpt.getBindLevelBuildingIdList(userId)); List buildingInfoList = overviewInfoMapperExt.getBuildingInfo(buildingMap);