update 权限

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.jsowell.common.annotation.DataScope;
 import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
@@ -199,11 +198,11 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
 	 * @return
 	 */
 	@Override
-	@DataScope(deptAlias = "t3")
+	// @DataScope(deptAlias = "t3")
 	public OrderTotalDataVO getOrderTotalData(QueryOrderDTO dto) {
 		OrderTotalDataVO vo = new OrderTotalDataVO();
 		dto.setOrderStatus(OrderStatusEnum.ORDER_COMPLETE.getValue());
-		List<OrderListVO> list = orderBasicInfoMapper.selectOrderBasicInfoList(dto);
+		List<OrderListVO> list = selectOrderBasicInfoList(dto);
 		BigDecimal sumOrderAmount = BigDecimal.ZERO;
 		BigDecimal sumUsedElectricity = BigDecimal.ZERO;
 		vo.setDateDescription(dto.getStartTime() + " - " + dto.getEndTime());

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java

@@ -2,9 +2,9 @@ package com.jsowell.pile.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.google.common.collect.Lists;
-import com.jsowell.common.annotation.DataScope;
 import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.constant.Constants;
+import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
 import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
 import com.jsowell.common.core.redis.RedisCache;
@@ -22,8 +22,12 @@ import com.jsowell.pile.dto.IndexQueryDTO;
 import com.jsowell.pile.dto.QueryPileDTO;
 import com.jsowell.pile.dto.ReplaceMerchantStationDTO;
 import com.jsowell.pile.mapper.PileBasicInfoMapper;
-import com.jsowell.pile.mapper.PileMemberRelationMapper;
-import com.jsowell.pile.service.*;
+import com.jsowell.pile.service.IPileBasicInfoService;
+import com.jsowell.pile.service.IPileConnectorInfoService;
+import com.jsowell.pile.service.IPileMerchantInfoService;
+import com.jsowell.pile.service.IPileModelInfoService;
+import com.jsowell.pile.service.IPileSimInfoService;
+import com.jsowell.pile.service.SimCardService;
 import com.jsowell.pile.vo.base.MerchantInfoVO;
 import com.jsowell.pile.vo.base.PileInfoVO;
 import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO;
@@ -154,12 +158,12 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
 
 	/**
 	 * 查询充电桩信息
-	 *
+	 * 后管使用，带权限过滤
 	 * @param dto 前台参数
 	 * @return 充电桩信息集合
 	 */
 	@Override
-	@DataScope(deptAlias = "t2")
+	// @DataScope(deptAlias = "t2")
 	public List<PileDetailVO> queryPileInfos(QueryPileDTO dto) {
 		log.info("queryPileInfos dto:{}", JSONObject.toJSONString(dto));
 		// 首先不分页查询所有符合条件的充电桩
@@ -204,9 +208,22 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
 		return pileInfoVOS;
 	}
 
+	/**
+	 * 查询充电桩列表
+	 * 后管使用，带权限过滤
+	 * @param queryPileDTO
+	 * @return
+	 */
 	@Override
 	// @DataScope(deptAlias = "t1")
 	public List<PileDetailVO> queryPileInfoList(QueryPileDTO queryPileDTO) {
+		AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
+		if (authorizedMap == null) {
+			// 为空表示没有权限，返回空数组
+			return Lists.newArrayList();
+		}
+		queryPileDTO.setStationDeptIds(authorizedMap.getStationDeptIds());
+		queryPileDTO.setMerchantDeptIds(authorizedMap.getMerchantDeptIds());
 		return pileBasicInfoMapper.queryPileInfos(queryPileDTO);
 	}
 

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java

@@ -1,10 +1,12 @@
 package com.jsowell.pile.service.impl;
 
-import com.jsowell.common.annotation.DataScope;
+import com.google.common.collect.Lists;
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.core.domain.entity.SysDept;
+import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.DictUtils;
+import com.jsowell.common.util.SecurityUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.PileMerchantInfo;
 import com.jsowell.pile.mapper.PileMerchantInfoMapper;
@@ -56,8 +58,16 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService {
 	 * @return 充电桩运营商信息
 	 */
 	@Override
-	@DataScope(deptAlias = "t")
+	// @DataScope(deptAlias = "t")
 	public List<PileMerchantInfo> selectPileMerchantInfoList(PileMerchantInfo pileMerchantInfo) {
+		AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
+		if (authorizedMap == null) {
+			// 为空表示没有权限，返回空数组
+			return Lists.newArrayList();
+		}
+		pileMerchantInfo.setStationDeptIds(authorizedMap.getStationDeptIds());
+		pileMerchantInfo.setMerchantDeptIds(authorizedMap.getMerchantDeptIds());
+
 		List<PileMerchantInfo> list = pileMerchantInfoMapper.selectPileMerchantInfoList(pileMerchantInfo);
 		if (Objects.nonNull(list)) {
 			for (PileMerchantInfo p:list) {

jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml

@@ -171,7 +171,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
         </if>
         <!-- 数据范围过滤 -->
-        ${dto.params.dataScope}
+        <if test="dto.merchantDeptIds != null and dto.merchantDeptIds.size() != 0">
+            and t2.dept_id in
+            <foreach collection="dto.merchantDeptIds" item="merchantDeptId" open="(" separator="," close=")">
+                #{merchantDeptId}
+            </foreach>
+        </if>
+        <if test="dto.stationDeptIds != null and dto.stationDeptIds.size() != 0">
+            and t3.dept_id in
+            <foreach collection="dto.stationDeptIds" item="stationDeptId" open="(" separator="," close=")">
+                #{stationDeptId}
+            </foreach>
+        </if>
         group by t1.id
         order by t1.sn
     </select>

jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml

@@ -76,7 +76,12 @@
                 and logo_url = #{logoUrl}
             </if>
             <!-- 数据范围过滤 -->
-            ${params.dataScope}
+            <if test="merchantDeptIds != null and merchantDeptIds.size() != 0">
+                and dept_id in
+                <foreach collection="merchantDeptIds" item="merchantDeptId" open="(" separator="," close=")">
+                    #{merchantDeptId}
+                </foreach>
+            </if>
         </where>
     </select>