Skip to content

S
smart_gov_platform
Commit 8a2e7cd7 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

菜单增加描述字段

parent 9d6a3783
Show whitespace changes
Inline Side-by-side
Showing with 1353 additions and 1256 deletions
portal-manager/doc/api.md
View file @ 8a2e7cd7
......@@ -1286,6 +1286,7 @@ data|object|数据对象
  createTime|Date|创建时间
  createUserId|Long|创建用户
  createUserName|String|创建用户名称
  remark|String|描述备注
dict|object|字典对象
 linkType|object|字典属性对象，详见附录
 visible|object|字典属性对象，详见附录
......@@ -1463,6 +1464,7 @@ data|object|数据对象
 createTime|Date|创建时间
 createUserId|Long|创建用户
 createUserName|String|创建用户名称
  remark|String|描述备注
dict|object|字典对象
 linkType|object|字典属性对象，详见附录
 visible|object|字典属性对象，详见附录
......@@ -1490,7 +1492,8 @@ dict|object|字典对象
"orderId":6861,
"createTime":"2022-06-02",
"createUserId":2189,
"createUserName":"zov8bo"
"createUserName":"zov8bo",
"remark":"zov8bo"
}
}
```
......@@ -1521,7 +1524,7 @@ menuType|Integer|是|菜单类型(0.目录，1.菜单，2.按钮)
status|Integer|是|菜单状态(0.禁用，1.启用)
authType|Integer|是|权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
orderId|Integer|是|排序编号
createUserName|String|是|创建用户名称
remark|String|是|描述备注
**请求样例:**
```
......@@ -1537,7 +1540,8 @@ createUserName|String|是|创建用户名称
"menuType":0,
"status":1,
"authType":3,
"orderId":0
"orderId":0,
"remark":"qnglei"
}
```
......@@ -1566,6 +1570,7 @@ data|object|数据对象
  createTime|Date|创建时间
  createUserId|Long|创建用户
  createUserName|String|创建用户名称
  remark|String|描述备注
**响应消息样例:**
```
......
portal-manager/src/main/java/com/mortals/xhx/module/menu/model/MenuEntity.java
View file @ 8a2e7cd7
......@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.menu.model.vo.MenuVo;
/**
* 菜单信息业务实体对象
*
* @author zxfei
* @date 2022-06-02
*/
* 菜单信息业务实体对象
*
* @author zxfei
* @date 2022-08-02
*/
public class MenuEntity extends MenuVo {
private static final long serialVersionUID = 1L;
......@@ -68,6 +68,10 @@ public class MenuEntity extends MenuVo {
* 创建用户名称
*/
private String createUserName;
/**
* 描述备注
*/
private String remark;
......@@ -254,6 +258,20 @@ public class MenuEntity extends MenuVo {
public void setCreateUserName(String createUserName){
this.createUserName = createUserName;
}
/**
* 获取 描述备注
* @return String
*/
public String getRemark(){
return remark;
}
/**
* 设置 描述备注
* @param remark
*/
public void setRemark(String remark){
this.remark = remark;
}
......@@ -289,6 +307,7 @@ public class MenuEntity extends MenuVo {
sb.append(",authType:").append(getAuthType());
sb.append(",orderId:").append(getOrderId());
sb.append(",createUserName:").append(getCreateUserName());
sb.append(",remark:").append(getRemark());
return sb.toString();
}
......@@ -319,5 +338,7 @@ public class MenuEntity extends MenuVo {
this.orderId = 0;
this.createUserName = "";
this.remark = "";
}
}
\ No newline at end of file
portal-manager/src/main/java/com/mortals/xhx/module/menu/model/MenuQuery.java
View file @ 8a2e7cd7
......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.menu.model;
import java.util.List;
import com.mortals.xhx.module.menu.model.MenuEntity;
/**
* 菜单信息业务查询对象
*
* @author zxfei
* @date 2022-06-02
*/
* 菜单信息业务查询对象
*
* @author zxfei
* @date 2022-08-02
*/
public class MenuQuery extends MenuEntity {
/** 开始 菜单ID，主键，自增长 */
private Long idStart;
......@@ -141,6 +141,9 @@ public class MenuQuery extends MenuEntity {
/** 创建用户名称 */
private List<String> createUserNameList;
/** 描述备注 */
private List<String> remarkList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<MenuQuery> orConditionList;
......@@ -847,6 +850,21 @@ public class MenuQuery extends MenuEntity {
public void setCreateUserNameList(List<String> createUserNameList){
this.createUserNameList = createUserNameList;
}
/**
* 获取 描述备注
* @return remarkList
*/
public List<String> getRemarkList(){
return this.remarkList;
}
/**
* 设置 描述备注
* @param remarkList
*/
public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList;
}
/**
* 设置 菜单ID，主键，自增长
* @param id
......@@ -1367,6 +1385,25 @@ public class MenuQuery extends MenuEntity {
return this;
}
/**
* 设置 描述备注
* @param remark
*/
public MenuQuery remark(String remark){
setRemark(remark);
return this;
}
/**
* 设置 描述备注
* @param remarkList
*/
public MenuQuery remarkList(List<String> remarkList){
this.remarkList = remarkList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
portal-manager/src/main/resources/sqlmap/module/menu/MenuMapper.xml
View file @ 8a2e7cd7
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.menu.dao.ibatis.MenuDaoImpl">
<!-- 字段和属性映射 -->
......@@ -21,6 +21,7 @@
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="createUserName" column="createUserName" />
<result property="remark" column="remark" />
</resultMap>
......@@ -76,23 +77,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))">
a.createUserName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="MenuEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_menu
(name,url,parentId,linkType,imgPath,buttonImgPath,imgCommPath,visible,menuType,status,authType,orderId,createTime,createUserId,createUserName)
(name,url,parentId,linkType,imgPath,buttonImgPath,imgCommPath,visible,menuType,status,authType,orderId,createTime,createUserId,createUserName,remark)
VALUES
(#{name},#{url},#{parentId},#{linkType},#{imgPath},#{buttonImgPath},#{imgCommPath},#{visible},#{menuType},#{status},#{authType},#{orderId},#{createTime},#{createUserId},#{createUserName})
(#{name},#{url},#{parentId},#{linkType},#{imgPath},#{buttonImgPath},#{imgCommPath},#{visible},#{menuType},#{status},#{authType},#{orderId},#{createTime},#{createUserId},#{createUserName},#{remark})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_menu
(name,url,parentId,linkType,imgPath,buttonImgPath,imgCommPath,visible,menuType,status,authType,orderId,createTime,createUserId,createUserName)
(name,url,parentId,linkType,imgPath,buttonImgPath,imgCommPath,visible,menuType,status,authType,orderId,createTime,createUserId,createUserName,remark)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.name},#{item.url},#{item.parentId},#{item.linkType},#{item.imgPath},#{item.buttonImgPath},#{item.imgCommPath},#{item.visible},#{item.menuType},#{item.status},#{item.authType},#{item.orderId},#{item.createTime},#{item.createUserId},#{item.createUserName})
(#{item.name},#{item.url},#{item.parentId},#{item.linkType},#{item.imgPath},#{item.buttonImgPath},#{item.imgCommPath},#{item.visible},#{item.menuType},#{item.status},#{item.authType},#{item.orderId},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.remark})
</foreach>
</insert>
......@@ -171,6 +175,9 @@
<if test="(colPickMode==0 and data.containsKey('createUserName')) or (colPickMode==1 and !data.containsKey('createUserName'))">
a.createUserName=#{data.createUserName},
</if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -328,6 +335,13 @@
</if>
</foreach>
</trim>
<trim prefix="remark=(case" suffix="ELSE remark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
when a.id=#{item.id} then #{item.remark}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -723,6 +737,21 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.remark == null">
${_conditionType_} a.remark is null
</if>
</if>
<if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -816,6 +845,11 @@
<if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('remark')">
a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment