Skip to content

W
wangxiaolu-sfa-module-system
提交 50c93983 authored 作者: 000516's avatar 000516 提交者： Coding
浏览文件
操作

集成Mybatis-plus；分页规范修改；完成考勤功能

Merge Request: 集成Mybatis-plus；分页规范修改；完成考勤功能 Created By: @李秋林 Accepted By: @李秋林 URL: https://g-pkkp8204.coding.net/p/wangxiaolu-sfa/d/wangxiaolu-sfa-module-system/git/merge/34?initial=true
上级 329823c7 baef22c3
隐藏空白字符变更
内嵌 并排
正在显示 包含 502 行增加 和 371 行删除
pom.xml
浏览文件 @ 50c93983
......@@ -85,11 +85,6 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
......
src/main/java/com/sfa/system/advice/ControllerResponseAdvice.java → src/main/java/com/sfa/system/config/advice/ControllerResponseAdvice.java
浏览文件 @ 50c93983
package com.sfa.system.advice;
package com.sfa.system.config.advice;
import com.fasterxml.jackson.core.JsonProcessingException;
......
src/main/java/com/sfa/system/controller/core/KqRuleCoreController.java
浏览文件 @ 50c93983
......@@ -29,7 +29,7 @@ public class KqRuleCoreController extends BaseController {
/**
* 新增考勤规则
*/
@RequiresPermissions("gen:rule:add")
@RequiresPermissions("system:kq_rule:list")
@Log(title = "考勤规则", businessType = BusinessType.INSERT)
@PostMapping("/add")
public void add(@RequestBody @Validated MdmKqRuleVo mdmKqRuleVo) {
......@@ -43,7 +43,7 @@ public class KqRuleCoreController extends BaseController {
/**
* 修改考勤规则
*/
@RequiresPermissions("gen:rule:edit")
@RequiresPermissions("system:kq_rule:list")
@Log(title = "考勤规则", businessType = BusinessType.UPDATE)
@PutMapping("/put")
public void edit(@RequestBody MdmKqRuleVo mdmKqRuleVo) {
......
src/main/java/com/sfa/system/controller/query/KqRuleQueryController.java
浏览文件 @ 50c93983
package com.sfa.system.controller.query;
import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.security.annotation.RequiresPermissions;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.pojo.request.MdmKqRuleVo;
import com.sfa.system.pojo.response.MdmKqRuleDto;
import com.sfa.system.api.pojo.response.MdmKqRuleDto;
import com.sfa.system.service.core.IMdmKqRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.sfa.common.security.annotation.RequiresPermissions;
import java.time.LocalTime;
import java.util.List;
/**
* @author : liqiulin
......@@ -25,16 +28,16 @@ public class KqRuleQueryController extends BaseController {
/**
* 查询考勤规则列表
*/
// todo @RequiresPermissions("gen:rule:list")
@PostMapping("/list")
public List<MdmKqRuleDto> list(@RequestBody MdmKqRuleVo mdmKqRuleVo) {
@RequiresPermissions("system:kq_rule:list")
@GetMapping("/list")
public PageInfo list(MdmKqRuleVo mdmKqRuleVo) {
return mdmKqRuleService.selectMdmKqRuleList(mdmKqRuleVo);
}
// /**
// * 导出考勤规则列表
// */
// @RequiresPermissions("gen:rule:export")
// @RequiresPermissions("system:kq_rule:list")
// @Log(title = "考勤规则", businessType = BusinessType.EXPORT)
// @PostMapping("/export")
// public void export(HttpServletResponse response, MdmKqRuleVo mdmKqRuleVo)
......@@ -47,7 +50,7 @@ public class KqRuleQueryController extends BaseController {
/**
* 获取考勤规则详细信息
*/
// todo @RequiresPermissions("gen:rule:query")
@RequiresPermissions("system:kq_rule:list")
@GetMapping(value = "/{ruleId}")
public MdmKqRuleDto getInfo(@PathVariable("ruleId") Long ruleId) {
MdmKqRuleDto mdmKqRuleDto = mdmKqRuleService.selectMdmKqRuleByRuleId(ruleId);
......
src/main/java/com/sfa/system/controller/query/SysConfigController.java
浏览文件 @ 50c93983
package com.sfa.system.controller.query;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.sfa.common.core.utils.poi.ExcelUtil;
import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.core.web.domain.AjaxResult;
import com.sfa.common.core.web.page.TableDataInfo;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.log.annotation.Log;
import com.sfa.common.log.enums.BusinessType;
import com.sfa.common.security.annotation.RequiresPermissions;
import com.sfa.common.security.utils.SecurityUtils;
import com.sfa.system.domain.entity.SysConfig;
import com.sfa.system.domain.dao.ISysConfigDao;
import com.sfa.system.domain.entity.SysConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 参数配置 信息操作处理
......@@ -40,11 +34,9 @@ public class SysConfigController extends BaseController
*/
@RequiresPermissions("system:config:list")
@GetMapping("/list")
public TableDataInfo list(SysConfig config)
public PageInfo list(SysConfig config)
{
startPage();
List<SysConfig> list = configDao.selectConfigList(config);
return getDataTable(list);
return configDao.selectConfigList(config);
}
@Log(title = "参数管理", businessType = BusinessType.EXPORT)
......@@ -52,7 +44,7 @@ public class SysConfigController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysConfig config)
{
List<SysConfig> list = configDao.selectConfigList(config);
List<SysConfig> list = configDao.selectConfigList(config).getRows();
ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
util.exportExcel(response, list, "参数数据");
}
......
src/main/java/com/sfa/system/controller/query/SysDictDataController.java
浏览文件 @ 50c93983
package com.sfa.system.controller.query;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.core.utils.poi.ExcelUtil;
import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.core.web.domain.AjaxResult;
import com.sfa.common.core.web.page.TableDataInfo;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.log.annotation.Log;
import com.sfa.common.log.enums.BusinessType;
import com.sfa.common.security.annotation.RequiresPermissions;
......@@ -25,6 +12,13 @@ import com.sfa.common.security.utils.SecurityUtils;
import com.sfa.system.api.domain.SysDictData;
import com.sfa.system.domain.dao.ISysDictDataDao;
import com.sfa.system.domain.dao.ISysDictTypeDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
* 数据字典信息
......@@ -43,11 +37,9 @@ public class SysDictDataController extends BaseController
@RequiresPermissions("system:dict:list")
@GetMapping("/list")
public TableDataInfo list(SysDictData dictData)
public PageInfo list(SysDictData dictData)
{
startPage();
List<SysDictData> list = dictDataDao.selectDictDataList(dictData);
return getDataTable(list);
return dictDataDao.selectDictDataList(dictData);
}
@Log(title = "字典数据", businessType = BusinessType.EXPORT)
......@@ -55,7 +47,7 @@ public class SysDictDataController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysDictData dictData)
{
List<SysDictData> list = dictDataDao.selectDictDataList(dictData);
List<SysDictData> list = dictDataDao.selectDictDataList(dictData).getRows();
ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
util.exportExcel(response, list, "字典数据");
}
......
src/main/java/com/sfa/system/controller/query/SysDictTypeController.java
浏览文件 @ 50c93983
package com.sfa.system.controller.query;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.sfa.common.core.utils.poi.ExcelUtil;
import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.core.web.domain.AjaxResult;
import com.sfa.common.core.web.page.TableDataInfo;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.log.annotation.Log;
import com.sfa.common.log.enums.BusinessType;
import com.sfa.common.security.annotation.RequiresPermissions;
import com.sfa.common.security.utils.SecurityUtils;
import com.sfa.system.api.domain.SysDictType;
import com.sfa.system.domain.dao.ISysDictTypeDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 数据字典信息
......@@ -37,11 +31,9 @@ public class SysDictTypeController extends BaseController
@RequiresPermissions("system:dict:list")
@GetMapping("/list")
public TableDataInfo list(SysDictType dictType)
public PageInfo list(SysDictType dictType)
{
startPage();
List<SysDictType> list = sysDictTypeDao.selectDictTypeList(dictType);
return getDataTable(list);
return sysDictTypeDao.selectDictTypeList(dictType);
}
@Log(title = "字典类型", businessType = BusinessType.EXPORT)
......@@ -49,7 +41,7 @@ public class SysDictTypeController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysDictType dictType)
{
List<SysDictType> list = sysDictTypeDao.selectDictTypeList(dictType);
List<SysDictType> list = sysDictTypeDao.selectDictTypeList(dictType).getRows();
ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
util.exportExcel(response, list, "字典类型");
}
......
src/main/java/com/sfa/system/controller/query/SysLogininforController.java
浏览文件 @ 50c93983
package com.sfa.system.controller.query;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.sfa.common.core.constant.CacheConstants;
import com.sfa.common.core.utils.poi.ExcelUtil;
import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.core.web.domain.AjaxResult;
import com.sfa.common.core.web.page.TableDataInfo;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.log.annotation.Log;
import com.sfa.common.log.enums.BusinessType;
import com.sfa.common.redis.service.RedisService;
......@@ -22,6 +12,11 @@ import com.sfa.common.security.annotation.InnerAuth;
import com.sfa.common.security.annotation.RequiresPermissions;
import com.sfa.system.api.domain.SysLogininfor;
import com.sfa.system.domain.dao.ISysLogininforDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 系统访问记录
......@@ -40,11 +35,9 @@ public class SysLogininforController extends BaseController
@RequiresPermissions("system:logininfor:list")
@GetMapping("/list")
public TableDataInfo list(SysLogininfor logininfor)
public PageInfo list(SysLogininfor logininfor)
{
startPage();
List<SysLogininfor> list = sysLogininforDao.selectLogininforList(logininfor);
return getDataTable(list);
return sysLogininforDao.selectLogininforList(logininfor);
}
@Log(title = "登录日志", businessType = BusinessType.EXPORT)
......@@ -52,7 +45,7 @@ public class SysLogininforController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysLogininfor logininfor)
{
List<SysLogininfor> list = sysLogininforDao.selectLogininforList(logininfor);
List<SysLogininfor> list = sysLogininforDao.selectLogininforList(logininfor).getRows();
ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
util.exportExcel(response, list, "登录日志");
}
......
src/main/java/com/sfa/system/controller/query/SysMenuController.java
浏览文件 @ 50c93983
......@@ -97,6 +97,7 @@ public class SysMenuController extends BaseController
{
return error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
}
menu.setCreateUserId(SecurityUtils.getUserId());
menu.setCreateBy(SecurityUtils.getUsername());
return toAjax(sysMenuDao.insertMenu(menu));
}
......@@ -121,6 +122,7 @@ public class SysMenuController extends BaseController
{
return error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
}
menu.setUpdateUserId(SecurityUtils.getUserId());
menu.setUpdateBy(SecurityUtils.getUsername());
return toAjax(sysMenuDao.updateMenu(menu));
}
......
src/main/java/com/sfa/system/controller/query/SysNoticeController.java
浏览文件 @ 50c93983
package com.sfa.system.controller.query;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.core.web.domain.AjaxResult;
import com.sfa.common.core.web.page.TableDataInfo;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.log.annotation.Log;
import com.sfa.common.log.enums.BusinessType;
import com.sfa.common.security.annotation.RequiresPermissions;
import com.sfa.common.security.utils.SecurityUtils;
import com.sfa.system.domain.entity.SysNotice;
import com.sfa.system.domain.dao.ISysNoticeDao;
import com.sfa.system.domain.entity.SysNotice;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
* 公告 信息操作处理
......@@ -38,11 +30,9 @@ public class SysNoticeController extends BaseController
*/
@RequiresPermissions("system:notice:list")
@GetMapping("/list")
public TableDataInfo list(SysNotice notice)
public PageInfo list(SysNotice notice)
{
startPage();
List<SysNotice> list = sysNoticeDao.selectNoticeList(notice);
return getDataTable(list);
return sysNoticeDao.selectNoticeList(notice);
}
/**
......
src/main/java/com/sfa/system/controller/query/SysOperlogController.java
浏览文件 @ 50c93983
package com.sfa.system.controller.query;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.sfa.common.core.utils.poi.ExcelUtil;
import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.core.web.domain.AjaxResult;
import com.sfa.common.core.web.page.TableDataInfo;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.log.annotation.Log;
import com.sfa.common.log.enums.BusinessType;
import com.sfa.common.security.annotation.InnerAuth;
import com.sfa.common.security.annotation.RequiresPermissions;
import com.sfa.system.api.domain.SysOperLog;
import com.sfa.system.domain.dao.ISysOperLogDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 操作日志记录
......@@ -35,11 +30,9 @@ public class SysOperlogController extends BaseController
@RequiresPermissions("system:operlog:list")
@GetMapping("/list")
public TableDataInfo list(SysOperLog operLog)
public PageInfo list(SysOperLog operLog)
{
startPage();
List<SysOperLog> list = sysOperLogDao.selectOperLogList(operLog);
return getDataTable(list);
return sysOperLogDao.selectOperLogList(operLog);
}
@Log(title = "操作日志", businessType = BusinessType.EXPORT)
......@@ -47,7 +40,7 @@ public class SysOperlogController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysOperLog operLog)
{
List<SysOperLog> list = sysOperLogDao.selectOperLogList(operLog);
List<SysOperLog> list = sysOperLogDao.selectOperLogList(operLog).getRows();
ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
util.exportExcel(response, list, "操作日志");
}
......
src/main/java/com/sfa/system/controller/query/SysPostController.java
浏览文件 @ 50c93983
package com.sfa.system.controller.query;
import java.util.List;
import java.util.Objects;
import javax.servlet.http.HttpServletResponse;
import com.sfa.common.core.enums.ECode;
import com.sfa.common.core.exception.CheckedException;
import com.sfa.common.core.exception.WXLSQLException;
import com.sfa.system.domain.dao.ISysPostDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.sfa.common.core.utils.poi.ExcelUtil;
import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.core.web.domain.AjaxResult;
import com.sfa.common.core.web.page.TableDataInfo;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.log.annotation.Log;
import com.sfa.common.log.enums.BusinessType;
import com.sfa.common.security.annotation.RequiresPermissions;
import com.sfa.common.security.utils.SecurityUtils;
import com.sfa.system.domain.dao.ISysPostDao;
import com.sfa.system.domain.entity.SysPost;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 岗位信息操作处理
......@@ -46,11 +36,9 @@ public class SysPostController extends BaseController
*/
@RequiresPermissions("system:post:list")
@GetMapping("/list")
public TableDataInfo list(SysPost post)
public PageInfo list(SysPost post)
{
startPage();
List<SysPost> list = sysPostDao.selectPostList(post);
return getDataTable(list);
return sysPostDao.selectPostList(post);
}
@Log(title = "岗位管理", businessType = BusinessType.EXPORT)
......@@ -58,7 +46,7 @@ public class SysPostController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysPost post)
{
List<SysPost> list = sysPostDao.selectPostList(post);
List<SysPost> list = sysPostDao.selectPostList(post).getRows();
ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
util.exportExcel(response, list, "岗位数据");
}
......
src/main/java/com/sfa/system/controller/query/SysRoleController.java
浏览文件 @ 50c93983
package com.sfa.system.controller.query;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.sfa.common.core.utils.poi.ExcelUtil;
import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.core.web.domain.AjaxResult;
import com.sfa.common.core.web.page.TableDataInfo;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.log.annotation.Log;
import com.sfa.common.log.enums.BusinessType;
import com.sfa.common.security.annotation.RequiresPermissions;
import com.sfa.common.security.utils.SecurityUtils;
import com.sfa.system.api.domain.SysDept;
import com.sfa.system.api.domain.SysRole;
import com.sfa.system.api.domain.SysUser;
import com.sfa.system.domain.entity.SysUserRole;
import com.sfa.system.domain.dao.ISysDeptDao;
import com.sfa.system.domain.dao.ISysRoleDao;
import com.sfa.system.domain.dao.ISysUserDao;
import com.sfa.system.domain.entity.SysUserRole;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 角色信息
......@@ -40,19 +33,14 @@ public class SysRoleController extends BaseController
@Autowired
private ISysRoleDao sysRoleDao;
@Autowired
private ISysUserDao sysUserDao;
@Autowired
private ISysDeptDao sysDeptDao;
@RequiresPermissions("system:role:list")
@GetMapping("/list")
public TableDataInfo list(SysRole role)
public PageInfo list(SysRole role)
{
startPage();
List<SysRole> list = sysRoleDao.selectRoleList(role);
return getDataTable(list);
return sysRoleDao.selectRoleList(role);
}
@Log(title = "角色管理", businessType = BusinessType.EXPORT)
......@@ -60,7 +48,7 @@ public class SysRoleController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysRole role)
{
List<SysRole> list = sysRoleDao.selectRoleList(role);
List<SysRole> list = sysRoleDao.selectRoleList(role).getRows();
ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
util.exportExcel(response, list, "角色数据");
}
......@@ -92,6 +80,7 @@ public class SysRoleController extends BaseController
{
return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
}
role.setCreateUserId(SecurityUtils.getUserId());
role.setCreateBy(SecurityUtils.getUsername());
return toAjax(sysRoleDao.insertRole(role));
......@@ -115,6 +104,7 @@ public class SysRoleController extends BaseController
{
return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
}
role.setUpdateUserId(SecurityUtils.getUserId());
role.setUpdateBy(SecurityUtils.getUsername());
return toAjax(sysRoleDao.updateRole(role));
}
......@@ -166,36 +156,36 @@ public class SysRoleController extends BaseController
{
return success(sysRoleDao.selectRoleAll());
}
/**
* 查询已分配用户角色列表
*/
@RequiresPermissions("system:role:list")
@GetMapping("/authUser/allocatedList")
public TableDataInfo allocatedList(SysUser user)
{
startPage();
List<SysUser> list = sysUserDao.selectAllocatedList(user);
return getDataTable(list);
}
/**
* 查询未分配用户角色列表
*/
@RequiresPermissions("system:role:list")
@GetMapping("/authUser/unallocatedList")
public TableDataInfo unallocatedList(SysUser user)
{
startPage();
List<SysUser> list = sysUserDao.selectUnallocatedList(user);
return getDataTable(list);
}
// /**
// * 查询已分配用户角色列表
// */
// @RequiresPermissions("system:role:list")
// @GetMapping("/authUser/allocatedList")
// public TableDataInfo allocatedList(SysUser user)
// {
// startPage();
// List<SysUser> list = sysUserDao.selectAllocatedList(user);
// return getDataTable(list);
// }
// /**
// * 查询未分配用户角色列表
// */
// @RequiresPermissions("system:role:list")
// @GetMapping("/authUser/unallocatedList")
// public TableDataInfo unallocatedList(SysUser user)
// {
// startPage();
// List<SysUser> list = sysUserDao.selectUnallocatedList(user);
// return getDataTable(list);
// }
/**
* 取消授权用户
*/
@RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancel")
// @PutMapping("/authUser/cancel")
public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
{
return toAjax(sysRoleDao.deleteAuthUser(userRole));
......@@ -206,7 +196,7 @@ public class SysRoleController extends BaseController
*/
@RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancelAll")
// @PutMapping("/authUser/cancelAll")
public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
{
return toAjax(sysRoleDao.deleteAuthUsers(roleId, userIds));
......
src/main/java/com/sfa/system/controller/query/SysUserOnlineController.java
浏览文件 @ 50c93983
package com.sfa.system.controller.query;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.sfa.common.core.constant.CacheConstants;
import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.core.web.controller.BaseController;
import com.sfa.common.core.web.domain.AjaxResult;
import com.sfa.common.core.web.page.TableDataInfo;
import com.sfa.common.log.annotation.Log;
import com.sfa.common.log.enums.BusinessType;
import com.sfa.common.redis.service.RedisService;
......@@ -22,6 +11,13 @@ import com.sfa.common.security.annotation.RequiresPermissions;
import com.sfa.system.api.model.LoginUser;
import com.sfa.system.domain.entity.SysUserOnline;
import com.sfa.system.service.ISysUserOnlineService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/**
* 在线用户监控
......@@ -40,10 +36,10 @@ public class SysUserOnlineController extends BaseController
@RequiresPermissions("monitor:online:list")
@GetMapping("/list")
public TableDataInfo list(String ipaddr, String userName)
public List<SysUserOnline> list(String ipaddr, String userName)
{
Collection<String> keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
List<SysUserOnline> userOnlineList = new ArrayList<>();
for (String key : keys)
{
LoginUser user = redisService.getCacheObject(key);
......@@ -66,7 +62,7 @@ public class SysUserOnlineController extends BaseController
}
Collections.reverse(userOnlineList);
userOnlineList.removeAll(Collections.singleton(null));
return getDataTable(userOnlineList);
return userOnlineList;
}
/**
......
src/main/java/com/sfa/system/controller/query/SysUserQueryController.java
浏览文件 @ 50c93983
......@@ -15,6 +15,7 @@ import com.sfa.system.api.domain.SysDept;
import com.sfa.system.api.domain.SysRole;
import com.sfa.system.api.domain.SysUser;
import com.sfa.system.api.model.LoginUser;
import com.sfa.system.api.pojo.request.UserVo;
import com.sfa.system.domain.dao.ISysPostDao;
import com.sfa.system.domain.dao.ISysUserDao;
import com.sfa.system.domain.dao.ISysConfigDao;
......@@ -68,10 +69,9 @@ public class SysUserQueryController extends BaseController
*/
@RequiresPermissions("system:user:list")
@GetMapping("/list")
public PageInfo list(PageInfo pageInfo)
public PageInfo list(UserVo userVo)
{
userQueryService.selectUserPage(pageInfo);
return pageInfo;
return userQueryService.selectUserPage(userVo);
}
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
......
src/main/java/com/sfa/system/domain/dao/IMdmKqRuleDao.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.domain.wq.MdmKqRuleWq;
import com.sfa.system.pojo.request.MdmKqRuleVo;
import com.sfa.system.pojo.response.MdmKqRuleDto;
import java.util.List;
import com.sfa.system.api.pojo.response.MdmKqRuleDto;
/**
* @author : liqiulin
......@@ -29,7 +28,7 @@ public interface IMdmKqRuleDao {
* @param mdmKqRuleWq 查询条件合集
* @return 考勤规则集合
*/
public List<MdmKqRuleDto> selectMdmKqRuleList(MdmKqRuleWq mdmKqRuleWq);
public PageInfo selectMdmKqRuleList(MdmKqRuleWq mdmKqRuleWq);
/**
* 新增考勤规则
......
src/main/java/com/sfa/system/domain/dao/ISysConfigDao.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.domain.entity.SysConfig;
/**
......@@ -32,7 +32,7 @@ public interface ISysConfigDao
* @param config 参数配置信息
* @return 参数配置集合
*/
public List<SysConfig> selectConfigList(SysConfig config);
public PageInfo selectConfigList(SysConfig config);
/**
* 新增参数配置
......
src/main/java/com/sfa/system/domain/dao/ISysDictDataDao.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.api.domain.SysDictData;
/**
......@@ -16,7 +16,7 @@ public interface ISysDictDataDao
* @param dictData 字典数据信息
* @return 字典数据集合信息
*/
public List<SysDictData> selectDictDataList(SysDictData dictData);
public PageInfo selectDictDataList(SysDictData dictData);
/**
* 根据字典类型和字典键值查询字典数据信息
......
src/main/java/com/sfa/system/domain/dao/ISysDictTypeDao.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.api.domain.SysDictData;
import com.sfa.system.api.domain.SysDictType;
......@@ -17,7 +19,7 @@ public interface ISysDictTypeDao
* @param dictType 字典类型信息
* @return 字典类型集合信息
*/
public List<SysDictType> selectDictTypeList(SysDictType dictType);
public PageInfo selectDictTypeList(SysDictType dictType);
/**
* 根据所有字典类型
......
src/main/java/com/sfa/system/domain/dao/ISysLogininforDao.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.api.domain.SysLogininfor;
/**
......@@ -23,7 +23,7 @@ public interface ISysLogininforDao
* @param logininfor 访问日志对象
* @return 登录记录集合
*/
public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
public PageInfo selectLogininforList(SysLogininfor logininfor);
/**
* 批量删除系统登录日志
......
src/main/java/com/sfa/system/domain/dao/ISysNoticeDao.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.domain.entity.SysNotice;
/**
......@@ -24,7 +24,7 @@ public interface ISysNoticeDao
* @param notice 公告信息
* @return 公告集合
*/
public List<SysNotice> selectNoticeList(SysNotice notice);
public PageInfo selectNoticeList(SysNotice notice);
/**
* 新增公告
......
src/main/java/com/sfa/system/domain/dao/ISysOperLogDao.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.api.domain.SysOperLog;
/**
......@@ -24,7 +24,7 @@ public interface ISysOperLogDao
* @param operLog 操作日志对象
* @return 操作日志集合
*/
public List<SysOperLog> selectOperLogList(SysOperLog operLog);
public PageInfo selectOperLogList(SysOperLog operLog);
/**
* 批量删除系统操作日志
......
src/main/java/com/sfa/system/domain/dao/ISysPostDao.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.domain.entity.SysPost;
import com.sfa.system.pojo.response.SysPostDto;
......@@ -17,7 +19,7 @@ public interface ISysPostDao
* @param post 岗位信息
* @return 岗位列表
*/
public List<SysPost> selectPostList(SysPost post);
public PageInfo selectPostList(SysPost post);
/**
* 查询所有岗位
......
src/main/java/com/sfa/system/domain/dao/ISysRoleDao.java
浏览文件 @ 50c93983
......@@ -2,6 +2,8 @@ package com.sfa.system.domain.dao;
import java.util.List;
import java.util.Set;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.api.domain.SysRole;
import com.sfa.system.domain.entity.SysUserRole;
......@@ -18,7 +20,7 @@ public interface ISysRoleDao
* @param role 角色信息
* @return 角色数据集合信息
*/
public List<SysRole> selectRoleList(SysRole role);
public PageInfo selectRoleList(SysRole role);
/**
* 根据用户ID查询角色列表
......
src/main/java/com/sfa/system/domain/dao/ISysUserDao.java
浏览文件 @ 50c93983
......@@ -3,6 +3,7 @@ package com.sfa.system.domain.dao;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.api.domain.SysUser;
import com.sfa.system.api.pojo.request.UserVo;
import com.sfa.system.domain.wq.SysUserWq;
import java.util.List;
......@@ -212,5 +213,5 @@ public interface ISysUserDao
/**
* 分页查询
*/
void selectUserPage(PageInfo pageInfo);
PageInfo selectUserPage(SysUserWq sysUserWq);
}
src/main/java/com/sfa/system/domain/dao/impl/MdmKqRuleDaoImpl.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.enums.ECode;
import com.sfa.common.core.exception.CheckedException;
import com.sfa.common.core.exception.WXLSQLException;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport;
import com.sfa.system.domain.dao.IMdmKqRuleDao;
import com.sfa.system.domain.entity.MdmKqRule;
import com.sfa.system.domain.mapper.MdmKqRuleMapper;
import com.sfa.system.domain.wq.MdmKqRuleWq;
import com.sfa.system.pojo.request.MdmKqRuleVo;
import com.sfa.system.pojo.response.MdmKqRuleDto;
import com.sfa.system.api.pojo.response.MdmKqRuleDto;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -55,10 +58,11 @@ public class MdmKqRuleDaoImpl implements IMdmKqRuleDao {
* @return 考勤规则
*/
@Override
public List<MdmKqRuleDto> selectMdmKqRuleList(MdmKqRuleWq mdmKqRuleWq) {
public PageInfo selectMdmKqRuleList(MdmKqRuleWq mdmKqRuleWq) {
LambdaQueryWrapper<MdmKqRule> qw = buildWrapper(mdmKqRuleWq);
List<MdmKqRule> mdmKqRules = mdmKqRuleMapper.selectList(qw);
return transitionDtos(mdmKqRules);
Page<MdmKqRule> pageR = mdmKqRuleMapper.selectPage(TableSupport.pageI(), qw);
PageInfo<MdmKqRule> pageInfo = new PageInfo<>(pageR);
return pageInfo;
}
/**
......
src/main/java/com/sfa/system/domain/dao/impl/SysConfigDaoImpl.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao.impl;
import java.util.Collection;
import java.util.List;
import javax.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.constant.CacheConstants;
import com.sfa.common.core.constant.UserConstants;
import com.sfa.common.core.exception.ServiceException;
import com.sfa.common.core.text.Convert;
import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport;
import com.sfa.common.redis.service.RedisService;
import com.sfa.system.domain.dao.ISysConfigDao;
import com.sfa.system.domain.entity.SysConfig;
import com.sfa.system.domain.mapper.SysConfigMapper;
import com.sfa.system.domain.dao.ISysConfigDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import java.util.Collection;
import java.util.List;
/**
* 参数配置 服务层实现
......@@ -84,9 +89,25 @@ public class SysConfigDaoImpl implements ISysConfigDao
* @return 参数配置集合
*/
@Override
public List<SysConfig> selectConfigList(SysConfig config)
{
return configMapper.selectConfigList(config);
public PageInfo selectConfigList(SysConfig config){
LambdaQueryWrapper<SysConfig> qw = buildWrapper(config);
Page<SysConfig> pageR = configMapper.selectPage(TableSupport.pageI(), qw);
PageInfo<SysConfig> pageInfo = new PageInfo<>(pageR);
return pageInfo;
}
private LambdaQueryWrapper<SysConfig> buildWrapper(SysConfig config) {
LambdaQueryWrapper<SysConfig> qw = new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(config.getConfigType())){
qw.eq(SysConfig::getConfigType,config.getConfigType());
}
if (StringUtils.isNotEmpty(config.getConfigName())){
qw.like(SysConfig::getConfigName,config.getConfigName());
}
if (StringUtils.isNotEmpty(config.getConfigKey())){
qw.like(SysConfig::getConfigKey,config.getConfigKey());
}
return qw;
}
/**
......
src/main/java/com/sfa/system/domain/dao/impl/SysDictDataDaoImpl.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport;
import com.sfa.common.security.utils.DictUtils;
import com.sfa.system.api.domain.SysDictData;
import com.sfa.system.domain.mapper.SysDictDataMapper;
import com.sfa.system.domain.dao.ISysDictDataDao;
import com.sfa.system.domain.mapper.SysDictDataMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 字典 业务层处理
......@@ -26,9 +32,26 @@ public class SysDictDataDaoImpl implements ISysDictDataDao
* @return 字典数据集合信息
*/
@Override
public List<SysDictData> selectDictDataList(SysDictData dictData)
public PageInfo selectDictDataList(SysDictData dictData)
{
return dictDataMapper.selectDictDataList(dictData);
LambdaQueryWrapper<SysDictData> qw = buildWrapper(dictData);
Page<SysDictData> pageR = dictDataMapper.selectPage(TableSupport.pageI(), qw);
PageInfo<SysDictData> pageInfo = new PageInfo<>(pageR);
return pageInfo;
}
private LambdaQueryWrapper<SysDictData> buildWrapper(SysDictData dictData) {
LambdaQueryWrapper<SysDictData> queryWrapper = new LambdaQueryWrapper<>();
if (!StringUtils.isBlank(dictData.getDictType())) {
queryWrapper.eq(SysDictData::getDictType, dictData.getDictType());
}
if (!StringUtils.isBlank(dictData.getStatus())) {
queryWrapper.eq(SysDictData::getStatus, dictData.getStatus());
}
if (!StringUtils.isBlank(dictData.getDictLabel())) {
queryWrapper.like(SysDictData::getDictLabel, dictData.getDictLabel());
}
return queryWrapper;
}
/**
......
src/main/java/com/sfa/system/domain/dao/impl/SysDictTypeDaoImpl.java
浏览文件 @ 50c93983
......@@ -5,6 +5,11 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -48,9 +53,26 @@ public class SysDictTypeDaoImpl implements ISysDictTypeDao
* @return 字典类型集合信息
*/
@Override
public List<SysDictType> selectDictTypeList(SysDictType dictType)
public PageInfo selectDictTypeList(SysDictType dictType)
{
return dictTypeMapper.selectDictTypeList(dictType);
LambdaQueryWrapper<SysDictType> qw = buildWrapper(dictType);
Page<SysDictType> pageR = dictTypeMapper.selectPage(TableSupport.pageI(), qw);
PageInfo<SysDictType> pageInfo = new PageInfo<>(pageR);
return pageInfo;
}
private LambdaQueryWrapper<SysDictType> buildWrapper(SysDictType dictType) {
LambdaQueryWrapper<SysDictType> qw = new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(dictType.getStatus())){
qw.eq(SysDictType::getStatus,dictType.getStatus());
}
if (StringUtils.isNotEmpty(dictType.getDictName())){
qw.like(SysDictType::getDictName,dictType.getDictName());
}
if (StringUtils.isNotEmpty(dictType.getDictType())){
qw.eq(SysDictType::getDictType,dictType.getDictType());
}
return qw;
}
/**
......
src/main/java/com/sfa/system/domain/dao/impl/SysLogininforDaoImpl.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport;
import com.sfa.system.api.domain.SysLogininfor;
import com.sfa.system.domain.mapper.SysLogininforMapper;
import com.sfa.system.domain.dao.ISysLogininforDao;
import com.sfa.system.domain.mapper.SysLogininforMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Objects;
/**
* 系统访问日志情况信息 服务层处理
......@@ -37,9 +43,30 @@ public class SysLogininforDaoImpl implements ISysLogininforDao
* @return 登录记录集合
*/
@Override
public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor)
public PageInfo selectLogininforList(SysLogininfor logininfor)
{
return logininforMapper.selectLogininforList(logininfor);
LambdaQueryWrapper<SysLogininfor> qw = buildWrapper(logininfor);
Page<SysLogininfor> pageR = logininforMapper.selectPage(TableSupport.pageI(), qw);
PageInfo<SysLogininfor> pageInfo = new PageInfo<>(pageR);
return pageInfo;
}
private LambdaQueryWrapper<SysLogininfor> buildWrapper(SysLogininfor logininfor) {
LambdaQueryWrapper<SysLogininfor> qw = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(logininfor.getStatus())){
qw.eq(SysLogininfor::getStatus,logininfor.getStatus());
}
if (StringUtils.isNotBlank(logininfor.getIpaddr())){
qw.eq(SysLogininfor::getIpaddr,logininfor.getIpaddr());
}
if (StringUtils.isNotBlank(logininfor.getUserName())){
qw.eq(SysLogininfor::getUserName,logininfor.getUserName());
}
if (Objects.nonNull(logininfor.getBeginTime())&&Objects.nonNull(logininfor.getEndTime())){
qw.between(SysLogininfor::getAccessTime, logininfor.getBeginTime(),logininfor.getEndTime());
}
qw.orderByDesc(SysLogininfor::getInfoId);
return qw;
}
/**
......
src/main/java/com/sfa/system/domain/dao/impl/SysNoticeDaoImpl.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport;
import com.sfa.system.domain.dao.ISysNoticeDao;
import com.sfa.system.domain.entity.SysNotice;
import com.sfa.system.domain.mapper.SysNoticeMapper;
import com.sfa.system.domain.dao.ISysNoticeDao;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 公告 服务层实现
......@@ -37,9 +41,26 @@ public class SysNoticeDaoImpl implements ISysNoticeDao
* @return 公告集合
*/
@Override
public List<SysNotice> selectNoticeList(SysNotice notice)
public PageInfo selectNoticeList(SysNotice notice)
{
return noticeMapper.selectNoticeList(notice);
LambdaQueryWrapper<SysNotice> qw = buildWrapper(notice);
Page<SysNotice> pageR = noticeMapper.selectPage(TableSupport.pageI(), qw);
PageInfo<SysNotice> pageInfo = new PageInfo<>(pageR);
return pageInfo;
}
private LambdaQueryWrapper<SysNotice> buildWrapper(SysNotice notice) {
LambdaQueryWrapper<SysNotice> qw = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(notice.getNoticeType())){
qw.eq(SysNotice::getNoticeType,notice.getNoticeType());
}
if (StringUtils.isNotBlank(notice.getNoticeTitle())){
qw.like(SysNotice::getNoticeTitle,notice.getNoticeTitle());
}
if (StringUtils.isNotBlank(notice.getCreateBy())){
qw.like(SysNotice::getCreateBy,notice.getCreateBy());
}
return qw;
}
/**
......
src/main/java/com/sfa/system/domain/dao/impl/SysOperLogDaoImpl.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport;
import com.sfa.system.api.domain.SysOperLog;
import com.sfa.system.domain.mapper.SysOperLogMapper;
import com.sfa.system.domain.dao.ISysOperLogDao;
import com.sfa.system.domain.mapper.SysOperLogMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Objects;
/**
* 操作日志 服务层处理
......@@ -37,9 +43,39 @@ public class SysOperLogDaoImpl implements ISysOperLogDao
* @return 操作日志集合
*/
@Override
public List<SysOperLog> selectOperLogList(SysOperLog operLog)
public PageInfo selectOperLogList(SysOperLog operLog)
{
return operLogMapper.selectOperLogList(operLog);
LambdaQueryWrapper<SysOperLog> qw = buildWrapper(operLog);
Page<SysOperLog> pageR = operLogMapper.selectPage(TableSupport.pageI(), qw);
PageInfo<SysOperLog> pageInfo = new PageInfo<>(pageR);
return pageInfo;
}
private LambdaQueryWrapper<SysOperLog> buildWrapper(SysOperLog operLog) {
LambdaQueryWrapper<SysOperLog> qw =new LambdaQueryWrapper<>();
if (Objects.nonNull(operLog.getBusinessType())){
qw.eq(SysOperLog::getBusinessType,operLog.getBusinessType());
}
if (Objects.nonNull(operLog.getStatus())){
qw.eq(SysOperLog::getStatus,operLog.getStatus());
}
if (Objects.nonNull(operLog.getBusinessTypes())){
qw.in(SysOperLog::getBusinessType,operLog.getBusinessTypes());
}
if (StringUtils.isNotBlank(operLog.getOperIp())){
qw.like(SysOperLog::getOperIp,operLog.getOperIp());
}
if (StringUtils.isNotBlank(operLog.getTitle())){
qw.like(SysOperLog::getTitle,operLog.getTitle());
}
if (StringUtils.isNotBlank(operLog.getOperName())){
qw.like(SysOperLog::getOperName,operLog.getOperName());
}
if (Objects.nonNull(operLog.getBeginTime())&&Objects.nonNull(operLog.getEndTime())){
qw.between(SysOperLog::getOperTime, operLog.getBeginTime(),operLog.getEndTime());
}
qw.orderByDesc(SysOperLog::getOperId);
return qw;
}
/**
......
src/main/java/com/sfa/system/domain/dao/impl/SysPostDaoImpl.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.constant.UserConstants;
import com.sfa.common.core.exception.ServiceException;
import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.core.utils.bean.BeanUtils;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport;
import com.sfa.system.domain.dao.ISysPostDao;
import com.sfa.system.domain.entity.SysPost;
import com.sfa.system.domain.mapper.SysPostMapper;
......@@ -13,11 +17,8 @@ import com.sfa.system.pojo.response.SysPostDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
/**
* 岗位信息 服务层处理
......@@ -41,9 +42,26 @@ public class SysPostDaoImpl implements ISysPostDao
* @return 岗位信息集合
*/
@Override
public List<SysPost> selectPostList(SysPost post)
public PageInfo selectPostList(SysPost post)
{
return postMapper.selectPostList(post);
LambdaQueryWrapper<SysPost> qw = buildWrapper(post);
Page<SysPost> pageR = postMapper.selectPage(TableSupport.pageI(), qw);
PageInfo<SysPost> pageInfo = new PageInfo<>(pageR);
return pageInfo;
}
private LambdaQueryWrapper<SysPost> buildWrapper(SysPost post) {
LambdaQueryWrapper<SysPost> qw = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(post.getStatus())){
qw.eq(SysPost::getStatus,post.getStatus());
}
if (StringUtils.isNotBlank(post.getPostCode())){
qw.like(SysPost::getPostCode,post.getPostCode());
}
if (StringUtils.isNotBlank(post.getPostName())){
qw.like(SysPost::getPostName,post.getPostName());
}
return qw;
}
/**
......
src/main/java/com/sfa/system/domain/dao/impl/SysRoleDaoImpl.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.constant.UserConstants;
import com.sfa.common.core.exception.ServiceException;
import com.sfa.common.core.utils.SpringUtils;
import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport;
import com.sfa.common.datascope.annotation.DataScope;
import com.sfa.common.security.utils.SecurityUtils;
import com.sfa.system.api.domain.SysRole;
import com.sfa.system.api.domain.SysUser;
import com.sfa.system.domain.dao.ISysRoleDao;
import com.sfa.system.domain.entity.SysRoleDept;
import com.sfa.system.domain.entity.SysRoleMenu;
import com.sfa.system.domain.entity.SysUserRole;
......@@ -23,7 +19,11 @@ import com.sfa.system.domain.mapper.SysRoleDeptMapper;
import com.sfa.system.domain.mapper.SysRoleMapper;
import com.sfa.system.domain.mapper.SysRoleMenuMapper;
import com.sfa.system.domain.mapper.SysUserRoleMapper;
import com.sfa.system.domain.dao.ISysRoleDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
/**
* 角色 业务层处理
......@@ -53,9 +53,31 @@ public class SysRoleDaoImpl implements ISysRoleDao
*/
@Override
@DataScope(deptAlias = "d")
public List<SysRole> selectRoleList(SysRole role)
public PageInfo selectRoleList(SysRole role)
{
return roleMapper.selectRoleList(role);
LambdaQueryWrapper<SysRole> qw = buildWrapper(role);
Page<SysRole> pageR = roleMapper.selectPage(TableSupport.pageI(), qw);
PageInfo<SysRole> pageInfo = new PageInfo<>(pageR);
return pageInfo;
}
private LambdaQueryWrapper<SysRole> buildWrapper(SysRole role) {
LambdaQueryWrapper<SysRole> qw = new LambdaQueryWrapper<>();
qw.eq(SysRole::getDelFlag,"0");
if (Objects.nonNull(role.getRoleId())){
qw.eq(SysRole::getRoleId,role.getRoleId());
}
if (StringUtils.isNotBlank(role.getStatus())){
qw.eq(SysRole::getStatus,role.getStatus());
}
if (StringUtils.isNotBlank(role.getRoleName())){
qw.like(SysRole::getRoleName,role.getRoleName());
}
if (StringUtils.isNotBlank(role.getRoleKey())){
qw.like(SysRole::getRoleKey,role.getRoleKey());
}
qw.orderByAsc(SysRole::getRoleSort);
return qw;
}
/**
......@@ -112,7 +134,8 @@ public class SysRoleDaoImpl implements ISysRoleDao
@Override
public List<SysRole> selectRoleAll()
{
return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
return roleMapper.selectRoleList(new SysRole());
// return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
}
/**
......@@ -203,7 +226,8 @@ public class SysRoleDaoImpl implements ISysRoleDao
{
SysRole role = new SysRole();
role.setRoleId(roleId);
List<SysRole> roles = SpringUtils.getAopProxy(this).selectRoleList(role);
List<SysRole> roles = roleMapper.selectRoleList(role);
// List<SysRole> roles = SpringUtils.getAopProxy(this).selectRoleList(role);
if (StringUtils.isEmpty(roles))
{
throw new ServiceException("没有权限访问角色数据！");
......
src/main/java/com/sfa/system/domain/dao/impl/SysUserDaoImpl.java
浏览文件 @ 50c93983
package com.sfa.system.domain.dao.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sfa.common.core.constant.UserConstants;
import com.sfa.common.core.enums.ECode;
import com.sfa.common.core.exception.ServiceException;
......@@ -8,19 +10,20 @@ import com.sfa.common.core.utils.SpringUtils;
import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.core.utils.bean.BeanValidators;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.common.core.web.page.TableSupport;
import com.sfa.common.datascope.annotation.DataScope;
import com.sfa.common.security.utils.SecurityUtils;
import com.sfa.system.api.domain.SysRole;
import com.sfa.system.api.domain.SysUser;
import com.sfa.system.api.pojo.request.UserVo;
import com.sfa.system.domain.dao.ISysConfigDao;
import com.sfa.system.domain.dao.ISysDeptDao;
import com.sfa.system.domain.dao.ISysUserDao;
import com.sfa.system.domain.entity.SysPost;
import com.sfa.system.domain.entity.SysUserPost;
import com.sfa.system.domain.entity.SysUserRole;
import com.sfa.system.domain.mapper.*;
import com.sfa.system.domain.wq.SysUserWq;
import com.sfa.system.domain.dao.ISysConfigDao;
import com.sfa.system.domain.dao.ISysDeptDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
......@@ -261,7 +264,7 @@ public class SysUserDaoImpl implements ISysUserDao {
// insertUserPost(user);
// 新增用户与角色管理
// insertUserRole(user);
insertUserRoleOne(user.getUserId(),user.getRoleId());
insertUserRoleOne(user.getUserId(), user.getRoleId());
return rows;
}
......@@ -276,9 +279,6 @@ public class SysUserDaoImpl implements ISysUserDao {
}
}
private void buildWrapper(SysUserWq sysUserWq) {
}
/**
* 注册用户信息
*
......@@ -320,7 +320,7 @@ public class SysUserDaoImpl implements ISysUserDao {
userRoleMapper.deleteUserRoleByUserId(userVo.getUserId());
// 新增用户与角色管理
// insertUserRole(user);
insertUserRoleOne(user.getUserId(),user.getRoleId());
insertUserRoleOne(user.getUserId(), user.getRoleId());
return userMapper.updateById(user);
}
......@@ -445,10 +445,10 @@ public class SysUserDaoImpl implements ISysUserDao {
}
public void insertUserRoleOne(Long userId, Long roleId) {
if (Objects.isNull(roleId)){
if (Objects.isNull(roleId)) {
return;
}
userRoleMapper.insertUserRoleOne(userId,roleId);
userRoleMapper.insertUserRoleOne(userId, roleId);
}
/**
......@@ -548,11 +548,38 @@ public class SysUserDaoImpl implements ISysUserDao {
}
@Override
public void selectUserPage(PageInfo pageInfo) {
List<SysUser> sysUsers = userMapper.selectUserPage();
pageInfo.setRows(sysUsers);
pageInfo.setTotalPage(10);
pageInfo.setTotal(10);
public PageInfo selectUserPage(SysUserWq sysUserWq) {
LambdaQueryWrapper<SysUser> qw = buildWrapper(sysUserWq);
Page<SysUser> pageR = userMapper.selectPage(TableSupport.pageI(), qw);
PageInfo<SysUser> pageInfo = new PageInfo<>(pageR);
return pageInfo;
}
private LambdaQueryWrapper<SysUser> buildWrapper(SysUserWq sysUserWq) {
LambdaQueryWrapper<SysUser> qw = new LambdaQueryWrapper<>();
qw.eq(SysUser::getDelFlag, "0");
if (StringUtils.isNotBlank(sysUserWq.getStatus())) {
qw.eq(SysUser::getStatus, sysUserWq.getStatus());
}
if (Objects.nonNull(sysUserWq.getRoleId())) {
qw.eq(SysUser::getRoleId, sysUserWq.getRoleId());
}
if (Objects.nonNull(sysUserWq.getDeptId())) {
qw.eq(SysUser::getDeptId, sysUserWq.getDeptId());
}
if (Objects.nonNull(sysUserWq.getBeginTime())&&Objects.nonNull(sysUserWq.getEndTime())){
qw.between(SysUser::getCreateTime, sysUserWq.getBeginTime(),sysUserWq.getEndTime());
}
if (Objects.nonNull(sysUserWq.getExistRole()) && !sysUserWq.getExistRole()){
qw.isNull(SysUser::getRoleId);
}
if (StringUtils.isNotBlank(sysUserWq.getUserNameLike())) {
qw.like(SysUser::getUserName, sysUserWq.getUserNameLike());
}
if (StringUtils.isNotBlank(sysUserWq.getPhonenumberLike())) {
qw.like(SysUser::getPhonenumber, sysUserWq.getPhonenumberLike());
}
return qw;
}
}
src/main/java/com/sfa/system/domain/mapper/SysUserRoleMapper.java
浏览文件 @ 50c93983
......@@ -66,4 +66,5 @@ public interface SysUserRoleMapper
public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
void insertUserRoleOne(@Param("userId") Long userId,@Param("roleId") Long roleId);
}
src/main/java/com/sfa/system/domain/wq/SysUserWq.java
浏览文件 @ 50c93983
......@@ -3,6 +3,8 @@ package com.sfa.system.domain.wq;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* @author : liqiulin
* @date : 2024-10-30 11
......@@ -15,7 +17,19 @@ public class SysUserWq {
private String phonenumber;
private String userNameLike;
private String phonenumberLike;
private String status;
private boolean isAdd;
private Date beginTime;
private Date endTime;
private Long roleId;
private Long deptId;
private Boolean existRole;
}
src/main/java/com/sfa/system/pojo/response/MdmKqRuleDto.java deleted 100644 → 0
浏览文件 @ 329823c7
package com.sfa.system.pojo.response;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalTime;
import java.util.Date;
/**
* @author : liqiulin
* @date : 2024-10-29 14
* @describe :
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class MdmKqRuleDto {
/** 规则ID */
private Long ruleId;
/** 规则编号 */
private String ruleNum;
/** 规则名称 */
private String ruleName;
/** 上班打卡允许开始时间 */
private LocalTime firBegintime;
/** 上班打卡允许结束时间 */
private LocalTime firEndtime;
/** 午班打卡允许开始时间 */
private LocalTime secBegintime;
/** 午班打卡允许结束时间 */
private LocalTime secEndtime;
/** 下班打卡允许开始时间 */
private LocalTime thiBegintime;
/** 下班打卡允许结束时间 */
private LocalTime thiEndtime;
/** 备注 */
private String remark;
private LocalTime currently;
/** 记录版本 */
private Long flag;
/** 删除标识 */
private String delFlag;
}
src/main/java/com/sfa/system/service/core/IMdmKqRuleService.java
浏览文件 @ 50c93983
package com.sfa.system.service.core;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.pojo.request.MdmKqRuleVo;
import com.sfa.system.pojo.response.MdmKqRuleDto;
import java.util.List;
import com.sfa.system.api.pojo.response.MdmKqRuleDto;
/**
* @author : liqiulin
......@@ -12,7 +11,7 @@ import java.util.List;
*/
public interface IMdmKqRuleService {
List<MdmKqRuleDto> selectMdmKqRuleList(MdmKqRuleVo mdmKqRuleVo);
PageInfo selectMdmKqRuleList(MdmKqRuleVo mdmKqRuleVo);
MdmKqRuleDto selectMdmKqRuleByRuleId(Long ruleId);
......
src/main/java/com/sfa/system/service/core/impl/IMdmKqRuleServiceImpl.java
浏览文件 @ 50c93983
package com.sfa.system.service.core.impl;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.domain.dao.IMdmKqRuleDao;
import com.sfa.system.domain.wq.MdmKqRuleWq;
import com.sfa.system.pojo.request.MdmKqRuleVo;
import com.sfa.system.pojo.response.MdmKqRuleDto;
import com.sfa.system.api.pojo.response.MdmKqRuleDto;
import com.sfa.system.service.core.IMdmKqRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author : liqiulin
* @date : 2024-10-29 14
......@@ -22,7 +21,7 @@ public class IMdmKqRuleServiceImpl implements IMdmKqRuleService {
IMdmKqRuleDao IMdmKqRuleDao;
@Override
public List<MdmKqRuleDto> selectMdmKqRuleList(MdmKqRuleVo ruleVo) {
public PageInfo selectMdmKqRuleList(MdmKqRuleVo ruleVo) {
MdmKqRuleWq mdmKqRuleWq = new MdmKqRuleWq().setRuleNameLike(ruleVo.getRuleName()).setCreateByLike(ruleVo.getCreateBy());
return IMdmKqRuleDao.selectMdmKqRuleList(mdmKqRuleWq);
}
......
src/main/java/com/sfa/system/service/core/impl/SysUserCoreServiceImpl.java
浏览文件 @ 50c93983
package com.sfa.system.service.core.impl;
import com.sfa.common.core.utils.StringUtils;
import com.sfa.system.api.pojo.request.UserVo;
import com.sfa.system.api.pojo.response.SiteDto;
import com.sfa.system.domain.dao.IMdmCityDao;
......@@ -53,7 +54,11 @@ public class SysUserCoreServiceImpl implements ISysUserCoreService {
// 补充角色、城市等信息
private void addCity(UserVo userVo){
if (Objects.isNull(userVo.getWorkCityNum())){
if (StringUtils.isEmpty(userVo.getWorkCityNum())){
userVo.setWorkProvinceNum(null)
.setWorkProvinceName(null)
.setWorkCityNum(null)
.setWorkCityName(null);
return;
}
SiteDto siteDto = mdmCityDao.selectOneCity(userVo.getWorkProvinceNum(), userVo.getWorkCityNum());
......
src/main/java/com/sfa/system/service/query/IUserQueryService.java
浏览文件 @ 50c93983
package com.sfa.system.service.query;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.api.pojo.request.UserVo;
/**
* @author : liqiulin
......@@ -10,8 +11,8 @@ import com.sfa.common.core.web.domain.PageInfo;
public interface IUserQueryService {
/**
* 分页查询
* @param pageInfo
* @param userVo 查询
* @return
*/
void selectUserPage(PageInfo pageInfo);
PageInfo selectUserPage(UserVo userVo);
}
src/main/java/com/sfa/system/service/query/impl/UserQueryServiceImpl.java
浏览文件 @ 50c93983
package com.sfa.system.service.query.impl;
import com.sfa.common.core.web.domain.PageInfo;
import com.sfa.system.api.pojo.request.UserVo;
import com.sfa.system.domain.dao.ISysUserDao;
import com.sfa.system.domain.wq.SysUserWq;
import com.sfa.system.service.query.IUserQueryService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -21,7 +24,12 @@ public class UserQueryServiceImpl implements IUserQueryService {
* 分页查询
*/
@Override
public void selectUserPage(PageInfo pageInfo) {
userDao.selectUserPage(pageInfo);
public PageInfo selectUserPage(UserVo userVo) {
SysUserWq sysUserWq = new SysUserWq();
BeanUtils.copyProperties(userVo,sysUserWq);
sysUserWq.setUserNameLike(userVo.getUserName())
.setPhonenumberLike(userVo.getPhonenumber());
return userDao.selectUserPage(sysUserWq);
}
}
src/main/resources/mapper/system/SysMenuMapper.xml
浏览文件 @ 50c93983
......@@ -153,6 +153,7 @@
<if test="icon !=null and icon != ''">icon = #{icon},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateUserId != null and updateUserId != ''">update_user_id = #{updateUserId},</if>
update_time = sysdate()
</set>
where menu_id = #{menuId}
......@@ -177,6 +178,7 @@
<if test="icon != null and icon != ''">icon,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createUserId != null and createUserId != ''">create_user_id,</if>
create_time
)values(
<if test="menuId != null and menuId != 0">#{menuId},</if>
......@@ -196,6 +198,7 @@
<if test="icon != null and icon != ''">#{icon},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createUserId != null and createUserId != ''">#{createUserId},</if>
sysdate()
)
</insert>
......
src/main/resources/mapper/system/SysRoleMapper.xml
浏览文件 @ 50c93983
......@@ -97,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">status,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createUserId != null and createUserId != ''">create_user_id,</if>
create_time
)values(
<if test="roleId != null and roleId != 0">#{roleId},</if>
......@@ -109,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createUserId != null and createUserId != ''">#{createUserId},</if>
sysdate()
)
</insert>
......@@ -125,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateUserId != null and updateUserId != ''">update_user_id = #{updateUserId},</if>
update_time = sysdate()
</set>
where role_id = #{roleId}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论