Skip to content

S
sv-springboot
Commit 2cd91dc8 by Suvalue
Options

1.菜单相关接口添加 

2.发布配置
parent 6ac2589c
Showing with 437 additions and 70 deletions
bsoft-admin/pom.xml
......@@ -12,6 +12,7 @@
<artifactId>bsoft-admin</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>bsoft-admin</name>
<packaging>war</packaging>
<description>Demo project for Spring Boot</description>
<properties>
......@@ -93,12 +94,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>com.bsoft</groupId>
<artifactId>bsoft-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
......
bsoft-admin/src/main/java/com/bsoft/admin/ServletInitializer.java 0 → 100644
package com.bsoft.admin;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
public class ServletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
//Application的类名
return application.sources(BsoftAdminApplication.class);
}
}
bsoft-admin/src/main/java/com/bsoft/admin/controller/MenuController.java 0 → 100644
package com.bsoft.admin.controller;
import com.bsoft.admin.common.Result;
import com.bsoft.admin.common.annotations.CurrentUser;
import com.bsoft.admin.common.annotations.Token;
import com.bsoft.admin.model.SysMenu;
import com.bsoft.admin.model.SysRole;
import com.bsoft.admin.model.reqmodel.MenuReq;
import com.bsoft.admin.model.reqmodel.RoleReq;
import com.bsoft.admin.service.SysMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
@Api(tags = "菜单API",produces="produces",consumes="consumes",protocols="protocols")
@RequestMapping("/menu")
@RestController
public class MenuController {
@Autowired
private SysMenuService sysMenuService;
@PostMapping("all")
@Token
@ApiOperation("查询菜单列表")
public Object getAll(@RequestBody MenuReq.GetMenuReq menu)throws Exception{
List<SysMenu> list = sysMenuService.getAll(menu);
return Result.success(list);
}
@PostMapping("info")
@Token
@ApiOperation("查询菜单详细信息")
public Object getById(@RequestBody MenuReq.InfoMenuReq menu)throws Exception{
SysMenu info = sysMenuService.info(menu);
return Result.success(info);
}
@PostMapping("add")
@Token
@ApiOperation("添加菜单")
public Object addUser(@ApiIgnore @CurrentUser Long userId, @RequestBody MenuReq.AddMenuReq menu)throws Exception{
boolean result = sysMenuService.addMenu(userId,menu);
if(result)
return Result.success(null);
else
return Result.error();
}
@PostMapping("delete")
@Token
@ApiOperation("删除菜单")
public Object addUser(@RequestBody MenuReq.DeleteMenuReq menu)throws Exception{
boolean result = sysMenuService.deleteMenu(menu);
if(result)
return Result.success(null);
else
return Result.error();
}
@PostMapping("update")
@Token
@ApiOperation("修改菜单")
public Object addUser(@RequestBody MenuReq.UpdateMenuReq menu)throws Exception{
boolean result = sysMenuService.updateMenu(menu);
if(result)
return Result.success(null);
else
return Result.error();
}
}
bsoft-admin/src/main/java/com/bsoft/admin/controller/RoleController.java
......@@ -4,7 +4,6 @@ import com.bsoft.admin.common.Result;
import com.bsoft.admin.common.annotations.CurrentUser;
import com.bsoft.admin.common.annotations.Token;
import com.bsoft.admin.model.SysRole;
import com.bsoft.admin.model.SysUser;
import com.bsoft.admin.model.reqmodel.RoleReq;
import com.bsoft.admin.service.SysRoleService;
import io.swagger.annotations.Api;
......@@ -28,7 +27,7 @@ public class RoleController {
@PostMapping("all")
@Token
@ApiOperation("查询角色列表")
public Object getAll(@RequestBody RoleReq.GetReq role)throws Exception{
public Object getAll(@RequestBody RoleReq.GetRoleReq role)throws Exception{
List<SysRole> list = sysRoleService.getAll(role);
return Result.success(list);
}
......@@ -36,7 +35,7 @@ public class RoleController {
@PostMapping("info")
@Token
@ApiOperation("查询角色详细信息")
public Object getById(@RequestBody RoleReq.InfoReq role)throws Exception{
public Object getById(@RequestBody RoleReq.InfoRoleReq role)throws Exception{
SysRole info = sysRoleService.info(role.getRoleId());
return Result.success(info);
}
......@@ -44,7 +43,7 @@ public class RoleController {
@PostMapping("add")
@Token
@ApiOperation("添加角色")
public Object addUser(@ApiIgnore @CurrentUser Long userId, @RequestBody RoleReq.AddReq role)throws Exception{
public Object addUser(@ApiIgnore @CurrentUser Long userId, @RequestBody RoleReq.AddRoleReq role)throws Exception{
SysRole sysRole = sysRoleService.findByCode(role.getRoleCode());
if(sysRole!=null){
return Result.error("该角色已存在！");
......@@ -59,7 +58,7 @@ public class RoleController {
@PostMapping("delete")
@Token
@ApiOperation("删除角色")
public Object addUser(@RequestBody RoleReq.DeleteReq role)throws Exception{
public Object addUser(@RequestBody RoleReq.DeleteRoleReq role)throws Exception{
boolean result = sysRoleService.deleteRole(role);
if(result)
return Result.success(null);
......@@ -69,8 +68,8 @@ public class RoleController {
@PostMapping("update")
@Token
@ApiOperation("修改")
public Object addUser(@RequestBody RoleReq.UpdateReq role)throws Exception{
@ApiOperation("修改角色")
public Object addUser(@RequestBody RoleReq.UpdateRoleReq role)throws Exception{
SysRole reqRole = sysRoleService.info(role.getRoleId());
SysRole codeRole = sysRoleService.findByCode(role.getRoleCode());
if(reqRole!=null){
......
bsoft-admin/src/main/java/com/bsoft/admin/controller/UserController.java
......@@ -34,7 +34,7 @@ public class UserController {
@PostMapping("all")
@Token
@ApiOperation("查询用户列表")
public Object getAll(@RequestBody UserReq.GetReq user)throws Exception{
public Object getAll(@RequestBody UserReq.GetUserReq user)throws Exception{
List<SysUser> list = userService.getAll(user);
return Result.success(list);
}
......@@ -42,7 +42,7 @@ public class UserController {
@PostMapping("info")
@Token
@ApiOperation("查询用户详细信息")
public Object getById(@RequestBody UserReq.InfoReq user)throws Exception{
public Object getById(@RequestBody UserReq.InfoUserReq user)throws Exception{
SysUser info = userService.info(user.getUserId());
return Result.success(info);
}
......@@ -50,7 +50,7 @@ public class UserController {
@PostMapping("add")
@Token
@ApiOperation("添加用户")
public Object addUser(@ApiIgnore@CurrentUser Long userId, @RequestBody UserReq.AddReq user)throws Exception{
public Object addUser(@ApiIgnore@CurrentUser Long userId, @RequestBody UserReq.AddUserReq user)throws Exception{
SysUser sysUser = userService.findByLoginName(user.getUserCode());
if(sysUser!=null){
return Result.error("该账号已存在！");
......@@ -65,7 +65,7 @@ public class UserController {
@PostMapping("delete")
@Token
@ApiOperation("删除用户")
public Object deleteUser(@RequestBody UserReq.DeleteReq user)throws Exception{
public Object deleteUser(@RequestBody UserReq.DeleteUserReq user)throws Exception{
boolean result =userService.deleteUser(user);
if(result)
return Result.success(null);
......@@ -76,7 +76,7 @@ public class UserController {
@PostMapping("update")
@Token
@ApiOperation("修改用户")
public Object updateUser(@RequestBody UserReq.UpdateReq user)throws Exception{
public Object updateUser(@RequestBody UserReq.UpdateUserReq user)throws Exception{
SysUser reqUser = userService.info(user.getUserId());
SysUser codeUser = userService.findByLoginName(user.getUserCode());
if(reqUser!=null){
......
bsoft-admin/src/main/java/com/bsoft/admin/model/reqmodel/MenuReq.java 0 → 100644
package com.bsoft.admin.model.reqmodel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotNull;
public class MenuReq {
public static class GetMenuReq{
@ApiModelProperty(value="菜单名称")
private String menuName;
public String getMenuName() {
return menuName;
}
public void setMenuName(String menuName) {
this.menuName = menuName;
}
@Override
public String toString() {
return "GetMenuReq{" +
"menuName='" + menuName + '\'' +
'}';
}
}
public static class InfoMenuReq{
@ApiModelProperty(value="菜单ID",required = true)
@NotNull(message = "菜单ID 参数必传")
private Long menuId;
public Long getMenuId() {
return menuId;
}
public void setMenuId(Long menuId) {
this.menuId = menuId;
}
@Override
public String toString() {
return "InfoMenuReq{" +
"menuId=" + menuId +
'}';
}
}
public static class AddMenuReq{
@ApiModelProperty(value="菜单名称",required = true)
@NotNull(message = "菜单名称 参数必传")
private String menuName;
@ApiModelProperty(value="菜单路径",required = true)
private String menuUrl;
@ApiModelProperty(value="菜单图片",required = true)
private String menuImage;
@ApiModelProperty(value="父级关系",required = true)
@NotNull(message = "父级关系 参数必传")
private Long parentId;
@ApiModelProperty(value="页面编码",required = true)
private String pageCode;
public String getMenuName() {
return menuName;
}
public void setMenuName(String menuName) {
this.menuName = menuName;
}
public String getMenuUrl() {
return menuUrl;
}
public void setMenuUrl(String menuUrl) {
this.menuUrl = menuUrl;
}
public String getMenuImage() {
return menuImage;
}
public void setMenuImage(String menuImage) {
this.menuImage = menuImage;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public String getPageCode() {
return pageCode;
}
public void setPageCode(String pageCode) {
this.pageCode = pageCode;
}
@Override
public String toString() {
return "AddMenuReq{" +
"menuName='" + menuName + '\'' +
", menuUrl='" + menuUrl + '\'' +
", menuImage='" + menuImage + '\'' +
", parentId=" + parentId +
", pageCode='" + pageCode + '\'' +
'}';
}
}
public static class DeleteMenuReq{
@ApiModelProperty(value="菜单ID",required = true)
@NotNull(message = "菜单ID 参数必传")
private Long menuId;
public Long getMenuId() {
return menuId;
}
public void setMenuId(Long menuId) {
this.menuId = menuId;
}
@Override
public String toString() {
return "InfoMenuReq{" +
"menuId=" + menuId +
'}';
}
}
public static class UpdateMenuReq{
@ApiModelProperty(value="菜单ID",required = true)
@NotNull(message = "菜单ID 参数必传")
private Long menuId;
@ApiModelProperty(value="菜单名称",required = true)
@NotNull(message = "菜单名称 参数必传")
private String menuName;
@ApiModelProperty(value="菜单路径",required = true)
private String menuUrl;
@ApiModelProperty(value="菜单图片",required = true)
private String menuImage;
@ApiModelProperty(value="父级关系",required = true)
@NotNull(message = "父级关系 参数必传")
private Long parentId;
@ApiModelProperty(value="页面编码",required = true)
private String pageCode;
public Long getMenuId() {
return menuId;
}
public void setMenuId(Long menuId) {
this.menuId = menuId;
}
public String getMenuName() {
return menuName;
}
public void setMenuName(String menuName) {
this.menuName = menuName;
}
public String getMenuUrl() {
return menuUrl;
}
public void setMenuUrl(String menuUrl) {
this.menuUrl = menuUrl;
}
public String getMenuImage() {
return menuImage;
}
public void setMenuImage(String menuImage) {
this.menuImage = menuImage;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public String getPageCode() {
return pageCode;
}
public void setPageCode(String pageCode) {
this.pageCode = pageCode;
}
@Override
public String toString() {
return "UpdateMenuReq{" +
"menuId=" + menuId +
", menuName='" + menuName + '\'' +
", menuUrl='" + menuUrl + '\'' +
", menuImage='" + menuImage + '\'' +
", parentId=" + parentId +
", pageCode='" + pageCode + '\'' +
'}';
}
}
}
bsoft-admin/src/main/java/com/bsoft/admin/model/reqmodel/RoleReq.java
......@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotNull;
public class RoleReq {
public static class GetReq{
public static class GetRoleReq{
@ApiModelProperty(value="角色名称",required = true)
private String roleName;
......@@ -25,7 +25,7 @@ public class RoleReq {
}
}
public static class InfoReq{
public static class InfoRoleReq{
@ApiModelProperty(value="角色ID",required = true)
@NotNull(message = "角色ID 参数必传")
private Long roleId;
......@@ -46,7 +46,7 @@ public class RoleReq {
}
}
public static class AddReq{
public static class AddRoleReq{
@ApiModelProperty(value="角色编码",required = true)
@NotNull(message = "角色编码 参数必传")
private Long roleCode;
......@@ -80,7 +80,7 @@ public class RoleReq {
}
}
public static class DeleteReq{
public static class DeleteRoleReq{
@ApiModelProperty(value="角色ID",required = true)
@NotNull(message = "角色ID 参数必传")
private Long roleId;
......@@ -101,7 +101,7 @@ public class RoleReq {
}
}
public static class UpdateReq{
public static class UpdateRoleReq{
@ApiModelProperty(value="角色ID",required = true)
@NotNull(message = "角色ID 参数必传")
private Long roleId;
......
bsoft-admin/src/main/java/com/bsoft/admin/model/reqmodel/UserReq.java
......@@ -6,7 +6,7 @@ import javax.validation.constraints.NotNull;
public class UserReq {
public static class GetReq{
public static class GetUserReq{
@ApiModelProperty(value="用户名称",required = true)
private String userName;
......@@ -26,7 +26,7 @@ public class UserReq {
}
}
public static class InfoReq{
public static class InfoUserReq{
@ApiModelProperty(value="用户ID",required = true)
@NotNull(message = "用户ID 参数必传")
private Long userId;
......@@ -47,7 +47,7 @@ public class UserReq {
}
}
public static class AddReq{
public static class AddUserReq{
@ApiModelProperty(value="账号",required = true)
@NotNull(message = "账号 参数必传")
private String userCode;
......@@ -131,7 +131,7 @@ public class UserReq {
}
public static class DeleteReq{
public static class DeleteUserReq{
@ApiModelProperty(value="用户ID",required = true)
@NotNull(message = "用户ID 参数必传")
private Long userId;
......@@ -152,7 +152,7 @@ public class UserReq {
}
}
public static class UpdateReq{
public static class UpdateUserReq{
@ApiModelProperty(value="用户ID",required = true)
@NotNull(message = "用户ID 参数必传")
private Long userId;
......
bsoft-admin/src/main/java/com/bsoft/admin/service/SysMenuService.java
package com.bsoft.admin.service;
import com.bsoft.admin.model.SysMenu;
import com.bsoft.admin.model.reqmodel.MenuReq;
import com.bsoft.admin.model.respmodel.SysMenuList;
import java.util.List;
public interface SysMenuService extends ServiceBase<SysMenu> {
public interface SysMenuService {
//顶级菜单的父级id
final static Integer MENU_TOP_PARENT_ID =0;
List<SysMenuList> getMenu(Long userId) throws Exception;
List<SysMenu> getAll(MenuReq.GetMenuReq menu);
SysMenu info(MenuReq.InfoMenuReq menu);
boolean addMenu(Long userId,MenuReq.AddMenuReq menu);
boolean deleteMenu(MenuReq.DeleteMenuReq menu);
boolean updateMenu(MenuReq.UpdateMenuReq menu);
}
bsoft-admin/src/main/java/com/bsoft/admin/service/SysRoleService.java
......@@ -7,9 +7,9 @@ import java.util.List;
public interface SysRoleService {
SysRole findByCode(Long roleCode);
boolean addRole(Long userId, RoleReq.AddReq role);
boolean deleteRole(RoleReq.DeleteReq role);
boolean updateRole(RoleReq.UpdateReq role);
List<SysRole> getAll(RoleReq.GetReq role);
boolean addRole(Long userId, RoleReq.AddRoleReq role);
boolean deleteRole(RoleReq.DeleteRoleReq role);
boolean updateRole(RoleReq.UpdateRoleReq role);
List<SysRole> getAll(RoleReq.GetRoleReq role);
SysRole info(long roleId);
}
bsoft-admin/src/main/java/com/bsoft/admin/service/UserService.java
......@@ -7,9 +7,9 @@ import java.util.List;
public interface UserService {
SysUser findByLoginName(String loginName);
boolean addUser(Long userId, UserReq.AddReq user);
boolean deleteUser(UserReq.DeleteReq user);
boolean updateUser(UserReq.UpdateReq user);
List<SysUser> getAll(UserReq.GetReq user);
boolean addUser(Long userId, UserReq.AddUserReq user);
boolean deleteUser(UserReq.DeleteUserReq user);
boolean updateUser(UserReq.UpdateUserReq user);
List<SysUser> getAll(UserReq.GetUserReq user);
SysUser info(Long userId);
}
bsoft-admin/src/main/java/com/bsoft/admin/service/impl/SysMenuServiceImpl.java
package com.bsoft.admin.service.impl;
import com.bsoft.admin.common.enums.StateType;
import com.bsoft.admin.mapper.SysMenuMapper;
import com.bsoft.admin.model.SysMenu;
import com.bsoft.admin.model.SysRole;
import com.bsoft.admin.model.reqmodel.MenuReq;
import com.bsoft.admin.model.respmodel.SysMenuList;
import com.bsoft.admin.service.SysMenuService;
import org.springframework.stereotype.Service;
......@@ -9,6 +12,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
......@@ -42,32 +46,69 @@ public class SysMenuServiceImpl implements SysMenuService {
}
@Override
public int add(SysMenu sysMenu) {
return 0;
public List<SysMenu> getAll(MenuReq.GetMenuReq menu){
List<SysMenu> list = sysMenuMapper.selectAll();
if(menu.getMenuName()!=null){
list = list.stream().filter(
o->(o.getMenuName()!=null && o.getMenuName().toLowerCase().contains(menu.getMenuName().toLowerCase())))
.collect(Collectors.toList());
}
@Override
public List<SysMenu> findAll() {
return null;
return list;
}
@Override
public SysMenu find(Long id) {
return null;
public SysMenu info(MenuReq.InfoMenuReq menu){
SysMenu sysMenu = sysMenuMapper.selectByPrimaryKey(menu.getMenuId());
return sysMenu;
}
@Override
public int delete(Long id) {
return 0;
public boolean addMenu(Long userId,MenuReq.AddMenuReq menu){
if(menu!=null){
SysMenu sysMenu = new SysMenu();
sysMenu.setCreateData(new Date());
sysMenu.setCreateUserid(userId);
sysMenu.setState((short) StateType.ON.getValue());
sysMenu.setMenuName(menu.getMenuName());
sysMenu.setMenuUrl(menu.getMenuUrl());
sysMenu.setMenuImage(menu.getMenuImage());
sysMenu.setPageCode(menu.getPageCode());
sysMenu.setParentId(menu.getParentId());
sysMenuMapper.insert(sysMenu);
return true;
}
return false;
}
@Override
public int logicDelete(Long id) {
return 0;
public boolean deleteMenu(MenuReq.DeleteMenuReq menu){
if(menu!=null){
SysMenu sysMenu = sysMenuMapper.selectByPrimaryKey(menu.getMenuId());
if(sysMenu!=null){
sysMenu.setState((short) StateType.OFF.getValue());
sysMenuMapper.updateByPrimaryKey(sysMenu);
return true;
}
}
return false;
}
@Override
public int update(SysMenu sysMenu) {
return 0;
public boolean updateMenu(MenuReq.UpdateMenuReq menu) {
if(menu!=null) {
SysMenu sysMenu = sysMenuMapper.selectByPrimaryKey(menu.getMenuId());
if(sysMenu!=null){
sysMenu.setMenuName(menu.getMenuName());
sysMenu.setMenuUrl(menu.getMenuUrl());
sysMenu.setMenuImage(menu.getMenuImage());
sysMenu.setPageCode(menu.getPageCode());
sysMenu.setParentId(menu.getParentId());
sysMenuMapper.updateByPrimaryKey(sysMenu);
return true;
}
}
return false;
}
}
bsoft-admin/src/main/java/com/bsoft/admin/service/impl/SysRoleServiceImpl.java
......@@ -23,7 +23,7 @@ public class SysRoleServiceImpl implements SysRoleService {
}
@Override
public boolean addRole(Long userId, RoleReq.AddReq role) {
public boolean addRole(Long userId, RoleReq.AddRoleReq role) {
if(role!=null){
SysRole sysRole = new SysRole();
sysRole.setCreateDate(new Date());
......@@ -38,7 +38,7 @@ public class SysRoleServiceImpl implements SysRoleService {
}
@Override
public boolean deleteRole(RoleReq.DeleteReq role) {
public boolean deleteRole(RoleReq.DeleteRoleReq role) {
if(role!=null){
SysRole sysRole = sysRoleMapper.selectByPrimaryKey(role.getRoleId());
if(sysRole!=null){
......@@ -51,7 +51,7 @@ public class SysRoleServiceImpl implements SysRoleService {
}
@Override
public boolean updateRole(RoleReq.UpdateReq role) {
public boolean updateRole(RoleReq.UpdateRoleReq role) {
if(role!=null) {
SysRole sysRole = sysRoleMapper.selectByPrimaryKey(role.getRoleId());
if(sysRole!=null){
......@@ -65,7 +65,7 @@ public class SysRoleServiceImpl implements SysRoleService {
}
@Override
public List<SysRole> getAll(RoleReq.GetReq role) {
public List<SysRole> getAll(RoleReq.GetRoleReq role) {
List<SysRole> list = sysRoleMapper.selectAll();
if(role.getRoleName()!=null){
list = list.stream().filter(
......
bsoft-admin/src/main/java/com/bsoft/admin/service/impl/UserServiceImpl.java
......@@ -24,7 +24,7 @@ public class UserServiceImpl implements UserService {
}
@Override
public boolean addUser(Long userId, UserReq.AddReq user){
public boolean addUser(Long userId, UserReq.AddUserReq user){
if(user!=null) {
SysUser sysUser = new SysUser();
sysUser.setUserCode(user.getUserCode());
......@@ -43,7 +43,7 @@ public class UserServiceImpl implements UserService {
}
@Override
public boolean deleteUser(UserReq.DeleteReq user) {
public boolean deleteUser(UserReq.DeleteUserReq user) {
if(user!=null){
SysUser sysUser = sysUserMapper.selectByPrimaryKey(user.getUserId());
if(sysUser!=null){
......@@ -56,7 +56,7 @@ public class UserServiceImpl implements UserService {
}
@Override
public boolean updateUser(UserReq.UpdateReq user) {
public boolean updateUser(UserReq.UpdateUserReq user) {
if(user!=null){
SysUser sysUser = sysUserMapper.selectByPrimaryKey(user.getUserId());
if(sysUser!=null){
......@@ -74,7 +74,7 @@ public class UserServiceImpl implements UserService {
}
@Override
public List<SysUser> getAll(UserReq.GetReq user) {
public List<SysUser> getAll(UserReq.GetUserReq user) {
List<SysUser> list = sysUserMapper.selectAll();
if(user.getUserName()!=null){
list = list.stream().filter(
......
bsoft-admin/src/main/resources/mapper/SysMenuMapper.xml
......@@ -48,12 +48,13 @@
select ID, CREATE_DATA, CREATE_USERID, "STATE", MENU_NAME, MENU_URL, MENU_IMAGE,
PARENT_ID, PAGE_CODE, SORT
from SYS_MENU
where ID = #{id,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL} and "STATE"=1
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATA, CREATE_USERID, "STATE", MENU_NAME, MENU_URL, MENU_IMAGE,
PARENT_ID, PAGE_CODE, SORT
from SYS_MENU
where "STATE"=1
</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
......
bsoft-admin/src/main/resources/mapper/SysRoleMapper.xml
......@@ -14,13 +14,13 @@
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.admin.model.SysRole">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
<selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
select SEQ_SYS_ROLE_ID.nextval from dual
</selectKey>
insert into SYS_ROLE (CREATE_DATE, CREATE_USERID, "STATE",
insert into SYS_ROLE (ID,CREATE_DATE, CREATE_USERID, "STATE",
ROLE_NAME, ROLE_CODE)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{roleName,jdbcType=VARCHAR}, #{roleCode,jdbcType=DECIMAL})
values (#{id,jdbcType=DECIMAL},#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL},
#{state,jdbcType=DECIMAL}, #{roleName,jdbcType=VARCHAR}, #{roleCode,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.admin.model.SysRole">
update SYS_ROLE
......
bsoft-admin/src/main/resources/mapper/SysUserMapper.xml
......@@ -23,16 +23,16 @@
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.admin.model.SysUser">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
<selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
select SEQ_SYS_USER_ID.nextval from dual
</selectKey>
insert into SYS_USER (CREATE_DATE, CREATE_USERID, "STATE",
insert into SYS_USER (ID,CREATE_DATE, CREATE_USERID, "STATE",
USER_CODE, USER_NAME, "PASSWORD",
IDCARD, SEX, MOBILE,
PAGE_COUNT, ERROR_COUNT, ERROR_TIME,
LAST_TIME, LAST_IP)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
values (#{id,jdbcType=DECIMAL},#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL},
#{state,jdbcType=DECIMAL},#{userCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
#{idcard,jdbcType=VARCHAR}, #{sex,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
#{pageCount,jdbcType=DECIMAL}, #{errorCount,jdbcType=DECIMAL}, #{errorTime,jdbcType=TIMESTAMP},
#{lastTime,jdbcType=TIMESTAMP}, #{lastIp,jdbcType=VARCHAR})
......
bsoft-admin/src/main/webapp/WEB-INF/web.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
version="4.0">
<context-param>
<param-name>webAppRootKey</param-name>
<param-value>admin</param-value>
</context-param>
</web-app>
\ No newline at end of file
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