diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/SystemMsg.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/SystemMsg.java index fdd01620..dfdb1560 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/SystemMsg.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/SystemMsg.java @@ -18,11 +18,10 @@ package org.opsli.modulars.system; import org.opsli.common.base.msg.BaseMsg; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.core.msg - * @Author: Parker - * @CreateTime: 2020-09-13 19:36 - * @Description: 核心类 - 消息 + * 系统 - 消息 + * + * @author Parker + * @date 2020-09-13 17:40 */ public enum SystemMsg implements BaseMsg { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/entity/SysArea.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/entity/SysArea.java index fe0afa1f..6d5e811d 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/entity/SysArea.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/entity/SysArea.java @@ -24,11 +24,10 @@ import lombok.EqualsAndHashCode; import org.opsli.core.base.entity.BaseEntity; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.system.area.entity - * @Author: Parker - * @CreateTime: 2020-11-28 18:59:59 - * @Description: 地域表 + * 地域表 + * + * @author Parker + * @date 2020-11-28 18:59:59 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/mapper/SysAreaMapper.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/mapper/SysAreaMapper.java index c2b2ef03..171808d6 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/mapper/SysAreaMapper.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/mapper/SysAreaMapper.java @@ -18,6 +18,7 @@ package org.opsli.modulars.system.area.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import lombok.Data; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.opsli.core.base.entity.HasChildren; @@ -26,20 +27,20 @@ import org.opsli.modulars.system.area.entity.SysArea; import java.util.List; /** -* @BelongsProject: opsli-boot -* @BelongsPackage: org.opsli.modulars.system.area.mapper -* @Author: Parker -* @CreateTime: 2020-11-28 18:59:59 -* @Description: 地域表 Mapper -*/ + * 地域表 Mapper + * + * @author Parker + * @date 2020-11-28 18:59:59 + */ @Mapper public interface SysAreaMapper extends BaseMapper { /** * 是否有下级 + * @param wrapper 查询器 * @return List */ - List hasChildren(@Param(Constants.WRAPPER) Wrapper wrapper); + List hasChildren(@Param(Constants.WRAPPER) Wrapper wrapper); } diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/service/ISysAreaService.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/service/ISysAreaService.java index c77f6088..9da07cc0 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/service/ISysAreaService.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/service/ISysAreaService.java @@ -24,18 +24,18 @@ import java.util.List; import java.util.Set; /** -* @BelongsProject: opsli-boot -* @BelongsPackage: org.opsli.modulars.system.area.service -* @Author: Parker -* @CreateTime: 2020-11-28 18:59:59 -* @Description: 地域表 Service -*/ + * 地域表 Service + * + * @author Parker + * @date 2020-11-28 18:59:59 + */ public interface ISysAreaService extends CrudServiceInterface { /** * 是否有下级 - * @return + * @param parentIds 父级节点集合 + * @return List */ List hasChildren(Set parentIds); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/service/impl/SysAreaServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/service/impl/SysAreaServiceImpl.java index c072fe2e..d04c3b6e 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/service/impl/SysAreaServiceImpl.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/service/impl/SysAreaServiceImpl.java @@ -47,6 +47,13 @@ import java.util.Set; * @CreateTime: 2020-11-28 18:59:59 * @Description: 地域表 Service Impl */ + +/** + * 地域表 Service Impl + * + * @author Parker + * @date 2020-11-28 18:59:59 + */ @Service public class SysAreaServiceImpl extends CrudServiceImpl implements ISysAreaService { @@ -117,8 +124,8 @@ public class SysAreaServiceImpl extends CrudServiceImpl { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/mapper/DictMapper.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/mapper/DictMapper.java index fcaf20e0..e1260acf 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/mapper/DictMapper.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/mapper/DictMapper.java @@ -20,11 +20,10 @@ import org.apache.ibatis.annotations.Mapper; import org.opsli.modulars.system.dict.entity.SysDict; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.mapper - * @Author: Parker - * @CreateTime: 2020-09-17 13:01 - * @Description: 数据字典 Mapper + * 数据字典 Mapper + * + * @author Parker + * @date 2020-09-16 17:33 */ @Mapper public interface DictMapper extends BaseMapper { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/IDictDetailService.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/IDictDetailService.java index a90b7934..3c069466 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/IDictDetailService.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/IDictDetailService.java @@ -22,18 +22,17 @@ import org.opsli.modulars.system.dict.entity.SysDictDetail; import java.util.List; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-17 13:07 - * @Description: 数据字典 明细 接口 + * 数据字典 明细 接口 + * + * @author Parker + * @date 2020-09-16 17:33 */ public interface IDictDetailService extends CrudServiceInterface { /** * 根据父类ID 删除 * @param parentId 父类ID - * @return + * @return boolean */ boolean delByParent(String parentId); @@ -41,7 +40,7 @@ public interface IDictDetailService extends CrudServiceInterface findListByTypeCode(String typeCode); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/IDictService.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/IDictService.java index a55cdc53..df3376da 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/IDictService.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/IDictService.java @@ -21,11 +21,10 @@ import org.opsli.modulars.system.dict.entity.SysDict; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-17 13:07 - * @Description: 数据字典 接口 + * 数据字典 接口 + * + * @author Parker + * @date 2020-09-16 17:33 */ public interface IDictService extends CrudServiceInterface { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java index 317f1d1b..6412e978 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java @@ -44,11 +44,10 @@ import java.util.*; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-16 17:34 - * @Description: 数据字典 明细 接口实现类 + * 数据字典 明细 接口实现类 + * + * @author Parker + * @date 2020-09-16 17:33 */ @Service public class DictDetailServiceImpl extends CrudServiceImpl implements IDictDetailService { @@ -61,7 +60,7 @@ public class DictDetailServiceImpl extends CrudServiceImpl findListByTypeCode(String typeCode) { @@ -321,7 +320,7 @@ public class DictDetailServiceImpl extends CrudServiceImpl typeCodeList) { // 删除缓存 diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictServiceImpl.java index 3b978da5..4bfec023 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictServiceImpl.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictServiceImpl.java @@ -37,11 +37,10 @@ import java.util.List; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-16 17:34 - * @Description: 数据字典 接口实现类 + * 数据字典 接口实现类 + * + * @author Parker + * @date 2020-09-16 17:33 */ @Service public class DictServiceImpl extends CrudServiceImpl implements IDictService { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictDetailRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictDetailRestController.java index efee3ca0..0f628c30 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictDetailRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictDetailRestController.java @@ -48,13 +48,11 @@ import javax.servlet.http.HttpServletResponse; import java.lang.reflect.Method; import java.util.List; - /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.web - * @Author: Parker - * @CreateTime: 2020-09-13 17:40 - * @Description: 数据字典明细 + * 数据字典明细 Controller + * + * @author Parker + * @date 2020-09-16 17:33 */ @Api(tags = DictDetailApi.TITLE) @Slf4j @@ -208,7 +206,6 @@ public class DictDetailRestController extends BaseRestController> findListByTypeCode(String typeCode) { return ResultVo.success(IService.findListByTypeCode(typeCode)); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictRestController.java index 2c3691e2..74ada4b5 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/web/DictRestController.java @@ -52,11 +52,10 @@ import java.util.List; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.web - * @Author: Parker - * @CreateTime: 2020-09-13 17:40 - * @Description: 数据字典 + * 数据字典 Controller + * + * @author Parker + * @date 2020-09-16 17:33 */ @Api(tags = DictApi.TITLE) @Slf4j @@ -209,7 +208,6 @@ public class DictRestController extends BaseRestController { /** * 清空一个月之前的数据 - * @return + * @param date 日期 + * @return boolean */ boolean emptyByOneMonth(Date date); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/service/ILogsService.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/service/ILogsService.java index 7de664e6..2c01356e 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/service/ILogsService.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/service/ILogsService.java @@ -21,17 +21,16 @@ import org.opsli.modulars.system.logs.entity.SysLogs; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-17 13:07 - * @Description: 角色 接口 + * 日志 Service + * + * @author Parker + * @date 2020-11-28 18:59:59 */ public interface ILogsService extends CrudServiceInterface { /** * 清空一个月之前的数据 - * @return + * @return boolean */ boolean emptyByOneMonth(); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/service/impl/LogsServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/service/impl/LogsServiceImpl.java index 5979f9db..06529e28 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/service/impl/LogsServiceImpl.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/service/impl/LogsServiceImpl.java @@ -29,11 +29,10 @@ import java.util.Date; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-16 17:34 - * @Description: 日志 接口实现类 + * 日志 Service Impl + * + * @author Parker + * @date 2020-11-28 18:59:59 */ @Service public class LogsServiceImpl extends CrudServiceImpl implements ILogsService { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/web/LogsRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/web/LogsRestController.java index 4dbb2afd..766d5cb3 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/web/LogsRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/logs/web/LogsRestController.java @@ -35,11 +35,10 @@ import javax.servlet.http.HttpServletRequest; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.web - * @Author: Parker - * @CreateTime: 2020-09-13 17:40 - * @Description: 系统日志 + * 日志 Controller + * + * @author Parker + * @date 2020-11-28 18:59:59 */ @Api(tags = LogsApi.TITLE) @Slf4j diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/entity/SysMenu.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/entity/SysMenu.java index 417acd4d..53eb13fb 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/entity/SysMenu.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/entity/SysMenu.java @@ -23,11 +23,10 @@ import lombok.EqualsAndHashCode; import org.opsli.core.base.entity.BaseEntity; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.entity - * @Author: Parker - * @CreateTime: 2020-09-16 17:33 - * @Description: 菜单表 + * 菜单表 + * + * @author Parker + * @date 2020-09-16 17:33 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/factory/MenuFactory.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/factory/MenuFactory.java index ae66f589..e273d048 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/factory/MenuFactory.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/factory/MenuFactory.java @@ -15,7 +15,7 @@ import java.util.List; * 菜单生成工厂 * * @author 周鹏程 - * @date 2021-05-04 7:15 下午 + * @date 2021-05-04 7:15 **/ public enum MenuFactory { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/mapper/MenuMapper.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/mapper/MenuMapper.java index 4e9d3ad0..65a6a283 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/mapper/MenuMapper.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/mapper/MenuMapper.java @@ -26,11 +26,10 @@ import org.opsli.modulars.system.menu.entity.SysMenu; import java.util.List; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.mapper - * @Author: Parker - * @CreateTime: 2020-09-17 13:01 - * @Description: 角色 Mapper + * 菜单表 Mapper + * + * @author Parker + * @date 2020-09-16 17:33 */ @Mapper public interface MenuMapper extends BaseMapper { @@ -40,7 +39,7 @@ public interface MenuMapper extends BaseMapper { * @param wrapper 条件查询器 * @return List */ - List hasChildren(@Param(Constants.WRAPPER) Wrapper wrapper); + List hasChildren(@Param(Constants.WRAPPER) Wrapper wrapper); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/service/IMenuService.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/service/IMenuService.java index 0ec453f3..01b2da1f 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/service/IMenuService.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/service/IMenuService.java @@ -26,11 +26,10 @@ import java.util.Set; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-17 13:07 - * @Description: 角色 接口 + * 菜单表 Service + * + * @author Parker + * @date 2020-09-16 17:33 */ public interface IMenuService extends CrudServiceInterface { @@ -60,7 +59,6 @@ public interface IMenuService extends CrudServiceInterface { /** * 保存完成菜单 * @param menu 菜单 - * @return boolean */ void saveMenuByFull(MenuFullModel menu); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/service/impl/MenuServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/service/impl/MenuServiceImpl.java index 94859008..4a577f43 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/service/impl/MenuServiceImpl.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/service/impl/MenuServiceImpl.java @@ -39,7 +39,6 @@ import org.opsli.modulars.system.menu.entity.SysMenu; import org.opsli.modulars.system.menu.factory.MenuFactory; import org.opsli.modulars.system.menu.mapper.MenuMapper; import org.opsli.modulars.system.menu.service.IMenuService; -import org.opsli.modulars.system.org.entity.SysOrg; import org.opsli.modulars.system.role.service.IRoleMenuRefService; import org.opsli.modulars.system.user.service.IUserRoleRefService; import org.springframework.beans.factory.annotation.Autowired; @@ -51,11 +50,10 @@ import java.util.Set; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-16 17:34 - * @Description: 角色 接口实现类 + * 菜单表 Service Impl + * + * @author Parker + * @date 2020-09-16 17:33 */ @Service public class MenuServiceImpl extends CrudServiceImpl implements IMenuService { @@ -268,8 +266,8 @@ public class MenuServiceImpl extends CrudServiceImpl getJVMInfo() { + public ResultVo getJvmInfo() { return ResultVo.success( SystemInfoUtil.INSTANCE.getJvmInfo()); } diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/entity/SysOptions.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/entity/SysOptions.java index 81300d18..026fce46 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/entity/SysOptions.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/entity/SysOptions.java @@ -26,11 +26,10 @@ import lombok.EqualsAndHashCode; import org.opsli.core.base.entity.BaseEntity; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.system.options.entity - * @Author: Parker - * @CreateTime: 2021-02-07 18:24:38 - * @Description: 系统参数 + * 系统参数 + * + * @author Parker + * @date 2021-02-07 18:24:38 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/mapper/SysOptionsMapper.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/mapper/SysOptionsMapper.java index 82d5ebbd..3ab67a6e 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/mapper/SysOptionsMapper.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/mapper/SysOptionsMapper.java @@ -25,12 +25,11 @@ import org.opsli.modulars.system.options.entity.SysOptions; /** -* @BelongsProject: opsli-boot -* @BelongsPackage: org.opsli.modulars.system.options.mapper -* @Author: Parker -* @CreateTime: 2021-02-07 18:24:38 -* @Description: 系统参数 Mapper -*/ + * 系统参数 Mapper + * + * @author Parker + * @date 2021-02-07 18:24:38 + */ @Mapper public interface SysOptionsMapper extends BaseMapper { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/service/ISysOptionsService.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/service/ISysOptionsService.java index ba5fe322..60215572 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/service/ISysOptionsService.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/service/ISysOptionsService.java @@ -28,17 +28,16 @@ import java.util.Map; /** -* @BelongsProject: opsli-boot -* @BelongsPackage: org.opsli.modulars.system.options.service -* @Author: Parker -* @CreateTime: 2021-02-07 18:24:38 -* @Description: 系统参数 Service -*/ + * 系统参数 Service + * + * @author Parker + * @date 2021-02-07 18:24:38 + */ public interface ISysOptionsService extends CrudServiceInterface { /** * 更新参数 - * @param params + * @param params 参数 */ void updateOptions(Map params); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/service/impl/SysOptionsServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/service/impl/SysOptionsServiceImpl.java index 7dc03a4f..f4ceb44d 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/service/impl/SysOptionsServiceImpl.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/service/impl/SysOptionsServiceImpl.java @@ -43,14 +43,12 @@ import java.util.Collections; import java.util.List; import java.util.Map; - /** -* @BelongsProject: opsli-boot -* @BelongsPackage: org.opsli.modulars.system.options.service.impl -* @Author: Parker -* @CreateTime: 2021-02-07 18:24:38 -* @Description: 系统参数 Service Impl -*/ + * 系统参数 Service Impl + * + * @author Parker + * @date 2021-02-07 18:24:38 + */ @Service public class SysOptionsServiceImpl extends CrudServiceImpl implements ISysOptionsService { @@ -268,7 +266,7 @@ public class SysOptionsServiceImpl extends CrudServiceImpl optionList){ // 清空缓存 diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/web/SysOptionsRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/web/SysOptionsRestController.java index 18b95938..47b0f38d 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/web/SysOptionsRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/web/SysOptionsRestController.java @@ -53,13 +53,11 @@ import java.util.Map; /** -* @BelongsProject: opsli-boot -* @BelongsPackage: org.opsli.modulars.system.options.web -* @CreateTime: 2021-02-07 18:24:38 -* @Description: 系统参数 Controller -* -* @author Parker -*/ + * 系统参数 Controller + * + * @author Parker + * @date 2021-02-07 18:24:38 + */ @Api(tags = OptionsApi.TITLE) @Slf4j @ApiRestController("/system/options") @@ -257,7 +255,6 @@ public class SysOptionsRestController extends BaseRestController getByCode(String optionCode) { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/entity/SysOrg.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/entity/SysOrg.java index 38a34787..4de9e57d 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/entity/SysOrg.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/entity/SysOrg.java @@ -24,11 +24,10 @@ import lombok.EqualsAndHashCode; import org.opsli.core.base.entity.BaseEntity; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.system.org.entity - * @Author: Parker - * @CreateTime: 2020-11-28 18:59:59 - * @Description: 组织机构表 + * 组织机构表 + * + * @author Parker + * @date 2021-02-07 18:24:38 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/mapper/SysOrgMapper.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/mapper/SysOrgMapper.java index a6fc08d5..ad40c5a5 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/mapper/SysOrgMapper.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/mapper/SysOrgMapper.java @@ -26,12 +26,11 @@ import org.opsli.modulars.system.org.entity.SysOrg; import java.util.List; /** -* @BelongsProject: opsli-boot -* @BelongsPackage: org.opsli.modulars.system.org.mapper -* @Author: Parker -* @CreateTime: 2020-11-28 18:59:59 -* @Description: 组织机构表 Mapper -*/ + * 组织机构 Mapper + * + * @author Parker + * @date 2021-02-07 18:24:38 + */ @Mapper public interface SysOrgMapper extends BaseMapper { @@ -41,13 +40,14 @@ public interface SysOrgMapper extends BaseMapper { * @param wrapper 条件查询器 * @return List */ - List hasChildren(@Param(Constants.WRAPPER) Wrapper wrapper); + List hasChildren(@Param(Constants.WRAPPER) Wrapper wrapper); /** * 是否被引用 + * @param wrapper 条件查询器 * @return Integer */ - Integer hasUse(@Param(Constants.WRAPPER) Wrapper wrapper); + Integer hasUse(@Param(Constants.WRAPPER) Wrapper wrapper); } diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/service/ISysOrgService.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/service/ISysOrgService.java index 48330a7e..1ab92fe8 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/service/ISysOrgService.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/service/ISysOrgService.java @@ -26,12 +26,11 @@ import java.util.List; import java.util.Set; /** -* @BelongsProject: opsli-boot -* @BelongsPackage: org.opsli.modulars.system.org.service -* @Author: Parker -* @CreateTime: 2020-11-28 18:59:59 -* @Description: 组织机构表 Service -*/ + * 组织机构 Service + * + * @author Parker + * @date 2021-02-07 18:24:38 + */ public interface ISysOrgService extends CrudServiceInterface { /** diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/service/impl/SysOrgServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/service/impl/SysOrgServiceImpl.java index bc65cc2f..ceba1ba6 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/service/impl/SysOrgServiceImpl.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/service/impl/SysOrgServiceImpl.java @@ -47,12 +47,11 @@ import java.util.Set; /** -* @BelongsProject: opsli-boot -* @BelongsPackage: org.opsli.modulars.system.org.service.impl -* @Author: Parker -* @CreateTime: 2020-11-28 18:59:59 -* @Description: 组织机构表 Service Impl -*/ + * 组织机构 Service Impl + * + * @author Parker + * @date 2021-02-07 18:24:38 + */ @Service public class SysOrgServiceImpl extends CrudServiceImpl implements ISysOrgService { @@ -152,7 +151,6 @@ public class SysOrgServiceImpl extends CrudServiceImpl { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/mapper/RoleMenuRefMapper.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/mapper/RoleMenuRefMapper.java index 25f2bc54..8aa4c4bd 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/mapper/RoleMenuRefMapper.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/mapper/RoleMenuRefMapper.java @@ -23,19 +23,18 @@ import org.opsli.modulars.system.role.entity.SysRoleMenuRef; import java.util.List; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.mapper - * @Author: Parker - * @CreateTime: 2020-09-17 13:01 - * @Description: 角色 Mapper + * 角色 - 菜单 Mapper + * + * @author Parker + * @date 2020-09-16 17:33 */ @Mapper public interface RoleMenuRefMapper extends BaseMapper { /** * 根据角色ID 获得权限(包含菜单) - * @param roleId - * @return + * @param roleId 角色ID + * @return List */ List queryAllPerms(String roleId); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/IRoleMenuRefService.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/IRoleMenuRefService.java index db790b8c..f922901d 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/IRoleMenuRefService.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/IRoleMenuRefService.java @@ -20,26 +20,25 @@ import org.opsli.modulars.system.menu.entity.SysMenu; import java.util.List; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-17 13:07 - * @Description: 角色-菜单 接口 + * 角色-菜单 Service + * + * @author Parker + * @date 2020-09-17 13:07 */ public interface IRoleMenuRefService { /** * 根据角色ID 获得权限(包含菜单) - * @param roleId - * @return + * @param roleId 角色ID + * @return List */ List getPerms(String roleId); /** * 保存权限 - * @param roleId - * @param permsIds - * @return + * @param roleId 角色ID + * @param permsIds 权限集合 + * @return boolean */ boolean setPerms(String roleId,String[] permsIds); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/IRoleService.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/IRoleService.java index 39352c0f..e3020898 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/IRoleService.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/IRoleService.java @@ -21,11 +21,10 @@ import org.opsli.modulars.system.role.entity.SysRole; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-17 13:07 - * @Description: 角色 接口 + * 角色 Service + * + * @author Parker + * @date 2020-09-17 13:07 */ public interface IRoleService extends CrudServiceInterface { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/impl/RoleMenuRefServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/impl/RoleMenuRefServiceImpl.java index 48ebb49f..439fdd12 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/impl/RoleMenuRefServiceImpl.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/impl/RoleMenuRefServiceImpl.java @@ -38,11 +38,10 @@ import java.util.List; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-16 17:34 - * @Description: 角色 接口实现类 + * 角色 - 菜单 Service Impl + * + * @author Parker + * @date 2020-09-17 13:07 */ @Service public class RoleMenuRefServiceImpl extends ServiceImpl implements IRoleMenuRefService { @@ -106,7 +105,7 @@ public class RoleMenuRefServiceImpl extends ServiceImpl implements IRoleService { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleMenuRefRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleMenuRefRestController.java index 897265df..4c6ebbc9 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleMenuRefRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleMenuRefRestController.java @@ -43,11 +43,10 @@ import java.util.stream.Collectors; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.web - * @Author: Parker - * @CreateTime: 2020-09-13 17:40 - * @Description: 角色权限 + * 角色权限 Controller + * + * @author Parker + * @date 2020-09-16 17:33 */ @Api(tags = RoleMenuRefApi.TITLE) @Slf4j @@ -101,8 +100,7 @@ public class RoleMenuRefRestController implements RoleMenuRefApi { /** * 设置权限 - * @param model roleId 角色Id - * @param model permsIds 权限Id 数组 + * @param model 模型 * @return ResultVo */ @RequiresPermissions("system_role_setPerms") diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleRestController.java index dde40e2b..84b8e3c2 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/web/RoleRestController.java @@ -50,11 +50,10 @@ import java.util.List; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.web - * @Author: Parker - * @CreateTime: 2020-09-13 17:40 - * @Description: 角色管理 + * 角色管理 Controller + * + * @author Parker + * @date 2020-09-16 17:33 */ @Api(tags = "角色管理") @Slf4j @@ -216,7 +215,6 @@ public class RoleRestController extends BaseRestController { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/service/ITenantService.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/service/ITenantService.java index 64628d75..9c8ed5b7 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/service/ITenantService.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/service/ITenantService.java @@ -21,11 +21,10 @@ import org.opsli.modulars.system.tenant.entity.SysTenant; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.system.service - * @Author: Parker - * @CreateTime: 2020-09-17 13:07 - * @Description: 租户 接口 + * 租户 Service + * + * @author Parker + * @date 2020-09-16 17:33 */ public interface ITenantService extends CrudServiceInterface { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/service/impl/TenantServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/service/impl/TenantServiceImpl.java index de8d1e39..592fe461 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/service/impl/TenantServiceImpl.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/service/impl/TenantServiceImpl.java @@ -46,13 +46,11 @@ import java.util.Collection; import java.util.Collections; import java.util.List; - /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.system.service - * @Author: Parker - * @CreateTime: 2020-09-16 17:34 - * @Description: 租户 接口实现类 + * 租户 Service Impl + * + * @author Parker + * @date 2020-09-16 17:33 */ @Service public class TenantServiceImpl extends CrudServiceImpl implements ITenantService { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/web/TenantRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/web/TenantRestController.java index 181afddc..d129e4c7 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/web/TenantRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/web/TenantRestController.java @@ -48,11 +48,10 @@ import java.lang.reflect.Method; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.system.web - * @Author: Parker - * @CreateTime: 2020-09-13 17:40 - * @Description: 租户管理 + * 租户管理 Controller + * + * @author Parker + * @date 2020-09-16 17:33 */ @Api(tags = TenantApi.TITLE) @Slf4j @@ -192,7 +191,6 @@ public class TenantRestController extends BaseRestController { @@ -40,64 +39,65 @@ public interface UserMapper extends BaseMapper { /** * 根据用户ID 获得当前角色编码集合 - * @param userId - * @return + * @param userId 用户ID + * @return List */ List getRoleCodeList(String userId); /** * 根据用户ID 获得当前角色Id集合 - * @param userId - * @return + * @param userId 用户ID + * @return List */ List getRoleIdList(String userId); /** * 根据用户ID 获得权限 - * @param userId - * @return + * @param userId 用户ID + * @return List */ List queryAllPerms(String userId); /** * 根据用户ID 获得菜单集合 - * @param userId - * @return + * @param userId 用户ID + * @return List */ List findMenuListByUserId(String userId); /** * 根据用户ID 获得全部菜单集合 - * @param userId - * @return + * @param userId 用户ID + * @return List */ List findMenuAllListByUserId(String userId); /** * 修改密码 - * @param userPassword - * @return + * @param userPassword 账号密码 + * @return boolean */ boolean updatePassword(UserPassword userPassword); /** * 更新用户最后登录IP - * @param entity - * @return + * @param entity Entity + * @return boolean */ boolean updateLoginIp(SysUser entity); /** * 更新用户头像 - * @param entity - * @return + * @param entity Entity + * @return boolean */ boolean updateAvatar(SysUser entity); /** * 查询集合 - * @return + * @param wrapper 条件查询器 + * @return List */ - List findList(@Param(Constants.WRAPPER) Wrapper wrapper); + List findList(@Param(Constants.WRAPPER) Wrapper wrapper); } diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/UserOrgRefMapper.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/UserOrgRefMapper.java index babadd2e..17e8af18 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/UserOrgRefMapper.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/UserOrgRefMapper.java @@ -21,11 +21,10 @@ import org.opsli.modulars.system.user.entity.SysUserOrgRef; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.mapper - * @Author: Parker - * @CreateTime: 2020-09-17 13:01 - * @Description: 用户组织 Mapper + * 用户组织 Mapper + * + * @author Parker + * @date 2020-09-16 17:33 */ @Mapper public interface UserOrgRefMapper extends BaseMapper { diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/UserRoleRefMapper.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/UserRoleRefMapper.java index 47116463..cb3c6c0a 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/UserRoleRefMapper.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/UserRoleRefMapper.java @@ -22,26 +22,25 @@ import org.opsli.modulars.system.user.entity.SysUserRoleRef; import java.util.List; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.mapper - * @Author: Parker - * @CreateTime: 2020-09-17 13:01 - * @Description: 用户角色 Mapper + * 用户角色 Mapper + * + * @author Parker + * @date 2020-09-16 17:33 */ @Mapper public interface UserRoleRefMapper extends BaseMapper { /** * 根据角色ID 获得当前用户Id集合 - * @param roleId - * @return + * @param roleId 角色ID + * @return List */ List getUserIdListByRoleId(String roleId); /** * 根据菜单ID 获得当前用户Id集合 - * @param menuId - * @return + * @param menuId 菜单ID + * @return List */ List getUserIdListByMenuId(String menuId); } diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/IUserOrgRefService.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/IUserOrgRefService.java index 21138175..cb5fc1b0 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/IUserOrgRefService.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/IUserOrgRefService.java @@ -20,19 +20,18 @@ import org.opsli.api.wrapper.system.user.UserOrgRefModel; import java.util.List; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-17 13:07 - * @Description: 用户-组织 接口 + * 用户-组织 Service + * + * @author Parker + * @date 2020-09-16 17:33 */ public interface IUserOrgRefService { /** * 保存组织 - * @param model - * @return + * @param model 模型 + * @return boolean */ boolean setOrg(UserOrgRefModel model); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/IUserRoleRefService.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/IUserRoleRefService.java index c62aad46..f0e9d90e 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/IUserRoleRefService.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/IUserRoleRefService.java @@ -18,33 +18,32 @@ package org.opsli.modulars.system.user.service; import java.util.List; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-17 13:07 - * @Description: 用户-角色 接口 + * 用户-角色 Service + * + * @author Parker + * @date 2020-09-16 17:33 */ public interface IUserRoleRefService { /** * 根据角色ID 获得当前用户Id集合 - * @param roleId - * @return + * @param roleId 角色ID + * @return List */ List getUserIdListByRoleId(String roleId); /** * 根据菜单ID 获得当前用户Id集合 - * @param roleId - * @return + * @param roleId 角色ID + * @return List */ List getUserIdListByMenuId(String roleId); /** * 保存角色 - * @param userId - * @param roleIds - * @return + * @param userId 用户ID + * @param roleIds 角色ID 集合 + * @return boolean */ boolean setRoles(String userId,String[] roleIds); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/IUserService.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/IUserService.java index fb7561ba..d9a89864 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/IUserService.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/IUserService.java @@ -15,7 +15,6 @@ */ package org.opsli.modulars.system.user.service; -import org.apache.poi.ss.formula.functions.T; import org.opsli.api.wrapper.system.menu.MenuModel; import org.opsli.api.wrapper.system.user.UserAndOrgModel; import org.opsli.api.wrapper.system.user.UserModel; @@ -29,84 +28,83 @@ import java.util.List; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-17 13:07 - * @Description: 用户 接口 + * 用户信息 Service + * + * @author Parker + * @date 2020-09-16 17:33 */ public interface IUserService extends CrudServiceInterface { /** * 根据 用户名 获得当前用户 - * @param username - * @return + * @param username 用户名 + * @return UserModel */ UserModel queryByUserName(String username); /** * 根据用户ID 获得当前角色编码集合 - * @param userId - * @return + * @param userId 用户ID + * @return List */ List getRoleCodeList(String userId); /** * 根据用户ID 获得当前角色Id集合 - * @param userId - * @return + * @param userId 用户ID + * @return List */ List getRoleIdList(String userId); /** * 根据用户ID 获得权限 - * @param userId - * @return + * @param userId 用户ID + * @return List */ List getAllPerms(String userId); /** * 根据用户ID 获得菜单集合 - * @param userId - * @return + * @param userId 用户ID + * @return List */ List getMenuListByUserId(String userId); /** * 根据用户ID 获得全部菜单集合 - * @param userId - * @return + * @param userId 用户ID + * @return List */ List getMenuAllListByUserId(String userId); /** * 修改密码 - * @param userPassword - * @return + * @param userPassword 账户密码 + * @return boolean */ boolean updatePassword(UserPassword userPassword); /** * 重置密码 - * @param userPassword - * @return + * @param userPassword 账户密码 + * @return boolean */ boolean resetPassword(UserPassword userPassword); /** * 更新用户最后登录IP - * @param model - * @return + * @param model 模型 + * @return boolean */ boolean updateLoginIp(UserModel model); /** * 更新用户头像 - * @param model - * @return + * @param model 模型 + * @return boolean */ boolean updateAvatar(UserModel model); @@ -115,13 +113,13 @@ public interface IUserService extends CrudServiceInterface { * 变更账户状态 * @param userId 用户ID * @param enable 状态 - * @return + * @return boolean */ boolean enableAccount(String userId, String enable); /** * 查询分页数据 自定义 - * + * @param page 分页 * @return Page */ Page findPageByCus(Page page); diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserOrgRefServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserOrgRefServiceImpl.java index 096b313c..c9cd359c 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserOrgRefServiceImpl.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserOrgRefServiceImpl.java @@ -37,11 +37,10 @@ import java.util.List; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-16 17:34 - * @Description: 角色 接口实现类 + * 用户-组织 Service Impl + * + * @author Parker + * @date 2020-09-16 17:33 */ @Service public class UserOrgRefServiceImpl extends ServiceImpl implements IUserOrgRefService { @@ -107,7 +106,7 @@ public class UserOrgRefServiceImpl extends ServiceImpl userIds){ // 清空缓存 diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserRoleRefServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserRoleRefServiceImpl.java index 22d5a415..e80a1b2d 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserRoleRefServiceImpl.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserRoleRefServiceImpl.java @@ -35,13 +35,11 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; - /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.service - * @Author: Parker - * @CreateTime: 2020-09-16 17:34 - * @Description: 角色 接口实现类 + * 用户-角色 Service Impl + * + * @author Parker + * @date 2020-09-16 17:33 */ @Service public class UserRoleRefServiceImpl extends ServiceImpl implements IUserRoleRefService { @@ -107,7 +105,7 @@ public class UserRoleRefServiceImpl extends ServiceImpl implements IUserService { @@ -653,8 +652,8 @@ public class UserServiceImpl extends CrudServiceImpl list){ if(CollUtil.isNotEmpty(list)){ diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserOrgRefRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserOrgRefRestController.java index fdc17455..94acb488 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserOrgRefRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserOrgRefRestController.java @@ -32,13 +32,11 @@ import org.opsli.modulars.system.SystemMsg; import org.opsli.modulars.system.user.service.IUserOrgRefService; import org.springframework.beans.factory.annotation.Autowired; - /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.web - * @Author: Parker - * @CreateTime: 2020-09-13 17:40 - * @Description: 用户组织 + * 用户-组织 Controller + * + * @author Parker + * @date 2020-09-16 17:33 */ @Api(tags = UserOrgRefApi.TITLE) @Slf4j @@ -55,7 +53,7 @@ public class UserOrgRefRestController implements UserOrgRefApi { /** * 设置组织 - * @param model + * @param model 模型 * @return ResultVo */ @Override diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java index ea6861dd..f26689a3 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java @@ -75,11 +75,10 @@ import java.util.Map; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.web - * @Author: Parker - * @CreateTime: 2020-09-13 17:40 - * @Description: 用户信息 + * 用户管理 Controller + * + * @author Parker + * @date 2020-09-16 17:33 */ @Api(tags = UserApi.TITLE) @Slf4j diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRoleRefRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRoleRefRestController.java index e39aac36..ecfcfe39 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRoleRefRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRoleRefRestController.java @@ -34,11 +34,10 @@ import org.springframework.beans.factory.annotation.Autowired; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.modulars.test.web - * @Author: Parker - * @CreateTime: 2020-09-13 17:40 - * @Description: 用户角色 + * 用户-角色 Controller + * + * @author Parker + * @date 2020-09-16 17:33 */ @Api(tags = UserRoleRefApi.TITLE) @Slf4j @@ -55,8 +54,7 @@ public class UserRoleRefRestController implements UserRoleRefApi { /** * 设置角色 - * @param model userId 用户Id - * @param model roleIds 角色Id 数组 + * @param model 模型 * @return ResultVo */ @Override diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/email/web/EmailRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/email/web/EmailRestController.java index f50beb5f..31d59f43 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/email/web/EmailRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/email/web/EmailRestController.java @@ -13,11 +13,10 @@ import org.springframework.web.bind.annotation.RequestBody; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.plugins.email.web - * @Author: Parker - * @CreateTime: 2020-09-13 17:40 - * @Description: 邮件 Controller + * 邮件 Controller + * + * @author Parker + * @date 2020-09-13 17:40 */ @Api(tags = "邮件类") @Slf4j diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/oss/web/OssRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/oss/web/OssRestController.java index 2fcc8b4f..5e74be3f 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/oss/web/OssRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/oss/web/OssRestController.java @@ -6,11 +6,10 @@ import org.opsli.common.annotation.ApiRestController; /** - * @BelongsProject: opsli-boot - * @BelongsPackage: org.opsli.plugins.oss.web - * @Author: Parker - * @CreateTime: 2020-09-13 17:40 - * @Description: 文件管理类 Controller + * 文件管理 Controller + * + * @author Parker + * @date 2020-09-13 17:40 */ @Api(tags = "文件管理类") @Slf4j diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/searchhis/web/SearchHisRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/searchhis/web/SearchHisRestController.java index 15fa1cc1..86678f59 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/searchhis/web/SearchHisRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/tools/searchhis/web/SearchHisRestController.java @@ -33,7 +33,6 @@ import java.util.Set; * * @author parker * @date 2020-05-23 13:30 - ** */ @Api(tags = "搜索历史记录") @Slf4j diff --git a/opsli-modulars/opsli-modulars-system/src/test/java/LimiterTest.java b/opsli-modulars/opsli-modulars-system/src/test/java/LimiterTest.java index df0bebdb..ee45d3af 100644 --- a/opsli-modulars/opsli-modulars-system/src/test/java/LimiterTest.java +++ b/opsli-modulars/opsli-modulars-system/src/test/java/LimiterTest.java @@ -6,11 +6,10 @@ import org.opsli.common.thread.refuse.AsyncProcessQueueReFuse; import java.util.Map; /** - * @BelongsProject: think-bboss-parent - * @BelongsPackage: PACKAGE_NAME - * @Author: Parker - * @CreateTime: 2021-01-05 17:17 - * @Description: 限流器测试 + * 限流器测试 + * + * @author Parker + * @date 2021-01-05 17:17 */ public class LimiterTest {