Skip to content

S
sv-springboot
Commit 2642576a by Suvalue
Options

综合页菜单接口

parent 16d434cb
Showing with 114 additions and 12 deletions
hs-api/src/main/java/com/hs/api/controller/UserController.java
......@@ -7,6 +7,7 @@ import com.hs.api.model.SerDepartment;
import com.hs.api.model.SysRole;
import com.hs.api.model.SysUser;
import com.hs.api.model.reqmodel.Disease;
import com.hs.api.model.reqmodel.MenuReq;
import com.hs.api.model.respmodel.SysMenuList;
import com.hs.api.service.SysMenuService;
import com.hs.api.service.SysUserOrgRsService;
......@@ -67,6 +68,14 @@ public class UserController {
return Result.success(sysMenuList);
}
@PostMapping("menu/list")
@Token
@ApiOperation("查询综合菜单")
public Object getMenuByType(@RequestBody MenuReq req) throws Exception {
List<SysMenuList> sysMenuList = sysMenuService.getMenuByType(req.getMenuType());
return Result.success(sysMenuList);
}
/**
* 根据用户id查询用户机构
*
......
hs-api/src/main/java/com/hs/api/mapper/SysMenuMapper.java
......@@ -18,4 +18,6 @@ public interface SysMenuMapper {
int updateByPrimaryKey(SysMenu record);
List<SysMenuList> selectMenuByUser(@Param("userId") Long userId);
List<SysMenuList> selectMenuByType(@Param("menuType") Integer menuType);
}
\ No newline at end of file
hs-api/src/main/java/com/hs/api/model/SysMenu.java
......@@ -23,6 +23,8 @@ public class SysMenu {
private Long sort;
private Long menuType;
public Long getId() {
return id;
}
......@@ -102,4 +104,12 @@ public class SysMenu {
public void setSort(Long sort) {
this.sort = sort;
}
public Long getMenuType() {
return menuType;
}
public void setMenuType(Long menuType) {
this.menuType = menuType;
}
}
\ No newline at end of file
hs-api/src/main/java/com/hs/api/model/reqmodel/MenuReq.java 0 → 100644
package com.hs.api.model.reqmodel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class MenuReq {
@NotNull(message = "菜单类型不能为空")
@ApiModelProperty("菜单类型")
private Integer menuType;
}
hs-api/src/main/java/com/hs/api/service/Impl/SysMenuServiceImpl.java
......@@ -23,20 +23,30 @@ public class SysMenuServiceImpl implements SysMenuService {
SysMenuList sysMenuList = new SysMenuList();
SysMenu sysMenu = new SysMenu();
List<SysMenuList> list = sysMenuMapper.selectMenuByUser(userId);
List<SysMenuList> resultList = getLevelData(list, Long.valueOf(MENU_TOP_PARENT_ID));
resultList=resultList.stream().sorted(Comparator.comparing(SysMenu::getSort)).collect(Collectors.toList());
List<SysMenuList> resultList = getLevelData(list, Long.valueOf(MENU_TOP_PARENT_ID));
resultList = resultList.stream().sorted(Comparator.comparing(SysMenu::getSort)).collect(Collectors.toList());
return resultList;
}
@Override
public List<SysMenuList> getMenuByType(Integer menuType) throws Exception {
SysMenuList sysMenuList = new SysMenuList();
SysMenu sysMenu = new SysMenu();
List<SysMenuList> list = sysMenuMapper.selectMenuByType(menuType);
List<SysMenuList> resultList = getLevelData(list, Long.valueOf(MENU_TOP_PARENT_ID));
resultList = resultList.stream().sorted(Comparator.comparing(SysMenu::getSort)).collect(Collectors.toList());
return resultList;
}
private List<SysMenuList> getLevelData(List<SysMenuList> list, Long parentcode) {
List<SysMenuList> resultList = new ArrayList<>();
for (SysMenuList data : list) {
if (data.getParentId() == parentcode){
List<SysMenuList> childList = getLevelData(list,data.getId());
childList=childList.stream().sorted(Comparator.comparing(SysMenu::getSort)).collect(Collectors.toList());
data.setSysMenuList(childList);
resultList.add(data);
}
if (data.getParentId() == parentcode) {
List<SysMenuList> childList = getLevelData(list, data.getId());
childList = childList.stream().sorted(Comparator.comparing(SysMenu::getSort)).collect(Collectors.toList());
data.setSysMenuList(childList);
resultList.add(data);
}
}
return resultList;
}
......
hs-api/src/main/java/com/hs/api/service/SysMenuService.java
......@@ -11,4 +11,6 @@ public interface SysMenuService extends ServiceBase<SysMenu> {
final static Integer MENU_TOP_PARENT_ID = 0;
List<SysMenuList> getMenu(Long userId) throws Exception;
List<SysMenuList> getMenuByType(Integer menuType) throws Exception;
}
hs-api/src/main/resources/mapper/SysMenuMapper.xml
......@@ -12,6 +12,7 @@
<result column="PARENT_ID" jdbcType="DECIMAL" property="parentId"/>
<result column="PAGE_CODE" jdbcType="VARCHAR" property="pageCode"/>
<result column="SORT" jdbcType="DECIMAL" property="sort"/>
<result column="MENU_TYPE" jdbcType="DECIMAL" property="menuType"/>
</resultMap>
<resultMap id="sysMenuResultMap" type="com.hs.api.model.respmodel.SysMenuList" extends="BaseResultMap"/>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
......@@ -73,7 +74,14 @@
from SYS_MENU
</select>
<select id="selectMenuByUser" resultMap="sysMenuResultMap">
select DISTINCT m.ID, m.MENU_NAME, m.MENU_URL, m.MENU_IMAGE, m.PARENT_ID, m.PAGE_CODE, m.SORT
select DISTINCT m.ID,
m.MENU_NAME,
m.MENU_URL,
m.MENU_IMAGE,
m.PARENT_ID,
m.PAGE_CODE,
m.SORT,
m.MENU_TYPE
from SYS_ROLE_MENU_RS rmr
LEFT JOIN
SYS_MENU m on rmr.MENU_ID = m.ID
......@@ -83,15 +91,29 @@
and m.STATE = 1
and urr.STATE = 1
and urr.USER_ID = #{userId,jdbcType=DECIMAL}
and m.MENU_TYPE = 1
union
select DISTINCT m.ID, m.MENU_NAME, m.MENU_URL, m.MENU_IMAGE, m.PARENT_ID, m.PAGE_CODE, m.SORT
select DISTINCT m.ID,
m.MENU_NAME,
m.MENU_URL,
m.MENU_IMAGE,
m.PARENT_ID,
m.PAGE_CODE,
m.SORT,
m.MENU_TYPE
from SYS_USER_MENU_RS umr
LEFT JOIN
SYS_MENU m on umr.MENU_ID = m.ID
where umr.STATE = 1
and m.STATE = 1
and m.MENU_TYPE = 1
and umr.USER_ID = #{userId,jdbcType=DECIMAL}
</select>
<select id="selectMenuByType" resultMap="sysMenuResultMap">
select *
from SYS_MENU
where STATE = 1
and MENU_TYPE = #{menuType}
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/更新日志.txt
时间：2020.09.09 版本号：2.02.0909001
时间：2020.09.17 版本号：2.02.0917001
时间：2020.09.17 版本号：2.02.0917001
后端更新说明
汇总页面菜单接口
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间：2020.09.015 版本号：2.02.0915001
前端更新说明
列表三级病组 病组编码 PC端 悬停显示全称， paid 端点击显示全称
成本模块二级病组层头部数据展示block1中的第一条数据(全院数据)
列表医生模块 总费用单位为(万)
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间：2020.09.010 版本号：2.02.0910002
前端更新说明
670 成本科室病组的rw_tbl绑定字段有问题
绩效模块 医技 科室切换
成本模块 科室层饼图点击存储例数最高主病组编码
列表病组层 头部汇总数据不可点击
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间：2020.09.010 版本号：2.02.0910001
前端更新说明
669 医疗组列表同比，占比，偏离百分数处理，
671 趋势图缺失成本的柱图
670 成本科室病组的rw_tbl绑定字段有问题
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间：2020.09.09 版本号：2.02.0909001
后端更新说明
......
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