From 3cbf68cc264809b9435bde93d821c46b17fc4aa8 Mon Sep 17 00:00:00 2001 From: andy <1042025947@qq.com> Date: Fri, 18 Apr 2025 09:57:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9D=83=E9=99=90=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hd/common/core/constant/HDConstant.java | 24 +++++++++++ .../cloud/BatteryStationCdStrategyDao.java | 10 +++-- .../BatteryStationCdStrategyDetailDao.java | 7 +++- .../core/entity/cloud/BatteryStationDcc.java | 11 +---- .../entity/resource/auth/AuthPermission.java | 41 ++++++++----------- .../hd/common/core/permission/DataScope.java | 4 +- .../hd/cloud/dao/BatteryStationDccDao.java | 7 +++- .../hd/cloud/dao/BatteryStationDjDao.java | 7 +++- .../dao/BatteryStationHdFeeStandardDao.java | 10 +++-- .../cloud/dao/BatteryStationSecretKeyDao.java | 3 ++ .../com/evotech/hd/cloud/dao/CompanyDao.java | 3 ++ .../hd/cloud/dao/OrderRechargeDao.java | 3 ++ .../evotech/hd/cloud/dao/TradeDetailDao.java | 3 ++ .../evotech/hd/cloud/dao/VehicleInfoDao.java | 3 ++ wechat-server/pom.xml | 16 +++++--- 15 files changed, 97 insertions(+), 55 deletions(-) diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/constant/HDConstant.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/constant/HDConstant.java index 4ba91f3..7dfd1ef 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/constant/HDConstant.java +++ b/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"; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/dao/cloud/BatteryStationCdStrategyDao.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/dao/cloud/BatteryStationCdStrategyDao.java index 448ee93..85769b7 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/dao/cloud/BatteryStationCdStrategyDao.java +++ b/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 com.evotech.hd.common.core.entity.cloud.BatteryStationCdStrategy; +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 BatteryStationCdStrategyDao extends BaseMapper { List listCdStrategy(@Param("stationCode") String stationCode, @Param("status") Integer status); diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/dao/cloud/BatteryStationCdStrategyDetailDao.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/dao/cloud/BatteryStationCdStrategyDetailDao.java index e157755..046c772 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/dao/cloud/BatteryStationCdStrategyDetailDao.java +++ b/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 { List getDetailById(Integer id); diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDcc.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDcc.java index 1a6b888..9b260e9 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDcc.java +++ b/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 diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthPermission.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthPermission.java index e1956bd..5aec92d 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthPermission.java +++ b/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") - private String creater; - - @Schema(description = "创建时间", hidden = true) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date ctime; - - @Schema(description = "更新人", hidden = true) - private String updater; - - @Schema(description = "更新时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date uptime; +// @Schema(description = "创建人id") +// private String creater; +// +// @Schema(description = "创建时间", hidden = true) +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") +// private Date ctime; +// +// @Schema(description = "更新人", hidden = true) +// private String updater; +// +// @Schema(description = "更新时间") +// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") +// private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/permission/DataScope.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/permission/DataScope.java index 337ddda..06f5f4c 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/permission/DataScope.java +++ b/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(); diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationDccDao.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationDccDao.java index 0cfa0b5..ad802bf 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationDccDao.java +++ b/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 { List getDccByStationCode(String stationCode); diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationDjDao.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationDjDao.java index de1d07b..ae38f01 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationDjDao.java +++ b/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 { List getDjByStationCode(String stationCode); diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationHdFeeStandardDao.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationHdFeeStandardDao.java index 23bdec1..61d882e 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationHdFeeStandardDao.java +++ b/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 com.evotech.hd.common.core.entity.cloud.BatteryStationHdFeeStandard; +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 BatteryStationHdFeeStandardDao extends BaseMapper { List listFeeStandard(@Param("stationCode") String stationCode, @Param("day") String day); diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationSecretKeyDao.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationSecretKeyDao.java index 4818b57..3040cc8 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/BatteryStationSecretKeyDao.java +++ b/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 { } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/CompanyDao.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/CompanyDao.java index 8599461..4b7a8c1 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/CompanyDao.java +++ b/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 { } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/OrderRechargeDao.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/OrderRechargeDao.java index 400b138..0166256 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/OrderRechargeDao.java +++ b/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 { } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/TradeDetailDao.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/TradeDetailDao.java index 967e65d..5cc0c44 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/TradeDetailDao.java +++ b/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 { } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/VehicleInfoDao.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/VehicleInfoDao.java index eb7df16..efcf97a 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/VehicleInfoDao.java +++ b/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 { } diff --git a/wechat-server/pom.xml b/wechat-server/pom.xml index 2c461ed..735b6b4 100644 --- a/wechat-server/pom.xml +++ b/wechat-server/pom.xml @@ -21,12 +21,16 @@ common-web 1.0.0-SNAPSHOT - - com.evotech.hd - common-permission - 1.0.0-SNAPSHOT - - + + + + + + + com.evotech.hd + common-redis + 1.0.0-SNAPSHOT + com.evotech.hd common-mybatis