Browse Source
- 移除 tenant-admin 模块中的 FormButtonPermissionCheckerImpl 实现类 - 新增 common-online 模块中的 FormButtonPermissionCheckerImpl 实现类 - 将 IRoleFormButtonService 接口从 tenant 模块迁移至 common-online 模块 - 将 RoleFormButton 实体模型从 tenant 模块迁移至 common-online 模块 - 将 RoleFormButtonController 控制器从 tenant 模块迁移至 common-online 模块 - 将 RoleFormButtonDto 数据传输对象从 tenant 模块迁移至 common-online 模块 - 迁移 RoleFormButtonMapper 数据访问层及相关 XML 映射文件 - 更新权限检查逻辑以使用 TokenData 中的角色ID信息feature/form-permission-control
12 changed files with 40 additions and 55 deletions
@ -1,7 +1,7 @@ |
|||||||
package apelet.tenantadmin.tenant.dao; |
package apelet.common.online.dao; |
||||||
|
|
||||||
import apelet.common.core.base.dao.BaseDaoMapper; |
import apelet.common.core.base.dao.BaseDaoMapper; |
||||||
import apelet.tenantadmin.tenant.model.RoleFormButton; |
import apelet.common.online.model.RoleFormButton; |
||||||
import org.apache.ibatis.annotations.Param; |
import org.apache.ibatis.annotations.Param; |
||||||
|
|
||||||
import java.util.List; |
import java.util.List; |
||||||
@ -1,10 +1,10 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8"?> |
<?xml version="1.0" encoding="UTF-8"?> |
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||||
<mapper namespace="apelet.tenantadmin.tenant.dao.RoleFormButtonMapper"> |
<mapper namespace="apelet.common.online.dao.RoleFormButtonMapper"> |
||||||
|
|
||||||
<select id="getListByFilter" |
<select id="getListByFilter" |
||||||
resultType="apelet.tenantadmin.tenant.model.RoleFormButton"> |
resultType="apelet.common.online.model.RoleFormButton"> |
||||||
SELECT * FROM xy_sys_role_form_button |
SELECT * FROM xy_sys_role_form_button |
||||||
WHERE 1=1 |
WHERE 1=1 |
||||||
<if test="filter.roleId != null"> |
<if test="filter.roleId != null"> |
||||||
@ -1,4 +1,4 @@ |
|||||||
package apelet.tenantadmin.tenant.dto; |
package apelet.common.online.dto; |
||||||
|
|
||||||
import lombok.Data; |
import lombok.Data; |
||||||
|
|
||||||
@ -1,9 +1,9 @@ |
|||||||
package apelet.tenantadmin.tenant.model; |
package apelet.common.online.model; |
||||||
|
|
||||||
import apelet.common.core.base.mapper.BaseModelMapper; |
import apelet.common.core.base.mapper.BaseModelMapper; |
||||||
import apelet.common.core.base.model.BaseModel; |
import apelet.common.core.base.model.BaseModel; |
||||||
import apelet.common.core.validator.UpdateGroup; |
import apelet.common.core.validator.UpdateGroup; |
||||||
import apelet.tenantadmin.tenant.vo.RoleFormButtonVo; |
import apelet.common.online.vo.RoleFormButtonVo; |
||||||
import com.baomidou.mybatisplus.annotation.TableField; |
import com.baomidou.mybatisplus.annotation.TableField; |
||||||
import com.baomidou.mybatisplus.annotation.TableId; |
import com.baomidou.mybatisplus.annotation.TableId; |
||||||
import com.baomidou.mybatisplus.annotation.TableName; |
import com.baomidou.mybatisplus.annotation.TableName; |
||||||
@ -1,12 +1,12 @@ |
|||||||
package apelet.tenantadmin.tenant.service; |
package apelet.common.online.service; |
||||||
|
|
||||||
import apelet.common.core.base.service.IBaseService; |
import apelet.common.core.base.service.IBaseService; |
||||||
import apelet.common.core.object.CallResult; |
import apelet.common.core.object.CallResult; |
||||||
import apelet.common.core.object.MyOrderParam; |
import apelet.common.core.object.MyOrderParam; |
||||||
import apelet.common.core.object.MyPageData; |
import apelet.common.core.object.MyPageData; |
||||||
import apelet.common.core.object.MyPageParam; |
import apelet.common.core.object.MyPageParam; |
||||||
import apelet.tenantadmin.tenant.dto.RoleFormButtonDto; |
import apelet.common.online.dto.RoleFormButtonDto; |
||||||
import apelet.tenantadmin.tenant.model.RoleFormButton; |
import apelet.common.online.model.RoleFormButton; |
||||||
|
|
||||||
import java.util.List; |
import java.util.List; |
||||||
import java.util.Map; |
import java.util.Map; |
||||||
@ -1,18 +1,18 @@ |
|||||||
package apelet.tenantadmin.tenant.service.impl; |
package apelet.common.online.service.impl; |
||||||
|
|
||||||
import apelet.common.core.base.dao.BaseDaoMapper; |
import apelet.common.core.base.dao.BaseDaoMapper; |
||||||
import apelet.common.core.base.service.BaseService; |
import apelet.common.core.base.service.BaseService; |
||||||
import apelet.common.core.object.*; |
import apelet.common.core.object.*; |
||||||
|
import apelet.common.online.dao.RoleFormButtonMapper; |
||||||
|
import apelet.common.online.dto.RoleFormButtonDto; |
||||||
import apelet.common.online.model.OnlineForm; |
import apelet.common.online.model.OnlineForm; |
||||||
import apelet.common.online.model.OnlinePage; |
import apelet.common.online.model.OnlinePage; |
||||||
|
import apelet.common.online.model.RoleFormButton; |
||||||
|
import apelet.common.online.service.IRoleFormButtonService; |
||||||
import apelet.common.online.service.OnlineFormService; |
import apelet.common.online.service.OnlineFormService; |
||||||
import apelet.common.online.service.OnlinePageService; |
import apelet.common.online.service.OnlinePageService; |
||||||
|
import apelet.common.online.util.WidgetJsonButtonParser; |
||||||
import apelet.common.sequence.wrapper.IdGeneratorWrapper; |
import apelet.common.sequence.wrapper.IdGeneratorWrapper; |
||||||
import apelet.tenantadmin.tenant.dao.RoleFormButtonMapper; |
|
||||||
import apelet.tenantadmin.tenant.dto.RoleFormButtonDto; |
|
||||||
import apelet.tenantadmin.tenant.model.RoleFormButton; |
|
||||||
import apelet.tenantadmin.tenant.service.IRoleFormButtonService; |
|
||||||
import apelet.tenantadmin.tenant.util.WidgetJsonButtonParser; |
|
||||||
import cn.hutool.core.collection.CollectionUtil; |
import cn.hutool.core.collection.CollectionUtil; |
||||||
import cn.hutool.core.util.StrUtil; |
import cn.hutool.core.util.StrUtil; |
||||||
import com.alibaba.fastjson.JSON; |
import com.alibaba.fastjson.JSON; |
||||||
@ -1,4 +1,4 @@ |
|||||||
package apelet.tenantadmin.tenant.util; |
package apelet.common.online.util; |
||||||
|
|
||||||
import com.alibaba.fastjson.JSON; |
import com.alibaba.fastjson.JSON; |
||||||
import com.alibaba.fastjson.JSONArray; |
import com.alibaba.fastjson.JSONArray; |
||||||
@ -1,6 +1,6 @@ |
|||||||
package apelet.tenantadmin.tenant.vo; |
package apelet.common.online.vo; |
||||||
|
|
||||||
import apelet.tenantadmin.tenant.model.RoleFormButton; |
import apelet.common.online.model.RoleFormButton; |
||||||
import lombok.Data; |
import lombok.Data; |
||||||
import lombok.EqualsAndHashCode; |
import lombok.EqualsAndHashCode; |
||||||
|
|
||||||
Loading…
Reference in new issue