Skip to content

G
guns-vip
Commit b1437863 by stylefeng
Options

controller层删掉dao的直接调用

parent cafc08ae
Showing with 612 additions and 122 deletions
guns-admin/src/main/java/com/stylefeng/guns/config/MybatisPlusConfig.java
...@@ -26,7 +26,7 @@ import java.util.HashMap; ...@@ -26,7 +26,7 @@ import java.util.HashMap;
*/ */
@Configuration @Configuration
@EnableTransactionManagement(order = 2)//由于引入多数据源，所以让spring事务的aop要在多数据源切换aop的后面 @EnableTransactionManagement(order = 2)//由于引入多数据源，所以让spring事务的aop要在多数据源切换aop的后面
@MapperScan(basePackages = {"com.stylefeng.guns.modular.*.dao", "com.stylefeng.guns.core.common.persistence.dao"}) @MapperScan(basePackages = {"com.stylefeng.guns.modular.*.dao"})
public class MybatisPlusConfig { public class MybatisPlusConfig {
@Autowired @Autowired
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/BlackboardController.java
package com.stylefeng.guns.modular.system.controller; package com.stylefeng.guns.modular.system.controller;
import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.modular.system.dao.NoticeMapper; import com.stylefeng.guns.modular.system.service.INoticeService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
...@@ -21,14 +21,14 @@ import java.util.Map; ...@@ -21,14 +21,14 @@ import java.util.Map;
public class BlackboardController extends BaseController { public class BlackboardController extends BaseController {
@Autowired @Autowired
NoticeMapper noticeMapper; INoticeService noticeService;
/** /**
* 跳转到黑板 * 跳转到黑板
*/ */
@RequestMapping("") @RequestMapping("")
public String blackboard(Model model) { public String blackboard(Model model) {
List<Map<String, Object>> notices = noticeMapper.list(null); List<Map<String, Object>> notices = noticeService.list(null);
model.addAttribute("noticeList", notices); model.addAttribute("noticeList", notices);
return "/blackboard.html"; return "/blackboard.html";
} }
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DeptController.java
package com.stylefeng.guns.modular.system.controller; package com.stylefeng.guns.modular.system.controller;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.annotion.BussinessLog; import com.stylefeng.guns.core.common.annotion.BussinessLog;
import com.stylefeng.guns.core.common.annotion.Permission; import com.stylefeng.guns.core.common.annotion.Permission;
import com.stylefeng.guns.core.common.constant.dictmap.DeptDict; import com.stylefeng.guns.core.common.constant.dictmap.DeptDict;
import com.stylefeng.guns.core.common.constant.factory.ConstantFactory; import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import com.stylefeng.guns.core.common.exception.BizExceptionEnum; import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
import com.stylefeng.guns.modular.system.dao.DeptMapper;
import com.stylefeng.guns.modular.system.model.Dept;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.exception.GunsException; import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.log.LogObjectHolder; import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.node.ZTreeNode; import com.stylefeng.guns.core.node.ZTreeNode;
import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.Dept;
import com.stylefeng.guns.modular.system.service.IDeptService; import com.stylefeng.guns.modular.system.service.IDeptService;
import com.stylefeng.guns.modular.system.warpper.DeptWarpper; import com.stylefeng.guns.modular.system.warpper.DeptWarpper;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -38,9 +37,6 @@ public class DeptController extends BaseController { ...@@ -38,9 +37,6 @@ public class DeptController extends BaseController {
private String PREFIX = "/system/dept/"; private String PREFIX = "/system/dept/";
@Resource @Resource
DeptMapper deptMapper;
@Resource
IDeptService deptService; IDeptService deptService;
/** /**
...@@ -65,7 +61,7 @@ public class DeptController extends BaseController { ...@@ -65,7 +61,7 @@ public class DeptController extends BaseController {
@Permission @Permission
@RequestMapping("/dept_update/{deptId}") @RequestMapping("/dept_update/{deptId}")
public String deptUpdate(@PathVariable Integer deptId, Model model) { public String deptUpdate(@PathVariable Integer deptId, Model model) {
Dept dept = deptMapper.selectById(deptId); Dept dept = deptService.selectById(deptId);
model.addAttribute(dept); model.addAttribute(dept);
model.addAttribute("pName", ConstantFactory.me().getDeptName(dept.getPid())); model.addAttribute("pName", ConstantFactory.me().getDeptName(dept.getPid()));
LogObjectHolder.me().set(dept); LogObjectHolder.me().set(dept);
...@@ -78,7 +74,7 @@ public class DeptController extends BaseController { ...@@ -78,7 +74,7 @@ public class DeptController extends BaseController {
@RequestMapping(value = "/tree") @RequestMapping(value = "/tree")
@ResponseBody @ResponseBody
public List<ZTreeNode> tree() { public List<ZTreeNode> tree() {
List<ZTreeNode> tree = this.deptMapper.tree(); List<ZTreeNode> tree = this.deptService.tree();
tree.add(ZTreeNode.createParent()); tree.add(ZTreeNode.createParent());
return tree; return tree;
} }
...@@ -96,7 +92,7 @@ public class DeptController extends BaseController { ...@@ -96,7 +92,7 @@ public class DeptController extends BaseController {
} }
//完善pids,根据pid拿到pid的pids //完善pids,根据pid拿到pid的pids
deptSetPids(dept); deptSetPids(dept);
return this.deptMapper.insert(dept); return this.deptService.insert(dept);
} }
/** /**
...@@ -106,7 +102,7 @@ public class DeptController extends BaseController { ...@@ -106,7 +102,7 @@ public class DeptController extends BaseController {
@Permission @Permission
@ResponseBody @ResponseBody
public Object list(String condition) { public Object list(String condition) {
List<Map<String, Object>> list = this.deptMapper.list(condition); List<Map<String, Object>> list = this.deptService.list(condition);
return super.warpObject(new DeptWarpper(list)); return super.warpObject(new DeptWarpper(list));
} }
...@@ -117,7 +113,7 @@ public class DeptController extends BaseController { ...@@ -117,7 +113,7 @@ public class DeptController extends BaseController {
@Permission @Permission
@ResponseBody @ResponseBody
public Object detail(@PathVariable("deptId") Integer deptId) { public Object detail(@PathVariable("deptId") Integer deptId) {
return deptMapper.selectById(deptId); return deptService.selectById(deptId);
} }
/** /**
...@@ -132,7 +128,7 @@ public class DeptController extends BaseController { ...@@ -132,7 +128,7 @@ public class DeptController extends BaseController {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
deptSetPids(dept); deptSetPids(dept);
deptMapper.updateById(dept); deptService.updateById(dept);
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -159,7 +155,7 @@ public class DeptController extends BaseController { ...@@ -159,7 +155,7 @@ public class DeptController extends BaseController {
dept.setPids("[0],"); dept.setPids("[0],");
} else { } else {
int pid = dept.getPid(); int pid = dept.getPid();
Dept temp = deptMapper.selectById(pid); Dept temp = deptService.selectById(pid);
String pids = temp.getPids(); String pids = temp.getPids();
dept.setPid(pid); dept.setPid(pid);
dept.setPids(pids + "[" + pid + "],"); dept.setPids(pids + "[" + pid + "],");
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DictController.java
package com.stylefeng.guns.modular.system.controller; package com.stylefeng.guns.modular.system.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.annotion.BussinessLog; import com.stylefeng.guns.core.common.annotion.BussinessLog;
import com.stylefeng.guns.core.common.annotion.Permission; import com.stylefeng.guns.core.common.annotion.Permission;
import com.stylefeng.guns.core.common.constant.Const; import com.stylefeng.guns.core.common.constant.Const;
import com.stylefeng.guns.core.common.constant.dictmap.DictMap; import com.stylefeng.guns.core.common.constant.dictmap.DictMap;
import com.stylefeng.guns.core.common.constant.factory.ConstantFactory; import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import com.stylefeng.guns.core.common.exception.BizExceptionEnum; import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
import com.stylefeng.guns.modular.system.dao.DictMapper;
import com.stylefeng.guns.modular.system.model.Dict;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.exception.GunsException; import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.log.LogObjectHolder; import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.Dict;
import com.stylefeng.guns.modular.system.service.IDictService; import com.stylefeng.guns.modular.system.service.IDictService;
import com.stylefeng.guns.modular.system.warpper.DictWarpper; import com.stylefeng.guns.modular.system.warpper.DictWarpper;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -39,9 +38,6 @@ public class DictController extends BaseController { ...@@ -39,9 +38,6 @@ public class DictController extends BaseController {
private String PREFIX = "/system/dict/"; private String PREFIX = "/system/dict/";
@Resource @Resource
DictMapper dictMapper;
@Resource
IDictService dictService; IDictService dictService;
/** /**
...@@ -66,9 +62,9 @@ public class DictController extends BaseController { ...@@ -66,9 +62,9 @@ public class DictController extends BaseController {
@Permission(Const.ADMIN_NAME) @Permission(Const.ADMIN_NAME)
@RequestMapping("/dict_edit/{dictId}") @RequestMapping("/dict_edit/{dictId}")
public String deptUpdate(@PathVariable Integer dictId, Model model) { public String deptUpdate(@PathVariable Integer dictId, Model model) {
Dict dict = dictMapper.selectById(dictId); Dict dict = dictService.selectById(dictId);
model.addAttribute("dict", dict); model.addAttribute("dict", dict);
List<Dict> subDicts = dictMapper.selectList(new EntityWrapper<Dict>().eq("pid", dictId)); List<Dict> subDicts = dictService.selectList(new EntityWrapper<Dict>().eq("pid", dictId));
model.addAttribute("subDicts", subDicts); model.addAttribute("subDicts", subDicts);
LogObjectHolder.me().set(dict); LogObjectHolder.me().set(dict);
return PREFIX + "dict_edit.html"; return PREFIX + "dict_edit.html";
...@@ -98,7 +94,7 @@ public class DictController extends BaseController { ...@@ -98,7 +94,7 @@ public class DictController extends BaseController {
@Permission(Const.ADMIN_NAME) @Permission(Const.ADMIN_NAME)
@ResponseBody @ResponseBody
public Object list(String condition) { public Object list(String condition) {
List<Map<String, Object>> list = this.dictMapper.list(condition); List<Map<String, Object>> list = this.dictService.list(condition);
return super.warpObject(new DictWarpper(list)); return super.warpObject(new DictWarpper(list));
} }
...@@ -109,7 +105,7 @@ public class DictController extends BaseController { ...@@ -109,7 +105,7 @@ public class DictController extends BaseController {
@Permission(Const.ADMIN_NAME) @Permission(Const.ADMIN_NAME)
@ResponseBody @ResponseBody
public Object detail(@PathVariable("dictId") Integer dictId) { public Object detail(@PathVariable("dictId") Integer dictId) {
return dictMapper.selectById(dictId); return dictService.selectById(dictId);
} }
/** /**
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LogController.java
...@@ -9,8 +9,8 @@ import com.stylefeng.guns.core.common.constant.Const; ...@@ -9,8 +9,8 @@ import com.stylefeng.guns.core.common.constant.Const;
import com.stylefeng.guns.core.common.constant.factory.PageFactory; import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.common.constant.state.BizLogType; import com.stylefeng.guns.core.common.constant.state.BizLogType;
import com.stylefeng.guns.core.support.BeanKit; import com.stylefeng.guns.core.support.BeanKit;
import com.stylefeng.guns.modular.system.dao.OperationLogMapper;
import com.stylefeng.guns.modular.system.model.OperationLog; import com.stylefeng.guns.modular.system.model.OperationLog;
import com.stylefeng.guns.modular.system.service.IOperationLogService;
import com.stylefeng.guns.modular.system.warpper.LogWarpper; import com.stylefeng.guns.modular.system.warpper.LogWarpper;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -35,7 +35,7 @@ public class LogController extends BaseController { ...@@ -35,7 +35,7 @@ public class LogController extends BaseController {
private static String PREFIX = "/system/log/"; private static String PREFIX = "/system/log/";
@Resource @Resource
private OperationLogMapper operationLogMapper; private IOperationLogService operationLogService;
/** /**
* 跳转到日志管理的首页 * 跳转到日志管理的首页
...@@ -53,7 +53,7 @@ public class LogController extends BaseController { ...@@ -53,7 +53,7 @@ public class LogController extends BaseController {
@ResponseBody @ResponseBody
public Object list(@RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String logName, @RequestParam(required = false) Integer logType) { public Object list(@RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String logName, @RequestParam(required = false) Integer logType) {
Page<OperationLog> page = new PageFactory<OperationLog>().defaultPage(); Page<OperationLog> page = new PageFactory<OperationLog>().defaultPage();
List<Map<String, Object>> result = operationLogMapper.getOperationLogs(page, beginTime, endTime, logName, BizLogType.valueOf(logType), page.getOrderByField(), page.isAsc()); List<Map<String, Object>> result = operationLogService.getOperationLogs(page, beginTime, endTime, logName, BizLogType.valueOf(logType), page.getOrderByField(), page.isAsc());
page.setRecords((List<OperationLog>) new LogWarpper(result).warp()); page.setRecords((List<OperationLog>) new LogWarpper(result).warp());
return super.packForBT(page); return super.packForBT(page);
} }
...@@ -65,7 +65,7 @@ public class LogController extends BaseController { ...@@ -65,7 +65,7 @@ public class LogController extends BaseController {
@Permission(Const.ADMIN_NAME) @Permission(Const.ADMIN_NAME)
@ResponseBody @ResponseBody
public Object detail(@PathVariable Integer id) { public Object detail(@PathVariable Integer id) {
OperationLog operationLog = operationLogMapper.selectById(id); OperationLog operationLog = operationLogService.selectById(id);
Map<String, Object> stringObjectMap = BeanKit.beanToMap(operationLog); Map<String, Object> stringObjectMap = BeanKit.beanToMap(operationLog);
return super.warpObject(new LogWarpper(stringObjectMap)); return super.warpObject(new LogWarpper(stringObjectMap));
} }
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java
...@@ -11,9 +11,9 @@ import com.stylefeng.guns.core.shiro.ShiroUser; ...@@ -11,9 +11,9 @@ import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.ApiMenuFilter; import com.stylefeng.guns.core.util.ApiMenuFilter;
import com.stylefeng.guns.core.util.KaptchaUtil; import com.stylefeng.guns.core.util.KaptchaUtil;
import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.MenuMapper;
import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.model.User; import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.service.IMenuService;
import com.stylefeng.guns.modular.system.service.IUserService;
import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -36,10 +36,10 @@ import static com.stylefeng.guns.core.support.HttpKit.getIp; ...@@ -36,10 +36,10 @@ import static com.stylefeng.guns.core.support.HttpKit.getIp;
public class LoginController extends BaseController { public class LoginController extends BaseController {
@Autowired @Autowired
MenuMapper menuMapper; IMenuService menuService;
@Autowired @Autowired
UserMapper userMapper; IUserService userService;
/** /**
* 跳转到主页 * 跳转到主页
...@@ -53,7 +53,7 @@ public class LoginController extends BaseController { ...@@ -53,7 +53,7 @@ public class LoginController extends BaseController {
model.addAttribute("tips", "该用户没有角色，无法登陆"); model.addAttribute("tips", "该用户没有角色，无法登陆");
return "/login.html"; return "/login.html";
} }
List<MenuNode> menus = menuMapper.getMenusByRoleIds(roleList); List<MenuNode> menus = menuService.getMenusByRoleIds(roleList);
List<MenuNode> titles = MenuNode.buildTitle(menus); List<MenuNode> titles = MenuNode.buildTitle(menus);
titles = ApiMenuFilter.build(titles); titles = ApiMenuFilter.build(titles);
...@@ -61,7 +61,7 @@ public class LoginController extends BaseController { ...@@ -61,7 +61,7 @@ public class LoginController extends BaseController {
//获取用户头像 //获取用户头像
Integer id = ShiroKit.getUser().getId(); Integer id = ShiroKit.getUser().getId();
User user = userMapper.selectById(id); User user = userService.selectById(id);
String avatar = user.getAvatar(); String avatar = user.getAvatar();
model.addAttribute("avatar", avatar); model.addAttribute("avatar", avatar);
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginLogController.java
...@@ -7,8 +7,8 @@ import com.stylefeng.guns.core.common.annotion.BussinessLog; ...@@ -7,8 +7,8 @@ import com.stylefeng.guns.core.common.annotion.BussinessLog;
import com.stylefeng.guns.core.common.annotion.Permission; import com.stylefeng.guns.core.common.annotion.Permission;
import com.stylefeng.guns.core.common.constant.Const; import com.stylefeng.guns.core.common.constant.Const;
import com.stylefeng.guns.core.common.constant.factory.PageFactory; import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.modular.system.dao.LoginLogMapper;
import com.stylefeng.guns.modular.system.model.OperationLog; import com.stylefeng.guns.modular.system.model.OperationLog;
import com.stylefeng.guns.modular.system.service.ILoginLogService;
import com.stylefeng.guns.modular.system.warpper.LogWarpper; import com.stylefeng.guns.modular.system.warpper.LogWarpper;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -32,7 +32,7 @@ public class LoginLogController extends BaseController { ...@@ -32,7 +32,7 @@ public class LoginLogController extends BaseController {
private static String PREFIX = "/system/log/"; private static String PREFIX = "/system/log/";
@Resource @Resource
private LoginLogMapper loginLogMapper; private ILoginLogService loginLogService;
/** /**
* 跳转到日志管理的首页 * 跳转到日志管理的首页
...@@ -50,7 +50,7 @@ public class LoginLogController extends BaseController { ...@@ -50,7 +50,7 @@ public class LoginLogController extends BaseController {
@ResponseBody @ResponseBody
public Object list(@RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String logName) { public Object list(@RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String logName) {
Page<OperationLog> page = new PageFactory<OperationLog>().defaultPage(); Page<OperationLog> page = new PageFactory<OperationLog>().defaultPage();
List<Map<String, Object>> result = loginLogMapper.getLoginLogs(page, beginTime, endTime, logName, page.getOrderByField(), page.isAsc()); List<Map<String, Object>> result = loginLogService.getLoginLogs(page, beginTime, endTime, logName, page.getOrderByField(), page.isAsc());
page.setRecords((List<OperationLog>) new LogWarpper(result).warp()); page.setRecords((List<OperationLog>) new LogWarpper(result).warp());
return super.packForBT(page); return super.packForBT(page);
} }
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/MenuController.java
package com.stylefeng.guns.modular.system.controller; package com.stylefeng.guns.modular.system.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.Tip; import com.stylefeng.guns.core.base.tips.Tip;
import com.stylefeng.guns.core.common.annotion.BussinessLog; import com.stylefeng.guns.core.common.annotion.BussinessLog;
...@@ -14,7 +15,6 @@ import com.stylefeng.guns.core.log.LogObjectHolder; ...@@ -14,7 +15,6 @@ import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.node.ZTreeNode; import com.stylefeng.guns.core.node.ZTreeNode;
import com.stylefeng.guns.core.support.BeanKit; import com.stylefeng.guns.core.support.BeanKit;
import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.MenuMapper;
import com.stylefeng.guns.modular.system.model.Menu; import com.stylefeng.guns.modular.system.model.Menu;
import com.stylefeng.guns.modular.system.service.IMenuService; import com.stylefeng.guns.modular.system.service.IMenuService;
import com.stylefeng.guns.modular.system.warpper.MenuWarpper; import com.stylefeng.guns.modular.system.warpper.MenuWarpper;
...@@ -44,9 +44,6 @@ public class MenuController extends BaseController { ...@@ -44,9 +44,6 @@ public class MenuController extends BaseController {
private static String PREFIX = "/system/menu/"; private static String PREFIX = "/system/menu/";
@Resource @Resource
MenuMapper menuMapper;
@Resource
IMenuService menuService; IMenuService menuService;
/** /**
...@@ -74,12 +71,12 @@ public class MenuController extends BaseController { ...@@ -74,12 +71,12 @@ public class MenuController extends BaseController {
if (ToolUtil.isEmpty(menuId)) { if (ToolUtil.isEmpty(menuId)) {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
Menu menu = this.menuMapper.selectById(menuId); Menu menu = this.menuService.selectById(menuId);
//获取父级菜单的id //获取父级菜单的id
Menu temp = new Menu(); Menu temp = new Menu();
temp.setCode(menu.getPcode()); temp.setCode(menu.getPcode());
Menu pMenu = this.menuMapper.selectOne(temp); Menu pMenu = this.menuService.selectOne(new EntityWrapper<>(temp));
//如果父级是顶级菜单 //如果父级是顶级菜单
if (pMenu == null) { if (pMenu == null) {
...@@ -110,7 +107,7 @@ public class MenuController extends BaseController { ...@@ -110,7 +107,7 @@ public class MenuController extends BaseController {
//设置父级菜单编号 //设置父级菜单编号
menuSetPcode(menu); menuSetPcode(menu);
this.menuMapper.updateById(menu); this.menuService.updateById(menu);
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -121,7 +118,7 @@ public class MenuController extends BaseController { ...@@ -121,7 +118,7 @@ public class MenuController extends BaseController {
@RequestMapping(value = "/list") @RequestMapping(value = "/list")
@ResponseBody @ResponseBody
public Object list(@RequestParam(required = false) String menuName, @RequestParam(required = false) String level) { public Object list(@RequestParam(required = false) String menuName, @RequestParam(required = false) String level) {
List<Map<String, Object>> menus = this.menuMapper.selectMenus(menuName, level); List<Map<String, Object>> menus = this.menuService.selectMenus(menuName, level);
return super.warpObject(new MenuWarpper(menus)); return super.warpObject(new MenuWarpper(menus));
} }
...@@ -147,7 +144,7 @@ public class MenuController extends BaseController { ...@@ -147,7 +144,7 @@ public class MenuController extends BaseController {
menuSetPcode(menu); menuSetPcode(menu);
menu.setStatus(MenuStatus.ENABLE.getCode()); menu.setStatus(MenuStatus.ENABLE.getCode());
this.menuMapper.insert(menu); this.menuService.insert(menu);
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -179,7 +176,7 @@ public class MenuController extends BaseController { ...@@ -179,7 +176,7 @@ public class MenuController extends BaseController {
if (ToolUtil.isEmpty(menuId)) { if (ToolUtil.isEmpty(menuId)) {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
this.menuMapper.selectById(menuId); this.menuService.selectById(menuId);
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -189,7 +186,7 @@ public class MenuController extends BaseController { ...@@ -189,7 +186,7 @@ public class MenuController extends BaseController {
@RequestMapping(value = "/menuTreeList") @RequestMapping(value = "/menuTreeList")
@ResponseBody @ResponseBody
public List<ZTreeNode> menuTreeList() { public List<ZTreeNode> menuTreeList() {
List<ZTreeNode> roleTreeList = this.menuMapper.menuTreeList(); List<ZTreeNode> roleTreeList = this.menuService.menuTreeList();
return roleTreeList; return roleTreeList;
} }
...@@ -199,7 +196,7 @@ public class MenuController extends BaseController { ...@@ -199,7 +196,7 @@ public class MenuController extends BaseController {
@RequestMapping(value = "/selectMenuTreeList") @RequestMapping(value = "/selectMenuTreeList")
@ResponseBody @ResponseBody
public List<ZTreeNode> selectMenuTreeList() { public List<ZTreeNode> selectMenuTreeList() {
List<ZTreeNode> roleTreeList = this.menuMapper.menuTreeList(); List<ZTreeNode> roleTreeList = this.menuService.menuTreeList();
roleTreeList.add(ZTreeNode.createParent()); roleTreeList.add(ZTreeNode.createParent());
return roleTreeList; return roleTreeList;
} }
...@@ -210,12 +207,12 @@ public class MenuController extends BaseController { ...@@ -210,12 +207,12 @@ public class MenuController extends BaseController {
@RequestMapping(value = "/menuTreeListByRoleId/{roleId}") @RequestMapping(value = "/menuTreeListByRoleId/{roleId}")
@ResponseBody @ResponseBody
public List<ZTreeNode> menuTreeListByRoleId(@PathVariable Integer roleId) { public List<ZTreeNode> menuTreeListByRoleId(@PathVariable Integer roleId) {
List<Long> menuIds = this.menuMapper.getMenuIdsByRoleId(roleId); List<Long> menuIds = this.menuService.getMenuIdsByRoleId(roleId);
if (ToolUtil.isEmpty(menuIds)) { if (ToolUtil.isEmpty(menuIds)) {
List<ZTreeNode> roleTreeList = this.menuMapper.menuTreeList(); List<ZTreeNode> roleTreeList = this.menuService.menuTreeList();
return roleTreeList; return roleTreeList;
} else { } else {
List<ZTreeNode> roleTreeListByUserId = this.menuMapper.menuTreeListByMenuIds(menuIds); List<ZTreeNode> roleTreeListByUserId = this.menuService.menuTreeListByMenuIds(menuIds);
return roleTreeListByUserId; return roleTreeListByUserId;
} }
} }
...@@ -230,7 +227,7 @@ public class MenuController extends BaseController { ...@@ -230,7 +227,7 @@ public class MenuController extends BaseController {
menu.setLevels(1); menu.setLevels(1);
} else { } else {
long code = Long.parseLong(menu.getPcode()); long code = Long.parseLong(menu.getPcode());
Menu pMenu = menuMapper.selectById(code); Menu pMenu = menuService.selectById(code);
Integer pLevels = pMenu.getLevels(); Integer pLevels = pMenu.getLevels();
menu.setPcode(pMenu.getCode()); menu.setPcode(pMenu.getCode());
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/NoticeController.java
...@@ -9,8 +9,8 @@ import com.stylefeng.guns.core.exception.GunsException; ...@@ -9,8 +9,8 @@ import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.log.LogObjectHolder; import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit; import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.NoticeMapper;
import com.stylefeng.guns.modular.system.model.Notice; import com.stylefeng.guns.modular.system.model.Notice;
import com.stylefeng.guns.modular.system.service.INoticeService;
import com.stylefeng.guns.modular.system.warpper.NoticeWrapper; import com.stylefeng.guns.modular.system.warpper.NoticeWrapper;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
...@@ -37,7 +37,7 @@ public class NoticeController extends BaseController { ...@@ -37,7 +37,7 @@ public class NoticeController extends BaseController {
private String PREFIX = "/system/notice/"; private String PREFIX = "/system/notice/";
@Resource @Resource
private NoticeMapper noticeMapper; private INoticeService noticeService;
/** /**
* 跳转到通知列表首页 * 跳转到通知列表首页
...@@ -60,7 +60,7 @@ public class NoticeController extends BaseController { ...@@ -60,7 +60,7 @@ public class NoticeController extends BaseController {
*/ */
@RequestMapping("/notice_update/{noticeId}") @RequestMapping("/notice_update/{noticeId}")
public String noticeUpdate(@PathVariable Integer noticeId, Model model) { public String noticeUpdate(@PathVariable Integer noticeId, Model model) {
Notice notice = this.noticeMapper.selectById(noticeId); Notice notice = this.noticeService.selectById(noticeId);
model.addAttribute("notice",notice); model.addAttribute("notice",notice);
LogObjectHolder.me().set(notice); LogObjectHolder.me().set(notice);
return PREFIX + "notice_edit.html"; return PREFIX + "notice_edit.html";
...@@ -71,7 +71,7 @@ public class NoticeController extends BaseController { ...@@ -71,7 +71,7 @@ public class NoticeController extends BaseController {
*/ */
@RequestMapping("/hello") @RequestMapping("/hello")
public String hello() { public String hello() {
List<Map<String, Object>> notices = noticeMapper.list(null); List<Map<String, Object>> notices = noticeService.list(null);
super.setAttr("noticeList",notices); super.setAttr("noticeList",notices);
return "/blackboard.html"; return "/blackboard.html";
} }
...@@ -82,7 +82,7 @@ public class NoticeController extends BaseController { ...@@ -82,7 +82,7 @@ public class NoticeController extends BaseController {
@RequestMapping(value = "/list") @RequestMapping(value = "/list")
@ResponseBody @ResponseBody
public Object list(String condition) { public Object list(String condition) {
List<Map<String, Object>> list = this.noticeMapper.list(condition); List<Map<String, Object>> list = this.noticeService.list(condition);
return super.warpObject(new NoticeWrapper(list)); return super.warpObject(new NoticeWrapper(list));
} }
...@@ -113,7 +113,7 @@ public class NoticeController extends BaseController { ...@@ -113,7 +113,7 @@ public class NoticeController extends BaseController {
//缓存通知名称 //缓存通知名称
LogObjectHolder.me().set(ConstantFactory.me().getNoticeTitle(noticeId)); LogObjectHolder.me().set(ConstantFactory.me().getNoticeTitle(noticeId));
this.noticeMapper.deleteById(noticeId); this.noticeService.deleteById(noticeId);
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -128,7 +128,7 @@ public class NoticeController extends BaseController { ...@@ -128,7 +128,7 @@ public class NoticeController extends BaseController {
if (ToolUtil.isOneEmpty(notice, notice.getId(), notice.getTitle(), notice.getContent())) { if (ToolUtil.isOneEmpty(notice, notice.getId(), notice.getTitle(), notice.getContent())) {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
Notice old = this.noticeMapper.selectById(notice.getId()); Notice old = this.noticeService.selectById(notice.getId());
old.setTitle(notice.getTitle()); old.setTitle(notice.getTitle());
old.setContent(notice.getContent()); old.setContent(notice.getContent());
old.updateById(); old.updateById();
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java
...@@ -15,11 +15,10 @@ import com.stylefeng.guns.core.log.LogObjectHolder; ...@@ -15,11 +15,10 @@ import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.node.ZTreeNode; import com.stylefeng.guns.core.node.ZTreeNode;
import com.stylefeng.guns.core.util.Convert; import com.stylefeng.guns.core.util.Convert;
import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.RoleMapper;
import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.model.Role; import com.stylefeng.guns.modular.system.model.Role;
import com.stylefeng.guns.modular.system.model.User; import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.service.IRoleService; import com.stylefeng.guns.modular.system.service.IRoleService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.warpper.RoleWarpper; import com.stylefeng.guns.modular.system.warpper.RoleWarpper;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
...@@ -47,10 +46,7 @@ public class RoleController extends BaseController { ...@@ -47,10 +46,7 @@ public class RoleController extends BaseController {
private static String PREFIX = "/system/role"; private static String PREFIX = "/system/role";
@Resource @Resource
UserMapper userMapper; IUserService userService;
@Resource
RoleMapper roleMapper;
@Resource @Resource
IRoleService roleService; IRoleService roleService;
...@@ -80,7 +76,7 @@ public class RoleController extends BaseController { ...@@ -80,7 +76,7 @@ public class RoleController extends BaseController {
if (ToolUtil.isEmpty(roleId)) { if (ToolUtil.isEmpty(roleId)) {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
Role role = this.roleMapper.selectById(roleId); Role role = this.roleService.selectById(roleId);
model.addAttribute(role); model.addAttribute(role);
model.addAttribute("pName", ConstantFactory.me().getSingleRoleName(role.getPid())); model.addAttribute("pName", ConstantFactory.me().getSingleRoleName(role.getPid()));
model.addAttribute("deptName", ConstantFactory.me().getDeptName(role.getDeptid())); model.addAttribute("deptName", ConstantFactory.me().getDeptName(role.getDeptid()));
...@@ -109,7 +105,7 @@ public class RoleController extends BaseController { ...@@ -109,7 +105,7 @@ public class RoleController extends BaseController {
@RequestMapping(value = "/list") @RequestMapping(value = "/list")
@ResponseBody @ResponseBody
public Object list(@RequestParam(required = false) String roleName) { public Object list(@RequestParam(required = false) String roleName) {
List<Map<String, Object>> roles = this.roleMapper.selectRoles(super.getPara("roleName")); List<Map<String, Object>> roles = this.roleService.selectRoles(super.getPara("roleName"));
return super.warpObject(new RoleWarpper(roles)); return super.warpObject(new RoleWarpper(roles));
} }
...@@ -125,7 +121,7 @@ public class RoleController extends BaseController { ...@@ -125,7 +121,7 @@ public class RoleController extends BaseController {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
role.setId(null); role.setId(null);
this.roleMapper.insert(role); this.roleService.insert(role);
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -140,7 +136,7 @@ public class RoleController extends BaseController { ...@@ -140,7 +136,7 @@ public class RoleController extends BaseController {
if (result.hasErrors()) { if (result.hasErrors()) {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
this.roleMapper.updateById(role); this.roleService.updateById(role);
//删除缓存 //删除缓存
CacheKit.removeAll(Cache.CONSTANT); CacheKit.removeAll(Cache.CONSTANT);
...@@ -160,7 +156,7 @@ public class RoleController extends BaseController { ...@@ -160,7 +156,7 @@ public class RoleController extends BaseController {
} }
//不能删除超级管理员角色 //不能删除超级管理员角色
if(roleId.equals(Const.ADMIN_ROLE_ID)){ if (roleId.equals(Const.ADMIN_ROLE_ID)) {
throw new GunsException(BizExceptionEnum.CANT_DELETE_ADMIN); throw new GunsException(BizExceptionEnum.CANT_DELETE_ADMIN);
} }
...@@ -183,7 +179,7 @@ public class RoleController extends BaseController { ...@@ -183,7 +179,7 @@ public class RoleController extends BaseController {
if (ToolUtil.isEmpty(roleId)) { if (ToolUtil.isEmpty(roleId)) {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
this.roleMapper.selectById(roleId); this.roleService.selectById(roleId);
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -208,7 +204,7 @@ public class RoleController extends BaseController { ...@@ -208,7 +204,7 @@ public class RoleController extends BaseController {
@RequestMapping(value = "/roleTreeList") @RequestMapping(value = "/roleTreeList")
@ResponseBody @ResponseBody
public List<ZTreeNode> roleTreeList() { public List<ZTreeNode> roleTreeList() {
List<ZTreeNode> roleTreeList = this.roleMapper.roleTreeList(); List<ZTreeNode> roleTreeList = this.roleService.roleTreeList();
roleTreeList.add(ZTreeNode.createParent()); roleTreeList.add(ZTreeNode.createParent());
return roleTreeList; return roleTreeList;
} }
...@@ -219,14 +215,14 @@ public class RoleController extends BaseController { ...@@ -219,14 +215,14 @@ public class RoleController extends BaseController {
@RequestMapping(value = "/roleTreeListByUserId/{userId}") @RequestMapping(value = "/roleTreeListByUserId/{userId}")
@ResponseBody @ResponseBody
public List<ZTreeNode> roleTreeListByUserId(@PathVariable Integer userId) { public List<ZTreeNode> roleTreeListByUserId(@PathVariable Integer userId) {
User theUser = this.userMapper.selectById(userId); User theUser = this.userService.selectById(userId);
String roleid = theUser.getRoleid(); String roleid = theUser.getRoleid();
if (ToolUtil.isEmpty(roleid)) { if (ToolUtil.isEmpty(roleid)) {
List<ZTreeNode> roleTreeList = this.roleMapper.roleTreeList(); List<ZTreeNode> roleTreeList = this.roleService.roleTreeList();
return roleTreeList; return roleTreeList;
} else { } else {
String[] strArray = Convert.toStrArray(",", roleid); String[] strArray = Convert.toStrArray(",", roleid);
List<ZTreeNode> roleTreeListByUserId = this.roleMapper.roleTreeListByRoleId(strArray); List<ZTreeNode> roleTreeListByUserId = this.roleService.roleTreeListByRoleId(strArray);
return roleTreeListByUserId; return roleTreeListByUserId;
} }
} }
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/UserMgrController.java
...@@ -20,6 +20,7 @@ import com.stylefeng.guns.core.util.ToolUtil; ...@@ -20,6 +20,7 @@ import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.UserMapper; import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.factory.UserFactory; import com.stylefeng.guns.modular.system.factory.UserFactory;
import com.stylefeng.guns.modular.system.model.User; import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.transfer.UserDto; import com.stylefeng.guns.modular.system.transfer.UserDto;
import com.stylefeng.guns.modular.system.warpper.UserWarpper; import com.stylefeng.guns.modular.system.warpper.UserWarpper;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -53,7 +54,7 @@ public class UserMgrController extends BaseController { ...@@ -53,7 +54,7 @@ public class UserMgrController extends BaseController {
private GunsProperties gunsProperties; private GunsProperties gunsProperties;
@Resource @Resource
private UserMapper userMapper; private IUserService userService;
/** /**
* 跳转到查看管理员列表的页面 * 跳转到查看管理员列表的页面
...@@ -97,7 +98,7 @@ public class UserMgrController extends BaseController { ...@@ -97,7 +98,7 @@ public class UserMgrController extends BaseController {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
assertAuth(userId); assertAuth(userId);
User user = this.userMapper.selectById(userId); User user = this.userService.selectById(userId);
model.addAttribute(user); model.addAttribute(user);
model.addAttribute("roleName", ConstantFactory.me().getRoleName(user.getRoleid())); model.addAttribute("roleName", ConstantFactory.me().getRoleName(user.getRoleid()));
model.addAttribute("deptName", ConstantFactory.me().getDeptName(user.getDeptid())); model.addAttribute("deptName", ConstantFactory.me().getDeptName(user.getDeptid()));
...@@ -114,7 +115,7 @@ public class UserMgrController extends BaseController { ...@@ -114,7 +115,7 @@ public class UserMgrController extends BaseController {
if (ToolUtil.isEmpty(userId)) { if (ToolUtil.isEmpty(userId)) {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
User user = this.userMapper.selectById(userId); User user = this.userService.selectById(userId);
model.addAttribute(user); model.addAttribute(user);
model.addAttribute("roleName", ConstantFactory.me().getRoleName(user.getRoleid())); model.addAttribute("roleName", ConstantFactory.me().getRoleName(user.getRoleid()));
model.addAttribute("deptName", ConstantFactory.me().getDeptName(user.getDeptid())); model.addAttribute("deptName", ConstantFactory.me().getDeptName(user.getDeptid()));
...@@ -140,7 +141,7 @@ public class UserMgrController extends BaseController { ...@@ -140,7 +141,7 @@ public class UserMgrController extends BaseController {
throw new GunsException(BizExceptionEnum.TWO_PWD_NOT_MATCH); throw new GunsException(BizExceptionEnum.TWO_PWD_NOT_MATCH);
} }
Integer userId = ShiroKit.getUser().getId(); Integer userId = ShiroKit.getUser().getId();
User user = userMapper.selectById(userId); User user = userService.selectById(userId);
String oldMd5 = ShiroKit.md5(oldPwd, user.getSalt()); String oldMd5 = ShiroKit.md5(oldPwd, user.getSalt());
if (user.getPassword().equals(oldMd5)) { if (user.getPassword().equals(oldMd5)) {
String newMd5 = ShiroKit.md5(newPwd, user.getSalt()); String newMd5 = ShiroKit.md5(newPwd, user.getSalt());
...@@ -160,11 +161,11 @@ public class UserMgrController extends BaseController { ...@@ -160,11 +161,11 @@ public class UserMgrController extends BaseController {
@ResponseBody @ResponseBody
public Object list(@RequestParam(required = false) String name, @RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) Integer deptid) { public Object list(@RequestParam(required = false) String name, @RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) Integer deptid) {
if (ShiroKit.isAdmin()) { if (ShiroKit.isAdmin()) {
List<Map<String, Object>> users = userMapper.selectUsers(null, name, beginTime, endTime, deptid); List<Map<String, Object>> users = userService.selectUsers(null, name, beginTime, endTime, deptid);
return new UserWarpper(users).warp(); return new UserWarpper(users).warp();
} else { } else {
DataScope dataScope = new DataScope(ShiroKit.getDeptDataScope()); DataScope dataScope = new DataScope(ShiroKit.getDeptDataScope());
List<Map<String, Object>> users = userMapper.selectUsers(dataScope, name, beginTime, endTime, deptid); List<Map<String, Object>> users = userService.selectUsers(dataScope, name, beginTime, endTime, deptid);
return new UserWarpper(users).warp(); return new UserWarpper(users).warp();
} }
} }
...@@ -182,7 +183,7 @@ public class UserMgrController extends BaseController { ...@@ -182,7 +183,7 @@ public class UserMgrController extends BaseController {
} }
// 判断账号是否重复 // 判断账号是否重复
User theUser = userMapper.getByAccount(user.getAccount()); User theUser = userService.getByAccount(user.getAccount());
if (theUser != null) { if (theUser != null) {
throw new GunsException(BizExceptionEnum.USER_ALREADY_REG); throw new GunsException(BizExceptionEnum.USER_ALREADY_REG);
} }
...@@ -193,7 +194,7 @@ public class UserMgrController extends BaseController { ...@@ -193,7 +194,7 @@ public class UserMgrController extends BaseController {
user.setStatus(ManagerStatus.OK.getCode()); user.setStatus(ManagerStatus.OK.getCode());
user.setCreatetime(new Date()); user.setCreatetime(new Date());
this.userMapper.insert(UserFactory.createUser(user)); this.userService.insert(UserFactory.createUser(user));
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -210,13 +211,13 @@ public class UserMgrController extends BaseController { ...@@ -210,13 +211,13 @@ public class UserMgrController extends BaseController {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
if (ShiroKit.hasRole(Const.ADMIN_NAME)) { if (ShiroKit.hasRole(Const.ADMIN_NAME)) {
this.userMapper.updateById(UserFactory.createUser(user)); this.userService.updateById(UserFactory.createUser(user));
return SUCCESS_TIP; return SUCCESS_TIP;
} else { } else {
assertAuth(user.getId()); assertAuth(user.getId());
ShiroUser shiroUser = ShiroKit.getUser(); ShiroUser shiroUser = ShiroKit.getUser();
if (shiroUser.getId().equals(user.getId())) { if (shiroUser.getId().equals(user.getId())) {
this.userMapper.updateById(UserFactory.createUser(user)); this.userService.updateById(UserFactory.createUser(user));
return SUCCESS_TIP; return SUCCESS_TIP;
} else { } else {
throw new GunsException(BizExceptionEnum.NO_PERMITION); throw new GunsException(BizExceptionEnum.NO_PERMITION);
...@@ -240,7 +241,7 @@ public class UserMgrController extends BaseController { ...@@ -240,7 +241,7 @@ public class UserMgrController extends BaseController {
throw new GunsException(BizExceptionEnum.CANT_DELETE_ADMIN); throw new GunsException(BizExceptionEnum.CANT_DELETE_ADMIN);
} }
assertAuth(userId); assertAuth(userId);
this.userMapper.setStatus(userId, ManagerStatus.DELETED.getCode()); this.userService.setStatus(userId, ManagerStatus.DELETED.getCode());
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -254,7 +255,7 @@ public class UserMgrController extends BaseController { ...@@ -254,7 +255,7 @@ public class UserMgrController extends BaseController {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
assertAuth(userId); assertAuth(userId);
return this.userMapper.selectById(userId); return this.userService.selectById(userId);
} }
/** /**
...@@ -269,10 +270,10 @@ public class UserMgrController extends BaseController { ...@@ -269,10 +270,10 @@ public class UserMgrController extends BaseController {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
assertAuth(userId); assertAuth(userId);
User user = this.userMapper.selectById(userId); User user = this.userService.selectById(userId);
user.setSalt(ShiroKit.getRandomSalt(5)); user.setSalt(ShiroKit.getRandomSalt(5));
user.setPassword(ShiroKit.md5(Const.DEFAULT_PWD, user.getSalt())); user.setPassword(ShiroKit.md5(Const.DEFAULT_PWD, user.getSalt()));
this.userMapper.updateById(user); this.userService.updateById(user);
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -292,7 +293,7 @@ public class UserMgrController extends BaseController { ...@@ -292,7 +293,7 @@ public class UserMgrController extends BaseController {
throw new GunsException(BizExceptionEnum.CANT_FREEZE_ADMIN); throw new GunsException(BizExceptionEnum.CANT_FREEZE_ADMIN);
} }
assertAuth(userId); assertAuth(userId);
this.userMapper.setStatus(userId, ManagerStatus.FREEZED.getCode()); this.userService.setStatus(userId, ManagerStatus.FREEZED.getCode());
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -308,7 +309,7 @@ public class UserMgrController extends BaseController { ...@@ -308,7 +309,7 @@ public class UserMgrController extends BaseController {
throw new GunsException(BizExceptionEnum.REQUEST_NULL); throw new GunsException(BizExceptionEnum.REQUEST_NULL);
} }
assertAuth(userId); assertAuth(userId);
this.userMapper.setStatus(userId, ManagerStatus.OK.getCode()); this.userService.setStatus(userId, ManagerStatus.OK.getCode());
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -328,7 +329,7 @@ public class UserMgrController extends BaseController { ...@@ -328,7 +329,7 @@ public class UserMgrController extends BaseController {
throw new GunsException(BizExceptionEnum.CANT_CHANGE_ADMIN); throw new GunsException(BizExceptionEnum.CANT_CHANGE_ADMIN);
} }
assertAuth(userId); assertAuth(userId);
this.userMapper.setRoles(userId, roleIds); this.userService.setRoles(userId, roleIds);
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -356,7 +357,7 @@ public class UserMgrController extends BaseController { ...@@ -356,7 +357,7 @@ public class UserMgrController extends BaseController {
return; return;
} }
List<Integer> deptDataScope = ShiroKit.getDeptDataScope(); List<Integer> deptDataScope = ShiroKit.getDeptDataScope();
User user = this.userMapper.selectById(userId); User user = this.userService.selectById(userId);
Integer deptid = user.getDeptid(); Integer deptid = user.getDeptid();
if (deptDataScope.contains(deptid)) { if (deptDataScope.contains(deptid)) {
return; return;
......
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDeptService.java
package com.stylefeng.guns.modular.system.service; package com.stylefeng.guns.modular.system.service;
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.core.node.ZTreeNode;
import com.stylefeng.guns.modular.system.model.Dept;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/** /**
* 部门服务 * 部门服务
* *
* @author fengshuonan * @author fengshuonan
* @date 2017-04-27 17:00 * @date 2017-04-27 17:00
*/ */
public interface IDeptService { public interface IDeptService extends IService<Dept> {
/** /**
* 删除部门 * 删除部门
*
* @author stylefeng
* @Date 2017/7/11 22:30
*/ */
void deleteDept(Integer deptId); void deleteDept(Integer deptId);
/**
* 获取ztree的节点列表
*/
List<ZTreeNode> tree();
/**
* 获取所有部门列表
*/
List<Map<String, Object>> list(@Param("condition") String condition);
} }
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDictService.java
package com.stylefeng.guns.modular.system.service; package com.stylefeng.guns.modular.system.service;
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.Dict;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/** /**
* 字典服务 * 字典服务
* *
* @author fengshuonan * @author fengshuonan
* @date 2017-04-27 17:00 * @date 2017-04-27 17:00
*/ */
public interface IDictService { public interface IDictService extends IService<Dict> {
/** /**
* 添加字典 * 添加字典
*
* @author fengshuonan
* @Date 2017/4/27 17:01
*/ */
void addDict(String dictName, String dictValues); void addDict(String dictName, String dictValues);
/** /**
* 编辑字典 * 编辑字典
*
* @author fengshuonan
* @Date 2017/4/28 11:01
*/ */
void editDict(Integer dictId, String dictName, String dicts); void editDict(Integer dictId, String dictName, String dicts);
/** /**
* 删除字典 * 删除字典
*
* @author fengshuonan
* @Date 2017/4/28 11:39
*/ */
void delteDict(Integer dictId); void delteDict(Integer dictId);
/**
* 根据编码获取词典列表
*/
List<Dict> selectByCode(@Param("code") String code);
/**
* 查询字典列表
*/
List<Map<String, Object>> list(@Param("condition") String conditiion);
} }
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILoginLogService.java 0 → 100644
package com.stylefeng.guns.modular.system.service;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.LoginLog;
import com.stylefeng.guns.modular.system.model.OperationLog;
import java.util.List;
import java.util.Map;
/**
* <p>
* 登录记录 服务类
* </p>
*
* @author stylefeng123
* @since 2018-02-22
*/
public interface ILoginLogService extends IService<LoginLog> {
/**
* 获取登录日志列表
*/
List<Map<String, Object>> getLoginLogs(Page<OperationLog> page, String beginTime, String endTime, String logName, String orderByField, boolean asc);
}
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMenuService.java
package com.stylefeng.guns.modular.system.service; package com.stylefeng.guns.modular.system.service;
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.core.node.MenuNode;
import com.stylefeng.guns.core.node.ZTreeNode;
import com.stylefeng.guns.modular.system.model.Menu;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/** /**
* 菜单服务 * 菜单服务
* *
* @author fengshuonan * @author fengshuonan
* @date 2017-05-05 22:19 * @date 2017-05-05 22:19
*/ */
public interface IMenuService { public interface IMenuService extends IService<Menu> {
/** /**
* 删除菜单 * 删除菜单
...@@ -23,4 +32,63 @@ public interface IMenuService { ...@@ -23,4 +32,63 @@ public interface IMenuService {
* @Date 2017/6/13 22:02 * @Date 2017/6/13 22:02
*/ */
void delMenuContainSubMenus(Long menuId); void delMenuContainSubMenus(Long menuId);
/**
* 根据条件查询菜单
*
* @return
* @date 2017年2月12日 下午9:14:34
*/
List<Map<String, Object>> selectMenus(@Param("condition") String condition, @Param("level") String level);
/**
* 根据条件查询菜单
*
* @return
* @date 2017年2月12日 下午9:14:34
*/
List<Long> getMenuIdsByRoleId(@Param("roleId") Integer roleId);
/**
* 获取菜单列表树
*
* @return
* @date 2017年2月19日 下午1:33:51
*/
List<ZTreeNode> menuTreeList();
/**
* 获取菜单列表树
*
* @return
* @date 2017年2月19日 下午1:33:51
*/
List<ZTreeNode> menuTreeListByMenuIds(List<Long> menuIds);
/**
* 删除menu关联的relation
*
* @param menuId
* @return
* @date 2017年2月19日 下午4:10:59
*/
int deleteRelationByMenu(Long menuId);
/**
* 获取资源url通过角色id
*
* @param roleId
* @return
* @date 2017年2月19日 下午7:12:38
*/
List<String> getResUrlsByRoleId(Integer roleId);
/**
* 根据角色获取菜单
*
* @param roleIds
* @return
* @date 2017年2月19日 下午10:35:40
*/
List<MenuNode> getMenusByRoleIds(List<Integer> roleIds);
} }
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/INoticeService.java 0 → 100644
package com.stylefeng.guns.modular.system.service;
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.Notice;
import java.util.List;
import java.util.Map;
/**
* <p>
* 通知表 服务类
* </p>
*
* @author stylefeng123
* @since 2018-02-22
*/
public interface INoticeService extends IService<Notice> {
/**
* 获取通知列表
*/
List<Map<String, Object>> list(String condition);
}
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOperationLogService.java 0 → 100644
package com.stylefeng.guns.modular.system.service;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.OperationLog;
import java.util.List;
import java.util.Map;
/**
* <p>
* 操作日志 服务类
* </p>
*
* @author stylefeng123
* @since 2018-02-22
*/
public interface IOperationLogService extends IService<OperationLog> {
/**
* 获取操作日志列表
*/
List<Map<String, Object>> getOperationLogs(Page<OperationLog> page, String beginTime, String endTime, String logName, String s, String orderByField, boolean asc);
}
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRelationService.java 0 → 100644
package com.stylefeng.guns.modular.system.service;
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.Relation;
/**
* <p>
* 角色和菜单关联表 服务类
* </p>
*
* @author stylefeng123
* @since 2018-02-22
*/
public interface IRelationService extends IService<Relation> {
}
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java
package com.stylefeng.guns.modular.system.service; package com.stylefeng.guns.modular.system.service;
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.core.node.ZTreeNode;
import com.stylefeng.guns.modular.system.model.Role;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/** /**
* 角色相关业务 * 角色相关业务
* *
* @author fengshuonan * @author fengshuonan
* @Date 2017年1月10日 下午9:11:57 * @Date 2017年1月10日 下午9:11:57
*/ */
public interface IRoleService { public interface IRoleService extends IService<Role> {
/** /**
* 设置某个角色的权限 * 设置某个角色的权限
...@@ -24,4 +32,37 @@ public interface IRoleService { ...@@ -24,4 +32,37 @@ public interface IRoleService {
* @Date 2017/5/5 22:24 * @Date 2017/5/5 22:24
*/ */
void delRoleById(Integer roleId); void delRoleById(Integer roleId);
/**
* 根据条件查询角色列表
*
* @return
* @date 2017年2月12日 下午9:14:34
*/
List<Map<String, Object>> selectRoles(@Param("condition") String condition);
/**
* 删除某个角色的所有权限
*
* @param roleId 角色id
* @return
* @date 2017年2月13日 下午7:57:51
*/
int deleteRolesById(@Param("roleId") Integer roleId);
/**
* 获取角色列表树
*
* @return
* @date 2017年2月18日 上午10:32:04
*/
List<ZTreeNode> roleTreeList();
/**
* 获取角色列表树
*
* @return
* @date 2017年2月18日 上午10:32:04
*/
List<ZTreeNode> roleTreeListByRoleId(String[] roleId);
} }
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserService.java 0 → 100644
package com.stylefeng.guns.modular.system.service;
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.core.datascope.DataScope;
import com.stylefeng.guns.modular.system.model.User;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* <p>
* 管理员表 服务类
* </p>
*
* @author stylefeng123
* @since 2018-02-22
*/
public interface IUserService extends IService<User> {
/**
* 修改用户状态
*/
int setStatus(@Param("userId") Integer userId, @Param("status") int status);
/**
* 修改密码
*/
int changePwd(@Param("userId") Integer userId, @Param("pwd") String pwd);
/**
* 根据条件查询用户列表
*/
List<Map<String, Object>> selectUsers(@Param("dataScope") DataScope dataScope, @Param("name") String name, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Integer deptid);
/**
* 设置用户的角色
*/
int setRoles(@Param("userId") Integer userId, @Param("roleIds") String roleIds);
/**
* 通过账号获取用户
*/
User getByAccount(@Param("account") String account);
}
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DeptServiceImpl.java
...@@ -2,6 +2,8 @@ package com.stylefeng.guns.modular.system.service.impl; ...@@ -2,6 +2,8 @@ package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.node.ZTreeNode;
import com.stylefeng.guns.modular.system.dao.DeptMapper; import com.stylefeng.guns.modular.system.dao.DeptMapper;
import com.stylefeng.guns.modular.system.model.Dept; import com.stylefeng.guns.modular.system.model.Dept;
import com.stylefeng.guns.modular.system.service.IDeptService; import com.stylefeng.guns.modular.system.service.IDeptService;
...@@ -10,17 +12,17 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -10,17 +12,17 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import java.util.Map;
@Service @Service
@Transactional @Transactional
public class DeptServiceImpl implements IDeptService { public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements IDeptService {
@Resource @Resource
DeptMapper deptMapper; DeptMapper deptMapper;
@Override @Override
public void deleteDept(Integer deptId) { public void deleteDept(Integer deptId) {
Dept dept = deptMapper.selectById(deptId); Dept dept = deptMapper.selectById(deptId);
Wrapper<Dept> wrapper = new EntityWrapper<>(); Wrapper<Dept> wrapper = new EntityWrapper<>();
...@@ -32,4 +34,14 @@ public class DeptServiceImpl implements IDeptService { ...@@ -32,4 +34,14 @@ public class DeptServiceImpl implements IDeptService {
dept.deleteById(); dept.deleteById();
} }
@Override
public List<ZTreeNode> tree() {
return this.baseMapper.tree();
}
@Override
public List<Map<String, Object>> list(String condition) {
return this.baseMapper.list(condition);
}
} }
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DictServiceImpl.java
...@@ -2,6 +2,7 @@ package com.stylefeng.guns.modular.system.service.impl; ...@@ -2,6 +2,7 @@ package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.common.exception.BizExceptionEnum; import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
import com.stylefeng.guns.core.exception.GunsException; import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.modular.system.dao.DictMapper; import com.stylefeng.guns.modular.system.dao.DictMapper;
...@@ -18,7 +19,7 @@ import static com.stylefeng.guns.core.common.constant.factory.MutiStrFactory.*; ...@@ -18,7 +19,7 @@ import static com.stylefeng.guns.core.common.constant.factory.MutiStrFactory.*;
@Service @Service
@Transactional @Transactional
public class DictServiceImpl implements IDictService { public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements IDictService {
@Resource @Resource
DictMapper dictMapper; DictMapper dictMapper;
...@@ -76,4 +77,14 @@ public class DictServiceImpl implements IDictService { ...@@ -76,4 +77,14 @@ public class DictServiceImpl implements IDictService {
//删除这个词典 //删除这个词典
dictMapper.deleteById(dictId); dictMapper.deleteById(dictId);
} }
@Override
public List<Dict> selectByCode(String code) {
return this.baseMapper.selectByCode(code);
}
@Override
public List<Map<String, Object>> list(String conditiion) {
return this.baseMapper.list(conditiion);
}
} }
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LoginLogServiceImpl.java 0 → 100644
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.LoginLogMapper;
import com.stylefeng.guns.modular.system.model.LoginLog;
import com.stylefeng.guns.modular.system.model.OperationLog;
import com.stylefeng.guns.modular.system.service.ILoginLogService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* <p>
* 登录记录 服务实现类
* </p>
*
* @author stylefeng123
* @since 2018-02-22
*/
@Service
public class LoginLogServiceImpl extends ServiceImpl<LoginLogMapper, LoginLog> implements ILoginLogService {
@Override
public List<Map<String, Object>> getLoginLogs(Page<OperationLog> page, String beginTime, String endTime, String logName, String orderByField, boolean asc) {
return this.baseMapper.getLoginLogs(page, beginTime, endTime, logName, orderByField, asc);
}
}
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java
...@@ -2,6 +2,9 @@ package com.stylefeng.guns.modular.system.service.impl; ...@@ -2,6 +2,9 @@ package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.node.MenuNode;
import com.stylefeng.guns.core.node.ZTreeNode;
import com.stylefeng.guns.modular.system.dao.MenuMapper; import com.stylefeng.guns.modular.system.dao.MenuMapper;
import com.stylefeng.guns.modular.system.model.Menu; import com.stylefeng.guns.modular.system.model.Menu;
import com.stylefeng.guns.modular.system.service.IMenuService; import com.stylefeng.guns.modular.system.service.IMenuService;
...@@ -9,6 +12,7 @@ import org.springframework.stereotype.Service; ...@@ -9,6 +12,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 菜单服务 * 菜单服务
...@@ -17,7 +21,7 @@ import java.util.List; ...@@ -17,7 +21,7 @@ import java.util.List;
* @date 2017-05-05 22:20 * @date 2017-05-05 22:20
*/ */
@Service @Service
public class MenuServiceImpl implements IMenuService { public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IMenuService {
@Resource @Resource
MenuMapper menuMapper; MenuMapper menuMapper;
...@@ -48,4 +52,39 @@ public class MenuServiceImpl implements IMenuService { ...@@ -48,4 +52,39 @@ public class MenuServiceImpl implements IMenuService {
delMenu(temp.getId()); delMenu(temp.getId());
} }
} }
@Override
public List<Map<String, Object>> selectMenus(String condition, String level) {
return this.baseMapper.selectMenus(condition, level);
}
@Override
public List<Long> getMenuIdsByRoleId(Integer roleId) {
return this.baseMapper.getMenuIdsByRoleId(roleId);
}
@Override
public List<ZTreeNode> menuTreeList() {
return this.baseMapper.menuTreeList();
}
@Override
public List<ZTreeNode> menuTreeListByMenuIds(List<Long> menuIds) {
return this.baseMapper.menuTreeListByMenuIds(menuIds);
}
@Override
public int deleteRelationByMenu(Long menuId) {
return this.baseMapper.deleteRelationByMenu(menuId);
}
@Override
public List<String> getResUrlsByRoleId(Integer roleId) {
return this.baseMapper.getResUrlsByRoleId(roleId);
}
@Override
public List<MenuNode> getMenusByRoleIds(List<Integer> roleIds) {
return this.baseMapper.getMenusByRoleIds(roleIds);
}
} }
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NoticeServiceImpl.java 0 → 100644
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.NoticeMapper;
import com.stylefeng.guns.modular.system.model.Notice;
import com.stylefeng.guns.modular.system.service.INoticeService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* <p>
* 通知表 服务实现类
* </p>
*
* @author stylefeng123
* @since 2018-02-22
*/
@Service
public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> implements INoticeService {
@Override
public List<Map<String, Object>> list(String condition) {
return this.baseMapper.list(condition);
}
}
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OperationLogServiceImpl.java 0 → 100644
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.OperationLogMapper;
import com.stylefeng.guns.modular.system.model.OperationLog;
import com.stylefeng.guns.modular.system.service.IOperationLogService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* <p>
* 操作日志 服务实现类
* </p>
*
* @author stylefeng123
* @since 2018-02-22
*/
@Service
public class OperationLogServiceImpl extends ServiceImpl<OperationLogMapper, OperationLog> implements IOperationLogService {
@Override
public List<Map<String, Object>> getOperationLogs(Page<OperationLog> page, String beginTime, String endTime, String logName, String s, String orderByField, boolean asc) {
return this.baseMapper.getOperationLogs(page, beginTime, endTime, logName, s, orderByField, asc);
}
}
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RelationServiceImpl.java 0 → 100644
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.RelationMapper;
import com.stylefeng.guns.modular.system.model.Relation;
import com.stylefeng.guns.modular.system.service.IRelationService;
import org.springframework.stereotype.Service;
/**
* <p>
* 角色和菜单关联表 服务实现类
* </p>
*
* @author stylefeng123
* @since 2018-02-22
*/
@Service
public class RelationServiceImpl extends ServiceImpl<RelationMapper, Relation> implements IRelationService {
}
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java
package com.stylefeng.guns.modular.system.service.impl; package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.node.ZTreeNode;
import com.stylefeng.guns.core.util.Convert; import com.stylefeng.guns.core.util.Convert;
import com.stylefeng.guns.modular.system.dao.RelationMapper; import com.stylefeng.guns.modular.system.dao.RelationMapper;
import com.stylefeng.guns.modular.system.dao.RoleMapper; import com.stylefeng.guns.modular.system.dao.RoleMapper;
import com.stylefeng.guns.modular.system.model.Relation; import com.stylefeng.guns.modular.system.model.Relation;
import com.stylefeng.guns.modular.system.model.Role;
import com.stylefeng.guns.modular.system.service.IRoleService; import com.stylefeng.guns.modular.system.service.IRoleService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@Service @Service
public class RoleServiceImpl implements IRoleService { public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IRoleService {
@Resource @Resource
RoleMapper roleMapper; RoleMapper roleMapper;
...@@ -45,4 +50,24 @@ public class RoleServiceImpl implements IRoleService { ...@@ -45,4 +50,24 @@ public class RoleServiceImpl implements IRoleService {
this.roleMapper.deleteRolesById(roleId); this.roleMapper.deleteRolesById(roleId);
} }
@Override
public List<Map<String, Object>> selectRoles(String condition) {
return this.baseMapper.selectRoles(condition);
}
@Override
public int deleteRolesById(Integer roleId) {
return this.baseMapper.deleteRolesById(roleId);
}
@Override
public List<ZTreeNode> roleTreeList() {
return this.baseMapper.roleTreeList();
}
@Override
public List<ZTreeNode> roleTreeListByRoleId(String[] roleId) {
return this.baseMapper.roleTreeListByRoleId(roleId);
}
} }
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java 0 → 100644
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.datascope.DataScope;
import com.stylefeng.guns.modular.system.dao.UserMapper;
import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.service.IUserService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* <p>
* 管理员表 服务实现类
* </p>
*
* @author stylefeng123
* @since 2018-02-22
*/
@Service
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
@Override
public int setStatus(Integer userId, int status) {
return this.baseMapper.setStatus(userId, status);
}
@Override
public int changePwd(Integer userId, String pwd) {
return this.baseMapper.changePwd(userId, pwd);
}
@Override
public List<Map<String, Object>> selectUsers(DataScope dataScope, String name, String beginTime, String endTime, Integer deptid) {
return this.baseMapper.selectUsers(dataScope, name, beginTime, endTime, deptid);
}
@Override
public int setRoles(Integer userId, String roleIds) {
return this.baseMapper.setRoles(userId, roleIds);
}
@Override
public User getByAccount(String account) {
return this.baseMapper.getByAccount(account);
}
}
guns-generator/src/main/java/com/stylefeng/guns/generator/action/config/GunsGeneratorConfig.java
...@@ -12,13 +12,13 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; ...@@ -12,13 +12,13 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
public class GunsGeneratorConfig extends AbstractGeneratorConfig { public class GunsGeneratorConfig extends AbstractGeneratorConfig {
protected void globalConfig() { protected void globalConfig() {
globalConfig.setOutputDir("D:\\ideaSpace\\guns\\guns-admin\\src\\main\\java");//写自己项目的绝对路径,注意具体到java目录 globalConfig.setOutputDir("D:\\ttt");//写自己项目的绝对路径,注意具体到java目录
globalConfig.setFileOverride(true); globalConfig.setFileOverride(true);
globalConfig.setEnableCache(false); globalConfig.setEnableCache(false);
globalConfig.setBaseResultMap(true); globalConfig.setBaseResultMap(true);
globalConfig.setBaseColumnList(true); globalConfig.setBaseColumnList(true);
globalConfig.setOpen(false); globalConfig.setOpen(false);
globalConfig.setAuthor("fengshuonan"); globalConfig.setAuthor("stylefeng");
} }
protected void dataSourceConfig() { protected void dataSourceConfig() {
...@@ -26,11 +26,11 @@ public class GunsGeneratorConfig extends AbstractGeneratorConfig { ...@@ -26,11 +26,11 @@ public class GunsGeneratorConfig extends AbstractGeneratorConfig {
dataSourceConfig.setDriverName("com.mysql.jdbc.Driver"); dataSourceConfig.setDriverName("com.mysql.jdbc.Driver");
dataSourceConfig.setUsername("root"); dataSourceConfig.setUsername("root");
dataSourceConfig.setPassword("root"); dataSourceConfig.setPassword("root");
dataSourceConfig.setUrl("jdbc:mysql://127.0.0.1:3306/adi_user_center?characterEncoding=utf8"); dataSourceConfig.setUrl("jdbc:mysql://127.0.0.1:3306/guns?characterEncoding=utf8");
} }
protected void strategyConfig() { protected void strategyConfig() {
//strategyConfig.setTablePrefix(new String[]{"xx_"});// 此处可以修改为您的表前缀 strategyConfig.setTablePrefix(new String[]{"sys_"});// 此处可以修改为您的表前缀
strategyConfig.setNaming(NamingStrategy.underline_to_camel); strategyConfig.setNaming(NamingStrategy.underline_to_camel);
} }
......
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