From 12aecbea0577056e837aa1bd90a60251f17148be Mon Sep 17 00:00:00 2001 From: xiangwb Date: Wed, 15 Nov 2017 16:51:03 +0800 Subject: [PATCH] merge --- .../{ => sys}/SysAuthorityRepository.java | 2 +- .../{ => sys}/SysConfigRepository.java | 2 +- .../{ => sys}/SysRoleAuthorityRepository.java | 2 +- .../{ => sys}/SysRoleRepository.java | 2 +- .../SysUserLoginInOutRepository.java | 2 +- .../{ => sys}/SysUserRepository.java | 2 +- .../{ => sys}/SysUserRoleRepository.java | 2 +- .../{ => sys}/SysAuthorityService.java | 4 +- .../service/{ => sys}/SysConfigService.java | 4 +- .../{ => sys}/SysRoleAuthorityService.java | 4 +- .../service/{ => sys}/SysRoleService.java | 4 +- .../{ => sys}/SysUserLoginInOutService.java | 4 +- .../service/{ => sys}/SysUserRoleService.java | 4 +- .../service/{ => sys}/SysUserService.java | 4 +- .../xwbing/controller/MailTestControl.java | 5 + .../controller/SysAuthorityControl.java | 100 --------- .../xwbing/controller/SysConfigControl.java | 107 ---------- .../com/xwbing/controller/SysRoleControl.java | 117 ---------- .../com/xwbing/controller/SysUserControl.java | 199 ------------------ .../controller/SysUserLoginInOutControl.java | 36 ---- 20 files changed, 26 insertions(+), 580 deletions(-) rename boot-service/src/main/java/com/xwbing/repository/{ => sys}/SysAuthorityRepository.java (95%) rename boot-service/src/main/java/com/xwbing/repository/{ => sys}/SysConfigRepository.java (91%) rename boot-service/src/main/java/com/xwbing/repository/{ => sys}/SysRoleAuthorityRepository.java (91%) rename boot-service/src/main/java/com/xwbing/repository/{ => sys}/SysRoleRepository.java (93%) rename boot-service/src/main/java/com/xwbing/repository/{ => sys}/SysUserLoginInOutRepository.java (91%) rename boot-service/src/main/java/com/xwbing/repository/{ => sys}/SysUserRepository.java (90%) rename boot-service/src/main/java/com/xwbing/repository/{ => sys}/SysUserRoleRepository.java (91%) rename boot-service/src/main/java/com/xwbing/service/{ => sys}/SysAuthorityService.java (98%) rename boot-service/src/main/java/com/xwbing/service/{ => sys}/SysConfigService.java (97%) rename boot-service/src/main/java/com/xwbing/service/{ => sys}/SysRoleAuthorityService.java (96%) rename boot-service/src/main/java/com/xwbing/service/{ => sys}/SysRoleService.java (98%) rename boot-service/src/main/java/com/xwbing/service/{ => sys}/SysUserLoginInOutService.java (96%) rename boot-service/src/main/java/com/xwbing/service/{ => sys}/SysUserRoleService.java (96%) rename boot-service/src/main/java/com/xwbing/service/{ => sys}/SysUserService.java (99%) delete mode 100644 boot-web/src/main/java/com/xwbing/controller/SysAuthorityControl.java delete mode 100644 boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java delete mode 100644 boot-web/src/main/java/com/xwbing/controller/SysRoleControl.java delete mode 100644 boot-web/src/main/java/com/xwbing/controller/SysUserControl.java delete mode 100644 boot-web/src/main/java/com/xwbing/controller/SysUserLoginInOutControl.java diff --git a/boot-service/src/main/java/com/xwbing/repository/SysAuthorityRepository.java b/boot-service/src/main/java/com/xwbing/repository/sys/SysAuthorityRepository.java similarity index 95% rename from boot-service/src/main/java/com/xwbing/repository/SysAuthorityRepository.java rename to boot-service/src/main/java/com/xwbing/repository/sys/SysAuthorityRepository.java index f928443..6d2ae01 100644 --- a/boot-service/src/main/java/com/xwbing/repository/SysAuthorityRepository.java +++ b/boot-service/src/main/java/com/xwbing/repository/sys/SysAuthorityRepository.java @@ -1,4 +1,4 @@ -package com.xwbing.repository; +package com.xwbing.repository.sys; import com.xwbing.entity.SysAuthority; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/boot-service/src/main/java/com/xwbing/repository/SysConfigRepository.java b/boot-service/src/main/java/com/xwbing/repository/sys/SysConfigRepository.java similarity index 91% rename from boot-service/src/main/java/com/xwbing/repository/SysConfigRepository.java rename to boot-service/src/main/java/com/xwbing/repository/sys/SysConfigRepository.java index 4814289..abf00b7 100644 --- a/boot-service/src/main/java/com/xwbing/repository/SysConfigRepository.java +++ b/boot-service/src/main/java/com/xwbing/repository/sys/SysConfigRepository.java @@ -1,4 +1,4 @@ -package com.xwbing.repository; +package com.xwbing.repository.sys; import com.xwbing.entity.SysConfig; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/boot-service/src/main/java/com/xwbing/repository/SysRoleAuthorityRepository.java b/boot-service/src/main/java/com/xwbing/repository/sys/SysRoleAuthorityRepository.java similarity index 91% rename from boot-service/src/main/java/com/xwbing/repository/SysRoleAuthorityRepository.java rename to boot-service/src/main/java/com/xwbing/repository/sys/SysRoleAuthorityRepository.java index ddaa709..9a82fa7 100644 --- a/boot-service/src/main/java/com/xwbing/repository/SysRoleAuthorityRepository.java +++ b/boot-service/src/main/java/com/xwbing/repository/sys/SysRoleAuthorityRepository.java @@ -1,4 +1,4 @@ -package com.xwbing.repository; +package com.xwbing.repository.sys; import com.xwbing.entity.SysRoleAuthority; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/boot-service/src/main/java/com/xwbing/repository/SysRoleRepository.java b/boot-service/src/main/java/com/xwbing/repository/sys/SysRoleRepository.java similarity index 93% rename from boot-service/src/main/java/com/xwbing/repository/SysRoleRepository.java rename to boot-service/src/main/java/com/xwbing/repository/sys/SysRoleRepository.java index 405a155..a660730 100644 --- a/boot-service/src/main/java/com/xwbing/repository/SysRoleRepository.java +++ b/boot-service/src/main/java/com/xwbing/repository/sys/SysRoleRepository.java @@ -1,4 +1,4 @@ -package com.xwbing.repository; +package com.xwbing.repository.sys; import com.xwbing.entity.SysRole; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/boot-service/src/main/java/com/xwbing/repository/SysUserLoginInOutRepository.java b/boot-service/src/main/java/com/xwbing/repository/sys/SysUserLoginInOutRepository.java similarity index 91% rename from boot-service/src/main/java/com/xwbing/repository/SysUserLoginInOutRepository.java rename to boot-service/src/main/java/com/xwbing/repository/sys/SysUserLoginInOutRepository.java index f2df019..99fb9e1 100644 --- a/boot-service/src/main/java/com/xwbing/repository/SysUserLoginInOutRepository.java +++ b/boot-service/src/main/java/com/xwbing/repository/sys/SysUserLoginInOutRepository.java @@ -1,4 +1,4 @@ -package com.xwbing.repository; +package com.xwbing.repository.sys; import com.xwbing.entity.SysUserLoginInOut; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/boot-service/src/main/java/com/xwbing/repository/SysUserRepository.java b/boot-service/src/main/java/com/xwbing/repository/sys/SysUserRepository.java similarity index 90% rename from boot-service/src/main/java/com/xwbing/repository/SysUserRepository.java rename to boot-service/src/main/java/com/xwbing/repository/sys/SysUserRepository.java index 0cdd4f9..187e1ff 100644 --- a/boot-service/src/main/java/com/xwbing/repository/SysUserRepository.java +++ b/boot-service/src/main/java/com/xwbing/repository/sys/SysUserRepository.java @@ -1,4 +1,4 @@ -package com.xwbing.repository; +package com.xwbing.repository.sys; import com.xwbing.entity.SysUser; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/boot-service/src/main/java/com/xwbing/repository/SysUserRoleRepository.java b/boot-service/src/main/java/com/xwbing/repository/sys/SysUserRoleRepository.java similarity index 91% rename from boot-service/src/main/java/com/xwbing/repository/SysUserRoleRepository.java rename to boot-service/src/main/java/com/xwbing/repository/sys/SysUserRoleRepository.java index 7485930..5e41324 100644 --- a/boot-service/src/main/java/com/xwbing/repository/SysUserRoleRepository.java +++ b/boot-service/src/main/java/com/xwbing/repository/sys/SysUserRoleRepository.java @@ -1,4 +1,4 @@ -package com.xwbing.repository; +package com.xwbing.repository.sys; import com.xwbing.entity.SysUserRole; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/boot-service/src/main/java/com/xwbing/service/SysAuthorityService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysAuthorityService.java similarity index 98% rename from boot-service/src/main/java/com/xwbing/service/SysAuthorityService.java rename to boot-service/src/main/java/com/xwbing/service/sys/SysAuthorityService.java index 98f288d..9f12bb6 100644 --- a/boot-service/src/main/java/com/xwbing/service/SysAuthorityService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysAuthorityService.java @@ -1,11 +1,11 @@ -package com.xwbing.service; +package com.xwbing.service.sys; import com.xwbing.constant.CommonConstant; import com.xwbing.entity.SysAuthority; import com.xwbing.entity.SysRoleAuthority; import com.xwbing.entity.vo.SysAuthVo; import com.xwbing.exception.BusinessException; -import com.xwbing.repository.SysAuthorityRepository; +import com.xwbing.repository.sys.SysAuthorityRepository; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; import org.apache.commons.collections.CollectionUtils; diff --git a/boot-service/src/main/java/com/xwbing/service/SysConfigService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysConfigService.java similarity index 97% rename from boot-service/src/main/java/com/xwbing/service/SysConfigService.java rename to boot-service/src/main/java/com/xwbing/service/sys/SysConfigService.java index 8583093..1befe25 100644 --- a/boot-service/src/main/java/com/xwbing/service/SysConfigService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysConfigService.java @@ -1,8 +1,8 @@ -package com.xwbing.service; +package com.xwbing.service.sys; import com.xwbing.entity.SysConfig; import com.xwbing.exception.BusinessException; -import com.xwbing.repository.SysConfigRepository; +import com.xwbing.repository.sys.SysConfigRepository; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; import org.slf4j.Logger; diff --git a/boot-service/src/main/java/com/xwbing/service/SysRoleAuthorityService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysRoleAuthorityService.java similarity index 96% rename from boot-service/src/main/java/com/xwbing/service/SysRoleAuthorityService.java rename to boot-service/src/main/java/com/xwbing/service/sys/SysRoleAuthorityService.java index 3461e0b..f4e23e3 100644 --- a/boot-service/src/main/java/com/xwbing/service/SysRoleAuthorityService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysRoleAuthorityService.java @@ -1,7 +1,7 @@ -package com.xwbing.service; +package com.xwbing.service.sys; import com.xwbing.entity.SysRoleAuthority; -import com.xwbing.repository.SysRoleAuthorityRepository; +import com.xwbing.repository.sys.SysRoleAuthorityRepository; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; import org.apache.commons.collections.CollectionUtils; diff --git a/boot-service/src/main/java/com/xwbing/service/SysRoleService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysRoleService.java similarity index 98% rename from boot-service/src/main/java/com/xwbing/service/SysRoleService.java rename to boot-service/src/main/java/com/xwbing/service/sys/SysRoleService.java index d9710af..b754ddd 100644 --- a/boot-service/src/main/java/com/xwbing/service/SysRoleService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysRoleService.java @@ -1,10 +1,10 @@ -package com.xwbing.service; +package com.xwbing.service.sys; import com.xwbing.entity.SysRole; import com.xwbing.entity.SysRoleAuthority; import com.xwbing.entity.SysUserRole; import com.xwbing.exception.BusinessException; -import com.xwbing.repository.SysRoleRepository; +import com.xwbing.repository.sys.SysRoleRepository; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; import org.apache.commons.collections.CollectionUtils; diff --git a/boot-service/src/main/java/com/xwbing/service/SysUserLoginInOutService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysUserLoginInOutService.java similarity index 96% rename from boot-service/src/main/java/com/xwbing/service/SysUserLoginInOutService.java rename to boot-service/src/main/java/com/xwbing/service/sys/SysUserLoginInOutService.java index f88e607..9dcaec5 100644 --- a/boot-service/src/main/java/com/xwbing/service/SysUserLoginInOutService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysUserLoginInOutService.java @@ -1,9 +1,9 @@ -package com.xwbing.service; +package com.xwbing.service.sys; import com.xwbing.constant.CommonEnum; import com.xwbing.entity.SysUser; import com.xwbing.entity.SysUserLoginInOut; -import com.xwbing.repository.SysUserLoginInOutRepository; +import com.xwbing.repository.sys.SysUserLoginInOutRepository; import com.xwbing.util.DateUtil2; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; diff --git a/boot-service/src/main/java/com/xwbing/service/SysUserRoleService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysUserRoleService.java similarity index 96% rename from boot-service/src/main/java/com/xwbing/service/SysUserRoleService.java rename to boot-service/src/main/java/com/xwbing/service/sys/SysUserRoleService.java index 8d00274..40d2e67 100644 --- a/boot-service/src/main/java/com/xwbing/service/SysUserRoleService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysUserRoleService.java @@ -1,7 +1,7 @@ -package com.xwbing.service; +package com.xwbing.service.sys; import com.xwbing.entity.SysUserRole; -import com.xwbing.repository.SysUserRoleRepository; +import com.xwbing.repository.sys.SysUserRoleRepository; import com.xwbing.util.PassWordUtil; import com.xwbing.util.RestMessage; import org.apache.commons.collections.CollectionUtils; diff --git a/boot-service/src/main/java/com/xwbing/service/SysUserService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java similarity index 99% rename from boot-service/src/main/java/com/xwbing/service/SysUserService.java rename to boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java index b7d9d86..e2fb6f7 100644 --- a/boot-service/src/main/java/com/xwbing/service/SysUserService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java @@ -1,4 +1,4 @@ -package com.xwbing.service; +package com.xwbing.service.sys; import com.alibaba.fastjson.JSONObject; import com.xwbing.constant.CommonConstant; @@ -6,7 +6,7 @@ import com.xwbing.constant.CommonEnum; import com.xwbing.entity.*; import com.xwbing.entity.model.EmailModel; import com.xwbing.exception.BusinessException; -import com.xwbing.repository.SysUserRepository; +import com.xwbing.repository.sys.SysUserRepository; import com.xwbing.util.*; import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; diff --git a/boot-web/src/main/java/com/xwbing/controller/MailTestControl.java b/boot-web/src/main/java/com/xwbing/controller/MailTestControl.java index 551a5a6..61dc22e 100644 --- a/boot-web/src/main/java/com/xwbing/controller/MailTestControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/MailTestControl.java @@ -6,6 +6,7 @@ import com.xwbing.service.MailService; import com.xwbing.util.JSONObjResult; import com.xwbing.util.RestMessage; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -27,6 +28,7 @@ public class MailTestControl { @LogInfo("发送纯文本邮件") @GetMapping("sendSimpleMail") + @ApiOperation(value = "发送纯文本邮件") public JSONObject sendSimpleMail() { RestMessage restMessage = mailService.sendSimpleMail("786461501@qq.com", "测试邮件", "收到一个纯文本邮件"); return JSONObjResult.toJSONObj(restMessage); @@ -34,6 +36,7 @@ public class MailTestControl { @LogInfo("发送html格式邮件") @GetMapping("sendHtmlMail") + @ApiOperation(value = "发送html格式邮件") public JSONObject sendHtmlMail() { String content = "" + "" + @@ -46,6 +49,7 @@ public class MailTestControl { @LogInfo("发送带附件邮件") @GetMapping("sendAttachmentsMail") + @ApiOperation(value = "发送带附件邮件") public JSONObject sendAttachmentsMail() { String path = "C:\\Users\\admin\\Desktop\\qq.txt"; RestMessage restMessage = mailService.sendAttachmentsMail("786461501@qq.com", "附件测试邮件", "收到一个带附件邮件", path); @@ -54,6 +58,7 @@ public class MailTestControl { @LogInfo("发送文本内嵌图片邮件") @GetMapping("sendInlineResourceMail") + @ApiOperation(value = "发送文本内嵌图片邮件") public JSONObject sendInlineResourceMail() { String rscId = "pic"; String content = "这是有图片的邮件："; diff --git a/boot-web/src/main/java/com/xwbing/controller/SysAuthorityControl.java b/boot-web/src/main/java/com/xwbing/controller/SysAuthorityControl.java deleted file mode 100644 index 0e33a82..0000000 --- a/boot-web/src/main/java/com/xwbing/controller/SysAuthorityControl.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.xwbing.controller; - -import com.alibaba.fastjson.JSONObject; -import com.xwbing.annotation.LogInfo; -import com.xwbing.constant.CommonConstant; -import com.xwbing.constant.CommonEnum; -import com.xwbing.entity.SysAuthority; -import com.xwbing.entity.vo.SysAuthVo; -import com.xwbing.service.SysAuthorityService; -import com.xwbing.util.JSONObjResult; -import com.xwbing.util.RestMessage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import org.apache.commons.lang3.StringUtils; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 项目名称: boot-module-demo - * 创建时间: 2017/11/15 10:36 - * 作者: xiangwb - * 说明: 权限控制层 - */ -@Api(tags = "authorityApi", description = "权限相关接口") -@RestController -@RequestMapping("/authority/") -public class SysAuthorityControl { - @Resource - private SysAuthorityService sysAuthorityService; - - @LogInfo("添加权限") - @PostMapping("save") - public JSONObject save(@RequestBody SysAuthority sysAuthority) { - RestMessage save = sysAuthorityService.save(sysAuthority); - return JSONObjResult.toJSONObj(save); - } - - @LogInfo("删除权限") - @GetMapping("removeById") - public JSONObject removeById(@RequestParam String id) { - if (StringUtils.isEmpty(id)) - return JSONObjResult.toJSONObj("主键不能为空"); - RestMessage result = sysAuthorityService.removeById(id); - return JSONObjResult.toJSONObj(result); - } - - @LogInfo("修改权限") - @PostMapping("update") - public JSONObject update(@RequestBody SysAuthority sysAuthority) { - if (StringUtils.isEmpty(sysAuthority.getId())) - return JSONObjResult.toJSONObj("主键不能为空"); - String enable = sysAuthority.getEnable(); - // 如果禁用，查询是否有子节点，如果有，子节点也要被禁用 - if (CommonConstant.ISNOTENABLE.equals(enable)) { - // 子节点的权限都禁用 - if (!sysAuthorityService.disableChildrenByParentId(sysAuthority.getId())) { - return JSONObjResult.toJSONObj("禁用子节点权限失败"); - } - } else { - // 如果是启用看父节点是否被禁用,一级的不需要判断 - if (!CommonConstant.ROOT.equals(sysAuthority.getParentId())) { - SysAuthority parent = sysAuthorityService.getById(sysAuthority.getParentId()); - if (parent != null && CommonEnum.YesOrNoEnum.NO.getCode().equals(parent.getEnable())) - return JSONObjResult.toJSONObj("父节点已被禁用，请先启用父节点"); - } - } - RestMessage result = sysAuthorityService.update(sysAuthority); - return JSONObjResult.toJSONObj(result); - } - - @LogInfo("根据是否启用查询所有权限") - @GetMapping("listByEnable") - @ApiImplicitParam(name = "enable", value = "是否启用,格式Y|N", paramType = "query", dataType = "string") - public JSONObject listByEnable(String enable) { - List authoritys = sysAuthorityService.listByEnable(enable); - return JSONObjResult.toJSONObj(authoritys, true, ""); - } - - @LogInfo("根据父节点查询子节点") - @GetMapping("listByParentId") - @ApiImplicitParam(name = "parentId", value = "父id,可为空", paramType = "query", dataType = "string") - public JSONObject listByParentId(String parentId) { - if (StringUtils.isEmpty(parentId)) - parentId = CommonConstant.ROOT; - if (!CommonConstant.ROOT.equals(parentId) && sysAuthorityService.getById(parentId) == null) - return JSONObjResult.toJSONObj("父节点不存在"); - List queryByParentId = sysAuthorityService.listByParentEnable(parentId, null); - return JSONObjResult.toJSONObj(queryByParentId, true, ""); - } - - @LogInfo("递归查询所有权限") - @GetMapping("listTree") - @ApiImplicitParam(name = "enable", value = "是否启用,格式Y|N", paramType = "query", dataType = "string") - public JSONObject listTree(String enable) { - List authoritys = sysAuthorityService.listChildren(CommonConstant.ROOT, enable); - return JSONObjResult.toJSONObj(authoritys, true, ""); - } -} diff --git a/boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java b/boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java deleted file mode 100644 index fe8e3ea..0000000 --- a/boot-web/src/main/java/com/xwbing/controller/SysConfigControl.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.xwbing.controller; - -import com.alibaba.fastjson.JSONObject; -import com.xwbing.entity.SysConfig; -import com.xwbing.service.SysConfigService; -import com.xwbing.util.JSONObjResult; -import com.xwbing.util.RestMessage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -/** - * 说明: 系统配置控制层 - * 项目名称: boot-module-demo - * 创建时间: 2017/5/10 16:36 - * 作者: xiangwb - */ -@Api(tags = "configApi", description = "系统配置相关接口") -@RestController -@RequestMapping("/config/") -public class SysConfigControl { - private final Logger logger = LoggerFactory.getLogger(SysConfigControl.class); - @Resource - private SysConfigService sysConfigService; - - @ApiOperation(value = "新增", notes = "新增系统配置信息") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "code", value = "配置项的key，长度为1-50", paramType = "query", required = true, dataType = "string"), -// @ApiImplicitParam(name = "value", value = "配置项的值", paramType = "query", required = true, dataType = "string"), -// @ApiImplicitParam(name = "enable", value = "是否启用，格式为Y|N", paramType = "query", required = true, dataType = "string"), -// @ApiImplicitParam(name = "name", value = "配置名称，长度为1-10", paramType = "query", required = true, dataType = "string") -// }) - @PostMapping("save") - public JSONObject save(@RequestBody @Valid SysConfig sysConfig) { - String logMsg = "新增系统配置信息"; - logger.info(logMsg); - RestMessage result = sysConfigService.save(sysConfig); - return JSONObjResult.toJSONObj(result); - } - - @ApiOperation(value = "删除", notes = "根据code删除系统配置信息") - @ApiImplicitParam(name = "code", value = "配置项的code", paramType = "query", required = true, dataType = "string") - @GetMapping("removeByCode") - public JSONObject removeByCode(@RequestParam String code) { - String logMsg = "删除系统配置信息"; - logger.info(logMsg + " code:{}", code); - if (StringUtils.isEmpty(code)) { - return JSONObjResult.toJSONObj("code不能为空"); - } - RestMessage result = sysConfigService.removeByCode(code); - return JSONObjResult.toJSONObj(result); - } - - @ApiOperation(value = "修改", notes = "修改系统配置信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "code", value = "配置项的key，长度为1-50", paramType = "query", required = true, dataType = "string"), - @ApiImplicitParam(name = "value", value = "配置项的值", paramType = "query", required = true, dataType = "string"), - @ApiImplicitParam(name = "enable", value = "是否启用，格式为Y|N", paramType = "query", required = true, dataType = "string"), - }) - @PostMapping("update") - public JSONObject update(SysConfig sysConfig) { - String logMsg = "修改系统配置信息"; - logger.info(logMsg); - if (StringUtils.isEmpty(sysConfig.getCode())) - return JSONObjResult.toJSONObj("配置项的code不能为空"); - RestMessage result = sysConfigService.update(sysConfig); - return JSONObjResult.toJSONObj(result); - } - - @ApiOperation(value = "查找", notes = "根据key查找系统配置信息") - @ApiImplicitParam(name = "code", value = "配置项的code", paramType = "query", required = true, dataType = "string") - @GetMapping("getByCode") - public JSONObject getByCode(@RequestParam String code) { - String logMsg = "根据code查找系统配置信息"; - logger.info(logMsg + " code:{}", code); - if (StringUtils.isEmpty(code)) { - return JSONObjResult.toJSONObj("code不能为空"); - } - SysConfig one = sysConfigService.getByCode(code); - if (one == null) { - return JSONObjResult.toJSONObj("该配置不存在"); - } - return JSONObjResult.toJSONObj(one, true, ""); - } - - @ApiOperation(value = "查找列表", notes = "根据是否启用查找配置列表") - @ApiImplicitParam(name = "enable", value = "是否启用，格式为Y|N", paramType = "query", required = true, dataType = "string") - @GetMapping("listByEnable") - public JSONObject listByEnable(@RequestParam String enable) { - String logMsg = "根据是否启用查找配置列表"; - logger.info(logMsg + " enable:{}", enable); - if (StringUtils.isEmpty(enable)) { - return JSONObjResult.toJSONObj("是否启用不能为空"); - } - List byEnable = sysConfigService.listByEnable(enable); - return JSONObjResult.toJSONObj(byEnable, true, ""); - } -} diff --git a/boot-web/src/main/java/com/xwbing/controller/SysRoleControl.java b/boot-web/src/main/java/com/xwbing/controller/SysRoleControl.java deleted file mode 100644 index a4b8a38..0000000 --- a/boot-web/src/main/java/com/xwbing/controller/SysRoleControl.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.xwbing.controller; - -import com.alibaba.fastjson.JSONObject; -import com.xwbing.annotation.LogInfo; -import com.xwbing.entity.SysAuthority; -import com.xwbing.entity.SysRole; -import com.xwbing.entity.SysRoleAuthority; -import com.xwbing.service.SysAuthorityService; -import com.xwbing.service.SysRoleAuthorityService; -import com.xwbing.service.SysRoleService; -import com.xwbing.util.JSONObjResult; -import com.xwbing.util.RestMessage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import org.apache.commons.lang3.StringUtils; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * 项目名称: boot-module-demo - * 创建时间: 2017/11/14 10:41 - * 作者: xiangwb - * 说明: - */ -@Api(tags = "sysRoleApi", description = "角色相关接口") -@RestController -@RequestMapping("/role/") -public class SysRoleControl { - @Resource - private SysRoleService sysRoleService; - @Resource - private SysAuthorityService sysAuthorityService; - @Resource - private SysRoleAuthorityService sysRoleAuthorityService; - - @LogInfo("添加角色") - @PostMapping("save") - public JSONObject save(@RequestBody SysRole sysRole) { - RestMessage result = sysRoleService.save(sysRole); - return JSONObjResult.toJSONObj(result); - } - - @LogInfo("删除角色") - @GetMapping("removeById") - public JSONObject removeById(@RequestParam String id) { - if (StringUtils.isEmpty(id)) - return JSONObjResult.toJSONObj("主键不能为空"); - RestMessage result = sysRoleService.removeById(id); - return JSONObjResult.toJSONObj(result); - } - - @LogInfo("修改角色") - @PostMapping("update") - public JSONObject update(@RequestBody SysRole sysRole) { - if (StringUtils.isEmpty(sysRole.getId())) - return JSONObjResult.toJSONObj("主键不能为空"); - RestMessage result = sysRoleService.update(sysRole); - return JSONObjResult.toJSONObj(result); - } - - @LogInfo("获取角色详情") - @GetMapping("getById") - public JSONObject getById(@RequestParam String id) { - if (StringUtils.isEmpty(id)) - return JSONObjResult.toJSONObj("主键不能为空"); - SysRole sysRole = sysRoleService.getById(id); - if (sysRole == null) - return JSONObjResult.toJSONObj("该角色不存在"); - return JSONObjResult.toJSONObj(sysRole, true, ""); - } - - @LogInfo("根据是否启用查询所有角色") - @GetMapping("listByEnable") - @ApiImplicitParam(name = "enable", value = "是否启用,格式Y|N", paramType = "query", dataType = "string") - public JSONObject listByEnable(String enable) { - List sysRoles = sysRoleService.listAllByEnable(enable); - return JSONObjResult.toJSONObj(sysRoles, true, ""); - } - - @LogInfo("根据角色主键查找权限") - @PostMapping("listAuthorityByRoleId") - @ApiImplicitParam(name = "enable", value = "是否启用,格式Y|N", paramType = "query", dataType = "string") - public JSONObject listAuthorityByRoleId(@RequestParam String roleId, String enable) { - if (StringUtils.isEmpty(roleId)) - return JSONObjResult.toJSONObj("角色主键不能为空"); - SysRole sysRole = sysRoleService.getById(roleId); - if (sysRole == null) - return JSONObjResult.toJSONObj("该角色不存在"); - List authoritys = sysAuthorityService.listByRoleIdEnable(roleId, enable); - return JSONObjResult.toJSONObj(authoritys, true, ""); - } - - @LogInfo("保存角色权限") - @PostMapping("saveAuthority") - public JSONObject saveAuthority(@RequestParam String authorityIds, @RequestParam String roleId) { - if (StringUtils.isEmpty(authorityIds)) - return JSONObjResult.toJSONObj("权限主键集合不能为空"); - if (StringUtils.isEmpty(roleId)) - return JSONObjResult.toJSONObj("角色主键不能为空"); - SysRole sysRole = sysRoleService.getById(roleId); - if (sysRole == null) - return JSONObjResult.toJSONObj("该角色不存在"); - String ids[] = authorityIds.split(","); - List list = new ArrayList<>(); - for (String id : ids) { - SysRoleAuthority roleAuthority = new SysRoleAuthority(); - roleAuthority.setRoleId(roleId); - roleAuthority.setAuthorityId(id); - list.add(roleAuthority); - } - RestMessage restMessage = sysRoleAuthorityService.saveBatch(list, roleId); - return JSONObjResult.toJSONObj(restMessage); - } -} diff --git a/boot-web/src/main/java/com/xwbing/controller/SysUserControl.java b/boot-web/src/main/java/com/xwbing/controller/SysUserControl.java deleted file mode 100644 index 45c95cd..0000000 --- a/boot-web/src/main/java/com/xwbing/controller/SysUserControl.java +++ /dev/null @@ -1,199 +0,0 @@ -package com.xwbing.controller; - -import com.alibaba.fastjson.JSONObject; -import com.xwbing.annotation.LogInfo; -import com.xwbing.constant.CommonConstant; -import com.xwbing.constant.CommonEnum; -import com.xwbing.entity.SysAuthority; -import com.xwbing.entity.SysRole; -import com.xwbing.entity.SysUser; -import com.xwbing.entity.SysUserRole; -import com.xwbing.service.SysAuthorityService; -import com.xwbing.service.SysRoleService; -import com.xwbing.service.SysUserRoleService; -import com.xwbing.service.SysUserService; -import com.xwbing.util.CommonDataUtil; -import com.xwbing.util.JSONObjResult; -import com.xwbing.util.RestMessage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; -import java.util.ArrayList; -import java.util.List; - -/** - * 说明: 用户控制层 - * 项目名称: boot-module-demo - * 创建时间: 2017/5/10 16:36 - * 作者: xiangwb - */ -@Api(tags = "userApi", description = "用户相关接口") -@RestController -@RequestMapping("/user/") -public class SysUserControl { - @Resource - private SysUserService sysUserService; - @Resource - private SysUserRoleService sysUserRoleService; - @Resource - private SysRoleService sysRoleService; - @Resource - private SysAuthorityService sysAuthorityService; - - @LogInfo("添加用户") - @PostMapping("save") - public JSONObject save(@RequestBody @Valid SysUser sysUser) { - RestMessage result = sysUserService.save(sysUser); - return JSONObjResult.toJSONObj(result); - } - - @LogInfo("删除用户") - @GetMapping("removeById") - public JSONObject removeById(@RequestParam String id) { - if (StringUtils.isEmpty(id)) - return JSONObjResult.toJSONObj("主键不能为空"); - RestMessage result = sysUserService.removeById(id); - return JSONObjResult.toJSONObj(result); - } - - @LogInfo("修改用户信息") - @PostMapping("update") - public JSONObject update(@RequestBody @Valid SysUser sysUser) { - if (StringUtils.isEmpty(sysUser.getId())) - return JSONObjResult.toJSONObj("主键不能为空"); - RestMessage result = sysUserService.update(sysUser); - return JSONObjResult.toJSONObj(result); - } - - @LogInfo("获取用户详情") - @GetMapping("getById") - public JSONObject getById(@RequestParam String id) { - if (StringUtils.isEmpty(id)) - return JSONObjResult.toJSONObj("主键不能为空"); - SysUser sysUser = sysUserService.getOne(id); - if (sysUser == null) - return JSONObjResult.toJSONObj("未查到该对象"); - return JSONObjResult.toJSONObj(sysUser, true, ""); - } - - @LogInfo("列表查询所有用户") - @GetMapping("listAll") - public JSONObject listAll() { - List list = sysUserService.listAll(); - return JSONObjResult.toJSONObj(list, true, ""); - } - - @LogInfo("登录") - @PostMapping("login") - public JSONObject login(HttpServletRequest request, @RequestParam String userName, @RequestParam String passWord, @RequestParam String checkCode) { - if (StringUtils.isEmpty(userName) || StringUtils.isEmpty(passWord)) - return JSONObjResult.toJSONObj("用户名或密码不能为空"); - if (StringUtils.isEmpty(checkCode)) - return JSONObjResult.toJSONObj("请输入验证码"); - RestMessage login = sysUserService.login(request, userName, passWord, checkCode); - return JSONObjResult.toJSONObj(login); - } - - @LogInfo("登出") - @GetMapping("logout") - public JSONObject logout(HttpServletRequest request) { - RestMessage logout = sysUserService.logout(request); - return JSONObjResult.toJSONObj(logout); - } - - @LogInfo("修改密码") - @PostMapping("updatePassWord") - public JSONObject updatePassWord(@RequestParam String newPassWord, @RequestParam String oldPassWord, @RequestParam String id) { - if (StringUtils.isEmpty(id)) - return JSONObjResult.toJSONObj("主键不能为空"); - if (StringUtils.isEmpty(newPassWord) || StringUtils.isEmpty(oldPassWord)) - return JSONObjResult.toJSONObj("原密码或新密码不能为空"); - RestMessage restMessage = sysUserService.updatePassWord(newPassWord, oldPassWord, id); - return JSONObjResult.toJSONObj(restMessage); - } - - @LogInfo("重置密码") - @GetMapping("resetPassWord") - public JSONObject resetPassWord(@RequestParam String id) { - if (StringUtils.isEmpty(id)) - return JSONObjResult.toJSONObj("主键不能为空"); - RestMessage restMessage = sysUserService.resetPassWord(id); - return JSONObjResult.toJSONObj(restMessage); - } - - @LogInfo("获取当前登录用户信息") - @GetMapping("getLoginUserInfo") - public JSONObject getLoginUserInfo() { - SysUser sysUser = sysUserService.getOne((String) CommonDataUtil.getToken(CommonConstant.CURRENT_USER_ID)); - if (sysUser == null) - return JSONObjResult.toJSONObj("未获取到当前登录用户信息"); - List button = new ArrayList<>(); - List menu = new ArrayList<>(); - List list; - if (CommonEnum.YesOrNoEnum.YES.getCode().equalsIgnoreCase(sysUser.getAdmin())) - list = sysAuthorityService.listByEnable(CommonEnum.YesOrNoEnum.YES.getCode()); - else - list = sysUserService.queryAuthority(sysUser.getId(), CommonEnum.YesOrNoEnum.YES.getCode()); - if (CollectionUtils.isNotEmpty(list)) { - for (SysAuthority sysAuthority : list) { - if (sysAuthority.getType() == CommonEnum.MenuOrButtonEnum.MENU.getCode()) - menu.add(sysAuthority); - else - button.add(sysAuthority); - } - } - sysUser.setMenuArray(menu); - sysUser.setButtonArray(button); - return JSONObjResult.toJSONObj(sysUser, true, ""); - } - - @LogInfo("保存用户角色") - @PostMapping("saveRole") - public JSONObject saveRole(@RequestParam String roleIds, @RequestParam String userId) { - if (StringUtils.isEmpty(roleIds)) - return JSONObjResult.toJSONObj("角色主键不能为空"); - if (StringUtils.isEmpty(userId)) - return JSONObjResult.toJSONObj("用户主键不能为空"); - SysUser old = sysUserService.getOne(userId); - if (old == null) - return JSONObjResult.toJSONObj("该用户不存在"); - if (CommonEnum.YesOrNoEnum.YES.getCode().equalsIgnoreCase(old.getAdmin())) - return JSONObjResult.toJSONObj("不能对管理员进行操作"); - String ids[] = roleIds.split(","); - List list = new ArrayList<>(); - for (String id : ids) { - SysUserRole userRole = new SysUserRole(); - userRole.setRoleId(id); - userRole.setUserId(userId); - list.add(userRole); - } - RestMessage restMessage = sysUserRoleService.saveBatch(list, userId); - return JSONObjResult.toJSONObj(restMessage); - } - - @LogInfo("根据用户主键查找所拥有的角色") - @PostMapping("listRoleByUserId") - @ApiImplicitParam(name = "enable", value = "是否启用,格式Y|N", paramType = "query", dataType = "string") - public JSONObject listRoleByUserId(@RequestParam String userId, String enable) { - if (StringUtils.isEmpty(userId)) - return JSONObjResult.toJSONObj("用户主键不能为空"); - List list = sysRoleService.listByUserIdEnable(userId, enable); - return JSONObjResult.toJSONObj(list, true, ""); - } - - @LogInfo("根据用户主键查找所拥有的权限") - @PostMapping("listAuthorityByUserId") - @ApiImplicitParam(name = "enable", value = "是否启用,格式Y|N", paramType = "query", dataType = "string") - public JSONObject listAuthorityByUserId(@RequestParam String userId, String enable) { - if (StringUtils.isEmpty(userId)) - return JSONObjResult.toJSONObj("用户主键不能为空"); - List list = sysUserService.queryAuthority(userId, enable); - return JSONObjResult.toJSONObj(list, true, ""); - } -} diff --git a/boot-web/src/main/java/com/xwbing/controller/SysUserLoginInOutControl.java b/boot-web/src/main/java/com/xwbing/controller/SysUserLoginInOutControl.java deleted file mode 100644 index 138d307..0000000 --- a/boot-web/src/main/java/com/xwbing/controller/SysUserLoginInOutControl.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.xwbing.controller; - -import com.alibaba.fastjson.JSONObject; -import com.xwbing.annotation.LogInfo; -import com.xwbing.entity.SysUserLoginInOut; -import com.xwbing.service.SysUserLoginInOutService; -import com.xwbing.util.JSONObjResult; -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 项目名称: boot-module-demo - * 创建时间: 2017/11/7 11:16 - * 作者: xiangwb - * 说明: 用户登录登出控制层 - */ -@Api(tags = "inoutApi", description = "登陆登出相关接口") -@RestController -@RequestMapping("/inout/") -public class SysUserLoginInOutControl { - @Resource - private SysUserLoginInOutService inOutService; - - @LogInfo("获取登录或登出信息") - @GetMapping("listByType") - public JSONObject listByType(@RequestParam int inout) { - List sysUserLoginInOuts = inOutService.listByType(inout); - return JSONObjResult.toJSONObj(sysUserLoginInOuts, true, "获取列表成功"); - } -}