diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemLoginService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemLoginService.java index 849fb8c..abd69bc 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemLoginService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemLoginService.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import io.swagger.annotations.ApiOperation; /** * @Description : 用户登陆方法，平台统一登陆 @@ -14,15 +15,21 @@ import cn.estsh.i3plus.pojo.platform.bean.SessionUser; **/ public interface ISystemLoginService { + @ApiOperation(value = "用户登录",notes = "普通用户登录") SessionUser queryUserLogin(String loginName, String s, String languageCode); + @ApiOperation(value = "用户登录",notes = "管理用户登录") SessionUser queryAdminLogin(String loginName, String s, String languageCode); + @ApiOperation(value = "封装用户",notes = "封装普通用户信息") SessionUser queryCheckUserLogin(UserToken authenticationToken); + @ApiOperation(value = "封装用户",notes = "封装管理员信息") SessionUser queryCheckAdminLogin(AdminToken authenticationToken); + @ApiOperation(value = "封装用户",notes = "封装超级管理员信息") SessionUser queryCheckSaAdminLogin(SaAdminToken authenticationToken); + @ApiOperation(value = "登录密码错误",notes = "登录密码错误记录错误次数功能") Integer doLoginPasswordError(String loginName); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java index 85c0d43..7301494 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; import cn.estsh.i3plus.pojo.platform.bean.SysPosition; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -23,6 +24,7 @@ public interface ICoreTreeService { * @param parentId * @return */ + @ApiOperation(value = "获取岗位树",notes = "根据父节点获取岗位树集合") List findSysPositionTreeByParentId(long parentId); /** @@ -30,6 +32,7 @@ public interface ICoreTreeService { * @param id * @return */ + @ApiOperation(value = "获取岗位树",notes = "根据父节点获取岗位树") SysPosition getSysPositionTreeById(long id); /** @@ -37,12 +40,14 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @ApiOperation(value = "封装岗位树",notes = "封装当前岗位树") void findSysPositionChildrenTreePack(SysPosition parent,int step); /** * 检查父节点是否是子节点ID或者为当前节点ID * @param position */ + @ApiOperation(value = "父节点检查",notes = "检查岗位的父节点是否是当前节点的子节点") void doValidatorSysPositionParentId(SysPosition position) ; /** @@ -50,6 +55,7 @@ public interface ICoreTreeService { * @param parentId * @return */ + @ApiOperation(value = "获取部门树",notes = "根据父节点获取部门树集合") List findSysDepartmentTreeByParentId(long parentId); /** @@ -57,6 +63,7 @@ public interface ICoreTreeService { * @param id * @return */ + @ApiOperation(value = "获取部门树",notes = "根据父节点获取部门树") SysDepartment getSysDepartmentTreeById(long id); /** @@ -64,12 +71,14 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @ApiOperation(value = "封装部门树",notes = "封装当前部门树") void findSysDepartmentChildrenTreePack(SysDepartment parent,int step); /** * 检查父节点是否是子节点ID或者为当前节点ID * @param department */ + @ApiOperation(value = "父节点检查",notes = "检查部门的父节点是否是当前节点的子节点") void doValidatorSysDepartmentParentId(SysDepartment department) ; /** @@ -77,6 +86,7 @@ public interface ICoreTreeService { * @param parentId * @return */ + @ApiOperation(value = "获取组织树",notes = "根据父节点获取组织树集合") List findSysOrganizeTreeByParentId(long parentId); /** @@ -84,6 +94,7 @@ public interface ICoreTreeService { * @param id * @return */ + @ApiOperation(value = "获取组织树",notes = "根据父节点获取组织树") SysOrganize getSysOrganizeTreeById(long id); /** @@ -91,26 +102,30 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @ApiOperation(value = "封装组织树",notes = "封装当前组织树") void findSysOrganizeChildrenTreePack(SysOrganize parent,int step); /** * 检查父节点是否是子节点ID或者为当前节点ID * @param organize */ + @ApiOperation(value = "父节点检查",notes = "检查组织的父节点是否是当前节点的子节点") void doValidatorSysOrganizeParentId(SysOrganize organize) ; /** - * 获取组织树 + * 获取菜单树 * @param parentId * @return */ + @ApiOperation(value = "获取菜单树",notes = "根据父节点获取菜单树集合") List findSysMenuTreeByParentId(long parentId); /** - * 获取组织树 + * 获取菜单树 * @param id * @return */ + @ApiOperation(value = "获取菜单树",notes = "根据父节点获取菜单树") SysMenu getSysMenuTreeById(long id); /** @@ -118,12 +133,14 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @ApiOperation(value = "封装菜单树",notes = "封装当前菜单树") void findSysMenuChildrenTreePack(SysMenu parent, int step); /** * 检查父节点是否是子节点ID或者为当前节点ID * @param menu */ + @ApiOperation(value = "父节点检查",notes = "检查菜单的父节点是否是当前节点的子节点") void doValidatorSysMenuParentId(SysMenu menu) ; /** @@ -131,6 +148,7 @@ public interface ICoreTreeService { * @param parentId * @return */ + @ApiOperation(value = "获取组织部门树",notes = "根据父节点获取组织部门树集合") List findOrganizeDepartment(long parentId); /** @@ -138,6 +156,7 @@ public interface ICoreTreeService { * @param id * @return */ + @ApiOperation(value = "获取组织部门树",notes = "根据父节点获取组织部门树") CommonTreeModel getOrganizeById(long id); /** @@ -145,6 +164,7 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @ApiOperation(value = "封装菜单树",notes = "封装当前组织部门树") void findOrganizeTreePack(CommonTreeModel parent, int step); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java index 6f0f6fa..83111a4 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -19,12 +20,14 @@ public interface ISysDepartmentService { * 添加部门 * @param department */ + @ApiOperation(value = "新增部门信息") SysDepartment insertSysDepartment(SysDepartment department); /** * 根据id删除部门 * @param id */ + @ApiOperation(value = "删除部门信息",notes = "根据ID 删除部门信息") void deleteSysDepartmentById(Long id); /** @@ -32,18 +35,21 @@ public interface ISysDepartmentService { * @param ids id数组 * @return */ + @ApiOperation(value = "删除部门信息",notes = "根据ID 批量删除部门信息") void deleteSysDepartmentByIds(Long[] ids); /** * 修改部门信息 * @param department */ + @ApiOperation(value = "更新部门信息") void updateSysDepartment(SysDepartment department); /** * 查询全部部门 * @return */ + @ApiOperation(value = "查询部门信息",notes = "查询所有部门信息") List listSysDepartment(); /** @@ -52,6 +58,7 @@ public interface ISysDepartmentService { * @param pager * @return */ + @ApiOperation(value = "查询部门信息",notes = "查询部门信息(分页、组合)") ListPager querySysDepartment(SysDepartment department, Pager pager); /** @@ -59,6 +66,7 @@ public interface ISysDepartmentService { * @param id * @return */ + @ApiOperation(value = "查询部门信息",notes = "根据ID查询部门信息") SysDepartment getSysDepartmentById(Long id); /** @@ -67,5 +75,6 @@ public interface ISysDepartmentService { * @param pager * @return */ + @ApiOperation(value = "查询部门信息",notes = "查询部门信息(分页、组合)") ListPager findSysDepartmentByPager(SysDepartment department, Pager pager); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java index de0ad57..e0303a3 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysFile; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -19,24 +20,21 @@ public interface ISysFileService { * 添加文件资源信息 * @param sysFile */ + @ApiOperation(value = "新增资源信息") SysFile insertSysFile(SysFile sysFile); /** - * 删除文件资源小新 - * @param id - */ - void deleteSysFileById(Long id); - - /** * 修改文件资源信息 * @param sysFile */ + @ApiOperation(value = "更新资源信息") void updateSysFile(SysFile sysFile); /** * 查询全部文件资源信息 * @return */ + @ApiOperation(value = "查询资源信息",notes = "查询所有资源信息") List listSysFile(); /** @@ -44,6 +42,7 @@ public interface ISysFileService { * @param id * @return */ + @ApiOperation(value = "查询资源信息",notes = "根据 ID查询资源信息") SysFile getSysFileById(Long id); /** @@ -52,11 +51,20 @@ public interface ISysFileService { * @param pager * @return */ + @ApiOperation(value = "查询资源信息",notes = "查询资源信息(分页、组合)") ListPager querySysFileByPager(SysFile sysFile, Pager pager); /** + * 删除文件资源小新 + * @param id + */ + @ApiOperation(value = "删除资源信息",notes = "根据ID删除资源信息") + void deleteSysFileById(Long id); + + /** * 批量删除文件资源 * @param ids */ + @ApiOperation(value = "删除资源信息",notes = "根据ID批量删除资源信息") void deleteSysFileByIds(Long[] ids); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java index 64efd55..1d9d40d 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java @@ -43,5 +43,6 @@ public interface ISysLocaleLanguageService { @ApiOperation(value = "根据语言id修改语言状态") void updateSysLocaleLanguageStatusById(Long id,Integer status); + @ApiOperation(value = "根据语言id批量修改语言状态") void updateSysLocaleLanguageStatusByIds(Long[] ids,Integer status); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java index 157bb09..ee18289 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -22,6 +23,7 @@ public interface ISysMenuService { * * @param sysMenu */ + @ApiOperation(value = "更新菜单信息") void updateSysMenu(SysMenu sysMenu); /** @@ -31,6 +33,7 @@ public interface ISysMenuService { * @param user 当前会话用户 * @return */ + @ApiOperation(value = "更新菜单信息",notes = "根据ID 更新菜单状态信息") void updateSysMenuStatus(Long id, int status, SessionUser user); /** @@ -39,6 +42,7 @@ public interface ISysMenuService { * @param status * @param user */ + @ApiOperation(value = "更新菜单信息",notes = "根据ID 批量更新菜单状态信息") void updateSysMenuStatusByIds(Long[] ids, int status, SessionUser user); /** @@ -46,6 +50,7 @@ public interface ISysMenuService { * @param id * @return */ + @ApiOperation(value = "删除菜单信息",notes = "根据ID 删除菜单信息") void deleteSysMenuById(Long id); /** @@ -53,6 +58,7 @@ public interface ISysMenuService { * @param ids id数组 * @return */ + @ApiOperation(value = "删除菜单信息",notes = "根据ID 批量删除菜单信息") void deleteSysMenuByIds(Long[] ids); /** @@ -61,6 +67,7 @@ public interface ISysMenuService { * @param sysMenu * @return */ + @ApiOperation(value = "新增菜单信息") SysMenu insertSysMenu(SysMenu sysMenu); /** @@ -68,6 +75,7 @@ public interface ISysMenuService { * * @return */ + @ApiOperation(value = "查询菜单信息",notes = "查询所有菜单信息") List findSysMenuAll(); /** @@ -76,6 +84,7 @@ public interface ISysMenuService { * @param id * @return */ + @ApiOperation(value = "查询菜单信息",notes = "根据ID查询菜单信息") SysMenu getSysMenuById(Long id); /** @@ -84,6 +93,7 @@ public interface ISysMenuService { * @param pager * @return */ + @ApiOperation(value = "查询菜单信息",notes = "查询菜单信息(分页、组合)") ListPager querySysMenu(SysMenu menu, Pager pager); diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java index ecb7a68..025bb95 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java @@ -36,6 +36,7 @@ public interface ISysOrganizeService { * 根据Key 删除数据 * @param id */ + @ApiOperation(value = "删除组织信息",notes = "根据 ID 删除组织信息") void deleteSysOrganizeById(Long id); /** @@ -43,6 +44,7 @@ public interface ISysOrganizeService { * @param ids id数组 * @return */ + @ApiOperation(value = "删除组织信息",notes = "根据 ID 批量删除组织信息") void deleteSysOrganizeByIds(Long[] ids); /** @@ -50,12 +52,14 @@ public interface ISysOrganizeService { * @param organize * @return */ + @ApiOperation(value = "新增组织信息") SysOrganize insertSysOrganize(SysOrganize organize); /** * 查询所有数据 * @return */ + @ApiOperation(value = "查询组织信息",notes = "查询所有组织信息") List listSysOrganize(); /** @@ -64,6 +68,7 @@ public interface ISysOrganizeService { * @param pager * @return */ + @ApiOperation(value = "查询组织信息",notes = "查询 组织信息(分页、组合)") ListPager querySysOrganize(SysOrganize organize, Pager pager); /** @@ -71,5 +76,6 @@ public interface ISysOrganizeService { * @param id * @return */ + @ApiOperation(value = "查询组织信息",notes = "根据ID查询组织信息") SysOrganize getSysOrganizeById(Long id); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java index cbc7aad..d6d13e5 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysPosition; +import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Page; import java.util.List; @@ -18,16 +19,16 @@ public interface ISysPositionService { /** * 修改数据 - * * @param position */ + @ApiOperation(value = "更新岗位信息") void updateSysPosition(SysPosition position); /** * 根据Key 删除数据 - * * @param id */ + @ApiOperation(value = "删除岗位信息",notes = "根据ID 删除岗位信息") void deleteSysPositionById(Long id); /** @@ -35,21 +36,22 @@ public interface ISysPositionService { * @param ids id数组 * @return */ + @ApiOperation(value = "删除岗位信息",notes = "根据ID 批量删除岗位信息") void deleteSysPositionByIds(Long[] ids); /** * 新增数据 - * * @param position * @return */ + @ApiOperation(value = "新增岗位信息") SysPosition insertSysPosition(SysPosition position); /** * 查询所有数据 - * * @return */ + @ApiOperation(value = "新增岗位信息") List listSysPosition(); /** @@ -58,6 +60,7 @@ public interface ISysPositionService { * @param pager * @return */ + @ApiOperation(value = "查询岗位信息",notes = "查询岗位信息 (分页，组合)") ListPager querySysPosition(SysPosition position, Pager pager); /** @@ -66,6 +69,7 @@ public interface ISysPositionService { * @param id * @return */ + @ApiOperation(value = "查询岗位信息",notes = "根据 ID 查询岗位信息") SysPosition getSysPositionById(Long id); /** @@ -74,6 +78,7 @@ public interface ISysPositionService { * @param pager * @return */ + @ApiOperation(value = "查询岗位信息",notes = "查询岗位信息 (分页，组合)") ListPager findSysPositionByPager(SysPosition position, Pager pager); diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java index b4e56e6..ca2b69f 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysRefRoleMenu; import cn.estsh.i3plus.pojo.platform.bean.SysRole; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -22,6 +23,7 @@ public interface ISysRoleService { * * @param sysRole */ + @ApiOperation(value = "更新角色信息",notes = "更新角色信息") void updateSysRole(SysRole sysRole); /** @@ -31,6 +33,7 @@ public interface ISysRoleService { * @param user 当前用户会话 * @return */ + @ApiOperation(value = "更新角色信息",notes = "更新角色状态信息") void updateSysRoleStatus(Long id, int status, SessionUser user); /** @@ -39,12 +42,14 @@ public interface ISysRoleService { * @param status * @param user */ + @ApiOperation(value = "更新角色信息",notes = "根据ID 批量更新角色状态信息") void updateSysRoleStatusByIds(Long[] ids, int status, SessionUser user); /** * 根据Key 删除数据 * @param id */ + @ApiOperation(value = "删除角色信息",notes = "根据ID 删除角色信息") void deleteSysRoleById(Long id); /** @@ -52,6 +57,7 @@ public interface ISysRoleService { * @param ids id数组 * @return */ + @ApiOperation(value = "删除角色信息",notes = "根据ID 批量删除角色信息") void deleteSysRoleByIds(Long[] ids); /** @@ -60,6 +66,7 @@ public interface ISysRoleService { * @param sysRole * @return */ + @ApiOperation(value = "新增角色信息") SysRole insertSysRole(SysRole sysRole); /** @@ -67,6 +74,7 @@ public interface ISysRoleService { * @param roleId * @param ids */ + @ApiOperation(value = "刷新角色菜单关系",notes = "刷新 角色 菜单关系信息") void refreshSysRoleRef(Long roleId,Long[] ids,String userName); /** @@ -74,6 +82,7 @@ public interface ISysRoleService { * @param roleIds * @param ids */ + @ApiOperation(value = "刷新角色菜单关系",notes = "批量刷新 角色 菜单关系信息") void refreshBatchSysRoleRef(Long[] roleIds,Long[] ids,String userName); /** @@ -81,6 +90,7 @@ public interface ISysRoleService { * @param roleId * @return */ + @ApiOperation(value = "查信角色菜单关系",notes = "查询 ID 查询角色菜单关系") List findSysRefRoleMenuByRoleId(Long roleId); /** @@ -88,6 +98,7 @@ public interface ISysRoleService { * * @return */ + @ApiOperation(value = "查信角色信息",notes = "查询所有角色信息") List findSysRoleAll(); /** @@ -96,6 +107,7 @@ public interface ISysRoleService { * @param id * @return */ + @ApiOperation(value = "查信角色信息",notes = "根据 ID 查询角色信息") SysRole getSysRoleById(Long id); /** @@ -104,5 +116,6 @@ public interface ISysRoleService { * @param pager * @return */ + @ApiOperation(value = "查信角色信息",notes = "查询角色信息(分页/组合)") ListPager querySysRole(SysRole role, Pager pager); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeRecordingService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeRecordingService.java index 8791da0..b325271 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeRecordingService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeRecordingService.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeRecording; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -18,12 +19,14 @@ public interface ISysTaskTimeRecordingService { * 修改数据 * @param taskTimeRecording */ + @ApiOperation(value = "更新任务表达式信息") void updateSysTaskTimeRecording(SysTaskTimeRecording taskTimeRecording); /** * 根据Key 删除数据 * @param id */ + @ApiOperation(value = "删除任务表达式信息",notes = "根据 ID 删除任务表达式信息") void deleteSysTaskTimeRecordingById(Long id); /** @@ -31,12 +34,14 @@ public interface ISysTaskTimeRecordingService { * @param taskTimeRecording * @return */ + @ApiOperation(value = "新增任务表达式信息") SysTaskTimeRecording insertSysTaskTimeRecording(SysTaskTimeRecording taskTimeRecording); /** * 查询所有数据 * @return */ + @ApiOperation(value = "查询任务表达式信息",notes = "查询所有任务表达式信息") List findSysTaskTimeRecordingAll(); /** @@ -44,5 +49,6 @@ public interface ISysTaskTimeRecordingService { * @param id * @return */ + @ApiOperation(value = "查询任务表达式信息",notes = "查询 ID 任务表达式信息") SysTaskTimeRecording getSysTaskTimeRecordingById(Long id); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java index 6c16aaf..5f21c4a 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolService.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysTool; import cn.estsh.i3plus.pojo.platform.bean.SysToolType; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -20,24 +21,21 @@ public interface ISysToolService { * 添加硬件 * @param tool */ + @ApiOperation(value = "新增硬件信息") SysTool insertSysTool(SysTool tool); /** - * 删除硬件 - * @param id - */ - void deleteSysToolById(Long id); - - /** * 修改硬件 * @param tool */ + @ApiOperation(value = "更新硬件信息") void updateSysTool(SysTool tool); /** * 查找全部硬件 * @return */ + @ApiOperation(value = "查询设备信息",notes = "查询所有设备信息") List listSysTool(); /** @@ -45,6 +43,7 @@ public interface ISysToolService { * @param id * @return */ + @ApiOperation(value = "查询设备信息",notes = "根据ID 查询设备信息") SysTool getSysToolById(Long id); /** @@ -53,6 +52,7 @@ public interface ISysToolService { * @param pager * @return */ + @ApiOperation(value = "查询设备信息",notes = "根据条件 查询设备信息(分页)") ListPager querySysToolByPager(SysTool tool, Pager pager); /** @@ -60,19 +60,28 @@ public interface ISysToolService { * @param id * @param status */ + @ApiOperation(value = "更新设备信息",notes = "更新设备状态信息") void updateSysToolStatusById(Long id,Integer status); /** + * 删除硬件 + * @param id + */ + @ApiOperation(value = "删除硬件信息",notes = "根据 ID 删除硬件信息") + void deleteSysToolById(Long id); + + /** * 批量删除硬件 * @param ids */ + @ApiOperation(value = "删除硬件信息",notes = "根据 ID 批量删除硬件信息") void deleteSysToolByIds(Long[] ids); - /** * 批量修改硬件状态 * @param ids * @param status */ + @ApiOperation(value = "更新设备信息",notes = "根据 ID 批量修改硬件状态信息") void updateSysToolStatusByIds(Long[] ids,Integer status); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolTypeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolTypeService.java index 8ef8385..94e9db5 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolTypeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysToolTypeService.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; import cn.estsh.i3plus.pojo.platform.bean.SysToolType; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -20,24 +21,28 @@ public interface ISysToolTypeService { * 添加硬件类型 * @param toolType */ + @ApiOperation(value = "新增硬件类型") void insertSysToolType(SysToolType toolType); /** * 删除硬件类型 * @param id */ + @ApiOperation(value = "删除硬件类型",notes = "根据 ID 删除硬件类型信息") void deleteSysToolTypeById(Long id); /** * 修改硬件类型 * @param toolType */ + @ApiOperation(value = "更新硬件类型") void updateSysToolType(SysToolType toolType); /** * 查找全部硬件类型 * @return */ + @ApiOperation(value = "查询硬件类型") List listSysToolType(); /** @@ -45,6 +50,7 @@ public interface ISysToolTypeService { * @param id * @return */ + @ApiOperation(value = "查询硬件类型",notes = "根据 ID 查询硬件类型信息") SysToolType getSysToolTypeById(Long id); /** @@ -53,11 +59,13 @@ public interface ISysToolTypeService { * @param pager * @return */ + @ApiOperation(value = "查询硬件类型",notes = "查询类型信息 复杂化查询") ListPager querySysToolTypeByPager(SysToolType toolType, Pager pager); /** * 批量删除硬件类型 * @param ids */ + @ApiOperation(value = "删除硬件类型",notes = "根据 ID 批量删除硬件类型信息") void deleteSysToolTypeByIds(Long[] ids); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java index de7897c..d5d8c72 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java @@ -38,6 +38,7 @@ public interface ISysUserInfoService { * @param departmentIds * @param userName */ + @ApiOperation(value = "刷新用户关系",notes = "刷新用户部门关系") void refreshRefUserDepartment(Long userInfoId, Long[] departmentIds, String userName); /** @@ -46,6 +47,7 @@ public interface ISysUserInfoService { * @param positionIds * @param userName */ + @ApiOperation(value = "刷新用户关系",notes = "刷新用户岗位关系") void refreshRefUserPosition(Long userInfoId, Long[] positionIds , String userName); /** @@ -54,6 +56,7 @@ public interface ISysUserInfoService { * @param organizeId * @param userName */ + @ApiOperation(value = "刷新用户关系",notes = "刷新用户组织关系") void refreshRefUserOrganize(Long userInfoId, Long organizeId, String userName); /** diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index c847c83..5d0c147 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -3,11 +3,12 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.*; +import io.swagger.annotations.ApiOperation; import org.apache.shiro.authc.AuthenticationException; import java.util.List; /** - * @Description : 用户账号服务 + * @Description : 账号账号服务 * @Reference : * @Author : wei.peng * @Date : 2018-10-25 16:21 @@ -16,64 +17,72 @@ import java.util.List; public interface ISysUserService { /** - * 用户登录 + * 账号登录 * @param loginName 登录名 * @param password 登录密码 * @param languageCode 界面语言 * @return */ + @ApiOperation(value = "账号登录",notes = "普通账号登录功能") SessionUser queryUserLogin(String loginName, String password, String languageCode) throws AuthenticationException; /** - * 修改权限状态 - * @param id 修改权限状态 + * 修改状态 + * @param id 修改账号状态 * @param status 状态 - * @param user 当前会话用户 + * @param user 当前会话账号 * @return */ + @ApiOperation(value = "修改状态",notes = "修改指定账号状态") void updateSysUserStatus(Long id, int status, SessionUser user); /** - * 批量修改用户状态 + * 批量修改账号状态 * @param ids * @param status * @param user */ + @ApiOperation(value = "修改状态",notes = "批量修改指定账号状态") void updateBatchSysUserStatus(Long[] ids, int status, SessionUser user); /** - * 修改用户信息 + * 修改账号信息 * @param sysUser */ + @ApiOperation(value = "修改账号信息",notes = "修改账号信息") void updateSysUser(SysUser sysUser) throws Exception; /** - * 修改用户密码 - * @param userId 需要修改的用户ID + * 修改账号密码 + * @param userId 需要修改的账号ID * @param password 旧密码 * @param newPwd 新密码 */ + @ApiOperation(value = "修改号密码",notes = "修改账号的密码信息") void updateSysUserPassword(Long userId,String password,String newPwd) throws Exception; /** - * 刷新用户登录信息 + * 刷新账号登录信息 * @param userId */ + @ApiOperation(value = "刷新账号",notes = "刷新账号登录信息") void refreshUserLoginInformation(Long userId); /** - * 新增用户信息 - * @param sysUser 新增用户 + * 新增账号信息 + * @param sysUser 新增账号 * @return */ + @ApiOperation(value = "新增账号",notes = "新增账号信息") SysUser insertSysUser(SysUser sysUser)throws Exception; /** - * 刷新用户角色关系 + * 刷新账号角色关系 * @param sysUser * @param roleIds * @param userName */ + @ApiOperation(value = "刷新账号",notes = "刷新账号角色关系") void refreshSysRefUserRole(SysUser sysUser, Long[] roleIds , String userName); /** @@ -81,19 +90,22 @@ public interface ISysUserService { * @param id * @return */ + @ApiOperation(value = "删除账号",notes = "根据ID 删除张哈信息") void deleteSysUserById(Long id); /** - * 批量删除用户 逻辑删除 - * @param ids 需要删除的用户ID - * @param user 当前会话用户 + * 批量删除账号 逻辑删除 + * @param ids 需要删除的账号ID + * @param user 当前会话账号 */ + @ApiOperation(value = "删除账号",notes = "根据ID 批量删除张哈信息") void deleteBatchSysUserById(Long[] ids, SessionUser user); /** * 查询所有数据 * @return */ + @ApiOperation(value = "查询所有",notes = "查询所有账号信息") List list(); /** @@ -102,6 +114,7 @@ public interface ISysUserService { * @param pager * @return */ + @ApiOperation(value = "账号查询",notes = "查询账号信息-复杂查询") ListPager querySysUserByPager(SysUser user, Pager pager); /** @@ -109,20 +122,23 @@ public interface ISysUserService { * @param id * @return */ + @ApiOperation(value = "账号查询",notes = "查询账号信息-根据ID查询") SysUser getSysUserById(Long id); /** - * 获取用户详细信息 + * 获取账号详细信息 * @param id * @return */ + @ApiOperation(value = "获取用户信息",notes = "查询用户信息-根据ID查询") SysUserInfo getSysUserInfoById(Long id); /** - * 根据登录名称 获取用户信息 + * 根据登录名称 获取账号信息 * @param loginName * @return */ + @ApiOperation(value = "获取账号信息",notes = "查询用户信息-根据登录名称查询") SysUser getSysUserByLoginName(String loginName); /** @@ -130,6 +146,7 @@ public interface ISysUserService { * @param email * @return */ + @ApiOperation(value = "获取账号信息",notes = "查询用户信息-根据邮箱查询") SysUser getSysUserByEmail(String email); /** @@ -137,21 +154,24 @@ public interface ISysUserService { * @param phone * @return */ + @ApiOperation(value = "获取账号信息",notes = "查询用户信息-根据手机查询") SysUser getSysUserByPhone(String phone); /** - * 查出用户角色关系 + * 查出账号角色关系 * @param userId * @return */ + @ApiOperation(value = "获取用户角色信息",notes = "获取指定账号的所有角色信息") List findSysRefUserRoleByUserId(Long userId); /** - * 判断用户名是否存在 + * 判断账号名是否存在 * @param userLoginName * @param id * @return */ + @ApiOperation(value = "账号检查",notes = "检查账号的登录名是否重复") boolean checkSysUserLoginName(String userLoginName, long id); /** @@ -160,6 +180,7 @@ public interface ISysUserService { * @param id * @return */ + @ApiOperation(value = "账号检查",notes = "检查账号的邮箱是否重复") boolean checkSysUserEmail(String email,long id); /** @@ -168,21 +189,24 @@ public interface ISysUserService { * @param id * @return */ + @ApiOperation(value = "账号检查",notes = "检查账号的手机号是否重复") boolean checkSysUserPhone(String phone,long id); /** - * 用户唯一教研 + * 账号唯一教研 * @param user */ + @ApiOperation(value = "账号检查",notes = "检查账号信息唯一(登录名、邮箱、手机号)") void checkSysUserOnly(SysUser user); /** - * 登录封装用户信息 + * 登录封装账号信息 * @param sessionUser * @param user * @param userType * @param languageCode * @return */ + @ApiOperation(value = "封装用户信息",notes = "封装登录完成后的用户信息(角色、权限、部门、组织、岗位)") SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index 0b70c9c..bdb9ec6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java @@ -79,7 +79,6 @@ public class SysLogOperateController extends CoreBaseController { } } - @GetMapping(value = "/get/{id}") @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志") public ResultBean getSysLogOperateById(@PathParam("id") String id){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java index 4af9408..29885c5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java @@ -36,7 +36,6 @@ public class SysLogSystemController extends CoreBaseController{ @Autowired private ISysLogSystemService logSystemService; - @PostMapping(value = "/insert") @ApiOperation(value="新增系统日志",notes = "新增系统日志") public ResultBean insertSysLogSystem(SysLogSystem logSystem) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java index 2f9ccf8..ef267e4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java @@ -51,13 +51,17 @@ import java.util.List; public class SysOrderNoRuleController extends CoreBaseController { @Autowired - ISysOrderNoRuleService sysOrderNoRuleService; + private ISysOrderNoRuleService sysOrderNoRuleService; + @Autowired - ISysDictionaryService sysDictionaryService; + private ISysDictionaryService sysDictionaryService; + @Autowired - ISysConfigService sysConfigService; + private ISysConfigService sysConfigService; + @Autowired - ISysFileService sysFileService; + private ISysFileService sysFileService; + @Autowired private FastDFSClient dfsClient; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java index 7669312..804c892 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java @@ -115,7 +115,7 @@ public class SysOrganizeController extends CoreBaseController{ } @GetMapping(value = "/list") - @ApiOperation(value = "查询SysOrganize", notes = "查询所有组织") + @ApiOperation(value = "查询所有组织", notes = "查询所有组织") public ResultBean findSysOrganizeAll() { try { List list = organizeService.listSysOrganize(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index 7a242f2..af3df02 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -107,7 +107,7 @@ public class SysRoleController extends CoreBaseController{ } @GetMapping(value = "/list") - @ApiOperation(value = "查询SysRole", notes = "查询所有系统角色") + @ApiOperation(value = "查询所有角色", notes = "查询所有系统角色") public ResultBean findAll() { try { List list = sysRoleService.findSysRoleAll(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java index eee7d02..0345188 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java @@ -63,7 +63,6 @@ public class SysTreeController extends CoreBaseController { } } - @GetMapping(value="/position/list/{parentId}") @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点") public ResultBean listSysPositionListTree(@PathVariable("parentId") long parentId) { @@ -137,7 +136,7 @@ public class SysTreeController extends CoreBaseController { } @GetMapping(value="/department/list/{parentId}") - @ApiOperation(value="查询组织树",notes="通过部门主键获取组织树，-1为根节点") + @ApiOperation(value="查询部门树",notes="通过部门主键获取部门树集合，-1为根节点") public ResultBean listDepartmentListTree(@PathVariable("parentId") long parentId) { try { List resultList = coreTreeService.findSysDepartmentTreeByParentId(parentId); @@ -154,9 +153,8 @@ public class SysTreeController extends CoreBaseController { } } - @GetMapping(value="/sys-menu/get/{id}") - @ApiOperation(value="部门树",notes="通过部门主键获取部门树，-1为根节点") + @ApiOperation(value="菜单树",notes="通过部门主键获取菜单树，-1为根节点") public ResultBean listSysMenuTree(@PathVariable("id") long id) { try { SysMenu obj = coreTreeService.getSysMenuTreeById(id); @@ -174,7 +172,7 @@ public class SysTreeController extends CoreBaseController { } @GetMapping(value="/sys-menu/list/{parentId}") - @ApiOperation(value="查询组织树",notes="通过部门主键获取组织树，-1为根节点") + @ApiOperation(value="查询菜单树",notes="通过组织主键获取菜单树集合，-1为根节点") public ResultBean listSysMenuListTree(@PathVariable("parentId") long parentId) { try { List resultList = coreTreeService.findSysMenuTreeByParentId(parentId); @@ -192,7 +190,7 @@ public class SysTreeController extends CoreBaseController { } @GetMapping(value="/organize-department/list/{parentId}") - @ApiOperation(value="查询组织-部门树",notes="通过部门主键获取组组织-部门，-1为根节点") + @ApiOperation(value="查询组织-部门树",notes="通过组织主键获取组织-部门，-1为根节点") public ResultBean listOrganizeDepartmentListTree(@PathVariable("parentId") long parentId) { try { List resultList = coreTreeService.findOrganizeDepartment(parentId); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 4314738..f41118d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -291,7 +291,6 @@ public class SysUserController extends CoreBaseController{ ValidatorBean.checkNotNull(id, "用户id 不能为空"); sysUserService.deleteSysUserById(Long.parseLong(id)); - sysUserInfoService.refreshUserInfoUserNum(Long.parseLong(id)); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); @@ -431,7 +430,6 @@ public class SysUserController extends CoreBaseController{ } } - @PostMapping("/password/update-verification") @ApiOperation(value = "修改密码",notes = "通过邮箱的验证码修改密码") public ResultBean getEmailVerification(String password,String email,String verification){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index 1482bfa..a21cdb5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -70,6 +70,7 @@ public class SysUserInfoController extends CoreBaseController{ ConvertBean.modelInitialize(userInfo,user); userInfo.setUserInfoStatus(CommonEnumUtil.USER_STATUS.ENABLE.getValue()); + userInfo.setUserLoginNum(0); SysUserInfo info = sysUserInfoService.insertSysUserInfo(userInfo); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index cec1026..dbae5e9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java @@ -12,6 +12,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.util.ImppRedis; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.CredentialsException; import org.apache.shiro.authc.IncorrectCredentialsException; @@ -44,6 +45,7 @@ public class SystemLoginService implements ISystemLoginService { protected ImppRedis redisCore; @Override + @ApiOperation(value = "用户登录",notes = "普通用户登录") public SessionUser queryUserLogin(String loginName, String loginPwd, String languageCode) { //生成令牌 UserToken ut = new UserToken(loginName,loginPwd,languageCode); @@ -52,6 +54,7 @@ public class SystemLoginService implements ISystemLoginService { } @Override + @ApiOperation(value = "用户登录",notes = "管理用户登录") public SessionUser queryAdminLogin(String loginName, String loginPwd, String languageCode) { //生成令牌 AdminToken adminToken = new AdminToken(loginName,loginPwd,languageCode); @@ -60,6 +63,7 @@ public class SystemLoginService implements ISystemLoginService { } @Override + @ApiOperation(value = "封装用户",notes = "封装普通用户信息") public SessionUser queryCheckUserLogin(UserToken userToken) { //验证用户 SysUser user = getUserLoginInfo(userToken.getLoginName(),userToken.getLoginPwd()); @@ -69,6 +73,7 @@ public class SystemLoginService implements ISystemLoginService { } @Override + @ApiOperation(value = "封装用户",notes = "封装管理员信息") public SessionUser queryCheckAdminLogin(AdminToken adminToken) { //验证用户 SysUser user = getUserLoginInfo(adminToken.getLoginName(),adminToken.getLoginPwd()); @@ -77,6 +82,7 @@ public class SystemLoginService implements ISystemLoginService { } @Override + @ApiOperation(value = "封装用户",notes = "封装超级管理员信息") public SessionUser queryCheckSaAdminLogin(SaAdminToken saAdminToken) { //SysUser user = getUserLoginInfo(saAdminToken.getLoginName(),saAdminToken.getLoginPwd()); SysUser user = null; @@ -90,6 +96,7 @@ public class SystemLoginService implements ISystemLoginService { } @Override + @ApiOperation(value = "登录密码错误",notes = "登录密码错误记录错误次数功能") public Integer doLoginPasswordError(String loginName) { SysUser user = sysUserRDao.getByProperty("userLoginName",loginName); if(user != null){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java index 287f463..cd4c272 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java @@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysPositionRepository; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -50,6 +51,7 @@ public class CoreTreeService implements ICoreTreeService { private SysMenuRepository menuRDao; @Override + @ApiOperation(value = "获取岗位树",notes = "根据父节点获取岗位树集合") public List findSysPositionTreeByParentId(long parentId) { List result = positionRDao.findByProperty("parentId", parentId); @@ -64,6 +66,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "获取岗位树",notes = "根据父节点获取岗位树") public SysPosition getSysPositionTreeById(long id) { // 查找数据 SysPosition position = positionRDao.getById(id); @@ -76,6 +79,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "封装岗位树",notes = "封装当前岗位树") public void findSysPositionChildrenTreePack(SysPosition parent, int step) { ++step; List childList = positionRDao.findByProperty("parentId", parent.getId()); @@ -92,12 +96,14 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "父节点检查",notes = "检查岗位的父节点是否是当前节点的子节点") public void doValidatorSysPositionParentId(SysPosition position) { findSysPositionChildrenTreePack(position,0); validatorSysPositionParentId(position.getChildList(),position.getParentId()); } @Override + @ApiOperation(value = "获取部门树",notes = "根据父节点获取部门树集合") public List findSysDepartmentTreeByParentId(long parentId) { List result = departmentRDao.findByProperty("parentId", parentId); @@ -112,6 +118,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "获取部门树",notes = "根据父节点获取部门树") public SysDepartment getSysDepartmentTreeById(long id) { // 查找数据 SysDepartment department = departmentRDao.getById(id); @@ -124,6 +131,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "封装部门树",notes = "封装当前部门树") public void findSysDepartmentChildrenTreePack(SysDepartment parent, int step) { ++step; List childList = departmentRDao.findByProperty("parentId", parent.getId()); @@ -140,12 +148,14 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "父节点检查",notes = "检查部门的父节点是否是当前节点的子节点") public void doValidatorSysDepartmentParentId(SysDepartment department) { findSysDepartmentChildrenTreePack(department,0); validatorSysDepartmentParentId(department.getChildList(),department.getParentId()); } @Override + @ApiOperation(value = "获取组织树",notes = "根据父节点获取组织树集合") public List findSysOrganizeTreeByParentId(long parentId) { StringBuffer orgHQL = new StringBuffer(); HqlPack.getNumEqualPack(parentId,"parentId",orgHQL); @@ -163,6 +173,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "获取组织树",notes = "根据父节点获取组织树") public SysOrganize getSysOrganizeTreeById(long id) { // 查找数据 SysOrganize organize = organizeRDao.getById(id); @@ -175,6 +186,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "封装组织树",notes = "封装当前组织树") public void findSysOrganizeChildrenTreePack(SysOrganize parent, int step) { ++step; @@ -194,12 +206,14 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "父节点检查",notes = "检查组织的父节点是否是当前节点的子节点") public void doValidatorSysOrganizeParentId(SysOrganize organize) { findSysOrganizeChildrenTreePack(organize,0); validatorSysOrganizeParentId(organize.getChildList(),organize.getParentId()); } @Override + @ApiOperation(value = "获取菜单树",notes = "根据父节点获取菜单树集合") public List findSysMenuTreeByParentId(long parentId) { List result = menuRDao.findByProperty("parentId", parentId); @@ -214,6 +228,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "获取菜单树",notes = "根据父节点获取菜单树") public SysMenu getSysMenuTreeById(long id) { // 查找数据 SysMenu menu = menuRDao.getById(id); @@ -226,6 +241,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "封装菜单树",notes = "封装当前菜单树") public void findSysMenuChildrenTreePack(SysMenu parent, int step) { ++step; List childList = menuRDao.findByProperty("parentId", parent.getId()); @@ -241,6 +257,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "父节点检查",notes = "检查菜单的父节点是否是当前节点的子节点") public void doValidatorSysMenuParentId(SysMenu menu) { findSysMenuChildrenTreePack(menu,0); validatorSysMenuParentId(menu.getChildList(),menu.getParentId()); @@ -319,6 +336,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "获取组织部门树",notes = "根据父节点获取组织部门树集合") public List findOrganizeDepartment(long parentId) { List result = new ArrayList<>(); @@ -345,6 +363,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "获取组织部门树",notes = "根据父节点获取组织部门树") public CommonTreeModel getOrganizeById(long id) { // 查找数据 SysOrganize organize = organizeRDao.getById(id); @@ -361,6 +380,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override + @ApiOperation(value = "封装菜单树",notes = "封装当前组织部门树") public void findOrganizeTreePack(CommonTreeModel parent, int step) { if(null != parent){ BaseBean bean = parent.getBean(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java index c925343..cff5499 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java @@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -42,6 +43,7 @@ public class SysDepartmentService implements ISysDepartmentService { private CoreTreeService coreTreeService; @Override + @ApiOperation(value = "新增部门信息") public SysDepartment insertSysDepartment(SysDepartment department) { LOGGER.info("部门信息 SysDepartment department:{}", department); // 代码唯一校验 @@ -76,6 +78,7 @@ public class SysDepartmentService implements ISysDepartmentService { } @Override + @ApiOperation(value = "删除部门信息",notes = "根据ID 删除部门信息") public void deleteSysDepartmentById(Long id) { LOGGER.info("部门信息 SysDepartment id :{}", id); // 查询是否存在子级 @@ -95,6 +98,7 @@ public class SysDepartmentService implements ISysDepartmentService { } @Override + @ApiOperation(value = "删除部门信息",notes = "根据ID 批量删除部门信息") public void deleteSysDepartmentByIds(Long[] ids) { LOGGER.info("部门信息 DEPARTMENT ids :{}", ids); long positionCount = departmentRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); @@ -111,6 +115,7 @@ public class SysDepartmentService implements ISysDepartmentService { } @Override + @ApiOperation(value = "更新部门信息") public void updateSysDepartment(SysDepartment department) { LOGGER.info("部门信息 DEPARTMENT department :{}", department); // 唯一校验 CODE 相同 ID 不同 则视为相同 @@ -158,12 +163,14 @@ public class SysDepartmentService implements ISysDepartmentService { } @Override + @ApiOperation(value = "查询部门信息",notes = "查询所有部门信息") public List listSysDepartment() { LOGGER.info("部门信息 DEPARTMENT list"); return departmentRDao.list(); } @Override + @ApiOperation(value = "查询部门信息",notes = "查询部门信息(分页、组合)") public ListPager querySysDepartment(SysDepartment department, Pager pager) { LOGGER.info("部门 SysDepartment find department :{} page:{}", department, pager); @@ -181,12 +188,14 @@ public class SysDepartmentService implements ISysDepartmentService { } @Override + @ApiOperation(value = "查询部门信息",notes = "根据ID查询部门信息") public SysDepartment getSysDepartmentById(Long id) { LOGGER.info("部门信息 DEPARTMENT id:{}",id); return departmentRDao.getById(id); } @Override + @ApiOperation(value = "查询部门信息",notes = "查询部门信息(分页、组合)") public ListPager findSysDepartmentByPager(SysDepartment department, Pager pager) { LOGGER.info("部门信息 DEPARTMENT department :{}", department); LOGGER.info("部门信息 DEPARTMENT pager :{}", pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java index fa9c668..dc8a70d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.platform.bean.SysFile; import cn.estsh.i3plus.pojo.platform.repository.SysFileRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -29,36 +30,35 @@ public class SysFileServiceImpl implements ISysFileService { public SysFileRepository sysFileRDao; @Override + @ApiOperation(value = "新增资源信息") public SysFile insertSysFile(SysFile sysFile) { LOGGER.info("文件资源 SYS_FILE :{}",sysFile); return sysFileRDao.insert(sysFile); } @Override - public void deleteSysFileById(Long id) { - LOGGER.info("文件资源 SYS_FILE id:{}",id); - sysFileRDao.deleteById(id); - } - - @Override + @ApiOperation(value = "更新资源信息") public void updateSysFile(SysFile sysFile) { LOGGER.info("文件资源 SYS_FILE :{}",sysFile); sysFileRDao.update(sysFile); } @Override + @ApiOperation(value = "查询资源信息",notes = "查询所有资源信息") public List listSysFile() { LOGGER.info("文件资源 SYS_FILE list"); return sysFileRDao.list(); } @Override + @ApiOperation(value = "查询资源信息",notes = "根据 ID查询资源信息") public SysFile getSysFileById(Long id) { LOGGER.info("文件资源 SYS_FILE id:{}",id); return sysFileRDao.getById(id); } @Override + @ApiOperation(value = "查询资源信息",notes = "查询资源信息(分页、组合)") public ListPager querySysFileByPager(SysFile sysFile, Pager pager) { LOGGER.info("文件资源 SYS_FILE sysFile:{}，Pager:{}",sysFile,pager); if(sysFile == null) { @@ -72,6 +72,13 @@ public class SysFileServiceImpl implements ISysFileService { } @Override + @ApiOperation(value = "删除资源信息",notes = "根据ID删除资源信息") + public void deleteSysFileById(Long id) { + LOGGER.info("文件资源 SYS_FILE id:{}",id); + sysFileRDao.deleteById(id); + } + + @Override public void deleteSysFileByIds(Long[] ids) { LOGGER.info("文件资源 SYS_FILE ids:{}", ids.toString()); sysFileRDao.deleteByIds(ids); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java index 6b85de1..08feda6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java @@ -12,6 +12,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +39,7 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { private SysLocaleResourceRepository sysLocaleResourceRDao; @Override + @ApiOperation(value = "添加系统语言",notes = "添加系统语言") public SysLocaleLanguage insertSysLocaleLanguage(SysLocaleLanguage sysLocaleLanguage) { LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE SysLocaleLanguage:{}",sysLocaleLanguage); int count = sysLocaleLanguageRDao.findByPropertyCount("languageCode",sysLocaleLanguage.getLanguageCode()); @@ -54,6 +56,7 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { } @Override + @ApiOperation(value = "修改系统语言",notes = "修改系统语言") public void updateSysLocaleLanguage(SysLocaleLanguage sysLocaleLanguage) { SysLocaleLanguage data = sysLocaleLanguageRDao.getById(sysLocaleLanguage.getId()); @@ -79,6 +82,7 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { } @Override + @ApiOperation(value = "根据id删除系统语言",notes = "根据id删除系统语言") public void deleteSysLocaleLanguageById(Long id) { SysLocaleLanguage sysLocaleLanguage = sysLocaleLanguageRDao.getById(id); ValidatorBean.checkNotNull(sysLocaleLanguage,"需要删除的资源不存在"); @@ -95,12 +99,14 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { } @Override + @ApiOperation(value = "查询全部系统语言",notes = "查询全部系统语言") public List listSysLocaleLanguage() { LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE list"); return sysLocaleLanguageRDao.list(); } @Override + @ApiOperation(value = "系统语言复杂查询，分页，排序",notes = "系统语言复杂查询，分页，排序") public ListPager querySysLocaleLanguageByPager(SysLocaleLanguage sysLocaleLanguage, Pager pager) { if(sysLocaleLanguage == null) { pager = PagerHelper.getPager(pager, sysLocaleLanguageRDao.listCount()); @@ -113,6 +119,7 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { } @Override + @ApiOperation(value = "根据id批量删除系统语言",notes = "根据id批量删除系统语言") public void deleteSysLocaleLanguageByIds(Long[] ids) { if(sysLocaleResourceRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("id",ids)) > 0){ throw ImppExceptionBuilder.newInstance() @@ -126,6 +133,7 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { } @Override + @ApiOperation(value = "设置默认语言",notes = "设置默认语言") public void updateSysLocaleLanguageDefaultById(Long ids) { sysLocaleLanguageRDao.updateByHqlWhere("and 1=1","isDefault",CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); @@ -134,16 +142,19 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { } @Override + @ApiOperation(value = "根据code查询语言") public SysLocaleLanguage getSysLocaleLanguageByCode(String code) { return sysLocaleLanguageRDao.getByProperty("languageCode",code); } @Override + @ApiOperation(value = "根据语言id修改语言状态") public void updateSysLocaleLanguageStatusById(Long id, Integer status) { sysLocaleLanguageRDao.updateByProperties("id",id,"languageStatus",status); } @Override + @ApiOperation(value = "根据语言id批量修改语言状态") public void updateSysLocaleLanguageStatusByIds(Long[] ids, Integer status) { sysLocaleLanguageRDao.updateByHqlWhere(CoreHqlPack.packHqlIds("id",ids),"languageStatus",status); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java index f6e4d09..5f28624 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java @@ -14,6 +14,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,6 +45,7 @@ public class SysMenuService implements ISysMenuService { private SysRefRoleMenuRepository refRoleMenuRDao; @Override + @ApiOperation(value = "更新菜单信息") public void updateSysMenu(SysMenu sysMenu) { LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); @@ -77,6 +79,7 @@ public class SysMenuService implements ISysMenuService { } @Override + @ApiOperation(value = "更新菜单信息",notes = "根据ID 更新菜单状态信息") public void updateSysMenuStatus(Long id, int status, SessionUser user) { LOGGER.info("系统功能 SYS_MENU id:{} status:{} user:{}", id,status,user); SysMenu menu = sysMenuRDao.getById(id); @@ -95,6 +98,7 @@ public class SysMenuService implements ISysMenuService { } @Override + @ApiOperation(value = "更新菜单信息",notes = "根据ID 批量更新菜单状态信息") public void updateSysMenuStatusByIds(Long[] ids, int status, SessionUser user) { LOGGER.info("系统功能 SYS_MENU ids:{} status:{} user:{}", ids, status, user); StringBuffer where = new StringBuffer(); @@ -104,6 +108,7 @@ public class SysMenuService implements ISysMenuService { } @Override + @ApiOperation(value = "删除菜单信息",notes = "根据ID 删除菜单信息") public void deleteSysMenuById(Long id) { LOGGER.info("系统功能 SYS_MENU Key:{}", id); long count = sysMenuRDao.findByPropertyCount("parentId",id); @@ -122,6 +127,7 @@ public class SysMenuService implements ISysMenuService { } @Override + @ApiOperation(value = "删除菜单信息",notes = "根据ID 批量删除菜单信息") public void deleteSysMenuByIds(Long[] ids) { LOGGER.info("系统功能 SYS_MENU ids :{}", ids); long positionCount = sysMenuRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); @@ -139,6 +145,7 @@ public class SysMenuService implements ISysMenuService { } @Override + @ApiOperation(value = "新增菜单信息") public SysMenu insertSysMenu(SysMenu sysMenu) { LOGGER.info("系统功能 SYS_MENU :{}", sysMenu); @@ -162,18 +169,21 @@ public class SysMenuService implements ISysMenuService { } @Override + @ApiOperation(value = "查询菜单信息",notes = "查询所有菜单信息") public List findSysMenuAll() { LOGGER.info("系统功能 SYS_MENU find All"); return sysMenuRDao.findAll(); } @Override + @ApiOperation(value = "查询菜单信息",notes = "根据ID查询菜单信息") public SysMenu getSysMenuById(Long id) { LOGGER.info("系统功能 SYS_MENU find id:{}", id); return sysMenuRDao.getOne(id); } @Override + @ApiOperation(value = "查询菜单信息",notes = "查询菜单信息(分页、组合)") public ListPager querySysMenu(SysMenu menu, Pager pager) { LOGGER.info("系统权限 SysMenu find menu :{} page :{}", menu, pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java index 2a0f762..3003211 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java @@ -12,6 +12,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +39,7 @@ public class SysOrganizeService implements ISysOrganizeService { private CoreTreeService coreTreeService; @Override + @ApiOperation(value = "更新组织",notes = "传入持久化组织对象，进行更新") public void updateSysOrganize(SysOrganize organize) { LOGGER.info("组织 ORGANIZE :{}", organize); // 唯一校验 CODE 相同 ID 不同 则视为相同 @@ -74,6 +76,7 @@ public class SysOrganizeService implements ISysOrganizeService { } @Override + @ApiOperation(value = "修改组织状态",notes = "") public void updateSysOrganizeStatus(Long id, int status, SessionUser user) { LOGGER.info("组织 ORGANIZE id:{} status:{} user:{}", id,status,user); SysOrganize organize = organizeRDao.getById(id); @@ -83,6 +86,7 @@ public class SysOrganizeService implements ISysOrganizeService { } @Override + @ApiOperation(value = "删除组织信息",notes = "根据 ID 删除组织信息") public void deleteSysOrganizeById(Long id) { LOGGER.info("组织 ORGANIZE Key:{}", id); long count = organizeRDao.findByPropertyCount("parentId", id); @@ -98,6 +102,7 @@ public class SysOrganizeService implements ISysOrganizeService { } @Override + @ApiOperation(value = "删除组织信息",notes = "根据 ID 批量删除组织信息") public void deleteSysOrganizeByIds(Long[] ids) { long positionCount = organizeRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); if (positionCount >= 1) { @@ -113,6 +118,7 @@ public class SysOrganizeService implements ISysOrganizeService { } @Override + @ApiOperation(value = "新增组织信息") public SysOrganize insertSysOrganize(SysOrganize organize) { LOGGER.info("组织 ORGANIZE :{}", organize); @@ -140,12 +146,14 @@ public class SysOrganizeService implements ISysOrganizeService { } @Override + @ApiOperation(value = "查询组织信息",notes = "查询所有组织信息") public List listSysOrganize() { LOGGER.info("组织 ORGANIZE find All"); return organizeRDao.findAll(); } @Override + @ApiOperation(value = "查询组织信息",notes = "查询 组织信息(分页、组合)") public ListPager querySysOrganize(SysOrganize organize, Pager pager) { LOGGER.info("组织信息 SysOrganize find SysOrganize page"); @@ -163,6 +171,7 @@ public class SysOrganizeService implements ISysOrganizeService { } @Override + @ApiOperation(value = "查询组织信息",notes = "根据ID查询组织信息") public SysOrganize getSysOrganizeById(Long id) { LOGGER.info("组织 ORGANIZE find id:{}", id); return organizeRDao.getById(id); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java index 4cd9f4b..d90808a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java @@ -12,6 +12,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -40,6 +41,7 @@ public class SysPositionService implements ISysPositionService { private SysUserRepository sysUserRDao; @Override + @ApiOperation(value = "新增岗位信息") public SysPosition insertSysPosition(SysPosition position) { LOGGER.info("岗位信息 POSITION position:{}", position); // CODE 唯一校验 @@ -68,6 +70,7 @@ public class SysPositionService implements ISysPositionService { } @Override + @ApiOperation(value = "更新岗位信息") public void updateSysPosition(SysPosition position) { LOGGER.info("岗位信息 POSITION position:{}", position); @@ -107,6 +110,7 @@ public class SysPositionService implements ISysPositionService { } @Override + @ApiOperation(value = "删除岗位信息",notes = "根据ID 删除岗位信息") public void deleteSysPositionById(Long id) { // 查询是否存在子级 LOGGER.info("岗位信息 POSITION id:{}", id); @@ -126,6 +130,7 @@ public class SysPositionService implements ISysPositionService { } @Override + @ApiOperation(value = "删除岗位信息",notes = "根据ID 批量删除岗位信息") public void deleteSysPositionByIds(Long[] ids) { LOGGER.info("岗位信息 POSITION ids:{}", ids); long positionCount = positionRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); @@ -143,12 +148,14 @@ public class SysPositionService implements ISysPositionService { } @Override + @ApiOperation(value = "新增岗位信息") public List listSysPosition() { LOGGER.info("岗位信息 SysPosition list"); return positionRDao.list(); } @Override + @ApiOperation(value = "查询岗位信息",notes = "查询岗位信息 (分页，组合)") public ListPager querySysPosition(SysPosition position, Pager pager) { LOGGER.info("岗位信息 SysPosition find SysPosition page"); @@ -166,12 +173,14 @@ public class SysPositionService implements ISysPositionService { } @Override + @ApiOperation(value = "查询岗位信息",notes = "根据 ID 查询岗位信息") public SysPosition getSysPositionById(Long id) { LOGGER.info("岗位信息 SysPosition id:{}", id); return positionRDao.getById(id); } @Override + @ApiOperation(value = "查询岗位信息",notes = "查询岗位信息 (分页，组合)") public ListPager findSysPositionByPager(SysPosition position, Pager pager) { LOGGER.info("岗位信息 SysPosition position", position); LOGGER.info("岗位信息 SysPosition pager:{}", pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java index be17ad7..387744d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java @@ -17,6 +17,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysRoleRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,12 +49,14 @@ public class SysRoleService implements ISysRoleService { private SysRefRoleMenuRepository refRoleMenuRDao; @Override + @ApiOperation(value = "更新角色信息",notes = "更新角色信息") public void updateSysRole(SysRole sysRole) { LOGGER.info("系统角色 SYS_ROLE :{}", sysRole); sysRoleRDao.update(sysRole); } @Override + @ApiOperation(value = "更新角色信息",notes = "更新角色状态信息") public void updateSysRoleStatus(Long id, int status, SessionUser user) { LOGGER.info("系统角色 SYS_MENU id:{} status:{} user:{}", id,status,user); SysRole role = sysRoleRDao.getById(id); @@ -63,6 +66,7 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "更新角色信息",notes = "根据ID 批量更新角色状态信息") public void updateSysRoleStatusByIds(Long[] ids, int status, SessionUser user) { LOGGER.info("系统功能 SYS_MENU ids:{} status:{} user:{}", ids, status, user); StringBuffer where = new StringBuffer(); @@ -72,6 +76,7 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "删除角色信息",notes = "根据ID 删除角色信息") public void deleteSysRoleById(Long id) { LOGGER.info("系统角色 SYS_ROLE Key:{}", id); refRoleMenuRDao.deleteByProperty("roleId",id); @@ -79,6 +84,7 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "删除角色信息",notes = "根据ID 批量删除角色信息") public void deleteSysRoleByIds(Long[] ids) { LOGGER.info("系统角色 SYS_ROLE ids :{}", ids); long positionCount = sysRoleRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); @@ -96,12 +102,14 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "新增角色信息") public SysRole insertSysRole(SysRole sysRole) { LOGGER.info("系统角色 SYS_ROLE :{}", sysRole); return sysRoleRDao.insert(sysRole); } @Override + @ApiOperation(value = "刷新角色菜单关系",notes = "刷新 角色 菜单关系信息") public void refreshSysRoleRef(Long roleId,Long[] ids,String userName) { LOGGER.info("系统角色 SYS_ROLE :{}", roleId); LOGGER.info("系统角色 List :{}", ids); @@ -110,6 +118,7 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "刷新角色菜单关系",notes = "批量刷新 角色 菜单关系信息") public void refreshBatchSysRoleRef(Long[] roleIds, Long[] ids,String userName) { LOGGER.info("系统角色 String[] :{}", roleIds); LOGGER.info("系统角色 List :{}", ids); @@ -188,6 +197,7 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "查信角色菜单关系",notes = "查询 ID 查询角色菜单关系") public List findSysRefRoleMenuByRoleId(Long roleId) { LOGGER.info("系统角色权限关系 RefRoleMenu find By RoleId"); return refRoleMenuRDao.findByProperty( @@ -197,18 +207,21 @@ public class SysRoleService implements ISysRoleService { } @Override + @ApiOperation(value = "查信角色信息",notes = "查询所有角色信息") public List findSysRoleAll() { LOGGER.info("系统角色 SYS_ROLE find All"); return sysRoleRDao.findAll(); } @Override + @ApiOperation(value = "查信角色信息",notes = "根据 ID 查询角色信息") public SysRole getSysRoleById(Long id) { LOGGER.info("系统角色 SYS_ROLE find id:{}", id); return sysRoleRDao.getOne(id); } @Override + @ApiOperation(value = "查信角色信息",notes = "查询角色信息(分页/组合)") public ListPager querySysRole(SysRole role, Pager pager) { LOGGER.info("系统角色 SysRole find role :{} page :{}", role, pager); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeRecordingService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeRecordingService.java index 22cb3af..dd343e8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeRecordingService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeRecordingService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeRecordingService; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeRecording; import cn.estsh.i3plus.pojo.platform.repository.SysTaskTimeRecordingRepository; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -26,30 +27,35 @@ public class SysTaskTimeRecordingService implements ISysTaskTimeRecordingService private SysTaskTimeRecordingRepository taskTimeRecordingRDao; @Override + @ApiOperation(value = "更新任务表达式信息") public void updateSysTaskTimeRecording(SysTaskTimeRecording taskTimeRecording) { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING :{}", taskTimeRecording); taskTimeRecordingRDao.update(taskTimeRecording); } @Override + @ApiOperation(value = "删除任务表达式信息",notes = "根据 ID 删除任务表达式信息") public void deleteSysTaskTimeRecordingById(Long id) { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING Key:{}", id); taskTimeRecordingRDao.deleteById(id); } @Override + @ApiOperation(value = "新增任务表达式信息") public SysTaskTimeRecording insertSysTaskTimeRecording(SysTaskTimeRecording taskTimeRecording) { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING :{}", taskTimeRecording); return taskTimeRecordingRDao.insert(taskTimeRecording); } @Override + @ApiOperation(value = "查询任务表达式信息",notes = "查询所有任务表达式信息") public List findSysTaskTimeRecordingAll() { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING find All"); return taskTimeRecordingRDao.findAll(); } @Override + @ApiOperation(value = "查询任务表达式信息",notes = "查询 ID 任务表达式信息") public SysTaskTimeRecording getSysTaskTimeRecordingById(Long id) { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING find id:{}", id); return taskTimeRecordingRDao.getOne(id); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java index b2c87f2..6d67bfc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysToolRepository; import cn.estsh.i3plus.pojo.platform.repository.SysToolTypeRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,6 +38,7 @@ public class SysToolService implements ISysToolService { private SysToolTypeRepository toolTypeRDao; @Override + @ApiOperation(value = "新增硬件信息") public SysTool insertSysTool(SysTool tool) { // 查询硬件类型名称 LOGGER.info("硬件类型 TOOL_TYPE :{}", tool); @@ -50,12 +52,14 @@ public class SysToolService implements ISysToolService { } @Override + @ApiOperation(value = "删除硬件信息",notes = "根据 ID 删除硬件信息") public void deleteSysToolById(Long id) { LOGGER.info("硬件 TOOL id:{}",id); toolRDao.deleteById(id); } @Override + @ApiOperation(value = "更新硬件信息") public void updateSysTool(SysTool tool) { // 查询硬件类型名称 LOGGER.info("硬件类型 TOOL_TYPE :{}", tool); @@ -69,18 +73,21 @@ public class SysToolService implements ISysToolService { } @Override + @ApiOperation(value = "查询设备信息",notes = "查询所有设备信息") public List listSysTool() { LOGGER.info("硬件 TOOL list"); return toolRDao.list(); } @Override + @ApiOperation(value = "查询设备信息",notes = "根据ID 查询设备信息") public SysTool getSysToolById(Long id) { LOGGER.info("硬件 TOOL id:{}",id); return toolRDao.getById(id); } @Override + @ApiOperation(value = "查询设备信息",notes = "根据条件 查询设备信息(分页)") public ListPager querySysToolByPager(SysTool tool, Pager pager) { LOGGER.info("硬件 TOOL SysTool:{}，Pager:{}",tool,pager); if(tool == null) { @@ -94,18 +101,21 @@ public class SysToolService implements ISysToolService { } @Override + @ApiOperation(value = "更新设备信息",notes = "更新设备状态信息") public void updateSysToolStatusById(Long id, Integer status) { LOGGER.info("硬件 TOOL id:{}，status：{}",id,status); toolRDao.updateByProperties("id",id,"toolStatus", status); } @Override + @ApiOperation(value = "删除硬件信息",notes = "根据 ID 批量删除硬件信息") public void deleteSysToolByIds(Long[] ids) { LOGGER.info("消息 SYS_MESSAGE ids:{}", ids.toString()); toolRDao.deleteByIds(ids); } @Override + @ApiOperation(value = "更新设备信息",notes = "根据 ID 批量修改硬件状态信息") public void updateSysToolStatusByIds(Long[] ids, Integer status) { LOGGER.info("硬件 TOOL ids：{}，status：{}",ids,status); StringBuffer where = new StringBuffer(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java index 0bb6347..2be50ef 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolTypeService.java @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysToolTypeRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -36,12 +37,14 @@ public class SysToolTypeService implements ISysToolTypeService { private SysToolRepository toolRDao; @Override + @ApiOperation(value = "新增硬件类型") public void insertSysToolType(SysToolType toolType) { LOGGER.info("硬件类型 TOOL_TYPE toolType:{}",toolType); toolTypeRDao.insert(toolType); } @Override + @ApiOperation(value = "删除硬件类型",notes = "根据 ID 删除硬件类型信息") public void deleteSysToolTypeById(Long id) { LOGGER.info("硬件类型 TOOL_TYPE id:{}",id); long count = toolRDao.findByPropertyCount("toolTypeId",id); @@ -58,6 +61,7 @@ public class SysToolTypeService implements ISysToolTypeService { } @Override + @ApiOperation(value = "更新硬件类型") public void updateSysToolType(SysToolType toolType) { LOGGER.info("硬件类型 TOOL_TYPE toolType:{}",toolType); toolTypeRDao.update(toolType); @@ -65,18 +69,21 @@ public class SysToolTypeService implements ISysToolTypeService { } @Override + @ApiOperation(value = "查询硬件类型") public List listSysToolType() { LOGGER.info("硬件类型 TOOL_TYPE list"); return toolTypeRDao.list(); } @Override + @ApiOperation(value = "查询硬件类型",notes = "根据 ID 查询硬件类型信息") public SysToolType getSysToolTypeById(Long id) { LOGGER.info("硬件类型 TOOL_TYPE id:{}",id); return toolTypeRDao.getById(id); } @Override + @ApiOperation(value = "查询硬件类型",notes = "查询类型信息 复杂化查询") public ListPager querySysToolTypeByPager(SysToolType toolType, Pager pager) { LOGGER.info("硬件类型 TOOL_TYPE SysToolType:{}，Pager:{}",toolType,pager); if(toolType == null) { @@ -90,6 +97,7 @@ public class SysToolTypeService implements ISysToolTypeService { } @Override + @ApiOperation(value = "删除硬件类型",notes = "根据 ID 批量删除硬件类型信息") public void deleteSysToolTypeByIds(Long[] ids) { LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids.toString()); long count = toolRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("toolTypeId",ids)); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java index 2c7e08c..07b5970 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java @@ -61,6 +61,7 @@ public class SysUserInfoService implements ISysUserInfoService { * @return */ @Override + @ApiOperation(value = "新增用户",notes = "新增一个用户信息") public SysUserInfo insertSysUserInfo(SysUserInfo userInfo) { LOGGER.info("用户信息 SysUserInfo userInfo:{}",userInfo); @@ -68,48 +69,53 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override + @ApiOperation(value = "修改用户",notes = "修改一个用户信息") public void updateSysUserInfo(SysUserInfo userInfo) { LOGGER.info("用户信息 SysUserInfo userInfo:{}",userInfo); sysUserInfoRDao.update(userInfo); } @Override + @ApiOperation(value = "刷新用户关系",notes = "刷新用户部门关系") public void refreshRefUserDepartment(Long userInfoId, Long[] departmentIds, String userName) { LOGGER.info("用户信息 SysUserInfo userInfoId:{} departmentIds:{} userName:{}",userInfoId,departmentIds,userName); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); if(userInfo != null ){ - // 查询部门信息 - StringBuffer where = new StringBuffer(); - HqlPack.getInPack(StringUtils.join(departmentIds,","),"id",where); - List departmentList = departmentRDao.findByHqlWhere(where.toString()); // 删除用户部门关系 refUserDepartmentRDao.deleteByProperty("userId",userInfo.getId()); - if(departmentList != null && departmentList.size() >0){ - List list = new ArrayList<>(); - List nameList = new ArrayList<>(); - SysRefUserDepartment ref = null; - for (SysDepartment department : departmentList) { - ref = new SysRefUserDepartment(); - ref.setDepartmentId(department.getId()); - ref.setDepartmentNameRdd(department.getName()); - ref.setUserId(userInfo.getId()); - ref.setUserNameRdd(userInfo.getName()); - ref.setCreateUser(userName); - ref.setCreateDatetime(TimeTool.getNowTime(true)); - list.add(ref); - - nameList.add(department.getName()); + if(departmentIds.length > 0){ + // 查询部门信息 + StringBuffer where = new StringBuffer(); + HqlPack.getInPack(StringUtils.join(departmentIds,","),"id",where); + List departmentList = departmentRDao.findByHqlWhere(where.toString()); + + if(departmentList != null && departmentList.size() >0){ + List list = new ArrayList<>(); + List nameList = new ArrayList<>(); + SysRefUserDepartment ref = null; + for (SysDepartment department : departmentList) { + ref = new SysRefUserDepartment(); + ref.setDepartmentId(department.getId()); + ref.setDepartmentNameRdd(department.getName()); + ref.setUserId(userInfo.getId()); + ref.setUserNameRdd(userInfo.getName()); + ref.setCreateUser(userName); + ref.setCreateDatetime(TimeTool.getNowTime(true)); + list.add(ref); + + nameList.add(department.getName()); + } + + userInfo.setDepartmentNamesRdd(String.join(",",nameList)); + + refUserDepartmentRDao.saveAll(list); + sysUserInfoRDao.save(userInfo); + + LOGGER.info("用户信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}",list.size()); } - - userInfo.setDepartmentNamesRdd(String.join(",",nameList)); - - refUserDepartmentRDao.saveAll(list); - sysUserInfoRDao.save(userInfo); - - LOGGER.info("用户信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}",list.size()); } }else { throw ImppExceptionBuilder.newInstance() @@ -122,42 +128,44 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override + @ApiOperation(value = "刷新用户关系",notes = "刷新用户岗位关系") public void refreshRefUserPosition(Long userInfoId, Long[] positionIds , String userName) { LOGGER.info("用户信息 SysUserInfo userInfoId:{} positionIds:{} userName:{}",userInfoId,positionIds,userName); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); if(userInfo != null ){ - // 查询部门信息 - StringBuffer where = new StringBuffer(); - HqlPack.getInPack(StringUtils.join(positionIds,","),"id",where); - List positionList = positionRDao.findByHqlWhere(where.toString()); - // 删除用户岗位关系 refUserPositionRDao.deleteByProperty("userId",userInfo.getId()); - if(positionList != null && positionList.size() >0){ - List list = new ArrayList<>(); - List nameList = new ArrayList<>(); - SysRefUserPosition ref = null; - for (SysPosition position : positionList) { - ref = new SysRefUserPosition(); - ref.setUserId(userInfo.getId()); - ref.setUserNameRdd(userInfo.getName()); - ref.setPositionId(position.getId()); - ref.setPositionNameRdd(position.getName()); - ref.setCreateUser(userName); - ref.setCreateDatetime(TimeTool.getNowTime(true)); - list.add(ref); - - nameList.add(position.getName()); + if(positionIds.length > 0){ + StringBuffer where = new StringBuffer(); + HqlPack.getInPack(StringUtils.join(positionIds,","),"id",where); // 查询部门信息 + List positionList = positionRDao.findByHqlWhere(where.toString()); + + if(positionList != null && positionList.size() >0){ + List list = new ArrayList<>(); + List nameList = new ArrayList<>(); + SysRefUserPosition ref = null; + for (SysPosition position : positionList) { + ref = new SysRefUserPosition(); + ref.setUserId(userInfo.getId()); + ref.setUserNameRdd(userInfo.getName()); + ref.setPositionId(position.getId()); + ref.setPositionNameRdd(position.getName()); + ref.setCreateUser(userName); + ref.setCreateDatetime(TimeTool.getNowTime(true)); + list.add(ref); + + nameList.add(position.getName()); + } + + userInfo.setPositionNamesRdd(String.join(",",nameList)); + + refUserPositionRDao.saveAll(list); + sysUserInfoRDao.save(userInfo); + + LOGGER.info("用户信息 SysUserInfo RefUserPositionRDao Insert Size :{}",list.size()); } - - userInfo.setPositionNamesRdd(String.join(",",nameList)); - - refUserPositionRDao.saveAll(list); - sysUserInfoRDao.save(userInfo); - - LOGGER.info("用户信息 SysUserInfo RefUserPositionRDao Insert Size :{}",list.size()); } }else { throw ImppExceptionBuilder.newInstance() @@ -170,6 +178,7 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override + @ApiOperation(value = "刷新用户关系",notes = "刷新用户组织关系") public void refreshRefUserOrganize(Long userInfoId, Long organizeId, String userName) { LOGGER.info("用户信息 SysUserInfo userInfoId:{} organizeId:{} userName:{}",userInfoId,organizeId,userName); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); @@ -208,28 +217,33 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override + @ApiOperation(value = "删除用户",notes = "根据UserInfoId 删除用户信息") public void deleteSysUserInfoById(Long id) { LOGGER.info("用户信息 SysUserInfo id:{}",id); sysUserInfoRDao.deleteById(id); } @Override + @ApiOperation(value = "删除用户-批量",notes = "根据UserInfoId 批量删除用户信息") public void deleteSysUserInfoByIds(Long[] ids) { LOGGER.info("用户信息 SysUserInfo ids:{}",ids); sysUserInfoRDao.deleteByIds(ids); } @Override + @ApiOperation(value = "查询用户信息",notes = "根据 UserInfoId查询用户信息") public SysUserInfo getSysUserInfoById(Long id) { return sysUserInfoRDao.getById(id); } @Override + @ApiOperation(value = "查询用户信息",notes = "查询所有用户信息") public List listSysUserInfo() { return sysUserInfoRDao.findAll(); } @Override + @ApiOperation(value = "查询用户信息",notes = "根据复杂查询条件查询用户信息(分页信息)") public ListPager querySysUserInfo(SysUserInfo userInfo, Pager pager) { LOGGER.info("定时任务 TASK_TIME TaskTime:{}，Pager:{}",userInfo,pager); if(userInfo == null) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index b85f967..6da8497 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -245,12 +245,15 @@ public class SysUserService implements ISysUserService { @ApiOperation(value = "删除账号", notes = "删除账号信息，逻辑删除，账号关系业务物理删除") public void deleteSysUserById(Long id) { LOGGER.debug("平台用户 SYS_USER DELETE By id :{}", id); - sysUserRDao.updateByProperties("id", id, "isValid", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + SysUser user = sysUserRDao.getById(id); + user.setIsValid(CommonEnumUtil.IS_VAILD.INVAILD.getValue()); + sysUserRDao.save(user); // 删除用户关系(物理删除) refUserRoleRDao.deleteByProperty("userId", id); // 删除用户角色关系 refUserDepartmentRDao.deleteByProperty("userId", id); //删除用户部门关系 refUserPositionRDao.deleteByProperty("userId", id); //删除用户部门关系 + sysUserInfoService.refreshUserInfoUserNum(user.getUserInfoId()); } @Override @@ -425,7 +428,7 @@ public class SysUserService implements ISysUserService { * @return */ @Override - @ApiOperation(value = "封装用户信息", notes = "封装用户信息") + @ApiOperation(value = "封装用户信息",notes = "封装登录完成后的用户信息(角色、权限、部门、组织、岗位)") public SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) { LOGGER.debug("平台用户 SYS_USER user id :{}", user.getId()); SysUserInfo userInfo = sysUserInfoRDao.getById(user.getUserInfoId());