Skip to content

G
guns-vip
Commit df9b58a9 by fengshuonan
Options

更新spring boot版本和mp的版本

parent 23f66321
Showing with 141 additions and 226 deletions
pom.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.1.RELEASE</version> <version>2.1.1.RELEASE</version>
</parent> </parent>
<groupId>cn.stylefeng.guns</groupId> <groupId>cn.stylefeng.guns</groupId>
...@@ -34,18 +35,11 @@ ...@@ -34,18 +35,11 @@
<dependencies> <dependencies>
<!--代码生成器-->
<dependency>
<groupId>cn.stylefeng.guns</groupId>
<artifactId>guns-generator</artifactId>
<version>1.0.0</version>
</dependency>
<!--核心组件--> <!--核心组件-->
<dependency> <dependency>
<groupId>cn.stylefeng.roses</groupId> <groupId>cn.stylefeng.roses</groupId>
<artifactId>kernel-core</artifactId> <artifactId>kernel-core</artifactId>
<version>1.1.2</version> <version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
......
src/main/java/cn/stylefeng/guns/GunsApplication.java
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
*/ */
package cn.stylefeng.guns; package cn.stylefeng.guns;
import cn.stylefeng.guns.generator.config.GeneratorAutoConfiguration;
import cn.stylefeng.roses.core.config.WebAutoConfiguration; import cn.stylefeng.roses.core.config.WebAutoConfiguration;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -28,7 +27,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; ...@@ -28,7 +27,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* @author stylefeng * @author stylefeng
* @Date 2017/5/21 12:06 * @Date 2017/5/21 12:06
*/ */
@SpringBootApplication(exclude = {WebAutoConfiguration.class, GeneratorAutoConfiguration.class}) @SpringBootApplication(exclude = {WebAutoConfiguration.class})
public class GunsApplication { public class GunsApplication {
private final static Logger logger = LoggerFactory.getLogger(GunsApplication.class); private final static Logger logger = LoggerFactory.getLogger(GunsApplication.class);
......
src/main/java/cn/stylefeng/guns/config/datasource/MultiDataSourceConfig.java
...@@ -21,8 +21,8 @@ import cn.stylefeng.roses.core.datascope.DataScopeInterceptor; ...@@ -21,8 +21,8 @@ import cn.stylefeng.roses.core.datascope.DataScopeInterceptor;
import cn.stylefeng.roses.core.mutidatasource.DynamicDataSource; import cn.stylefeng.roses.core.mutidatasource.DynamicDataSource;
import cn.stylefeng.roses.core.mutidatasource.aop.MultiSourceExAop; import cn.stylefeng.roses.core.mutidatasource.aop.MultiSourceExAop;
import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor; import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
import com.baomidou.mybatisplus.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
...@@ -140,4 +140,5 @@ public class MultiDataSourceConfig { ...@@ -140,4 +140,5 @@ public class MultiDataSourceConfig {
public OptimisticLockerInterceptor optimisticLockerInterceptor() { public OptimisticLockerInterceptor optimisticLockerInterceptor() {
return new OptimisticLockerInterceptor(); return new OptimisticLockerInterceptor();
} }
} }
src/main/java/cn/stylefeng/guns/config/datasource/SingleDataSourceConfig.java
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
package cn.stylefeng.guns.config.datasource; package cn.stylefeng.guns.config.datasource;
import cn.stylefeng.roses.core.datascope.DataScopeInterceptor; import cn.stylefeng.roses.core.datascope.DataScopeInterceptor;
import com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor; import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
......
src/main/java/cn/stylefeng/guns/core/common/constant/factory/ConstantFactory.java
...@@ -26,8 +26,7 @@ import cn.stylefeng.guns.modular.system.entity.*; ...@@ -26,8 +26,7 @@ import cn.stylefeng.guns.modular.system.entity.*;
import cn.stylefeng.guns.modular.system.mapper.*; import cn.stylefeng.guns.modular.system.mapper.*;
import cn.stylefeng.roses.core.util.SpringContextHolder; import cn.stylefeng.roses.core.util.SpringContextHolder;
import cn.stylefeng.roses.core.util.ToolUtil; import cn.stylefeng.roses.core.util.ToolUtil;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.DependsOn; import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -171,7 +170,8 @@ public class ConstantFactory implements IConstantFactory { ...@@ -171,7 +170,8 @@ public class ConstantFactory implements IConstantFactory {
} else { } else {
Menu param = new Menu(); Menu param = new Menu();
param.setCode(code); param.setCode(code);
Menu menu = menuMapper.selectOne(param); QueryWrapper<Menu> queryWrapper = new QueryWrapper<>(param);
Menu menu = menuMapper.selectOne(queryWrapper);
if (menu == null) { if (menu == null) {
return ""; return "";
} else { } else {
...@@ -189,7 +189,8 @@ public class ConstantFactory implements IConstantFactory { ...@@ -189,7 +189,8 @@ public class ConstantFactory implements IConstantFactory {
} else { } else {
Menu menu = new Menu(); Menu menu = new Menu();
menu.setCode(code); menu.setCode(code);
Menu tempMenu = this.menuMapper.selectOne(menu); QueryWrapper<Menu> queryWrapper = new QueryWrapper<>(menu);
Menu tempMenu = this.menuMapper.selectOne(queryWrapper);
return tempMenu.getMenuId(); return tempMenu.getMenuId();
} }
} }
...@@ -226,11 +227,12 @@ public class ConstantFactory implements IConstantFactory { ...@@ -226,11 +227,12 @@ public class ConstantFactory implements IConstantFactory {
public String getDictsByName(String name, String code) { public String getDictsByName(String name, String code) {
Dict temp = new Dict(); Dict temp = new Dict();
temp.setName(name); temp.setName(name);
Dict dict = dictMapper.selectOne(temp); QueryWrapper<Dict> queryWrapper = new QueryWrapper<>(temp);
Dict dict = dictMapper.selectOne(queryWrapper);
if (dict == null) { if (dict == null) {
return ""; return "";
} else { } else {
Wrapper<Dict> wrapper = new EntityWrapper<>(); QueryWrapper<Dict> wrapper = new QueryWrapper<>();
wrapper = wrapper.eq("PID", dict.getDictId()); wrapper = wrapper.eq("PID", dict.getDictId());
List<Dict> dicts = dictMapper.selectList(wrapper); List<Dict> dicts = dictMapper.selectList(wrapper);
for (Dict item : dicts) { for (Dict item : dicts) {
...@@ -262,7 +264,7 @@ public class ConstantFactory implements IConstantFactory { ...@@ -262,7 +264,7 @@ public class ConstantFactory implements IConstantFactory {
if (ToolUtil.isEmpty(id)) { if (ToolUtil.isEmpty(id)) {
return null; return null;
} else { } else {
EntityWrapper<Dict> wrapper = new EntityWrapper<>(); QueryWrapper<Dict> wrapper = new QueryWrapper<>();
List<Dict> dicts = dictMapper.selectList(wrapper.eq("PID", id)); List<Dict> dicts = dictMapper.selectList(wrapper.eq("PID", id));
if (dicts == null || dicts.size() == 0) { if (dicts == null || dicts.size() == 0) {
return null; return null;
...@@ -279,7 +281,7 @@ public class ConstantFactory implements IConstantFactory { ...@@ -279,7 +281,7 @@ public class ConstantFactory implements IConstantFactory {
@Override @Override
public List<Long> getSubDeptId(Long deptId) { public List<Long> getSubDeptId(Long deptId) {
Wrapper<Dept> wrapper = new EntityWrapper<>(); QueryWrapper<Dept> wrapper = new QueryWrapper<>();
wrapper = wrapper.like("PIDS", "%[" + deptId + "]%"); wrapper = wrapper.like("PIDS", "%[" + deptId + "]%");
List<Dept> depts = this.deptMapper.selectList(wrapper); List<Dept> depts = this.deptMapper.selectList(wrapper);
......
src/main/java/cn/stylefeng/guns/core/common/constant/factory/PageFactory.java
...@@ -18,7 +18,7 @@ package cn.stylefeng.guns.core.common.constant.factory; ...@@ -18,7 +18,7 @@ package cn.stylefeng.guns.core.common.constant.factory;
import cn.stylefeng.guns.core.common.constant.state.Order; import cn.stylefeng.guns.core.common.constant.state.Order;
import cn.stylefeng.roses.core.util.HttpContext; import cn.stylefeng.roses.core.util.HttpContext;
import cn.stylefeng.roses.core.util.ToolUtil; import cn.stylefeng.roses.core.util.ToolUtil;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -28,9 +28,9 @@ import javax.servlet.http.HttpServletRequest; ...@@ -28,9 +28,9 @@ import javax.servlet.http.HttpServletRequest;
* @author fengshuonan * @author fengshuonan
* @date 2017-04-05 22:25 * @date 2017-04-05 22:25
*/ */
public class PageFactory<T> { public class PageFactory {
public Page<T> defaultPage() { public Page defaultPage() {
HttpServletRequest request = HttpContext.getRequest(); HttpServletRequest request = HttpContext.getRequest();
//每页多少条数据 //每页多少条数据
...@@ -47,18 +47,15 @@ public class PageFactory<T> { ...@@ -47,18 +47,15 @@ public class PageFactory<T> {
//如果没有排序字段名称 //如果没有排序字段名称
if (ToolUtil.isEmpty(sort)) { if (ToolUtil.isEmpty(sort)) {
return new Page((offset / limit + 1), limit);
Page<T> page = new Page<>((offset / limit + 1), limit);
page.setOpenSort(false);
return page;
} else { } else {
//如果有排序字段 //如果有排序字段
Page<T> page = new Page<>((offset / limit + 1), limit, sort); Page page = new Page((offset / limit + 1), limit);
if (Order.ASC.getDes().equals(order)) { if (Order.ASC.getDes().equals(order)) {
page.setAsc(true); page.setAsc(sort);
} else { } else {
page.setAsc(false); page.setDesc(sort);
} }
return page; return page;
} }
......
src/main/java/cn/stylefeng/guns/core/common/page/PageInfoBT.java
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
package cn.stylefeng.guns.core.common.page; package cn.stylefeng.guns.core.common.page;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List; import java.util.List;
......
src/main/java/cn/stylefeng/guns/modular/system/controller/DeptController.java
...@@ -95,7 +95,7 @@ public class DeptController extends BaseController { ...@@ -95,7 +95,7 @@ public class DeptController extends BaseController {
} }
//缓存部门修改前详细信息 //缓存部门修改前详细信息
Dept dept = deptService.selectById(deptId); Dept dept = deptService.getById(deptId);
LogObjectHolder.me().set(dept); LogObjectHolder.me().set(dept);
return PREFIX + "dept_edit.html"; return PREFIX + "dept_edit.html";
...@@ -177,7 +177,7 @@ public class DeptController extends BaseController { ...@@ -177,7 +177,7 @@ public class DeptController extends BaseController {
@Permission @Permission
@ResponseBody @ResponseBody
public Object detail(@PathVariable("deptId") Long deptId) { public Object detail(@PathVariable("deptId") Long deptId) {
Dept dept = deptService.selectById(deptId); Dept dept = deptService.getById(deptId);
DeptDto deptDto = new DeptDto(); DeptDto deptDto = new DeptDto();
BeanUtil.copyProperties(dept, deptDto); BeanUtil.copyProperties(dept, deptDto);
deptDto.setPName(ConstantFactory.me().getDeptName(deptDto.getPid())); deptDto.setPName(ConstantFactory.me().getDeptName(deptDto.getPid()));
......
src/main/java/cn/stylefeng/guns/modular/system/controller/LogController.java
...@@ -26,8 +26,8 @@ import cn.stylefeng.guns.modular.system.entity.OperationLog; ...@@ -26,8 +26,8 @@ import cn.stylefeng.guns.modular.system.entity.OperationLog;
import cn.stylefeng.guns.modular.system.service.OperationLogService; import cn.stylefeng.guns.modular.system.service.OperationLogService;
import cn.stylefeng.guns.modular.system.warpper.LogWarpper; import cn.stylefeng.guns.modular.system.warpper.LogWarpper;
import cn.stylefeng.roses.core.base.controller.BaseController; import cn.stylefeng.roses.core.base.controller.BaseController;
import com.baomidou.mybatisplus.mapper.SqlRunner; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
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.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -79,11 +79,10 @@ public class LogController extends BaseController { ...@@ -79,11 +79,10 @@ public class LogController extends BaseController {
@RequestParam(required = false) Integer logType) { @RequestParam(required = false) Integer logType) {
//获取分页参数 //获取分页参数
Page<OperationLog> page = new PageFactory<OperationLog>().defaultPage(); Page page = new PageFactory().defaultPage();
//根据条件查询操作日志 //根据条件查询操作日志
List<Map<String, Object>> result = operationLogService.getOperationLogs(page, beginTime, endTime, logName, List<Map<String, Object>> result = operationLogService.getOperationLogs(page, beginTime, endTime, logName, BizLogType.valueOf(logType));
BizLogType.valueOf(logType), page.getOrderByField(), page.isAsc());
page.setRecords(new LogWarpper(result).wrap()); page.setRecords(new LogWarpper(result).wrap());
...@@ -100,7 +99,7 @@ public class LogController extends BaseController { ...@@ -100,7 +99,7 @@ public class LogController extends BaseController {
@Permission(Const.ADMIN_NAME) @Permission(Const.ADMIN_NAME)
@ResponseBody @ResponseBody
public Object detail(@PathVariable Long id) { public Object detail(@PathVariable Long id) {
OperationLog operationLog = operationLogService.selectById(id); OperationLog operationLog = operationLogService.getById(id);
Map<String, Object> stringObjectMap = BeanUtil.beanToMap(operationLog); Map<String, Object> stringObjectMap = BeanUtil.beanToMap(operationLog);
return super.warpObject(new LogWarpper(stringObjectMap)); return super.warpObject(new LogWarpper(stringObjectMap));
} }
......
src/main/java/cn/stylefeng/guns/modular/system/controller/LoginLogController.java
...@@ -20,12 +20,11 @@ import cn.stylefeng.guns.core.common.annotion.Permission; ...@@ -20,12 +20,11 @@ import cn.stylefeng.guns.core.common.annotion.Permission;
import cn.stylefeng.guns.core.common.constant.Const; import cn.stylefeng.guns.core.common.constant.Const;
import cn.stylefeng.guns.core.common.constant.factory.PageFactory; import cn.stylefeng.guns.core.common.constant.factory.PageFactory;
import cn.stylefeng.guns.core.common.page.PageInfoBT; import cn.stylefeng.guns.core.common.page.PageInfoBT;
import cn.stylefeng.guns.modular.system.entity.LoginLog;
import cn.stylefeng.guns.modular.system.service.LoginLogService; import cn.stylefeng.guns.modular.system.service.LoginLogService;
import cn.stylefeng.guns.modular.system.warpper.LogWarpper; import cn.stylefeng.guns.modular.system.warpper.LogWarpper;
import cn.stylefeng.roses.core.base.controller.BaseController; import cn.stylefeng.roses.core.base.controller.BaseController;
import com.baomidou.mybatisplus.mapper.SqlRunner; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
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.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -75,10 +74,10 @@ public class LoginLogController extends BaseController { ...@@ -75,10 +74,10 @@ public class LoginLogController extends BaseController {
@RequestParam(required = false) String logName) { @RequestParam(required = false) String logName) {
//获取分页参数 //获取分页参数
Page<LoginLog> page = new PageFactory<LoginLog>().defaultPage(); Page page = new PageFactory().defaultPage();
//根据条件查询日志 //根据条件查询日志
List<Map<String, Object>> result = loginLogService.getLoginLogs(page, beginTime, endTime, logName, page.getOrderByField(), page.isAsc()); List<Map<String, Object>> result = loginLogService.getLoginLogs(page, beginTime, endTime, logName);
page.setRecords(new LogWarpper(result).wrap()); page.setRecords(new LogWarpper(result).wrap());
return new PageInfoBT<>(page); return new PageInfoBT<>(page);
......
src/main/java/cn/stylefeng/guns/modular/system/controller/MenuController.java
...@@ -93,7 +93,7 @@ public class MenuController extends BaseController { ...@@ -93,7 +93,7 @@ public class MenuController extends BaseController {
} }
//获取菜单当前信息，记录日志用 //获取菜单当前信息，记录日志用
Menu menu = this.menuService.selectById(menuId); Menu menu = this.menuService.getById(menuId);
LogObjectHolder.me().set(menu); LogObjectHolder.me().set(menu);
return PREFIX + "menu_edit.html"; return PREFIX + "menu_edit.html";
...@@ -185,7 +185,7 @@ public class MenuController extends BaseController { ...@@ -185,7 +185,7 @@ public class MenuController extends BaseController {
if (ToolUtil.isEmpty(menuId)) { if (ToolUtil.isEmpty(menuId)) {
throw new ServiceException(BizExceptionEnum.REQUEST_NULL); throw new ServiceException(BizExceptionEnum.REQUEST_NULL);
} }
Menu menu = this.menuService.selectById(menuId); Menu menu = this.menuService.getById(menuId);
return ResponseData.success(menu); return ResponseData.success(menu);
} }
...@@ -202,7 +202,7 @@ public class MenuController extends BaseController { ...@@ -202,7 +202,7 @@ public class MenuController extends BaseController {
throw new ServiceException(BizExceptionEnum.REQUEST_NULL); throw new ServiceException(BizExceptionEnum.REQUEST_NULL);
} }
Menu menu = this.menuService.selectById(menuId); Menu menu = this.menuService.getById(menuId);
MenuDto menuDto = new MenuDto(); MenuDto menuDto = new MenuDto();
BeanUtil.copyProperties(menu, menuDto); BeanUtil.copyProperties(menu, menuDto);
......
src/main/java/cn/stylefeng/guns/modular/system/controller/NoticeController.java
...@@ -85,7 +85,7 @@ public class NoticeController extends BaseController { ...@@ -85,7 +85,7 @@ public class NoticeController extends BaseController {
*/ */
@RequestMapping("/notice_update/{noticeId}") @RequestMapping("/notice_update/{noticeId}")
public String noticeUpdate(@PathVariable Long noticeId, Model model) { public String noticeUpdate(@PathVariable Long noticeId, Model model) {
Notice notice = this.noticeService.selectById(noticeId); Notice notice = this.noticeService.getById(noticeId);
model.addAllAttributes(BeanUtil.beanToMap(notice)); model.addAllAttributes(BeanUtil.beanToMap(notice));
LogObjectHolder.me().set(notice); LogObjectHolder.me().set(notice);
return PREFIX + "notice_edit.html"; return PREFIX + "notice_edit.html";
...@@ -99,7 +99,7 @@ public class NoticeController extends BaseController { ...@@ -99,7 +99,7 @@ public class NoticeController extends BaseController {
*/ */
@RequestMapping("/hello") @RequestMapping("/hello")
public String hello() { public String hello() {
List<Map<String, Object>> notices = noticeService.list(null); List<Notice> notices = noticeService.list();
super.setAttr("noticeList", notices); super.setAttr("noticeList", notices);
return PREFIX + "notice_index.html"; return PREFIX + "notice_index.html";
} }
...@@ -132,7 +132,7 @@ public class NoticeController extends BaseController { ...@@ -132,7 +132,7 @@ public class NoticeController extends BaseController {
} }
notice.setCreateUser(ShiroKit.getUserNotNull().getId()); notice.setCreateUser(ShiroKit.getUserNotNull().getId());
notice.setCreateTime(new Date()); notice.setCreateTime(new Date());
this.noticeService.insert(notice); this.noticeService.save(notice);
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -150,7 +150,7 @@ public class NoticeController extends BaseController { ...@@ -150,7 +150,7 @@ public class NoticeController extends BaseController {
//缓存通知名称 //缓存通知名称
LogObjectHolder.me().set(ConstantFactory.me().getNoticeTitle(noticeId)); LogObjectHolder.me().set(ConstantFactory.me().getNoticeTitle(noticeId));
this.noticeService.deleteById(noticeId); this.noticeService.removeById(noticeId);
return SUCCESS_TIP; return SUCCESS_TIP;
} }
...@@ -168,7 +168,7 @@ public class NoticeController extends BaseController { ...@@ -168,7 +168,7 @@ public class NoticeController extends BaseController {
if (ToolUtil.isOneEmpty(notice, notice.getNoticeId(), notice.getTitle(), notice.getContent())) { if (ToolUtil.isOneEmpty(notice, notice.getNoticeId(), notice.getTitle(), notice.getContent())) {
throw new ServiceException(BizExceptionEnum.REQUEST_NULL); throw new ServiceException(BizExceptionEnum.REQUEST_NULL);
} }
Notice old = this.noticeService.selectById(notice.getNoticeId()); Notice old = this.noticeService.getById(notice.getNoticeId());
old.setTitle(notice.getTitle()); old.setTitle(notice.getTitle());
old.setContent(notice.getContent()); old.setContent(notice.getContent());
this.noticeService.updateById(old); this.noticeService.updateById(old);
......
src/main/java/cn/stylefeng/guns/modular/system/controller/RoleController.java
...@@ -97,7 +97,7 @@ public class RoleController extends BaseController { ...@@ -97,7 +97,7 @@ public class RoleController extends BaseController {
if (ToolUtil.isEmpty(roleId)) { if (ToolUtil.isEmpty(roleId)) {
throw new ServiceException(BizExceptionEnum.REQUEST_NULL); throw new ServiceException(BizExceptionEnum.REQUEST_NULL);
} }
Role role = this.roleService.selectById(roleId); Role role = this.roleService.getById(roleId);
LogObjectHolder.me().set(role); LogObjectHolder.me().set(role);
return PREFIX + "/role_edit.html"; return PREFIX + "/role_edit.html";
} }
...@@ -189,7 +189,7 @@ public class RoleController extends BaseController { ...@@ -189,7 +189,7 @@ public class RoleController extends BaseController {
if (ToolUtil.isEmpty(roleId)) { if (ToolUtil.isEmpty(roleId)) {
throw new ServiceException(BizExceptionEnum.REQUEST_NULL); throw new ServiceException(BizExceptionEnum.REQUEST_NULL);
} }
Role role = this.roleService.selectById(roleId); Role role = this.roleService.getById(roleId);
Map<String, Object> roleMap = BeanUtil.beanToMap(role); Map<String, Object> roleMap = BeanUtil.beanToMap(role);
Long pid = role.getPid(); Long pid = role.getPid();
...@@ -240,7 +240,7 @@ public class RoleController extends BaseController { ...@@ -240,7 +240,7 @@ public class RoleController extends BaseController {
@RequestMapping(value = "/roleTreeListByUserId/{userId}") @RequestMapping(value = "/roleTreeListByUserId/{userId}")
@ResponseBody @ResponseBody
public List<ZTreeNode> roleTreeListByUserId(@PathVariable Long userId) { public List<ZTreeNode> roleTreeListByUserId(@PathVariable Long userId) {
User theUser = this.userService.selectById(userId); User theUser = this.userService.getById(userId);
String roleId = theUser.getRoleId(); String roleId = theUser.getRoleId();
if (ToolUtil.isEmpty(roleId)) { if (ToolUtil.isEmpty(roleId)) {
return this.roleService.roleTreeList(); return this.roleService.roleTreeList();
......
src/main/java/cn/stylefeng/guns/modular/system/controller/SystemController.java
...@@ -129,14 +129,14 @@ public class SystemController extends BaseController { ...@@ -129,14 +129,14 @@ public class SystemController extends BaseController {
} }
//获取当前用户的头像id //获取当前用户的头像id
User user = userService.selectById(currentUser.getId()); User user = userService.getById(currentUser.getId());
String avatar = user.getAvatar(); String avatar = user.getAvatar();
//如果头像id为空就返回默认的 //如果头像id为空就返回默认的
if (ToolUtil.isEmpty(avatar)) { if (ToolUtil.isEmpty(avatar)) {
avatar = DefaultAvatar.BASE_64_AVATAR; avatar = DefaultAvatar.BASE_64_AVATAR;
} else { } else {
FileInfo fileInfo = fileInfoService.selectById(avatar); FileInfo fileInfo = fileInfoService.getById(avatar);
if (fileInfo == null) { if (fileInfo == null) {
avatar = DefaultAvatar.BASE_64_AVATAR; avatar = DefaultAvatar.BASE_64_AVATAR;
} else { } else {
...@@ -172,7 +172,7 @@ public class SystemController extends BaseController { ...@@ -172,7 +172,7 @@ public class SystemController extends BaseController {
throw new ServiceException(CoreExceptionEnum.NO_CURRENT_USER); throw new ServiceException(CoreExceptionEnum.NO_CURRENT_USER);
} }
User user = userService.selectById(currentUser.getId()); User user = userService.getById(currentUser.getId());
Map<String, Object> map = UserFactory.removeUnSafeFields(user); Map<String, Object> map = UserFactory.removeUnSafeFields(user);
HashMap<Object, Object> hashMap = CollectionUtil.newHashMap(); HashMap<Object, Object> hashMap = CollectionUtil.newHashMap();
......
src/main/java/cn/stylefeng/guns/modular/system/controller/UserMgrController.java
...@@ -120,7 +120,7 @@ public class UserMgrController extends BaseController { ...@@ -120,7 +120,7 @@ public class UserMgrController extends BaseController {
if (ToolUtil.isEmpty(userId)) { if (ToolUtil.isEmpty(userId)) {
throw new ServiceException(BizExceptionEnum.REQUEST_NULL); throw new ServiceException(BizExceptionEnum.REQUEST_NULL);
} }
User user = this.userService.selectById(userId); User user = this.userService.getById(userId);
LogObjectHolder.me().set(user); LogObjectHolder.me().set(user);
return PREFIX + "user_edit.html"; return PREFIX + "user_edit.html";
} }
...@@ -134,7 +134,7 @@ public class UserMgrController extends BaseController { ...@@ -134,7 +134,7 @@ public class UserMgrController extends BaseController {
@RequestMapping("/user_info") @RequestMapping("/user_info")
public String userInfo(Model model) { public String userInfo(Model model) {
Long userId = ShiroKit.getUserNotNull().getId(); Long userId = ShiroKit.getUserNotNull().getId();
User user = this.userService.selectById(userId); User user = this.userService.getById(userId);
model.addAllAttributes(BeanUtil.beanToMap(user)); model.addAllAttributes(BeanUtil.beanToMap(user));
model.addAttribute("roleName", ConstantFactory.me().getRoleName(user.getRoleId())); model.addAttribute("roleName", ConstantFactory.me().getRoleName(user.getRoleId()));
...@@ -168,7 +168,7 @@ public class UserMgrController extends BaseController { ...@@ -168,7 +168,7 @@ public class UserMgrController extends BaseController {
} }
this.userService.assertAuth(userId); this.userService.assertAuth(userId);
User user = this.userService.selectById(userId); User user = this.userService.getById(userId);
Map<String, Object> map = UserFactory.removeUnSafeFields(user); Map<String, Object> map = UserFactory.removeUnSafeFields(user);
HashMap<Object, Object> hashMap = CollectionUtil.newHashMap(); HashMap<Object, Object> hashMap = CollectionUtil.newHashMap();
...@@ -294,7 +294,7 @@ public class UserMgrController extends BaseController { ...@@ -294,7 +294,7 @@ public class UserMgrController extends BaseController {
throw new ServiceException(BizExceptionEnum.REQUEST_NULL); throw new ServiceException(BizExceptionEnum.REQUEST_NULL);
} }
this.userService.assertAuth(userId); this.userService.assertAuth(userId);
return this.userService.selectById(userId); return this.userService.getById(userId);
} }
/** /**
...@@ -312,7 +312,7 @@ public class UserMgrController extends BaseController { ...@@ -312,7 +312,7 @@ public class UserMgrController extends BaseController {
throw new ServiceException(BizExceptionEnum.REQUEST_NULL); throw new ServiceException(BizExceptionEnum.REQUEST_NULL);
} }
this.userService.assertAuth(userId); this.userService.assertAuth(userId);
User user = this.userService.selectById(userId); User user = this.userService.getById(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.userService.updateById(user); this.userService.updateById(user);
......
src/main/java/cn/stylefeng/guns/modular/system/entity/CodeDbinfo.java
package cn.stylefeng.guns.modular.system.entity; package cn.stylefeng.guns.modular.system.entity;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
......
src/main/java/cn/stylefeng/guns/modular/system/entity/Dept.java
package cn.stylefeng.guns.modular.system.entity; package cn.stylefeng.guns.modular.system.entity;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
......
src/main/java/cn/stylefeng/guns/modular/system/entity/Dict.java
package cn.stylefeng.guns.modular.system.entity; package cn.stylefeng.guns.modular.system.entity;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
......
src/main/java/cn/stylefeng/guns/modular/system/entity/FileInfo.java
package cn.stylefeng.guns.modular.system.entity; package cn.stylefeng.guns.modular.system.entity;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
......
src/main/java/cn/stylefeng/guns/modular/system/entity/LoginLog.java
package cn.stylefeng.guns.modular.system.entity; package cn.stylefeng.guns.modular.system.entity;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
......
src/main/java/cn/stylefeng/guns/modular/system/entity/Menu.java
package cn.stylefeng.guns.modular.system.entity; package cn.stylefeng.guns.modular.system.entity;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
......
src/main/java/cn/stylefeng/guns/modular/system/entity/Notice.java
package cn.stylefeng.guns.modular.system.entity; package cn.stylefeng.guns.modular.system.entity;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
......
src/main/java/cn/stylefeng/guns/modular/system/entity/OperationLog.java
package cn.stylefeng.guns.modular.system.entity; package cn.stylefeng.guns.modular.system.entity;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
......
src/main/java/cn/stylefeng/guns/modular/system/entity/Relation.java
package cn.stylefeng.guns.modular.system.entity; package cn.stylefeng.guns.modular.system.entity;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import static com.baomidou.mybatisplus.enums.IdType.ID_WORKER; import static com.baomidou.mybatisplus.annotation.IdType.ID_WORKER;
/** /**
* <p> * <p>
......
src/main/java/cn/stylefeng/guns/modular/system/entity/Role.java
package cn.stylefeng.guns.modular.system.entity; package cn.stylefeng.guns.modular.system.entity;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.baomidou.mybatisplus.enums.IdType;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
......
src/main/java/cn/stylefeng/guns/modular/system/entity/User.java
package cn.stylefeng.guns.modular.system.entity; package cn.stylefeng.guns.modular.system.entity;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill;
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/CodeDbinfoMapper.java
package cn.stylefeng.guns.modular.system.mapper; package cn.stylefeng.guns.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.CodeDbinfo; import cn.stylefeng.guns.modular.system.entity.CodeDbinfo;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* <p> * <p>
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/DeptMapper.java
...@@ -3,7 +3,7 @@ package cn.stylefeng.guns.modular.system.mapper; ...@@ -3,7 +3,7 @@ package cn.stylefeng.guns.modular.system.mapper;
import cn.stylefeng.guns.core.common.node.TreeviewNode; import cn.stylefeng.guns.core.common.node.TreeviewNode;
import cn.stylefeng.guns.core.common.node.ZTreeNode; import cn.stylefeng.guns.core.common.node.ZTreeNode;
import cn.stylefeng.guns.modular.system.entity.Dept; import cn.stylefeng.guns.modular.system.entity.Dept;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/DictMapper.java
package cn.stylefeng.guns.modular.system.mapper; package cn.stylefeng.guns.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.Dict; import cn.stylefeng.guns.modular.system.entity.Dict;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/FileInfoMapper.java
package cn.stylefeng.guns.modular.system.mapper; package cn.stylefeng.guns.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.FileInfo; import cn.stylefeng.guns.modular.system.entity.FileInfo;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* <p> * <p>
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/LoginLogMapper.java
package cn.stylefeng.guns.modular.system.mapper; package cn.stylefeng.guns.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.LoginLog; import cn.stylefeng.guns.modular.system.entity.LoginLog;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -21,6 +21,6 @@ public interface LoginLogMapper extends BaseMapper<LoginLog> { ...@@ -21,6 +21,6 @@ public interface LoginLogMapper extends BaseMapper<LoginLog> {
/** /**
* 获取登录日志 * 获取登录日志
*/ */
List<Map<String, Object>> getLoginLogs(@Param("page") Page<LoginLog> page, @Param("beginTime") String beginTime, List<Map<String, Object>> getLoginLogs(@Param("page") Page page, @Param("beginTime") String beginTime,
@Param("endTime") String endTime, @Param("logName") String logName, @Param("orderByField") String orderByField, @Param("isAsc") boolean isAsc); @Param("endTime") String endTime, @Param("logName") String logName);
} }
src/main/java/cn/stylefeng/guns/modular/system/mapper/MenuMapper.java
...@@ -3,7 +3,7 @@ package cn.stylefeng.guns.modular.system.mapper; ...@@ -3,7 +3,7 @@ package cn.stylefeng.guns.modular.system.mapper;
import cn.stylefeng.guns.core.common.node.MenuNode; import cn.stylefeng.guns.core.common.node.MenuNode;
import cn.stylefeng.guns.core.common.node.ZTreeNode; import cn.stylefeng.guns.core.common.node.ZTreeNode;
import cn.stylefeng.guns.modular.system.entity.Menu; import cn.stylefeng.guns.modular.system.entity.Menu;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/NoticeMapper.java
package cn.stylefeng.guns.modular.system.mapper; package cn.stylefeng.guns.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.Notice; import cn.stylefeng.guns.modular.system.entity.Notice;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/OperationLogMapper.java
package cn.stylefeng.guns.modular.system.mapper; package cn.stylefeng.guns.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.OperationLog; import cn.stylefeng.guns.modular.system.entity.OperationLog;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -21,7 +21,7 @@ public interface OperationLogMapper extends BaseMapper<OperationLog> { ...@@ -21,7 +21,7 @@ public interface OperationLogMapper extends BaseMapper<OperationLog> {
/** /**
* 获取操作日志 * 获取操作日志
*/ */
List<Map<String, Object>> getOperationLogs(@Param("page") Page<OperationLog> page, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("logName") String logName, @Param("logType") String logType, @Param("orderByField") String orderByField, @Param("isAsc") boolean isAsc); List<Map<String, Object>> getOperationLogs(@Param("page") Page page, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("logName") String logName, @Param("logType") String logType);
} }
src/main/java/cn/stylefeng/guns/modular/system/mapper/RelationMapper.java
package cn.stylefeng.guns.modular.system.mapper; package cn.stylefeng.guns.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.Relation; import cn.stylefeng.guns.modular.system.entity.Relation;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* <p> * <p>
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/RoleMapper.java
...@@ -2,7 +2,7 @@ package cn.stylefeng.guns.modular.system.mapper; ...@@ -2,7 +2,7 @@ package cn.stylefeng.guns.modular.system.mapper;
import cn.stylefeng.guns.core.common.node.ZTreeNode; import cn.stylefeng.guns.core.common.node.ZTreeNode;
import cn.stylefeng.guns.modular.system.entity.Role; import cn.stylefeng.guns.modular.system.entity.Role;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/UserMapper.java
...@@ -2,7 +2,7 @@ package cn.stylefeng.guns.modular.system.mapper; ...@@ -2,7 +2,7 @@ package cn.stylefeng.guns.modular.system.mapper;
import cn.stylefeng.guns.modular.system.entity.User; import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.roses.core.datascope.DataScope; import cn.stylefeng.roses.core.datascope.DataScope;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
......
src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/LoginLogMapper.xml
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
LOGIN_LOG_ID AS loginLogId, LOG_NAME AS logName, USER_ID AS userId, CREATE_TIME AS createTime, SUCCEED AS succeed, MESSAGE AS message, IP_ADDRESS AS ipAddress LOGIN_LOG_ID AS loginLogId, LOG_NAME AS logName, USER_ID AS userId, CREATE_TIME AS createTime, SUCCEED AS succeed, MESSAGE AS message, IP_ADDRESS AS ipAddress
</sql> </sql>
<select id="getLoginLogs" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page"> <select id="getLoginLogs" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from sys_login_log where 1 = 1 from sys_login_log where 1 = 1
...@@ -28,21 +28,6 @@ ...@@ -28,21 +28,6 @@
<if test="logName != null and logName !=''"> <if test="logName != null and logName !=''">
and LOG_NAME like CONCAT('%',#{logName},'%') and LOG_NAME like CONCAT('%',#{logName},'%')
</if> </if>
<choose>
<when test="orderByField != null and orderByField !=''">
<choose>
<when test="isAsc == true">
order by ${orderByField} ASC
</when>
<otherwise>
order by ${orderByField} DESC
</otherwise>
</choose>
</when>
<otherwise>
order by CREATE_TIME DESC
</otherwise>
</choose>
</select> </select>
</mapper> </mapper>
src/main/java/cn/stylefeng/guns/modular/system/mapper/mapping/OperationLogMapper.xml
...@@ -33,21 +33,6 @@ ...@@ -33,21 +33,6 @@
<if test="logType != null and logType !=''"> <if test="logType != null and logType !=''">
and LOG_TYPE like CONCAT('%',#{logType},'%') and LOG_TYPE like CONCAT('%',#{logType},'%')
</if> </if>
<choose>
<when test="orderByField != null and orderByField !=''">
<choose>
<when test="isAsc == true">
order by ${orderByField} ASC
</when>
<otherwise>
order by ${orderByField} DESC
</otherwise>
</choose>
</when>
<otherwise>
order by CREATE_TIME DESC
</otherwise>
</choose>
</select> </select>
</mapper> </mapper>
src/main/java/cn/stylefeng/guns/modular/system/service/CodeDbinfoService.java
...@@ -2,7 +2,7 @@ package cn.stylefeng.guns.modular.system.service; ...@@ -2,7 +2,7 @@ package cn.stylefeng.guns.modular.system.service;
import cn.stylefeng.guns.modular.system.entity.CodeDbinfo; import cn.stylefeng.guns.modular.system.entity.CodeDbinfo;
import cn.stylefeng.guns.modular.system.mapper.CodeDbinfoMapper; import cn.stylefeng.guns.modular.system.mapper.CodeDbinfoMapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
......
src/main/java/cn/stylefeng/guns/modular/system/service/DeptService.java
...@@ -7,9 +7,8 @@ import cn.stylefeng.guns.modular.system.entity.Dept; ...@@ -7,9 +7,8 @@ import cn.stylefeng.guns.modular.system.entity.Dept;
import cn.stylefeng.guns.modular.system.mapper.DeptMapper; import cn.stylefeng.guns.modular.system.mapper.DeptMapper;
import cn.stylefeng.roses.core.util.ToolUtil; import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.exception.ServiceException; import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -47,7 +46,7 @@ public class DeptService extends ServiceImpl<DeptMapper, Dept> { ...@@ -47,7 +46,7 @@ public class DeptService extends ServiceImpl<DeptMapper, Dept> {
//完善pids,根据pid拿到pid的pids //完善pids,根据pid拿到pid的pids
this.deptSetPids(dept); this.deptSetPids(dept);
this.insert(dept); this.save(dept);
} }
/** /**
...@@ -80,14 +79,14 @@ public class DeptService extends ServiceImpl<DeptMapper, Dept> { ...@@ -80,14 +79,14 @@ public class DeptService extends ServiceImpl<DeptMapper, Dept> {
Dept dept = deptMapper.selectById(deptId); Dept dept = deptMapper.selectById(deptId);
//根据like查询删除所有级联的部门 //根据like查询删除所有级联的部门
Wrapper<Dept> wrapper = new EntityWrapper<>(); QueryWrapper<Dept> wrapper = new QueryWrapper<>();
wrapper = wrapper.like("PIDS", "%[" + dept.getDeptId() + "]%"); wrapper = wrapper.like("PIDS", "%[" + dept.getDeptId() + "]%");
List<Dept> subDepts = deptMapper.selectList(wrapper); List<Dept> subDepts = deptMapper.selectList(wrapper);
for (Dept temp : subDepts) { for (Dept temp : subDepts) {
this.deleteById(temp.getDeptId()); this.removeById(temp.getDeptId());
} }
this.deleteById(dept.getDeptId()); this.removeById(dept.getDeptId());
} }
/** /**
...@@ -132,7 +131,7 @@ public class DeptService extends ServiceImpl<DeptMapper, Dept> { ...@@ -132,7 +131,7 @@ public class DeptService extends ServiceImpl<DeptMapper, Dept> {
dept.setPids("[0],"); dept.setPids("[0],");
} else { } else {
Long pid = dept.getPid(); Long pid = dept.getPid();
Dept temp = this.selectById(pid); Dept temp = this.getById(pid);
String pids = temp.getPids(); String pids = temp.getPids();
dept.setPid(pid); dept.setPid(pid);
dept.setPids(pids + "[" + pid + "],"); dept.setPids(pids + "[" + pid + "],");
......
src/main/java/cn/stylefeng/guns/modular/system/service/DictService.java
...@@ -7,9 +7,8 @@ import cn.stylefeng.guns.modular.system.mapper.DictMapper; ...@@ -7,9 +7,8 @@ import cn.stylefeng.guns.modular.system.mapper.DictMapper;
import cn.stylefeng.guns.modular.system.model.DictDto; import cn.stylefeng.guns.modular.system.model.DictDto;
import cn.stylefeng.roses.core.util.ToolUtil; import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.exception.ServiceException; import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -63,7 +62,7 @@ public class DictService extends ServiceImpl<DictMapper, Dict> { ...@@ -63,7 +62,7 @@ public class DictService extends ServiceImpl<DictMapper, Dict> {
//类型的父级id都为0 //类型的父级id都为0
dict.setPid(0L); dict.setPid(0L);
this.insert(dict); this.save(dict);
} }
/** /**
...@@ -79,7 +78,7 @@ public class DictService extends ServiceImpl<DictMapper, Dict> { ...@@ -79,7 +78,7 @@ public class DictService extends ServiceImpl<DictMapper, Dict> {
//字典的父级id为字典tyeId //字典的父级id为字典tyeId
dict.setPid(dictDto.getDictTypeId()); dict.setPid(dictDto.getDictTypeId());
this.insert(dict); this.save(dict);
} }
/** /**
...@@ -92,7 +91,7 @@ public class DictService extends ServiceImpl<DictMapper, Dict> { ...@@ -92,7 +91,7 @@ public class DictService extends ServiceImpl<DictMapper, Dict> {
public void delteDict(Long dictId) { public void delteDict(Long dictId) {
//删除这个字典的子词典 //删除这个字典的子词典
Wrapper<Dict> dictEntityWrapper = new EntityWrapper<>(); QueryWrapper<Dict> dictEntityWrapper = new QueryWrapper<>();
dictEntityWrapper = dictEntityWrapper.eq("PID", dictId); dictEntityWrapper = dictEntityWrapper.eq("PID", dictId);
dictMapper.delete(dictEntityWrapper); dictMapper.delete(dictEntityWrapper);
......
src/main/java/cn/stylefeng/guns/modular/system/service/FileInfoService.java
...@@ -7,8 +7,8 @@ import cn.stylefeng.guns.modular.system.entity.User; ...@@ -7,8 +7,8 @@ import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.modular.system.mapper.FileInfoMapper; import cn.stylefeng.guns.modular.system.mapper.FileInfoMapper;
import cn.stylefeng.roses.kernel.model.exception.ServiceException; import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import cn.stylefeng.roses.kernel.model.exception.enums.CoreExceptionEnum; import cn.stylefeng.roses.kernel.model.exception.enums.CoreExceptionEnum;
import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -41,13 +41,13 @@ public class FileInfoService extends ServiceImpl<FileInfoMapper, FileInfo> { ...@@ -41,13 +41,13 @@ public class FileInfoService extends ServiceImpl<FileInfoMapper, FileInfo> {
throw new ServiceException(CoreExceptionEnum.NO_CURRENT_USER); throw new ServiceException(CoreExceptionEnum.NO_CURRENT_USER);
} }
User user = userService.selectById(currentUser.getId()); User user = userService.getById(currentUser.getId());
//保存文件信息 //保存文件信息
FileInfo fileInfo = new FileInfo(); FileInfo fileInfo = new FileInfo();
fileInfo.setFileId(IdWorker.getIdStr()); fileInfo.setFileId(IdWorker.getIdStr());
fileInfo.setFileData(avatar); fileInfo.setFileData(avatar);
this.insert(fileInfo); this.save(fileInfo);
//更新用户的头像 //更新用户的头像
user.setAvatar(fileInfo.getFileId()); user.setAvatar(fileInfo.getFileId());
......
src/main/java/cn/stylefeng/guns/modular/system/service/LoginLogService.java
...@@ -2,8 +2,8 @@ package cn.stylefeng.guns.modular.system.service; ...@@ -2,8 +2,8 @@ package cn.stylefeng.guns.modular.system.service;
import cn.stylefeng.guns.modular.system.entity.LoginLog; import cn.stylefeng.guns.modular.system.entity.LoginLog;
import cn.stylefeng.guns.modular.system.mapper.LoginLogMapper; import cn.stylefeng.guns.modular.system.mapper.LoginLogMapper;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
...@@ -26,7 +26,7 @@ public class LoginLogService extends ServiceImpl<LoginLogMapper, LoginLog> { ...@@ -26,7 +26,7 @@ public class LoginLogService extends ServiceImpl<LoginLogMapper, LoginLog> {
* @author fengshuonan * @author fengshuonan
* @Date 2018/12/23 5:53 PM * @Date 2018/12/23 5:53 PM
*/ */
public List<Map<String, Object>> getLoginLogs(Page<LoginLog> page, String beginTime, String endTime, String logName, String orderByField, boolean asc) { public List<Map<String, Object>> getLoginLogs(Page page, String beginTime, String endTime, String logName) {
return this.baseMapper.getLoginLogs(page, beginTime, endTime, logName, orderByField, asc); return this.baseMapper.getLoginLogs(page, beginTime, endTime, logName);
} }
} }
src/main/java/cn/stylefeng/guns/modular/system/service/MenuService.java
...@@ -12,9 +12,8 @@ import cn.stylefeng.guns.modular.system.model.MenuDto; ...@@ -12,9 +12,8 @@ import cn.stylefeng.guns.modular.system.model.MenuDto;
import cn.stylefeng.roses.core.util.ToolUtil; import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException; import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
import cn.stylefeng.roses.kernel.model.exception.ServiceException; import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -60,7 +59,7 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> { ...@@ -60,7 +59,7 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> {
resultMenu.setStatus(MenuStatus.ENABLE.getCode()); resultMenu.setStatus(MenuStatus.ENABLE.getCode());
this.insert(resultMenu); this.save(resultMenu);
} }
/** /**
...@@ -94,7 +93,7 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> { ...@@ -94,7 +93,7 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> {
delMenu(menuId); delMenu(menuId);
//删除所有子菜单 //删除所有子菜单
Wrapper<Menu> wrapper = new EntityWrapper<>(); QueryWrapper<Menu> wrapper = new QueryWrapper<>();
wrapper = wrapper.like("PCODES", "%[" + menu.getCode() + "]%"); wrapper = wrapper.like("PCODES", "%[" + menu.getCode() + "]%");
List<Menu> menus = menuMapper.selectList(wrapper); List<Menu> menus = menuMapper.selectList(wrapper);
for (Menu temp : menus) { for (Menu temp : menus) {
...@@ -113,7 +112,7 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> { ...@@ -113,7 +112,7 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> {
//获取menuId的code //获取menuId的code
String code = ""; String code = "";
if (menuId != null) { if (menuId != null) {
Menu menu = this.selectById(menuId); Menu menu = this.getById(menuId);
code = menu.getCode(); code = menu.getCode();
} }
...@@ -192,7 +191,8 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> { ...@@ -192,7 +191,8 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> {
public Menu selectByCode(String code) { public Menu selectByCode(String code) {
Menu menu = new Menu(); Menu menu = new Menu();
menu.setCode(code); menu.setCode(code);
return this.baseMapper.selectOne(menu); QueryWrapper<Menu> queryWrapper = new QueryWrapper<>(menu);
return this.baseMapper.selectOne(queryWrapper);
} }
/** /**
...@@ -212,7 +212,7 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> { ...@@ -212,7 +212,7 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> {
resultMenu.setLevels(1); resultMenu.setLevels(1);
} else { } else {
Long pid = menuParam.getPid(); Long pid = menuParam.getPid();
Menu pMenu = this.selectById(pid); Menu pMenu = this.getById(pid);
Integer pLevels = pMenu.getLevels(); Integer pLevels = pMenu.getLevels();
resultMenu.setPcode(pMenu.getCode()); resultMenu.setPcode(pMenu.getCode());
......
src/main/java/cn/stylefeng/guns/modular/system/service/NoticeService.java
...@@ -2,7 +2,7 @@ package cn.stylefeng.guns.modular.system.service; ...@@ -2,7 +2,7 @@ package cn.stylefeng.guns.modular.system.service;
import cn.stylefeng.guns.modular.system.entity.Notice; import cn.stylefeng.guns.modular.system.entity.Notice;
import cn.stylefeng.guns.modular.system.mapper.NoticeMapper; import cn.stylefeng.guns.modular.system.mapper.NoticeMapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
......
src/main/java/cn/stylefeng/guns/modular/system/service/OperationLogService.java
...@@ -2,8 +2,8 @@ package cn.stylefeng.guns.modular.system.service; ...@@ -2,8 +2,8 @@ package cn.stylefeng.guns.modular.system.service;
import cn.stylefeng.guns.modular.system.entity.OperationLog; import cn.stylefeng.guns.modular.system.entity.OperationLog;
import cn.stylefeng.guns.modular.system.mapper.OperationLogMapper; import cn.stylefeng.guns.modular.system.mapper.OperationLogMapper;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
...@@ -26,8 +26,8 @@ public class OperationLogService extends ServiceImpl<OperationLogMapper, Operati ...@@ -26,8 +26,8 @@ public class OperationLogService extends ServiceImpl<OperationLogMapper, Operati
* @author fengshuonan * @author fengshuonan
* @Date 2018/12/23 5:41 PM * @Date 2018/12/23 5:41 PM
*/ */
public List<Map<String, Object>> getOperationLogs(Page<OperationLog> page, String beginTime, String endTime, String logName, String s, String orderByField, boolean asc) { public List<Map<String, Object>> getOperationLogs(Page page, String beginTime, String endTime, String logName, String s) {
return this.baseMapper.getOperationLogs(page, beginTime, endTime, logName, s, orderByField, asc); return this.baseMapper.getOperationLogs(page, beginTime, endTime, logName, s);
} }
} }
src/main/java/cn/stylefeng/guns/modular/system/service/RelationService.java
...@@ -2,7 +2,7 @@ package cn.stylefeng.guns.modular.system.service; ...@@ -2,7 +2,7 @@ package cn.stylefeng.guns.modular.system.service;
import cn.stylefeng.guns.modular.system.entity.Relation; import cn.stylefeng.guns.modular.system.entity.Relation;
import cn.stylefeng.guns.modular.system.mapper.RelationMapper; import cn.stylefeng.guns.modular.system.mapper.RelationMapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
......
src/main/java/cn/stylefeng/guns/modular/system/service/RoleService.java
...@@ -17,7 +17,7 @@ import cn.stylefeng.guns.modular.system.model.RoleDto; ...@@ -17,7 +17,7 @@ import cn.stylefeng.guns.modular.system.model.RoleDto;
import cn.stylefeng.roses.core.util.ToolUtil; import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException; import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
import cn.stylefeng.roses.kernel.model.exception.ServiceException; import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -57,7 +57,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> { ...@@ -57,7 +57,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
role.setRoleId(null); role.setRoleId(null);
this.insert(role); this.save(role);
} }
/** /**
...@@ -73,7 +73,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> { ...@@ -73,7 +73,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
throw new RequestEmptyException(); throw new RequestEmptyException();
} }
Role old = this.selectById(roleDto.getRoleId()); Role old = this.getById(roleDto.getRoleId());
BeanUtil.copyProperties(roleDto, old); BeanUtil.copyProperties(roleDto, old);
this.updateById(old); this.updateById(old);
......
src/main/java/cn/stylefeng/guns/modular/system/service/UserService.java
...@@ -13,7 +13,7 @@ import cn.stylefeng.guns.modular.system.mapper.UserMapper; ...@@ -13,7 +13,7 @@ import cn.stylefeng.guns.modular.system.mapper.UserMapper;
import cn.stylefeng.guns.modular.system.model.UserDto; import cn.stylefeng.guns.modular.system.model.UserDto;
import cn.stylefeng.roses.core.datascope.DataScope; import cn.stylefeng.roses.core.datascope.DataScope;
import cn.stylefeng.roses.kernel.model.exception.ServiceException; import cn.stylefeng.roses.kernel.model.exception.ServiceException;
import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -53,7 +53,7 @@ public class UserService extends ServiceImpl<UserMapper, User> { ...@@ -53,7 +53,7 @@ public class UserService extends ServiceImpl<UserMapper, User> {
String salt = ShiroKit.getRandomSalt(5); String salt = ShiroKit.getRandomSalt(5);
String password = ShiroKit.md5(user.getPassword(), salt); String password = ShiroKit.md5(user.getPassword(), salt);
this.insert(UserFactory.createUser(user, password, salt)); this.save(UserFactory.createUser(user, password, salt));
} }
/** /**
...@@ -63,7 +63,7 @@ public class UserService extends ServiceImpl<UserMapper, User> { ...@@ -63,7 +63,7 @@ public class UserService extends ServiceImpl<UserMapper, User> {
* @Date 2018/12/24 22:53 * @Date 2018/12/24 22:53
*/ */
public void editUser(UserDto user){ public void editUser(UserDto user){
User oldUser = this.selectById(user.getUserId()); User oldUser = this.getById(user.getUserId());
if (ShiroKit.hasRole(Const.ADMIN_NAME)) { if (ShiroKit.hasRole(Const.ADMIN_NAME)) {
this.updateById(UserFactory.editUser(user, oldUser)); this.updateById(UserFactory.editUser(user, oldUser));
...@@ -112,7 +112,7 @@ public class UserService extends ServiceImpl<UserMapper, User> { ...@@ -112,7 +112,7 @@ public class UserService extends ServiceImpl<UserMapper, User> {
*/ */
public void changePwd(String oldPassword,String newPassword) { public void changePwd(String oldPassword,String newPassword) {
Long userId = ShiroKit.getUserNotNull().getId(); Long userId = ShiroKit.getUserNotNull().getId();
User user = this.selectById(userId); User user = this.getById(userId);
String oldMd5 = ShiroKit.md5(oldPassword, user.getSalt()); String oldMd5 = ShiroKit.md5(oldPassword, user.getSalt());
...@@ -183,7 +183,7 @@ public class UserService extends ServiceImpl<UserMapper, User> { ...@@ -183,7 +183,7 @@ public class UserService extends ServiceImpl<UserMapper, User> {
return; return;
} }
List<Long> deptDataScope = ShiroKit.getDeptDataScope(); List<Long> deptDataScope = ShiroKit.getDeptDataScope();
User user = this.selectById(userId); User user = this.getById(userId);
Long deptId = user.getDeptId(); Long deptId = user.getDeptId();
if (deptDataScope.contains(deptId)) { if (deptDataScope.contains(deptId)) {
return; return;
......
src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptWarpper.java
...@@ -19,7 +19,7 @@ import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory; ...@@ -19,7 +19,7 @@ import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper; import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
import cn.stylefeng.roses.core.util.ToolUtil; import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.page.PageResult; import cn.stylefeng.roses.kernel.model.page.PageResult;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
src/main/java/cn/stylefeng/guns/modular/system/warpper/MenuWarpper.java
...@@ -19,7 +19,7 @@ import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory; ...@@ -19,7 +19,7 @@ import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper; import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
import cn.stylefeng.roses.kernel.model.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.model.enums.YesOrNotEnum;
import cn.stylefeng.roses.kernel.model.page.PageResult; import cn.stylefeng.roses.kernel.model.page.PageResult;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
src/main/java/cn/stylefeng/guns/modular/system/warpper/NoticeWrapper.java
...@@ -18,7 +18,7 @@ package cn.stylefeng.guns.modular.system.warpper; ...@@ -18,7 +18,7 @@ package cn.stylefeng.guns.modular.system.warpper;
import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory; import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper; import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
import cn.stylefeng.roses.kernel.model.page.PageResult; import cn.stylefeng.roses.kernel.model.page.PageResult;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
src/main/java/cn/stylefeng/guns/modular/system/warpper/RoleWarpper.java
...@@ -18,7 +18,7 @@ package cn.stylefeng.guns.modular.system.warpper; ...@@ -18,7 +18,7 @@ package cn.stylefeng.guns.modular.system.warpper;
import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory; import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper; import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
import cn.stylefeng.roses.kernel.model.page.PageResult; import cn.stylefeng.roses.kernel.model.page.PageResult;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
src/main/java/cn/stylefeng/guns/modular/system/warpper/UserWarpper.java
...@@ -18,7 +18,7 @@ package cn.stylefeng.guns.modular.system.warpper; ...@@ -18,7 +18,7 @@ package cn.stylefeng.guns.modular.system.warpper;
import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory; import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper; import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
import cn.stylefeng.roses.kernel.model.page.PageResult; import cn.stylefeng.roses.kernel.model.page.PageResult;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
src/main/resources/application.yml
...@@ -31,8 +31,6 @@ spring: ...@@ -31,8 +31,6 @@ spring:
mybatis-plus: mybatis-plus:
typeAliasesPackage: cn.stylefeng.guns.modular.system.model typeAliasesPackage: cn.stylefeng.guns.modular.system.model
global-config:
metaObject-handler: cn.stylefeng.guns.core.metadata.GunsMpFieldHandler
log: log:
path: guns-logs path: guns-logs
\ No newline at end of file
src/test/java/cn/stylefeng/guns/multi/entity/Test.java
package cn.stylefeng.guns.multi.entity; package cn.stylefeng.guns.multi.entity;
import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.enums.IdType; import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable; import java.io.Serializable;
......
src/test/java/cn/stylefeng/guns/multi/mapper/TestMapper.java
package cn.stylefeng.guns.multi.mapper; package cn.stylefeng.guns.multi.mapper;
import cn.stylefeng.guns.multi.entity.Test; import cn.stylefeng.guns.multi.entity.Test;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* <p> * <p>
......
src/test/java/cn/stylefeng/guns/system/MenuTest.java
...@@ -3,8 +3,7 @@ package cn.stylefeng.guns.system; ...@@ -3,8 +3,7 @@ package cn.stylefeng.guns.system;
import cn.stylefeng.guns.base.BaseJunit; import cn.stylefeng.guns.base.BaseJunit;
import cn.stylefeng.guns.modular.system.entity.Menu; import cn.stylefeng.guns.modular.system.entity.Menu;
import cn.stylefeng.guns.modular.system.mapper.MenuMapper; import cn.stylefeng.guns.modular.system.mapper.MenuMapper;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -59,7 +58,7 @@ public class MenuTest extends BaseJunit { ...@@ -59,7 +58,7 @@ public class MenuTest extends BaseJunit {
} }
private Menu getParentMenu(String code) { private Menu getParentMenu(String code) {
Wrapper<Menu> wrapper = new EntityWrapper<Menu>(); QueryWrapper<Menu> wrapper = new QueryWrapper<>();
wrapper = wrapper.eq("CODE", code); wrapper = wrapper.eq("CODE", code);
List<Menu> menus = menuMapper.selectList(wrapper); List<Menu> menus = menuMapper.selectList(wrapper);
if (menus == null || menus.size() == 0) { if (menus == null || menus.size() == 0) {
......
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