suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

字段优化

Browse Source
This commit is contained in:
zhangchenbiao
2023-08-01 15:16:14 +08:00
parent ab3ccf47bf
commit c9c7bd391c
5 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml
View File

@@ -10,13 +10,12 @@
<result column="sort" jdbcType="INTEGER" property="sort"/> <result column="sort" jdbcType="INTEGER" property="sort"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/> <result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="is_deleted" jdbcType="INTEGER" property="isDeleted"/> <result column="is_deleted" jdbcType="INTEGER" property="isDeleted"/>
<result column="type" jdbcType="VARCHAR" property="type"/>
<result column="icon" jdbcType="VARCHAR" property="icon"/> <result column="icon" jdbcType="VARCHAR" property="icon"/>
<result column="menu_type" jdbcType="TINYINT" property="menuType"/> <result column="menu_type" jdbcType="TINYINT" property="menuType"/>
<result column="env" jdbcType="VARCHAR" property="env"/> <result column="env" jdbcType="VARCHAR" property="env"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, parent_id, code, name, path, sort, remark, is_deleted, type, icon, menu_type, env id, parent_id, code, name, path, sort, remark, is_deleted, icon, menu_type, env
</sql> </sql>
<insert id="insertSelective" keyColumn="id" keyProperty="id" useGeneratedKeys="true"> <insert id="insertSelective" keyColumn="id" keyProperty="id" useGeneratedKeys="true">
insert into sys_menu insert into sys_menu
@@ -42,9 +41,6 @@
<if test="isDeleted != null"> <if test="isDeleted != null">
is_deleted, is_deleted,
</if> </if>
<if test="type != null">
type,
</if>
<if test="icon != null"> <if test="icon != null">
icon, icon,
</if> </if>
@@ -77,9 +73,6 @@
<if test="isDeleted != null"> <if test="isDeleted != null">
#{isDeleted}, #{isDeleted},
</if> </if>
<if test="type != null">
#{type},
</if>
<if test="icon != null"> <if test="icon != null">
#{icon}, #{icon},
</if> </if>
@@ -116,9 +109,6 @@
<if test="record.isDeleted != null"> <if test="record.isDeleted != null">
is_deleted = #{record.isDeleted}, is_deleted = #{record.isDeleted},
</if> </if>
<if test="record.type != null">
type = #{record.type},
</if>
<if test="record.icon != null"> <if test="record.icon != null">
icon = #{record.icon}, icon = #{record.icon},
</if> </if>

5
coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java
View File

@@ -33,15 +33,14 @@ public class AddMenuDTO {
private String env; private String env;
private String type; private String code;
public static SysMenuDO convertDO(AddMenuDTO param, MenuTypeEnum menuTypeEnum){ public static SysMenuDO convertDO(AddMenuDTO param, MenuTypeEnum menuTypeEnum){
SysMenuDO sysMenuDO = new SysMenuDO(); SysMenuDO sysMenuDO = new SysMenuDO();
sysMenuDO.setParentId(param.getParentId()); sysMenuDO.setParentId(param.getParentId());
sysMenuDO.setName(param.getName()); sysMenuDO.setName(param.getName());
sysMenuDO.setCode(param.getName()); sysMenuDO.setCode(param.getCode());
sysMenuDO.setPath(param.getPath()); sysMenuDO.setPath(param.getPath());
sysMenuDO.setType(param.getType());
sysMenuDO.setIcon(param.getIcon()); sysMenuDO.setIcon(param.getIcon());
sysMenuDO.setMenuType(menuTypeEnum.getCode()); sysMenuDO.setMenuType(menuTypeEnum.getCode());
return sysMenuDO; return sysMenuDO;

3
coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java
View File

@@ -41,9 +41,6 @@ public class SysMenuDO implements Serializable {
@ApiModelProperty("是否已删除") @ApiModelProperty("是否已删除")
private Integer isDeleted; private Integer isDeleted;
@ApiModelProperty("操作类型")
private String type;
@ApiModelProperty("图标") @ApiModelProperty("图标")
private String icon; private String icon;

2
coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java
View File

@@ -69,7 +69,7 @@ public class MenuAuthTreeVO {
vo.setId(menu.getId()); vo.setId(menu.getId());
vo.setParentId(menu.getParentId()); vo.setParentId(menu.getParentId());
vo.setName(menu.getName()); vo.setName(menu.getName());
vo.setCode(menu.getType()); vo.setCode(menu.getCode());
vo.setPath(menu.getPath()); vo.setPath(menu.getPath());
vo.setIcon(menu.getIcon()); vo.setIcon(menu.getIcon());
vo.setMenuType(menu.getMenuType()); vo.setMenuType(menu.getMenuType());

4
coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java
View File

@@ -72,7 +72,7 @@ public class MenuTreeVO {
vo.setId(menu.getId()); vo.setId(menu.getId());
vo.setParentId(menu.getParentId()); vo.setParentId(menu.getParentId());
vo.setName(menu.getName()); vo.setName(menu.getName());
vo.setCode(menu.getType()); vo.setCode(menu.getCode());
vo.setPath(menu.getPath()); vo.setPath(menu.getPath());
vo.setIcon(menu.getIcon()); vo.setIcon(menu.getIcon());
vo.setMenuType(menu.getMenuType()); vo.setMenuType(menu.getMenuType());
@@ -96,7 +96,7 @@ public class MenuTreeVO {
} }
//数据是权限的的时候 //数据是权限的的时候
if (CollectionUtils.isNotEmpty(parentAuthList)) { if (CollectionUtils.isNotEmpty(parentAuthList)) {
List<String> authList = parentAuthList.stream().map(SysMenuDO::getType).collect(Collectors.toList()); List<String> authList = parentAuthList.stream().map(SysMenuDO::getCode).filter(Objects::nonNull).collect(Collectors.toList());
data.setAuthorityList(authList); data.setAuthorityList(authList);
} }
} }