From 4f6f2b1581d0b9548a71cce723e87e245688335c Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Mon, 1 Dec 2025 20:16:43 +0800 Subject: [PATCH] =?UTF-8?q?getOverviewInfo=E6=94=B9=E4=B8=BA=E7=89=A9?= =?UTF-8?q?=E4=BB=B6=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../back/dao/ex/BasicUserMapperExt.java | 2 ++ .../dashboard/back/dao/ex/LevelMapperExt.java | 3 +++ .../resources/mappers/ex/BasicUserMapperExt.xml | 10 ++++++++++ .../resources/mappers/ex/LevelMapperExt.xml | 13 +++++++++++++ .../back/service/common/CommonOpt.java | 17 +++++++++++++++++ .../back/service/impl/OverviewServiceImpl.java | 2 +- 6 files changed, 46 insertions(+), 1 deletion(-) 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 54f682a..ea001b0 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 @@ -112,5 +112,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-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 9ef528a..c2b69bf 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 @@ -17,6 +17,7 @@ import com.dongjian.dashboard.back.common.Constants; import com.dongjian.dashboard.back.common.response.ResponseCode; import com.dongjian.dashboard.back.common.response.SimpleDataResponse; import com.dongjian.dashboard.back.dao.ex.BasicUserMapperExt; +import com.dongjian.dashboard.back.dao.ex.LevelMapperExt; import com.dongjian.dashboard.back.dao.ex.UserBuildingRelationMapperExt; import com.dongjian.dashboard.back.dto.device.LineDataSearchParams; import com.dongjian.dashboard.back.util.DESUtil; @@ -55,6 +56,8 @@ public class CommonOpt { private BasicUserMapperExt basicUserMapperExt; @Autowired private UserBuildingRelationMapperExt userBuildingRelationMapperExt; + @Autowired + private LevelMapperExt levelMapperExt; /** @@ -172,6 +175,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) { // 获取当前日期 LocalDate currentDate = LocalDate.now(); 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 7d03af2..d7a7a42 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 @@ -53,7 +53,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 = deviceRawdataRealtimeMapperExt.getBuildingInfo(buildingMap);