liuxiao/HaoKun_web_stie
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

官网 菜单标签表字段改变

Browse Source
This commit is contained in:
liuxiao 2024-06-21 09:53:40 +08:00
parent 17a7acbace
commit 7cf2e46087
5 changed files with 177 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ruoyi-system/src/main/java/com/ruoyi/official/domain/GwLable.java
View File

@ -39,7 +39,27 @@ public class GwLable extends BaseEntity {
/**
* 标签名称
*/
private String businessName;
private String menuName;
/**
* 父菜单ID
*/
private Long parentId;
/**
* 显示顺序
*/
private Long orderNum;
/**
* 显示状态（0显示 1隐藏）
*/
private String visible;
/**
* 菜单类型（M目录 C菜单）
*/
private String menuType;
/**
* 是否为外链（0是 1否）1
*/
private Long isFrame;
/**
* 创建者id
*/

32
ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwLableBo.java
View File

@ -44,7 +44,37 @@ public class GwLableBo extends BaseEntity {
* 标签名称
*/
@NotBlank(message = "标签名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String businessName;
private String menuName;
/**
* 父菜单ID
*/
@NotNull(message = "父菜单ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long parentId;
/**
* 显示顺序
*/
@NotNull(message = "显示顺序不能为空", groups = { AddGroup.class, EditGroup.class })
private Long orderNum;
/**
* 显示状态（0显示 1隐藏）
*/
@NotBlank(message = "显示状态（0显示 1隐藏）不能为空", groups = { AddGroup.class, EditGroup.class })
private String visible;
/**
* 菜单类型（M目录 C菜单）
*/
@NotBlank(message = "菜单类型（M目录 C菜单）不能为空", groups = { AddGroup.class, EditGroup.class })
private String menuType;
/**
* 是否为外链（0是 1否）1
*/
@NotNull(message = "是否为外链（0是 1否）1不能为空", groups = { AddGroup.class, EditGroup.class })
private Long isFrame;
/**
* 创建者id

36
ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/GwLableVo.java
View File

@ -44,7 +44,40 @@ public class GwLableVo {
* 标签名称
*/
@ExcelProperty(value = "标签名称")
private String businessName;
private String menuName;
/**
* 父菜单ID
*/
@ExcelProperty(value = "父菜单ID")
private Long parentId;
/**
* 显示顺序
*/
@ExcelProperty(value = "显示顺序")
private Long orderNum;
/**
* 显示状态（0显示 1隐藏）
*/
@ExcelProperty(value = "显示状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=显示,1=隐藏")
private String visible;
/**
* 菜单类型（M目录 C菜单）
*/
@ExcelProperty(value = "菜单类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "M=目录,C=菜单")
private String menuType;
/**
* 是否为外链（0是 1否）1
*/
@ExcelProperty(value = "是否为外链", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=是,1=否")
private Long isFrame;
/**
* 创建者id
@ -59,4 +92,5 @@ public class GwLableVo {
private Long updateUserId;
}

11
ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwLableServiceImpl.java
View File

@ -43,7 +43,7 @@ public class GwLableServiceImpl implements IGwLableService {
/**
* 查询标签封面信息
列表
列表
*/
@Override
public TableDataInfo<GwLableVo> queryPageList(GwLableBo bo, PageQuery pageQuery) {
@ -54,7 +54,7 @@ public class GwLableServiceImpl implements IGwLableService {
/**
* 查询标签封面信息
列表
列表
*/
@Override
public List<GwLableVo> queryList(GwLableBo bo) {
@ -67,7 +67,12 @@ public class GwLableServiceImpl implements IGwLableService {
LambdaQueryWrapper<GwLable> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getImageurl()), GwLable::getImageurl, bo.getImageurl());
lqw.eq(StringUtils.isNotBlank(bo.getFileType()), GwLable::getFileType, bo.getFileType());
lqw.like(StringUtils.isNotBlank(bo.getBusinessName()), GwLable::getBusinessName, bo.getBusinessName());
lqw.like(StringUtils.isNotBlank(bo.getMenuName()), GwLable::getMenuName, bo.getMenuName());
lqw.eq(bo.getParentId() != null, GwLable::getParentId, bo.getParentId());
lqw.eq(bo.getOrderNum() != null, GwLable::getOrderNum, bo.getOrderNum());
lqw.eq(StringUtils.isNotBlank(bo.getVisible()), GwLable::getVisible, bo.getVisible());
lqw.eq(StringUtils.isNotBlank(bo.getMenuType()), GwLable::getMenuType, bo.getMenuType());
lqw.eq(bo.getIsFrame() != null, GwLable::getIsFrame, bo.getIsFrame());
lqw.eq(bo.getCreateUserId() != null, GwLable::getCreateUserId, bo.getCreateUserId());
lqw.eq(bo.getUpdateUserId() != null, GwLable::getUpdateUserId, bo.getUpdateUserId());
return lqw;

90
ruoyi-ui/src/views/official/lable/index.vue
View File

@ -9,14 +9,46 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="标签名称" prop="businessName">
<el-form-item label="标签名称" prop="menuName">
<el-input
v-model="queryParams.businessName"
v-model="queryParams.menuName"
placeholder="请输入标签名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="父菜单ID" prop="parentId">
<el-input
v-model="queryParams.parentId"
placeholder="请输入父菜单ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="显示顺序" prop="orderNum">
<el-input
v-model="queryParams.orderNum"
placeholder="请输入显示顺序"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="显示状态" prop="visible">
<el-input
v-model="queryParams.visible"
placeholder="请输入显示状态"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否为外链" prop="isFrame">
<el-input
v-model="queryParams.isFrame"
placeholder="请输入是否为外链"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建者id" prop="createUserId">
<el-input
v-model="queryParams.createUserId"
@ -90,7 +122,12 @@
<el-table-column label="主键id" align="center" prop="id" v-if="true"/>
<el-table-column label="图片上传地址" align="center" prop="imageurl" />
<el-table-column label="文件类型 0：图片 1：视频" align="center" prop="fileType" />
<el-table-column label="标签名称" align="center" prop="businessName" />
<el-table-column label="标签名称" align="center" prop="menuName" />
<el-table-column label="父菜单ID" align="center" prop="parentId" />
<el-table-column label="显示顺序" align="center" prop="orderNum" />
<el-table-column label="显示状态" align="center" prop="visible" />
<el-table-column label="菜单类型" align="center" prop="menuType" />
<el-table-column label="是否为外链" align="center" prop="isFrame" />
<el-table-column label="创建者id" align="center" prop="createUserId" />
<el-table-column label="更新者id" align="center" prop="updateUserId" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -128,8 +165,20 @@
<el-form-item label="图片上传地址" prop="imageurl">
<el-input v-model="form.imageurl" placeholder="请输入图片上传地址" />
</el-form-item>
<el-form-item label="标签名称" prop="businessName">
<el-input v-model="form.businessName" placeholder="请输入标签名称" />
<el-form-item label="标签名称" prop="menuName">
<el-input v-model="form.menuName" placeholder="请输入标签名称" />
</el-form-item>
<el-form-item label="父菜单ID" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入父菜单ID" />
</el-form-item>
<el-form-item label="显示顺序" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="请输入显示顺序" />
</el-form-item>
<el-form-item label="显示状态" prop="visible">
<el-input v-model="form.visible" placeholder="请输入显示状态" />
</el-form-item>
<el-form-item label="是否为外链" prop="isFrame">
<el-input v-model="form.isFrame" placeholder="请输入是否为外链" />
</el-form-item>
<el-form-item label="创建者id" prop="createUserId">
<el-input v-model="form.createUserId" placeholder="请输入创建者id" />
@ -179,7 +228,12 @@ export default {
pageSize: 10,
imageurl: undefined,
fileType: undefined,
businessName: undefined,
menuName: undefined,
parentId: undefined,
orderNum: undefined,
visible: undefined,
menuType: undefined,
isFrame: undefined,
createUserId: undefined,
updateUserId: undefined,
},
@ -196,9 +250,24 @@ export default {
fileType: [
{ required: true, message: "文件类型 0：图片 1：视频不能为空", trigger: "change" }
],
businessName: [
menuName: [
{ required: true, message: "标签名称不能为空", trigger: "blur" }
],
parentId: [
{ required: true, message: "父菜单ID不能为空", trigger: "blur" }
],
orderNum: [
{ required: true, message: "显示顺序不能为空", trigger: "blur" }
],
visible: [
{ required: true, message: "显示状态不能为空", trigger: "blur" }
],
menuType: [
{ required: true, message: "菜单类型不能为空", trigger: "change" }
],
isFrame: [
{ required: true, message: "是否为外链不能为空", trigger: "blur" }
],
createUserId: [
{ required: true, message: "创建者id不能为空", trigger: "blur" }
],
@ -233,7 +302,12 @@ export default {
id: undefined,
imageurl: undefined,
fileType: undefined,
businessName: undefined,
menuName: undefined,
parentId: undefined,
orderNum: undefined,
visible: undefined,
menuType: undefined,
isFrame: undefined,
createBy: undefined,
createUserId: undefined,
createTime: undefined,