Merge remote-tracking branch 'origin/zhc' into zhc

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<String, Object> paramMap);
 
     Integer checkBuildingManager(Long userId);
+
+	Integer checkLevelManager(Long userId);
 }

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<Long> idList);
 
     List<LevelPageDTO> getListPage(PageLevelSearchParam pageSearchParam);
+
+    List<Long> getBoundBuilding(Long userId);
 }

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}
 	</select>
+
+	<select id="checkLevelManager" resultType="java.lang.Integer">
+		SELECT
+			count(1)
+		FROM
+			data_center_aeon_admin.basic_role_user_relation rru
+				INNER JOIN data_center_aeon_admin.basic_role br ON br.id = rru.role_id
+				INNER JOIN data_center_aeon_admin.basic_role_menu_relation rmr ON br.id = rmr.role_id
+		WHERE rmr.menu_id = 88 AND br.flag != 1 AND rru.user_id = #{userId}
+	</select>
     
 </mapper>

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/LevelMapperExt.xml

@@ -180,4 +180,17 @@
         order BY base.`id` desc
     </select>
 
+    <select id="getBoundBuilding" resultType="java.lang.Long">
+        SELECT
+            DISTINCT sb.building_id
+        FROM dashboard_level_role_user rl
+        INNER JOIN dashboard_level_role_object ro ON rl.level_role_id = ro.level_role_id
+        INNER JOIN dashboard_level_relation_branch_store brs ON ro.ref_type = 'BRANCH' AND ro.ref_id = brs.branch_id
+        INNER JOIN dashboard_level_relation_store_area sra ON brs.store_id = sra.store_id
+        INNER JOIN dashboard_level_relation_area_site ras ON sra.area_id = ras.area_id
+        INNER JOIN dashboard_level_relation_site_building sb ON ras.site_id = sb.site_id
+        INNER JOIN basic_building bb ON sb.building_id = bb.building_id
+        WHERE bb.flag = 0 AND rl.user_id = #{userId}
+    </select>
+
 </mapper>

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

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<Long> getBindLevelBuildingIdList(Long userId) {
+		Integer levelManager = basicUserMapperExt.checkLevelManager(userId);
+		if (levelManager > 0) {
+			return null;//null表示不限制, sql里面判定bindedBuildingList=null的话，就不限制楼宇
+		} else {
+			List<Long> bindedBuildingList = levelMapperExt.getBoundBuilding(userId);
+			if (CollectionUtils.isEmpty(bindedBuildingList)) {
+				return Collections.singletonList(-1L);//-1的话，表示没有绑定
+			} else {
+				return bindedBuildingList;
+			}
+		}
+	}
+
 	public List<String> getPreDay(int days) {
 		// 日本时区
 		ZoneId JST = Constants.ZONE_TOKYO;

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<List<OverviewVO>> getOverviewInfo(Long userId, Long companyId, Integer languageType, Integer utcOffset) {
 		Map<String, Object> buildingMap = new HashMap<>();
 		buildingMap.put("companyId", companyId);
-		buildingMap.put("bindBuildingIdList", commonOpt.getBindBuildingIdList(userId));
+		buildingMap.put("bindBuildingIdList", commonOpt.getBindLevelBuildingIdList(userId));
 
 		List<OverviewVO> buildingInfoList = overviewInfoMapperExt.getBuildingInfo(buildingMap);