Skip to content

W
wangxiaolu-sfa-module-system
提交 8bc5a9fd authored 作者: 李秋林's avatar 李秋林
浏览文件
操作

修改原Service文件，将直接引用Mapper的Service的文件修改为Dao文件

上级 6828e69e
隐藏空白字符变更
内嵌 并排
正在显示 包含 237 行增加 和 236 行删除
src/main/java/com/sfa/system/controller/core/SysUserCoreController.java
浏览文件 @ 8bc5a9fd
......@@ -5,8 +5,8 @@ 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.pojo.request.UserVo;
import com.sfa.system.service.ISysDeptService;
import com.sfa.system.service.ISysRoleService;
import com.sfa.system.domain.dao.ISysDeptDao;
import com.sfa.system.domain.dao.ISysRoleDao;
import com.sfa.system.service.core.ISysUserCoreService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
......@@ -22,9 +22,9 @@ import org.springframework.web.bind.annotation.*;
public class SysUserCoreController {
@Autowired
private ISysRoleService roleService;
private ISysRoleDao roleDao;
@Autowired
private ISysDeptService deptService;
private ISysDeptDao deptDao;
@Autowired
private ISysUserCoreService sysUserService;
......@@ -35,8 +35,8 @@ public class SysUserCoreController {
@Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping
public void add(@Validated @RequestBody UserVo userVo) {
deptService.checkDeptDataScope(userVo.getDeptId());
roleService.checkRoleDataScope(userVo.getRoleIds());
deptDao.checkDeptDataScope(userVo.getDeptId());
roleDao.checkRoleDataScope(userVo.getRoleIds());
userVo.setCreateUserId(SecurityUtils.getUserId());
userVo.setCreateBy(SecurityUtils.getUsername());
userVo.setPassword(SecurityUtils.encryptPassword(userVo.getPassword()));
......@@ -51,8 +51,8 @@ public class SysUserCoreController {
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping
public void edit(@Validated @RequestBody UserVo userVo) {
deptService.checkDeptDataScope(userVo.getDeptId());
roleService.checkRoleDataScope(userVo.getRoleIds());
deptDao.checkDeptDataScope(userVo.getDeptId());
roleDao.checkRoleDataScope(userVo.getRoleIds());
userVo.setUpdateUserId(SecurityUtils.getUserId());
userVo.setUpdateBy(SecurityUtils.getUsername());
sysUserService.updateUser(userVo);
......
src/main/java/com/sfa/system/controller/query/SysConfigController.java
浏览文件 @ 8bc5a9fd
......@@ -21,7 +21,7 @@ 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.service.ISysConfigService;
import com.sfa.system.domain.dao.ISysConfigDao;
/**
* 参数配置 信息操作处理
......@@ -33,7 +33,7 @@ import com.sfa.system.service.ISysConfigService;
public class SysConfigController extends BaseController
{
@Autowired
private ISysConfigService configService;
private ISysConfigDao configDao;
/**
* 获取参数配置列表
......@@ -43,7 +43,7 @@ public class SysConfigController extends BaseController
public TableDataInfo list(SysConfig config)
{
startPage();
List<SysConfig> list = configService.selectConfigList(config);
List<SysConfig> list = configDao.selectConfigList(config);
return getDataTable(list);
}
......@@ -52,7 +52,7 @@ public class SysConfigController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysConfig config)
{
List<SysConfig> list = configService.selectConfigList(config);
List<SysConfig> list = configDao.selectConfigList(config);
ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
util.exportExcel(response, list, "参数数据");
}
......@@ -63,7 +63,7 @@ public class SysConfigController extends BaseController
@GetMapping(value = "/{configId}")
public AjaxResult getInfo(@PathVariable Long configId)
{
return success(configService.selectConfigById(configId));
return success(configDao.selectConfigById(configId));
}
/**
......@@ -72,7 +72,7 @@ public class SysConfigController extends BaseController
@GetMapping(value = "/configKey/{configKey}")
public AjaxResult getConfigKey(@PathVariable String configKey)
{
return success(configService.selectConfigByKey(configKey));
return success(configDao.selectConfigByKey(configKey));
}
/**
......@@ -83,12 +83,12 @@ public class SysConfigController extends BaseController
@PostMapping
public AjaxResult add(@Validated @RequestBody SysConfig config)
{
if (!configService.checkConfigKeyUnique(config))
if (!configDao.checkConfigKeyUnique(config))
{
return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
}
config.setCreateBy(SecurityUtils.getUsername());
return toAjax(configService.insertConfig(config));
return toAjax(configDao.insertConfig(config));
}
/**
......@@ -99,12 +99,12 @@ public class SysConfigController extends BaseController
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysConfig config)
{
if (!configService.checkConfigKeyUnique(config))
if (!configDao.checkConfigKeyUnique(config))
{
return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
}
config.setUpdateBy(SecurityUtils.getUsername());
return toAjax(configService.updateConfig(config));
return toAjax(configDao.updateConfig(config));
}
/**
......@@ -115,7 +115,7 @@ public class SysConfigController extends BaseController
@DeleteMapping("/{configIds}")
public AjaxResult remove(@PathVariable Long[] configIds)
{
configService.deleteConfigByIds(configIds);
configDao.deleteConfigByIds(configIds);
return success();
}
......@@ -127,7 +127,7 @@ public class SysConfigController extends BaseController
@DeleteMapping("/refreshCache")
public AjaxResult refreshCache()
{
configService.resetConfigCache();
configDao.resetConfigCache();
return success();
}
}
src/main/java/com/sfa/system/controller/query/SysDeptController.java
浏览文件 @ 8bc5a9fd
......@@ -21,7 +21,7 @@ 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.service.ISysDeptService;
import com.sfa.system.domain.dao.ISysDeptDao;
/**
* 部门信息
......@@ -33,7 +33,7 @@ import com.sfa.system.service.ISysDeptService;
public class SysDeptController extends BaseController
{
@Autowired
private ISysDeptService deptService;
private ISysDeptDao deptDao;
/**
* 获取部门列表
......@@ -42,7 +42,7 @@ public class SysDeptController extends BaseController
@GetMapping("/list")
public AjaxResult list(SysDept dept)
{
List<SysDept> depts = deptService.selectDeptList(dept);
List<SysDept> depts = deptDao.selectDeptList(dept);
return success(depts);
}
......@@ -53,7 +53,7 @@ public class SysDeptController extends BaseController
@GetMapping("/list/exclude/{deptId}")
public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
{
List<SysDept> depts = deptService.selectDeptList(new SysDept());
List<SysDept> depts = deptDao.selectDeptList(new SysDept());
depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
return success(depts);
}
......@@ -65,8 +65,8 @@ public class SysDeptController extends BaseController
@GetMapping(value = "/{deptId}")
public AjaxResult getInfo(@PathVariable Long deptId)
{
deptService.checkDeptDataScope(deptId);
return success(deptService.selectDeptById(deptId));
deptDao.checkDeptDataScope(deptId);
return success(deptDao.selectDeptById(deptId));
}
/**
......@@ -77,12 +77,12 @@ public class SysDeptController extends BaseController
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDept dept)
{
if (!deptService.checkDeptNameUnique(dept))
if (!deptDao.checkDeptNameUnique(dept))
{
return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
}
dept.setCreateBy(SecurityUtils.getUsername());
return toAjax(deptService.insertDept(dept));
return toAjax(deptDao.insertDept(dept));
}
/**
......@@ -94,8 +94,8 @@ public class SysDeptController extends BaseController
public AjaxResult edit(@Validated @RequestBody SysDept dept)
{
Long deptId = dept.getDeptId();
deptService.checkDeptDataScope(deptId);
if (!deptService.checkDeptNameUnique(dept))
deptDao.checkDeptDataScope(deptId);
if (!deptDao.checkDeptNameUnique(dept))
{
return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
}
......@@ -103,12 +103,12 @@ public class SysDeptController extends BaseController
{
return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
}
else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptDao.selectNormalChildrenDeptById(deptId) > 0)
{
return error("该部门包含未停用的子部门！");
}
dept.setUpdateBy(SecurityUtils.getUsername());
return toAjax(deptService.updateDept(dept));
return toAjax(deptDao.updateDept(dept));
}
/**
......@@ -119,15 +119,15 @@ public class SysDeptController extends BaseController
@DeleteMapping("/{deptId}")
public AjaxResult remove(@PathVariable Long deptId)
{
if (deptService.hasChildByDeptId(deptId))
if (deptDao.hasChildByDeptId(deptId))
{
return warn("存在下级部门,不允许删除");
}
if (deptService.checkDeptExistUser(deptId))
if (deptDao.checkDeptExistUser(deptId))
{
return warn("部门存在用户,不允许删除");
}
deptService.checkDeptDataScope(deptId);
return toAjax(deptService.deleteDeptById(deptId));
deptDao.checkDeptDataScope(deptId);
return toAjax(deptDao.deleteDeptById(deptId));
}
}
src/main/java/com/sfa/system/controller/query/SysDictDataController.java
浏览文件 @ 8bc5a9fd
......@@ -23,8 +23,8 @@ 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.SysDictData;
import com.sfa.system.service.ISysDictDataService;
import com.sfa.system.service.ISysDictTypeService;
import com.sfa.system.domain.dao.ISysDictDataDao;
import com.sfa.system.domain.dao.ISysDictTypeDao;
/**
* 数据字典信息
......@@ -36,17 +36,17 @@ import com.sfa.system.service.ISysDictTypeService;
public class SysDictDataController extends BaseController
{
@Autowired
private ISysDictDataService dictDataService;
private ISysDictDataDao dictDataDao;
@Autowired
private ISysDictTypeService dictTypeService;
private ISysDictTypeDao dictTypeDao;
@RequiresPermissions("system:dict:list")
@GetMapping("/list")
public TableDataInfo list(SysDictData dictData)
{
startPage();
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
List<SysDictData> list = dictDataDao.selectDictDataList(dictData);
return getDataTable(list);
}
......@@ -55,7 +55,7 @@ public class SysDictDataController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysDictData dictData)
{
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
List<SysDictData> list = dictDataDao.selectDictDataList(dictData);
ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
util.exportExcel(response, list, "字典数据");
}
......@@ -67,7 +67,7 @@ public class SysDictDataController extends BaseController
@GetMapping(value = "/{dictCode}")
public AjaxResult getInfo(@PathVariable Long dictCode)
{
return success(dictDataService.selectDictDataById(dictCode));
return success(dictDataDao.selectDictDataById(dictCode));
}
/**
......@@ -76,7 +76,7 @@ public class SysDictDataController extends BaseController
@GetMapping(value = "/type/{dictType}")
public AjaxResult dictType(@PathVariable String dictType)
{
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
List<SysDictData> data = dictTypeDao.selectDictDataByType(dictType);
if (StringUtils.isNull(data))
{
data = new ArrayList<SysDictData>();
......@@ -93,7 +93,7 @@ public class SysDictDataController extends BaseController
public AjaxResult add(@Validated @RequestBody SysDictData dict)
{
dict.setCreateBy(SecurityUtils.getUsername());
return toAjax(dictDataService.insertDictData(dict));
return toAjax(dictDataDao.insertDictData(dict));
}
/**
......@@ -105,7 +105,7 @@ public class SysDictDataController extends BaseController
public AjaxResult edit(@Validated @RequestBody SysDictData dict)
{
dict.setUpdateBy(SecurityUtils.getUsername());
return toAjax(dictDataService.updateDictData(dict));
return toAjax(dictDataDao.updateDictData(dict));
}
/**
......@@ -116,7 +116,7 @@ public class SysDictDataController extends BaseController
@DeleteMapping("/{dictCodes}")
public AjaxResult remove(@PathVariable Long[] dictCodes)
{
dictDataService.deleteDictDataByIds(dictCodes);
dictDataDao.deleteDictDataByIds(dictCodes);
return success();
}
}
src/main/java/com/sfa/system/controller/query/SysDictTypeController.java
浏览文件 @ 8bc5a9fd
......@@ -21,7 +21,7 @@ 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.service.ISysDictTypeService;
import com.sfa.system.domain.dao.ISysDictTypeDao;
/**
* 数据字典信息
......@@ -33,14 +33,14 @@ import com.sfa.system.service.ISysDictTypeService;
public class SysDictTypeController extends BaseController
{
@Autowired
private ISysDictTypeService dictTypeService;
private ISysDictTypeDao sysDictTypeDao;
@RequiresPermissions("system:dict:list")
@GetMapping("/list")
public TableDataInfo list(SysDictType dictType)
{
startPage();
List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
List<SysDictType> list = sysDictTypeDao.selectDictTypeList(dictType);
return getDataTable(list);
}
......@@ -49,7 +49,7 @@ public class SysDictTypeController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysDictType dictType)
{
List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
List<SysDictType> list = sysDictTypeDao.selectDictTypeList(dictType);
ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
util.exportExcel(response, list, "字典类型");
}
......@@ -61,7 +61,7 @@ public class SysDictTypeController extends BaseController
@GetMapping(value = "/{dictId}")
public AjaxResult getInfo(@PathVariable Long dictId)
{
return success(dictTypeService.selectDictTypeById(dictId));
return success(sysDictTypeDao.selectDictTypeById(dictId));
}
/**
......@@ -72,12 +72,12 @@ public class SysDictTypeController extends BaseController
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDictType dict)
{
if (!dictTypeService.checkDictTypeUnique(dict))
if (!sysDictTypeDao.checkDictTypeUnique(dict))
{
return error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
}
dict.setCreateBy(SecurityUtils.getUsername());
return toAjax(dictTypeService.insertDictType(dict));
return toAjax(sysDictTypeDao.insertDictType(dict));
}
/**
......@@ -88,12 +88,12 @@ public class SysDictTypeController extends BaseController
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDictType dict)
{
if (!dictTypeService.checkDictTypeUnique(dict))
if (!sysDictTypeDao.checkDictTypeUnique(dict))
{
return error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
}
dict.setUpdateBy(SecurityUtils.getUsername());
return toAjax(dictTypeService.updateDictType(dict));
return toAjax(sysDictTypeDao.updateDictType(dict));
}
/**
......@@ -104,7 +104,7 @@ public class SysDictTypeController extends BaseController
@DeleteMapping("/{dictIds}")
public AjaxResult remove(@PathVariable Long[] dictIds)
{
dictTypeService.deleteDictTypeByIds(dictIds);
sysDictTypeDao.deleteDictTypeByIds(dictIds);
return success();
}
......@@ -116,7 +116,7 @@ public class SysDictTypeController extends BaseController
@DeleteMapping("/refreshCache")
public AjaxResult refreshCache()
{
dictTypeService.resetDictCache();
sysDictTypeDao.resetDictCache();
return success();
}
......@@ -126,7 +126,7 @@ public class SysDictTypeController extends BaseController
@GetMapping("/optionselect")
public AjaxResult optionselect()
{
List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
List<SysDictType> dictTypes = sysDictTypeDao.selectDictTypeAll();
return success(dictTypes);
}
}
src/main/java/com/sfa/system/controller/query/SysLogininforController.java
浏览文件 @ 8bc5a9fd
......@@ -21,7 +21,7 @@ import com.sfa.common.redis.service.RedisService;
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.service.ISysLogininforService;
import com.sfa.system.domain.dao.ISysLogininforDao;
/**
* 系统访问记录
......@@ -33,7 +33,7 @@ import com.sfa.system.service.ISysLogininforService;
public class SysLogininforController extends BaseController
{
@Autowired
private ISysLogininforService logininforService;
private ISysLogininforDao sysLogininforDao;
@Autowired
private RedisService redisService;
......@@ -43,7 +43,7 @@ public class SysLogininforController extends BaseController
public TableDataInfo list(SysLogininfor logininfor)
{
startPage();
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
List<SysLogininfor> list = sysLogininforDao.selectLogininforList(logininfor);
return getDataTable(list);
}
......@@ -52,7 +52,7 @@ public class SysLogininforController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysLogininfor logininfor)
{
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
List<SysLogininfor> list = sysLogininforDao.selectLogininforList(logininfor);
ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
util.exportExcel(response, list, "登录日志");
}
......@@ -62,7 +62,7 @@ public class SysLogininforController extends BaseController
@DeleteMapping("/{infoIds}")
public AjaxResult remove(@PathVariable Long[] infoIds)
{
return toAjax(logininforService.deleteLogininforByIds(infoIds));
return toAjax(sysLogininforDao.deleteLogininforByIds(infoIds));
}
@RequiresPermissions("system:logininfor:remove")
......@@ -70,7 +70,7 @@ public class SysLogininforController extends BaseController
@DeleteMapping("/clean")
public AjaxResult clean()
{
logininforService.cleanLogininfor();
sysLogininforDao.cleanLogininfor();
return success();
}
......@@ -87,6 +87,6 @@ public class SysLogininforController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody SysLogininfor logininfor)
{
return toAjax(logininforService.insertLogininfor(logininfor));
return toAjax(sysLogininforDao.insertLogininfor(logininfor));
}
}
src/main/java/com/sfa/system/controller/query/SysMenuController.java
浏览文件 @ 8bc5a9fd
......@@ -20,7 +20,7 @@ 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.SysMenu;
import com.sfa.system.service.ISysMenuService;
import com.sfa.system.domain.dao.ISysMenuDao;
/**
* 菜单信息
......@@ -32,7 +32,7 @@ import com.sfa.system.service.ISysMenuService;
public class SysMenuController extends BaseController
{
@Autowired
private ISysMenuService menuService;
private ISysMenuDao sysMenuDao;
/**
* 获取菜单列表
......@@ -42,7 +42,7 @@ public class SysMenuController extends BaseController
public AjaxResult list(SysMenu menu)
{
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuList(menu, userId);
List<SysMenu> menus = sysMenuDao.selectMenuList(menu, userId);
return success(menus);
}
......@@ -53,7 +53,7 @@ public class SysMenuController extends BaseController
@GetMapping(value = "/{menuId}")
public AjaxResult getInfo(@PathVariable Long menuId)
{
return success(menuService.selectMenuById(menuId));
return success(sysMenuDao.selectMenuById(menuId));
}
/**
......@@ -63,8 +63,8 @@ public class SysMenuController extends BaseController
public AjaxResult treeselect(SysMenu menu)
{
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuList(menu, userId);
return success(menuService.buildMenuTreeSelect(menus));
List<SysMenu> menus = sysMenuDao.selectMenuList(menu, userId);
return success(sysMenuDao.buildMenuTreeSelect(menus));
}
/**
......@@ -74,10 +74,10 @@ public class SysMenuController extends BaseController
public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
{
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuList(userId);
List<SysMenu> menus = sysMenuDao.selectMenuList(userId);
AjaxResult ajax = AjaxResult.success();
ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
ajax.put("menus", menuService.buildMenuTreeSelect(menus));
ajax.put("checkedKeys", sysMenuDao.selectMenuListByRoleId(roleId));
ajax.put("menus", sysMenuDao.buildMenuTreeSelect(menus));
return ajax;
}
......@@ -89,7 +89,7 @@ public class SysMenuController extends BaseController
@PostMapping
public AjaxResult add(@Validated @RequestBody SysMenu menu)
{
if (!menuService.checkMenuNameUnique(menu))
if (!sysMenuDao.checkMenuNameUnique(menu))
{
return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
}
......@@ -98,7 +98,7 @@ public class SysMenuController extends BaseController
return error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
}
menu.setCreateBy(SecurityUtils.getUsername());
return toAjax(menuService.insertMenu(menu));
return toAjax(sysMenuDao.insertMenu(menu));
}
/**
......@@ -109,7 +109,7 @@ public class SysMenuController extends BaseController
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysMenu menu)
{
if (!menuService.checkMenuNameUnique(menu))
if (!sysMenuDao.checkMenuNameUnique(menu))
{
return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
}
......@@ -122,7 +122,7 @@ public class SysMenuController extends BaseController
return error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
}
menu.setUpdateBy(SecurityUtils.getUsername());
return toAjax(menuService.updateMenu(menu));
return toAjax(sysMenuDao.updateMenu(menu));
}
/**
......@@ -133,15 +133,15 @@ public class SysMenuController extends BaseController
@DeleteMapping("/{menuId}")
public AjaxResult remove(@PathVariable("menuId") Long menuId)
{
if (menuService.hasChildByMenuId(menuId))
if (sysMenuDao.hasChildByMenuId(menuId))
{
return warn("存在子菜单,不允许删除");
}
if (menuService.checkMenuExistRole(menuId))
if (sysMenuDao.checkMenuExistRole(menuId))
{
return warn("菜单已分配,不允许删除");
}
return toAjax(menuService.deleteMenuById(menuId));
return toAjax(sysMenuDao.deleteMenuById(menuId));
}
/**
......@@ -153,7 +153,7 @@ public class SysMenuController extends BaseController
public AjaxResult getRouters()
{
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
return success(menuService.buildMenus(menus));
List<SysMenu> menus = sysMenuDao.selectMenuTreeByUserId(userId);
return success(sysMenuDao.buildMenus(menus));
}
}
\ No newline at end of file
src/main/java/com/sfa/system/controller/query/SysNoticeController.java
浏览文件 @ 8bc5a9fd
......@@ -19,7 +19,7 @@ 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.service.ISysNoticeService;
import com.sfa.system.domain.dao.ISysNoticeDao;
/**
* 公告 信息操作处理
......@@ -31,7 +31,7 @@ import com.sfa.system.service.ISysNoticeService;
public class SysNoticeController extends BaseController
{
@Autowired
private ISysNoticeService noticeService;
private ISysNoticeDao sysNoticeDao;
/**
* 获取通知公告列表
......@@ -41,7 +41,7 @@ public class SysNoticeController extends BaseController
public TableDataInfo list(SysNotice notice)
{
startPage();
List<SysNotice> list = noticeService.selectNoticeList(notice);
List<SysNotice> list = sysNoticeDao.selectNoticeList(notice);
return getDataTable(list);
}
......@@ -52,7 +52,7 @@ public class SysNoticeController extends BaseController
@GetMapping(value = "/{noticeId}")
public AjaxResult getInfo(@PathVariable Long noticeId)
{
return success(noticeService.selectNoticeById(noticeId));
return success(sysNoticeDao.selectNoticeById(noticeId));
}
/**
......@@ -64,7 +64,7 @@ public class SysNoticeController extends BaseController
public AjaxResult add(@Validated @RequestBody SysNotice notice)
{
notice.setCreateBy(SecurityUtils.getUsername());
return toAjax(noticeService.insertNotice(notice));
return toAjax(sysNoticeDao.insertNotice(notice));
}
/**
......@@ -76,7 +76,7 @@ public class SysNoticeController extends BaseController
public AjaxResult edit(@Validated @RequestBody SysNotice notice)
{
notice.setUpdateBy(SecurityUtils.getUsername());
return toAjax(noticeService.updateNotice(notice));
return toAjax(sysNoticeDao.updateNotice(notice));
}
/**
......@@ -87,6 +87,6 @@ public class SysNoticeController extends BaseController
@DeleteMapping("/{noticeIds}")
public AjaxResult remove(@PathVariable Long[] noticeIds)
{
return toAjax(noticeService.deleteNoticeByIds(noticeIds));
return toAjax(sysNoticeDao.deleteNoticeByIds(noticeIds));
}
}
src/main/java/com/sfa/system/controller/query/SysOperlogController.java
浏览文件 @ 8bc5a9fd
......@@ -19,7 +19,7 @@ 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.service.ISysOperLogService;
import com.sfa.system.domain.dao.ISysOperLogDao;
/**
* 操作日志记录
......@@ -31,14 +31,14 @@ import com.sfa.system.service.ISysOperLogService;
public class SysOperlogController extends BaseController
{
@Autowired
private ISysOperLogService operLogService;
private ISysOperLogDao sysOperLogDao;
@RequiresPermissions("system:operlog:list")
@GetMapping("/list")
public TableDataInfo list(SysOperLog operLog)
{
startPage();
List<SysOperLog> list = operLogService.selectOperLogList(operLog);
List<SysOperLog> list = sysOperLogDao.selectOperLogList(operLog);
return getDataTable(list);
}
......@@ -47,7 +47,7 @@ public class SysOperlogController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysOperLog operLog)
{
List<SysOperLog> list = operLogService.selectOperLogList(operLog);
List<SysOperLog> list = sysOperLogDao.selectOperLogList(operLog);
ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
util.exportExcel(response, list, "操作日志");
}
......@@ -57,7 +57,7 @@ public class SysOperlogController extends BaseController
@DeleteMapping("/{operIds}")
public AjaxResult remove(@PathVariable Long[] operIds)
{
return toAjax(operLogService.deleteOperLogByIds(operIds));
return toAjax(sysOperLogDao.deleteOperLogByIds(operIds));
}
@RequiresPermissions("system:operlog:remove")
......@@ -65,7 +65,7 @@ public class SysOperlogController extends BaseController
@DeleteMapping("/clean")
public AjaxResult clean()
{
operLogService.cleanOperLog();
sysOperLogDao.cleanOperLog();
return success();
}
......@@ -73,6 +73,6 @@ public class SysOperlogController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody SysOperLog operLog)
{
return toAjax(operLogService.insertOperlog(operLog));
return toAjax(sysOperLogDao.insertOperlog(operLog));
}
}
src/main/java/com/sfa/system/controller/query/SysPostController.java
浏览文件 @ 8bc5a9fd
......@@ -34,7 +34,7 @@ import com.sfa.system.domain.entity.SysPost;
public class SysPostController extends BaseController
{
@Autowired
private ISysPostDao postService;
private ISysPostDao sysPostDao;
/**
* 获取岗位列表
......@@ -44,7 +44,7 @@ public class SysPostController extends BaseController
public TableDataInfo list(SysPost post)
{
startPage();
List<SysPost> list = postService.selectPostList(post);
List<SysPost> list = sysPostDao.selectPostList(post);
return getDataTable(list);
}
......@@ -53,7 +53,7 @@ public class SysPostController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysPost post)
{
List<SysPost> list = postService.selectPostList(post);
List<SysPost> list = sysPostDao.selectPostList(post);
ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
util.exportExcel(response, list, "岗位数据");
}
......@@ -65,7 +65,7 @@ public class SysPostController extends BaseController
@GetMapping(value = "/{postId}")
public AjaxResult getInfo(@PathVariable Long postId)
{
return success(postService.selectPostById(postId));
return success(sysPostDao.selectPostById(postId));
}
/**
......@@ -76,17 +76,17 @@ public class SysPostController extends BaseController
@PostMapping
public AjaxResult add(@Validated @RequestBody SysPost post)
{
if (!postService.checkPostNameUnique(post))
if (!sysPostDao.checkPostNameUnique(post))
{
return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
}
else if (!postService.checkPostCodeUnique(post))
else if (!sysPostDao.checkPostCodeUnique(post))
{
return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
}
post.setCreateBy(SecurityUtils.getUsername());
post.setCreateUserId(SecurityUtils.getUserId());
return toAjax(postService.insertPost(post));
return toAjax(sysPostDao.insertPost(post));
}
/**
......@@ -97,17 +97,17 @@ public class SysPostController extends BaseController
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysPost post)
{
if (!postService.checkPostNameUnique(post))
if (!sysPostDao.checkPostNameUnique(post))
{
return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
}
else if (!postService.checkPostCodeUnique(post))
else if (!sysPostDao.checkPostCodeUnique(post))
{
return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
}
post.setUpdateUserId(SecurityUtils.getUserId());
post.setUpdateBy(SecurityUtils.getUsername());
return toAjax(postService.updatePost(post));
return toAjax(sysPostDao.updatePost(post));
}
/**
......@@ -118,7 +118,7 @@ public class SysPostController extends BaseController
@DeleteMapping("/{postIds}")
public AjaxResult remove(@PathVariable Long[] postIds)
{
return toAjax(postService.deletePostByIds(postIds));
return toAjax(sysPostDao.deletePostByIds(postIds));
}
/**
......@@ -127,7 +127,7 @@ public class SysPostController extends BaseController
@GetMapping("/optionselect")
public AjaxResult optionselect()
{
List<SysPost> posts = postService.selectPostAll();
List<SysPost> posts = sysPostDao.selectPostAll();
return success(posts);
}
}
src/main/java/com/sfa/system/controller/query/SysProfileController.java
浏览文件 @ 8bc5a9fd
......@@ -36,7 +36,7 @@ import com.sfa.system.domain.dao.ISysUserDao;
public class SysProfileController extends BaseController
{
@Autowired
private ISysUserDao userService;
private ISysUserDao sysUserDao;
@Autowired
private TokenService tokenService;
......@@ -51,10 +51,10 @@ public class SysProfileController extends BaseController
public AjaxResult profile()
{
String username = SecurityUtils.getUsername();
SysUser user = userService.selectUserByUserName(username);
SysUser user = sysUserDao.selectUserByUserName(username);
AjaxResult ajax = AjaxResult.success(user);
ajax.put("roleGroup", userService.selectUserRoleGroup(username));
ajax.put("postGroup", userService.selectUserPostGroup(username));
ajax.put("roleGroup", sysUserDao.selectUserRoleGroup(username));
ajax.put("postGroup", sysUserDao.selectUserPostGroup(username));
return ajax;
}
......@@ -71,15 +71,15 @@ public class SysProfileController extends BaseController
currentUser.setEmail(user.getEmail());
currentUser.setPhonenumber(user.getPhonenumber());
currentUser.setSex(user.getSex());
if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
if (StringUtils.isNotEmpty(user.getPhonenumber()) && !sysUserDao.checkPhoneUnique(currentUser))
{
return error("修改用户'" + loginUser.getUsername() + "'失败，手机号码已存在");
}
if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
if (StringUtils.isNotEmpty(user.getEmail()) && !sysUserDao.checkEmailUnique(currentUser))
{
return error("修改用户'" + loginUser.getUsername() + "'失败，邮箱账号已存在");
}
if (userService.updateUserProfile(currentUser))
if (sysUserDao.updateUserProfile(currentUser))
{
// 更新缓存用户信息
tokenService.setLoginUser(loginUser);
......@@ -96,7 +96,7 @@ public class SysProfileController extends BaseController
public AjaxResult updatePwd(String oldPassword, String newPassword)
{
String username = SecurityUtils.getUsername();
SysUser user = userService.selectUserByUserName(username);
SysUser user = sysUserDao.selectUserByUserName(username);
String password = user.getPassword();
if (!SecurityUtils.matchesPassword(oldPassword, password))
{
......@@ -107,7 +107,7 @@ public class SysProfileController extends BaseController
return error("新密码不能与旧密码相同");
}
newPassword = SecurityUtils.encryptPassword(newPassword);
if (userService.resetUserPwd(username, newPassword) > 0)
if (sysUserDao.resetUserPwd(username, newPassword) > 0)
{
// 更新缓存用户密码
LoginUser loginUser = SecurityUtils.getLoginUser();
......@@ -139,7 +139,7 @@ public class SysProfileController extends BaseController
return error("文件服务异常，请联系管理员");
}
String url = fileResult.getData().getUrl();
if (userService.updateUserAvatar(loginUser.getUsername(), url))
if (sysUserDao.updateUserAvatar(loginUser.getUsername(), url))
{
AjaxResult ajax = AjaxResult.success();
ajax.put("imgUrl", url);
......
src/main/java/com/sfa/system/controller/query/SysRoleController.java
浏览文件 @ 8bc5a9fd
......@@ -24,8 +24,8 @@ 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.service.ISysDeptService;
import com.sfa.system.service.ISysRoleService;
import com.sfa.system.domain.dao.ISysDeptDao;
import com.sfa.system.domain.dao.ISysRoleDao;
import com.sfa.system.domain.dao.ISysUserDao;
/**
......@@ -38,20 +38,20 @@ import com.sfa.system.domain.dao.ISysUserDao;
public class SysRoleController extends BaseController
{
@Autowired
private ISysRoleService roleService;
private ISysRoleDao sysRoleDao;
@Autowired
private ISysUserDao userService;
private ISysUserDao sysUserDao;
@Autowired
private ISysDeptService deptService;
private ISysDeptDao sysDeptDao;
@RequiresPermissions("system:role:list")
@GetMapping("/list")
public TableDataInfo list(SysRole role)
{
startPage();
List<SysRole> list = roleService.selectRoleList(role);
List<SysRole> list = sysRoleDao.selectRoleList(role);
return getDataTable(list);
}
......@@ -60,7 +60,7 @@ public class SysRoleController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SysRole role)
{
List<SysRole> list = roleService.selectRoleList(role);
List<SysRole> list = sysRoleDao.selectRoleList(role);
ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
util.exportExcel(response, list, "角色数据");
}
......@@ -72,8 +72,8 @@ public class SysRoleController extends BaseController
@GetMapping(value = "/{roleId}")
public AjaxResult getInfo(@PathVariable Long roleId)
{
roleService.checkRoleDataScope(roleId);
return success(roleService.selectRoleById(roleId));
sysRoleDao.checkRoleDataScope(roleId);
return success(sysRoleDao.selectRoleById(roleId));
}
/**
......@@ -84,16 +84,16 @@ public class SysRoleController extends BaseController
@PostMapping
public AjaxResult add(@Validated @RequestBody SysRole role)
{
if (!roleService.checkRoleNameUnique(role))
if (!sysRoleDao.checkRoleNameUnique(role))
{
return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
}
else if (!roleService.checkRoleKeyUnique(role))
else if (!sysRoleDao.checkRoleKeyUnique(role))
{
return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
}
role.setCreateBy(SecurityUtils.getUsername());
return toAjax(roleService.insertRole(role));
return toAjax(sysRoleDao.insertRole(role));
}
......@@ -105,18 +105,18 @@ public class SysRoleController extends BaseController
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId());
if (!roleService.checkRoleNameUnique(role))
sysRoleDao.checkRoleAllowed(role);
sysRoleDao.checkRoleDataScope(role.getRoleId());
if (!sysRoleDao.checkRoleNameUnique(role))
{
return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
}
else if (!roleService.checkRoleKeyUnique(role))
else if (!sysRoleDao.checkRoleKeyUnique(role))
{
return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
}
role.setUpdateBy(SecurityUtils.getUsername());
return toAjax(roleService.updateRole(role));
return toAjax(sysRoleDao.updateRole(role));
}
/**
......@@ -127,9 +127,9 @@ public class SysRoleController extends BaseController
@PutMapping("/dataScope")
public AjaxResult dataScope(@RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId());
return toAjax(roleService.authDataScope(role));
sysRoleDao.checkRoleAllowed(role);
sysRoleDao.checkRoleDataScope(role.getRoleId());
return toAjax(sysRoleDao.authDataScope(role));
}
/**
......@@ -140,10 +140,10 @@ public class SysRoleController extends BaseController
@PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId());
sysRoleDao.checkRoleAllowed(role);
sysRoleDao.checkRoleDataScope(role.getRoleId());
role.setUpdateBy(SecurityUtils.getUsername());
return toAjax(roleService.updateRoleStatus(role));
return toAjax(sysRoleDao.updateRoleStatus(role));
}
/**
......@@ -154,7 +154,7 @@ public class SysRoleController extends BaseController
@DeleteMapping("/{roleIds}")
public AjaxResult remove(@PathVariable Long[] roleIds)
{
return toAjax(roleService.deleteRoleByIds(roleIds));
return toAjax(sysRoleDao.deleteRoleByIds(roleIds));
}
/**
......@@ -164,7 +164,7 @@ public class SysRoleController extends BaseController
@GetMapping("/optionselect")
public AjaxResult optionselect()
{
return success(roleService.selectRoleAll());
return success(sysRoleDao.selectRoleAll());
}
/**
* 查询已分配用户角色列表
......@@ -174,7 +174,7 @@ public class SysRoleController extends BaseController
public TableDataInfo allocatedList(SysUser user)
{
startPage();
List<SysUser> list = userService.selectAllocatedList(user);
List<SysUser> list = sysUserDao.selectAllocatedList(user);
return getDataTable(list);
}
......@@ -186,7 +186,7 @@ public class SysRoleController extends BaseController
public TableDataInfo unallocatedList(SysUser user)
{
startPage();
List<SysUser> list = userService.selectUnallocatedList(user);
List<SysUser> list = sysUserDao.selectUnallocatedList(user);
return getDataTable(list);
}
......@@ -198,7 +198,7 @@ public class SysRoleController extends BaseController
@PutMapping("/authUser/cancel")
public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
{
return toAjax(roleService.deleteAuthUser(userRole));
return toAjax(sysRoleDao.deleteAuthUser(userRole));
}
/**
......@@ -209,7 +209,7 @@ public class SysRoleController extends BaseController
@PutMapping("/authUser/cancelAll")
public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
{
return toAjax(roleService.deleteAuthUsers(roleId, userIds));
return toAjax(sysRoleDao.deleteAuthUsers(roleId, userIds));
}
/**
......@@ -220,8 +220,8 @@ public class SysRoleController extends BaseController
@PutMapping("/authUser/selectAll")
public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
{
roleService.checkRoleDataScope(roleId);
return toAjax(roleService.insertAuthUsers(roleId, userIds));
sysRoleDao.checkRoleDataScope(roleId);
return toAjax(sysRoleDao.insertAuthUsers(roleId, userIds));
}
/**
......@@ -232,8 +232,8 @@ public class SysRoleController extends BaseController
public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
{
AjaxResult ajax = AjaxResult.success();
ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
ajax.put("checkedKeys", sysDeptDao.selectDeptListByRoleId(roleId));
ajax.put("depts", sysDeptDao.selectDeptTreeList(new SysDept()));
return ajax;
}
}
src/main/java/com/sfa/system/controller/query/SysUserQueryController.java
浏览文件 @ 8bc5a9fd
......@@ -17,10 +17,10 @@ import com.sfa.system.api.domain.SysUser;
import com.sfa.system.api.model.LoginUser;
import com.sfa.system.domain.dao.ISysPostDao;
import com.sfa.system.domain.dao.ISysUserDao;
import com.sfa.system.service.ISysConfigService;
import com.sfa.system.service.ISysDeptService;
import com.sfa.system.service.ISysPermissionService;
import com.sfa.system.service.ISysRoleService;
import com.sfa.system.domain.dao.ISysConfigDao;
import com.sfa.system.domain.dao.ISysDeptDao;
import com.sfa.system.domain.dao.ISysPermissionDao;
import com.sfa.system.domain.dao.ISysRoleDao;
import com.sfa.system.service.query.IUserQueryService;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -49,19 +49,19 @@ public class SysUserQueryController extends BaseController
private IUserQueryService userQueryService;
@Autowired
private ISysRoleService roleService;
private ISysRoleDao sysRoleDao;
@Autowired
private ISysDeptService deptService;
private ISysDeptDao sysDeptDao;
@Autowired
private ISysPostDao postService;
private ISysPostDao sysPostDao;
@Autowired
private ISysPermissionService permissionService;
private ISysPermissionDao sysPermissionDao;
@Autowired
private ISysConfigService configService;
private ISysConfigDao sysConfigDao;
/**
* 获取用户列表
......@@ -116,9 +116,9 @@ public class SysUserQueryController extends BaseController
return R.fail("用户名或密码错误");
}
// 角色集合
Set<String> roles = permissionService.getRolePermission(sysUser);
Set<String> roles = sysPermissionDao.getRolePermission(sysUser);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(sysUser);
Set<String> permissions = sysPermissionDao.getMenuPermission(sysUser);
LoginUser sysUserVo = new LoginUser();
sysUserVo.setSysUser(sysUser);
sysUserVo.setRoles(roles);
......@@ -134,7 +134,7 @@ public class SysUserQueryController extends BaseController
public R<Boolean> register(@RequestBody SysUser sysUser)
{
String username = sysUser.getUserName();
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
if (!("true".equals(sysConfigDao.selectConfigByKey("sys.account.registerUser"))))
{
return R.fail("当前系统没有开启注册功能！");
}
......@@ -165,9 +165,9 @@ public class SysUserQueryController extends BaseController
{
SysUser user = userDao.selectUserById(SecurityUtils.getUserId());
// 角色集合
Set<String> roles = permissionService.getRolePermission(user);
Set<String> roles = sysPermissionDao.getRolePermission(user);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(user);
Set<String> permissions = sysPermissionDao.getMenuPermission(user);
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
ajax.put("roles", roles);
......@@ -184,14 +184,14 @@ public class SysUserQueryController extends BaseController
{
userDao.checkUserDataScope(userId);
AjaxResult ajax = AjaxResult.success();
List<SysRole> roles = roleService.selectRoleAll();
List<SysRole> roles = sysRoleDao.selectRoleAll();
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
ajax.put("posts", postService.selectPostAll());
ajax.put("posts", sysPostDao.selectPostAll());
if (StringUtils.isNotNull(userId))
{
SysUser sysUser = userDao.selectUserById(userId);
ajax.put(AjaxResult.DATA_TAG, sysUser);
// ajax.put("postIds", postService.selectPostListByUserId(userId));
// ajax.put("postIds", sysPostDao.selectPostListByUserId(userId));
// ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
}
return ajax;
......@@ -204,8 +204,8 @@ public class SysUserQueryController extends BaseController
@PostMapping
public AjaxResult add(@Validated @RequestBody UserVo userVo)
{
deptService.checkDeptDataScope(userVo.getDeptId());
roleService.checkRoleDataScope(userVo.getRoleIds());
sysDeptDao.checkDeptDataScope(userVo.getDeptId());
sysRoleDao.checkRoleDataScope(userVo.getRoleIds());
if (!userDao.checkUserNameUnique(user))
{
return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
......@@ -235,8 +235,8 @@ public class SysUserQueryController extends BaseController
{
userDao.checkUserAllowed(user);
userDao.checkUserDataScope(user.getUserId());
deptService.checkDeptDataScope(user.getDeptId());
roleService.checkRoleDataScope(user.getRoleIds());
sysDeptDao.checkDeptDataScope(user.getDeptId());
sysRoleDao.checkRoleDataScope(user.getRoleIds());
if (!userDao.checkUserNameUnique(user))
{
return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
......@@ -308,7 +308,7 @@ public class SysUserQueryController extends BaseController
{
AjaxResult ajax = AjaxResult.success();
SysUser user = userDao.selectUserById(userId);
List<SysRole> roles = roleService.selectRolesByUserId(userId);
List<SysRole> roles = sysRoleDao.selectRolesByUserId(userId);
ajax.put("user", user);
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
return ajax;
......@@ -323,7 +323,7 @@ public class SysUserQueryController extends BaseController
public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
{
userDao.checkUserDataScope(userId);
roleService.checkRoleDataScope(roleIds);
sysRoleDao.checkRoleDataScope(roleIds);
userDao.insertUserAuth(userId, roleIds);
return success();
}
......@@ -335,6 +335,6 @@ public class SysUserQueryController extends BaseController
@GetMapping("/deptTree")
public AjaxResult deptTree(SysDept dept)
{
return success(deptService.selectDeptTreeList(dept));
return success(sysDeptDao.selectDeptTreeList(dept));
}
}
src/main/java/com/sfa/system/domain/dao/ISysConfigDao.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service;
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.system.domain.entity.SysConfig;
......@@ -8,7 +8,7 @@ import com.sfa.system.domain.entity.SysConfig;
*
* @author ruoyi
*/
public interface ISysConfigService
public interface ISysConfigDao
{
/**
* 查询参数配置信息
......
src/main/java/com/sfa/system/domain/dao/ISysDeptDao.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service;
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.system.api.domain.SysDept;
......@@ -9,7 +9,7 @@ import com.sfa.system.domain.entity.vo.TreeSelect;
*
* @author ruoyi
*/
public interface ISysDeptService
public interface ISysDeptDao
{
/**
* 查询部门管理数据
......
src/main/java/com/sfa/system/domain/dao/ISysDictDataDao.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service;
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.system.api.domain.SysDictData;
......@@ -8,7 +8,7 @@ import com.sfa.system.api.domain.SysDictData;
*
* @author ruoyi
*/
public interface ISysDictDataService
public interface ISysDictDataDao
{
/**
* 根据条件分页查询字典数据
......
src/main/java/com/sfa/system/domain/dao/ISysDictTypeDao.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service;
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.system.api.domain.SysDictData;
......@@ -9,7 +9,7 @@ import com.sfa.system.api.domain.SysDictType;
*
* @author ruoyi
*/
public interface ISysDictTypeService
public interface ISysDictTypeDao
{
/**
* 根据条件分页查询字典类型
......
src/main/java/com/sfa/system/domain/dao/ISysLogininforDao.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service;
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.system.api.domain.SysLogininfor;
......@@ -8,7 +8,7 @@ import com.sfa.system.api.domain.SysLogininfor;
*
* @author ruoyi
*/
public interface ISysLogininforService
public interface ISysLogininforDao
{
/**
* 新增系统登录日志
......
src/main/java/com/sfa/system/domain/dao/ISysMenuDao.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service;
package com.sfa.system.domain.dao;
import java.util.List;
import java.util.Set;
......@@ -11,7 +11,7 @@ import com.sfa.system.domain.entity.vo.TreeSelect;
*
* @author ruoyi
*/
public interface ISysMenuService
public interface ISysMenuDao
{
/**
* 根据用户查询系统菜单列表
......
src/main/java/com/sfa/system/domain/dao/ISysNoticeDao.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service;
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.system.domain.entity.SysNotice;
......@@ -8,7 +8,7 @@ import com.sfa.system.domain.entity.SysNotice;
*
* @author ruoyi
*/
public interface ISysNoticeService
public interface ISysNoticeDao
{
/**
* 查询公告信息
......
src/main/java/com/sfa/system/domain/dao/ISysOperLogDao.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service;
package com.sfa.system.domain.dao;
import java.util.List;
import com.sfa.system.api.domain.SysOperLog;
......@@ -8,7 +8,7 @@ import com.sfa.system.api.domain.SysOperLog;
*
* @author ruoyi
*/
public interface ISysOperLogService
public interface ISysOperLogDao
{
/**
* 新增操作日志
......
src/main/java/com/sfa/system/domain/dao/ISysPermissionDao.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service;
package com.sfa.system.domain.dao;
import java.util.Set;
......@@ -9,7 +9,7 @@ import com.sfa.system.api.domain.SysUser;
*
* @author ruoyi
*/
public interface ISysPermissionService
public interface ISysPermissionDao
{
/**
* 获取角色数据权限
......
src/main/java/com/sfa/system/domain/dao/ISysRoleDao.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service;
package com.sfa.system.domain.dao;
import java.util.List;
import java.util.Set;
......@@ -10,7 +10,7 @@ import com.sfa.system.domain.entity.SysUserRole;
*
* @author ruoyi
*/
public interface ISysRoleService
public interface ISysRoleDao
{
/**
* 根据条件分页查询角色数据
......
src/main/java/com/sfa/system/domain/dao/impl/GeneralDaoImpl.java
浏览文件 @ 8bc5a9fd
......@@ -21,7 +21,7 @@ import java.util.Objects;
* @describe :
*/
@Service
public class IGeneralDaoImpl implements IGeneralDao {
public class GeneralDaoImpl implements IGeneralDao {
@Autowired
SysQueryMapper sysQueryMapper;
......
src/main/java/com/sfa/system/domain/dao/impl/SysConfigDaoImpl.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service.impl;
package com.sfa.system.domain.dao.impl;
import java.util.Collection;
import java.util.List;
......@@ -13,7 +13,7 @@ import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.redis.service.RedisService;
import com.sfa.system.domain.entity.SysConfig;
import com.sfa.system.domain.mapper.SysConfigMapper;
import com.sfa.system.service.ISysConfigService;
import com.sfa.system.domain.dao.ISysConfigDao;
/**
* 参数配置 服务层实现
......@@ -21,7 +21,7 @@ import com.sfa.system.service.ISysConfigService;
* @author ruoyi
*/
@Service
public class SysConfigServiceImpl implements ISysConfigService
public class SysConfigDaoImpl implements ISysConfigDao
{
@Autowired
private SysConfigMapper configMapper;
......
src/main/java/com/sfa/system/domain/dao/impl/SysDeptDaoImpl.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service.impl;
package com.sfa.system.domain.dao.impl;
import java.util.ArrayList;
import java.util.Iterator;
......@@ -19,7 +19,7 @@ import com.sfa.system.api.domain.SysUser;
import com.sfa.system.domain.entity.vo.TreeSelect;
import com.sfa.system.domain.mapper.SysDeptMapper;
import com.sfa.system.domain.mapper.SysRoleMapper;
import com.sfa.system.service.ISysDeptService;
import com.sfa.system.domain.dao.ISysDeptDao;
/**
* 部门管理 服务实现
......@@ -27,7 +27,7 @@ import com.sfa.system.service.ISysDeptService;
* @author ruoyi
*/
@Service
public class SysDeptServiceImpl implements ISysDeptService
public class SysDeptDaoImpl implements ISysDeptDao
{
@Autowired
private SysDeptMapper deptMapper;
......
src/main/java/com/sfa/system/domain/dao/impl/SysDictDataDaoImpl.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service.impl;
package com.sfa.system.domain.dao.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -6,7 +6,7 @@ import org.springframework.stereotype.Service;
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.service.ISysDictDataService;
import com.sfa.system.domain.dao.ISysDictDataDao;
/**
* 字典 业务层处理
......@@ -14,7 +14,7 @@ import com.sfa.system.service.ISysDictDataService;
* @author ruoyi
*/
@Service
public class SysDictDataServiceImpl implements ISysDictDataService
public class SysDictDataDaoImpl implements ISysDictDataDao
{
@Autowired
private SysDictDataMapper dictDataMapper;
......
src/main/java/com/sfa/system/domain/dao/impl/SysDictTypeDaoImpl.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service.impl;
package com.sfa.system.domain.dao.impl;
import java.util.Comparator;
import java.util.List;
......@@ -16,7 +16,7 @@ import com.sfa.system.api.domain.SysDictData;
import com.sfa.system.api.domain.SysDictType;
import com.sfa.system.domain.mapper.SysDictDataMapper;
import com.sfa.system.domain.mapper.SysDictTypeMapper;
import com.sfa.system.service.ISysDictTypeService;
import com.sfa.system.domain.dao.ISysDictTypeDao;
/**
* 字典 业务层处理
......@@ -24,7 +24,7 @@ import com.sfa.system.service.ISysDictTypeService;
* @author ruoyi
*/
@Service
public class SysDictTypeServiceImpl implements ISysDictTypeService
public class SysDictTypeDaoImpl implements ISysDictTypeDao
{
@Autowired
private SysDictTypeMapper dictTypeMapper;
......
src/main/java/com/sfa/system/domain/dao/impl/SysLogininforDaoImpl.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service.impl;
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.sfa.system.api.domain.SysLogininfor;
import com.sfa.system.domain.mapper.SysLogininforMapper;
import com.sfa.system.service.ISysLogininforService;
import com.sfa.system.domain.dao.ISysLogininforDao;
/**
* 系统访问日志情况信息 服务层处理
......@@ -13,7 +13,7 @@ import com.sfa.system.service.ISysLogininforService;
* @author ruoyi
*/
@Service
public class SysLogininforServiceImpl implements ISysLogininforService
public class SysLogininforDaoImpl implements ISysLogininforDao
{
@Autowired
......
src/main/java/com/sfa/system/domain/dao/impl/SysMenuDaoImpl.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service.impl;
package com.sfa.system.domain.dao.impl;
import java.util.ArrayList;
import java.util.Arrays;
......@@ -23,7 +23,7 @@ import com.sfa.system.domain.entity.vo.TreeSelect;
import com.sfa.system.domain.mapper.SysMenuMapper;
import com.sfa.system.domain.mapper.SysRoleMapper;
import com.sfa.system.domain.mapper.SysRoleMenuMapper;
import com.sfa.system.service.ISysMenuService;
import com.sfa.system.domain.dao.ISysMenuDao;
/**
* 菜单 业务层处理
......@@ -31,7 +31,7 @@ import com.sfa.system.service.ISysMenuService;
* @author ruoyi
*/
@Service
public class SysMenuServiceImpl implements ISysMenuService
public class SysMenuDaoImpl implements ISysMenuDao
{
public static final String PREMISSION_STRING = "perms[\"{0}\"]";
......
src/main/java/com/sfa/system/domain/dao/impl/SysNoticeDaoImpl.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service.impl;
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.sfa.system.domain.entity.SysNotice;
import com.sfa.system.domain.mapper.SysNoticeMapper;
import com.sfa.system.service.ISysNoticeService;
import com.sfa.system.domain.dao.ISysNoticeDao;
/**
* 公告 服务层实现
......@@ -13,7 +13,7 @@ import com.sfa.system.service.ISysNoticeService;
* @author ruoyi
*/
@Service
public class SysNoticeServiceImpl implements ISysNoticeService
public class SysNoticeDaoImpl implements ISysNoticeDao
{
@Autowired
private SysNoticeMapper noticeMapper;
......
src/main/java/com/sfa/system/domain/dao/impl/SysOperLogDaoImpl.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service.impl;
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.sfa.system.api.domain.SysOperLog;
import com.sfa.system.domain.mapper.SysOperLogMapper;
import com.sfa.system.service.ISysOperLogService;
import com.sfa.system.domain.dao.ISysOperLogDao;
/**
* 操作日志 服务层处理
......@@ -13,7 +13,7 @@ import com.sfa.system.service.ISysOperLogService;
* @author ruoyi
*/
@Service
public class SysOperLogServiceImpl implements ISysOperLogService
public class SysOperLogDaoImpl implements ISysOperLogDao
{
@Autowired
private SysOperLogMapper operLogMapper;
......
src/main/java/com/sfa/system/domain/dao/impl/SysPermissionDaoImpl.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service.impl;
package com.sfa.system.domain.dao.impl;
import java.util.HashSet;
import java.util.List;
......@@ -10,9 +10,9 @@ import com.sfa.common.core.constant.UserConstants;
import com.sfa.common.core.utils.StringUtils;
import com.sfa.system.api.domain.SysRole;
import com.sfa.system.api.domain.SysUser;
import com.sfa.system.service.ISysMenuService;
import com.sfa.system.service.ISysPermissionService;
import com.sfa.system.service.ISysRoleService;
import com.sfa.system.domain.dao.ISysMenuDao;
import com.sfa.system.domain.dao.ISysPermissionDao;
import com.sfa.system.domain.dao.ISysRoleDao;
/**
* 用户权限处理
......@@ -20,13 +20,13 @@ import com.sfa.system.service.ISysRoleService;
* @author ruoyi
*/
@Service
public class SysPermissionServiceImpl implements ISysPermissionService
public class SysPermissionDaoImpl implements ISysPermissionDao
{
@Autowired
private ISysRoleService roleService;
private ISysRoleDao roleService;
@Autowired
private ISysMenuService menuService;
private ISysMenuDao menuService;
/**
* 获取角色数据权限
......
src/main/java/com/sfa/system/domain/dao/impl/SysRoleDaoImpl.java
浏览文件 @ 8bc5a9fd
package com.sfa.system.service.impl;
package com.sfa.system.domain.dao.impl;
import java.util.ArrayList;
import java.util.Arrays;
......@@ -23,7 +23,7 @@ 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.service.ISysRoleService;
import com.sfa.system.domain.dao.ISysRoleDao;
/**
* 角色 业务层处理
......@@ -31,7 +31,7 @@ import com.sfa.system.service.ISysRoleService;
* @author ruoyi
*/
@Service
public class SysRoleServiceImpl implements ISysRoleService
public class SysRoleDaoImpl implements ISysRoleDao
{
@Autowired
private SysRoleMapper roleMapper;
......
src/main/java/com/sfa/system/domain/dao/impl/SysUserDaoImpl.java
浏览文件 @ 8bc5a9fd
......@@ -19,8 +19,8 @@ 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.service.ISysConfigService;
import com.sfa.system.service.ISysDeptService;
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;
......@@ -60,10 +60,10 @@ public class SysUserDaoImpl implements ISysUserDao {
private SysUserPostMapper userPostMapper;
@Autowired
private ISysConfigService configService;
private ISysConfigDao configService;
@Autowired
private ISysDeptService deptService;
private ISysDeptDao deptService;
@Autowired
protected Validator validator;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论