调整权限参数信息

base-commons/common-core/src/main/java/com/evotech/hd/common/core/constant/HDConstant.java

@@ -3,13 +3,37 @@ package com.evotech.hd.common.core.constant;
 public interface HDConstant {
 
     public static final class PermissionConstant{
+        /**
+         * 当前登录用户的UID
+         */
         public static final String PERMISSION_AUTH_USER_UID = "AUTH_USER_UID";
+        /**
+         * 运用商的组织代码
+         */
         public static final String PERMISSION_PROXY_CODE = "PROXY_CODE";
+        /**
+         * 站端code
+         */
         public static final String PERMISSION_STATION_CODE = "STATION_CODE";
+        /**
+         * 站端Id
+         */
         public static final String PERMISSION_STATION_ID = "STATION_ID";
+        /***
+         * 公司的组织代码
+         */
         public static final String PERMISSION_COMPANY_CODE = "COMPANY_CODE";
+        /***
+         * 公司的id
+         */
         public static final String PERMISSION_COMPANY_ID = "COMPANY_ID";
+        /***
+         * 车辆的车牌
+         */
         public static final String PERMISSION_CAR_CODE = "CAR_CODE";
+        /***
+         * 车辆的Id
+         */
         public static final String PERMISSION_CAR_ID = "CAR_ID";
     }
 

base-commons/common-core/src/main/java/com/evotech/hd/common/core/dao/cloud/BatteryStationCdStrategyDao.java

@@ -1,16 +1,18 @@
 package com.evotech.hd.common.core.dao.cloud;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
+import com.evotech.hd.common.core.constant.HDConstant;
+import com.evotech.hd.common.core.entity.cloud.BatteryStationCdStrategy;
+import com.evotech.hd.common.core.permission.DataScope;
 import org.apache.ibatis.annotations.Param;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
-import com.evotech.hd.common.core.entity.cloud.BatteryStationCdStrategy;
 
 /**
  * @author zrb
  * @since 2025-02-10
  */
+@DataScope(permissionObject = HDConstant.COMPANY_ROLE_CODE, permissionScopeName = "station_code", permissionScopeRedisKey = HDConstant.PermissionConstant.PERMISSION_STATION_CODE)
 public interface BatteryStationCdStrategyDao extends BaseMapper<BatteryStationCdStrategy> {
 	
 	List<BatteryStationCdStrategy> listCdStrategy(@Param("stationCode") String stationCode, @Param("status") Integer status);

base-commons/common-core/src/main/java/com/evotech/hd/common/core/dao/cloud/BatteryStationCdStrategyDetailDao.java

@@ -1,14 +1,17 @@
 package com.evotech.hd.common.core.dao.cloud;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.evotech.hd.common.core.constant.HDConstant;
 import com.evotech.hd.common.core.entity.cloud.BatteryStationCdStrategyDetail;
+import com.evotech.hd.common.core.permission.DataScope;
+
+import java.util.List;
 
 /**
  * @author zrb
  * @since 2025-02-10
  */
+@DataScope(permissionObject = HDConstant.COMPANY_ROLE_CODE, permissionScopeName = "station_code", permissionScopeRedisKey = HDConstant.PermissionConstant.PERMISSION_STATION_CODE)
 public interface BatteryStationCdStrategyDetailDao extends BaseMapper<BatteryStationCdStrategyDetail> {
 	
 	List<BatteryStationCdStrategyDetail> getDetailById(Integer id);

base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDcc.java

@@ -1,16 +1,7 @@
 package com.evotech.hd.common.core.entity.cloud;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.evotech.hd.common.core.entity.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import jakarta.validation.constraints.NotBlank;
@@ -18,6 +9,8 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+
 /**
  * @author zrb
  * @since 2024-10-17

base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthPermission.java

@@ -1,20 +1,13 @@
 package com.evotech.hd.common.core.entity.resource.auth;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.evotech.hd.common.core.entity.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+
 /**
  * @author zrb
  * @since 2024-09-04
@@ -48,19 +41,19 @@ public class AuthPermission extends BaseEntity implements Serializable {
     @Schema(description = "接口描述")
     private String mark;
 
-    @Schema(description = "创建人id")
+//    @Schema(description = "创建人id")
-    private String creater;
+//    private String creater;
-
+//
-    @Schema(description = "创建时间", hidden = true)
+//    @Schema(description = "创建时间", hidden = true)
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date ctime;
+//    private Date ctime;
-
+//
-    @Schema(description = "更新人", hidden = true)
+//    @Schema(description = "更新人", hidden = true)
-    private String updater;
+//    private String updater;
-
+//
-    @Schema(description = "更新时间")
+//    @Schema(description = "更新时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date uptime;
+//    private Date uptime;
 }

base-commons/common-core/src/main/java/com/evotech/hd/common/core/permission/DataScope.java

@@ -28,12 +28,12 @@ public @interface DataScope {
     String permissionObject();
 
     /***
-     * 运营商权限限制的字段
+     * 权限限制的表字段
      */
     String permissionScopeName();
 
     /***
-     * 运营商权限限制的字段
+     * 权限限制的redis中的key
      * HDConstant.PermissionConstant中 的字段信息
      */
     String permissionScopeRedisKey();

cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationDccDao.java

@@ -1,14 +1,17 @@
 package com.evotech.hd.cloud.dao;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.evotech.hd.common.core.constant.HDConstant;
 import com.evotech.hd.common.core.entity.cloud.BatteryStationDcc;
+import com.evotech.hd.common.core.permission.DataScope;
+
+import java.util.List;
 
 /**
  * @author zrb
  * @since 2024-10-17
  */
+@DataScope(permissionObject = HDConstant.COMPANY_ROLE_CODE, permissionScopeName = "station_code", permissionScopeRedisKey = HDConstant.PermissionConstant.PERMISSION_STATION_CODE)
 public interface BatteryStationDccDao extends BaseMapper<BatteryStationDcc> {
 	
 	List<BatteryStationDcc> getDccByStationCode(String stationCode);

cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationDjDao.java

@@ -1,14 +1,17 @@
 package com.evotech.hd.cloud.dao;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.evotech.hd.common.core.constant.HDConstant;
 import com.evotech.hd.common.core.entity.cloud.BatteryStationDj;
+import com.evotech.hd.common.core.permission.DataScope;
+
+import java.util.List;
 
 /**
  * @author zrb
  * @since 2024-10-17
  */
+@DataScope(permissionObject = HDConstant.COMPANY_ROLE_CODE, permissionScopeName = "station_code", permissionScopeRedisKey = HDConstant.PermissionConstant.PERMISSION_STATION_CODE)
 public interface BatteryStationDjDao extends BaseMapper<BatteryStationDj> {
 	
 	List<BatteryStationDj> getDjByStationCode(String stationCode);

cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationHdFeeStandardDao.java

@@ -1,16 +1,18 @@
 package com.evotech.hd.cloud.dao;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
+import com.evotech.hd.common.core.constant.HDConstant;
+import com.evotech.hd.common.core.entity.cloud.BatteryStationHdFeeStandard;
+import com.evotech.hd.common.core.permission.DataScope;
 import org.apache.ibatis.annotations.Param;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
-import com.evotech.hd.common.core.entity.cloud.BatteryStationHdFeeStandard;
 
 /**
  * @author zrb
  * @since 2024-10-17
  */
+@DataScope(permissionObject = HDConstant.COMPANY_ROLE_CODE, permissionScopeName = "station_code", permissionScopeRedisKey = HDConstant.PermissionConstant.PERMISSION_STATION_CODE)
 public interface BatteryStationHdFeeStandardDao extends BaseMapper<BatteryStationHdFeeStandard> {
 	
 	List<BatteryStationHdFeeStandard> listFeeStandard(@Param("stationCode") String stationCode, @Param("day") String day);

cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationSecretKeyDao.java

@@ -2,11 +2,14 @@ package com.evotech.hd.cloud.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.evotech.hd.cloud.entity.BatteryStationSecretKey;
+import com.evotech.hd.common.core.constant.HDConstant;
+import com.evotech.hd.common.core.permission.DataScope;
 
 /**
  * @author zrb
  * @since 2024-11-05
  */
+@DataScope(permissionObject = HDConstant.COMPANY_ROLE_CODE, permissionScopeName = "station_code", permissionScopeRedisKey = HDConstant.PermissionConstant.PERMISSION_STATION_CODE)
 public interface BatteryStationSecretKeyDao extends BaseMapper<BatteryStationSecretKey> {
 
 }

cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/CompanyDao.java

@@ -1,13 +1,16 @@
 package com.evotech.hd.cloud.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.evotech.hd.common.core.constant.HDConstant;
 import com.evotech.hd.common.core.entity.cloud.Company;
+import com.evotech.hd.common.core.permission.DataScope;
 
 /**
  * @author zrb
  * @since 2024-11-20
  */
 //换电站
+@DataScope(permissionObject = HDConstant.COMPANY_ROLE_CODE, permissionScopeName = "pk_id", permissionScopeRedisKey = HDConstant.PermissionConstant.PERMISSION_COMPANY_ID)
 public interface CompanyDao extends BaseMapper<Company> {
 
 }

cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/OrderRechargeDao.java

@@ -1,12 +1,15 @@
 package com.evotech.hd.cloud.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.evotech.hd.common.core.constant.HDConstant;
 import com.evotech.hd.common.core.entity.cloud.OrderRecharge;
+import com.evotech.hd.common.core.permission.DataScope;
 
 /**
  * @author zrb
  * @since 2024-11-22
  */
+@DataScope(permissionObject = HDConstant.COMPANY_ROLE_CODE, permissionScopeName = "station_code", permissionScopeRedisKey = HDConstant.PermissionConstant.PERMISSION_STATION_CODE)
 public interface OrderRechargeDao extends BaseMapper<OrderRecharge> {
 
 }

cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/TradeDetailDao.java

@@ -1,12 +1,15 @@
 package com.evotech.hd.cloud.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.evotech.hd.common.core.constant.HDConstant;
 import com.evotech.hd.common.core.entity.cloud.TradeDetail;
+import com.evotech.hd.common.core.permission.DataScope;
 
 /**
  * @author zrb
  * @since 2024-11-22
  */
+@DataScope(permissionObject = HDConstant.COMPANY_ROLE_CODE, permissionScopeName = "station_code", permissionScopeRedisKey = HDConstant.PermissionConstant.PERMISSION_STATION_CODE)
 public interface TradeDetailDao extends BaseMapper<TradeDetail> {
 
 }

cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/VehicleInfoDao.java

@@ -1,13 +1,16 @@
 package com.evotech.hd.cloud.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.evotech.hd.common.core.constant.HDConstant;
 import com.evotech.hd.common.core.entity.cloud.VehicleInfo;
+import com.evotech.hd.common.core.permission.DataScope;
 
 /**
  * @author zrb
  * @since 2024-11-22
  */
 //换电站
+@DataScope(permissionObject = HDConstant.COMPANY_ROLE_CODE, permissionScopeName = "ccode", permissionScopeRedisKey = HDConstant.PermissionConstant.PERMISSION_COMPANY_CODE)
 public interface VehicleInfoDao extends BaseMapper<VehicleInfo> {
 
 }

wechat-server/pom.xml

@@ -21,12 +21,16 @@
       <artifactId>common-web</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.evotech.hd</groupId>-->
+<!--      <artifactId>common-permission</artifactId>-->
+<!--      <version>1.0.0-SNAPSHOT</version>-->
+<!--    </dependency>-->
 		<dependency>
 			<groupId>com.evotech.hd</groupId>
-      <artifactId>common-permission</artifactId>
+			<artifactId>common-redis</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
-    
     <dependency>
       <groupId>com.evotech.hd</groupId>
       <artifactId>common-mybatis</artifactId>