From f8906f7ff4649319fd0af5677b699ec1e6563659 Mon Sep 17 00:00:00 2001 From: winLsy <18332763730@163.com> Date: Tue, 20 Mar 2018 20:06:47 +0800 Subject: [PATCH] =?UTF-8?q?micro-fast-IIDYB=20=E8=A7=92=E8=89=B2=E7=9A=84?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{InitUpmsSystem.java => InitSystem.java} | 28 ++++++++++--------- .../controller/UpmsPermissionController.java | 15 ++++++++++ .../UpmsRolePermissionController.java | 26 ++++++++++++----- .../fast/upms/dao/UpmsPermissionMapper.java | 3 +- .../mappers/UpmsPermissionMapper.xml | 2 +- pom.xml | 14 ++++++++++ 6 files changed, 66 insertions(+), 22 deletions(-) rename boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/init/{InitUpmsSystem.java => InitSystem.java} (77%) diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/init/InitUpmsSystem.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/init/InitSystem.java similarity index 77% rename from boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/init/InitUpmsSystem.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/init/InitSystem.java index ce22e11..a48d326 100644 --- a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/init/InitUpmsSystem.java +++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/init/InitSystem.java @@ -25,11 +25,11 @@ import java.util.Map; */ @Component @Slf4j -public class InitUpmsSystem implements ApplicationListener { +public class InitSystem implements ApplicationListener { public static final String ANNOTATION_CONFIG_EMBEDDED_WEB_APPLICATION_CONTEXT = "AnnotationConfigEmbeddedWebApplicationContext"; public static final String ANNOTATION_CONFIG_APPLICATION_CONTEXT = "AnnotationConfigApplicationContext"; - @Autowired + @Autowired(required = false) private Map sqlInitPropertiesMap; @Override @@ -39,17 +39,19 @@ public class InitUpmsSystem implements ApplicationListener { - if (value != null) { - runInitSql(value.getDriverClassName(),value.getUrl(),value.getUsername(),value.getPassword(),value.getSqlPath()); - } - }); - log.info("name:{} displayName: {} parentName:{} parentName: {}", - applicationContext.getApplicationName(), - applicationContext.getDisplayName(), - parent.getApplicationName(), - parent.getDisplayName()); + if ( sqlInitPropertiesMap != null) { + // 初始化数据表 + sqlInitPropertiesMap.forEach((key,value) -> { + if (value != null) { + runInitSql(value.getDriverClassName(),value.getUrl(),value.getUsername(),value.getPassword(),value.getSqlPath()); + } + }); + log.info("name:{} displayName: {} parentName:{} parentName: {}", + applicationContext.getApplicationName(), + applicationContext.getDisplayName(), + parent.getApplicationName(), + parent.getDisplayName()); + } } } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsPermissionController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsPermissionController.java index 2e32ff7..859807b 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsPermissionController.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsPermissionController.java @@ -8,6 +8,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; import org.hibernate.validator.constraints.NotBlank; import org.hibernate.validator.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; @@ -76,4 +77,18 @@ public class UpmsPermissionController { public ServerResponse getPermissions(@RequestParam("userId") Integer userId,@RequestParam("type") Integer type,@RequestParam("pType") Integer pType) { return upmsPermissionService.getPermissionsByUserIdandPTypeandType(userId, type, pType); } + + @ApiOperation("按类型查询角色所拥有的权限") + @GetMapping("/role/permission") + public ServerResponse getRolePermission(@RequestParam("type") int type,@RequestParam("roleId") Integer roleId){ + // todo + return null; + } + + @ApiOperation("按类型查询角色未拥有的权限") + @GetMapping("/role/unhave/permission") + public ServerResponse getRoleUnHavePermission(@RequestParam("type") int type,@RequestParam("roleId") Integer roleId){ + // todo + return null; + } } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsRolePermissionController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsRolePermissionController.java index 73e785c..0c17645 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsRolePermissionController.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsRolePermissionController.java @@ -2,19 +2,17 @@ package com.micro.fast.upms.controller; import com.micro.fast.boot.starter.common.response.BaseConst; import com.micro.fast.boot.starter.common.response.ServerResponse; -import com.micro.fast.upms.pojo.UpmsRolePermission; import com.micro.fast.upms.service.UpmsRolePermissionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.hibernate.validator.constraints.NotBlank; -import org.hibernate.validator.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindException; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.ArrayList; -import java.util.List; /** * @@ -28,4 +26,18 @@ public class UpmsRolePermissionController { @Autowired private UpmsRolePermissionService upmsRolePermissionService; + @ApiOperation("给角色批量添加权限") + @PostMapping("/addRolePermission") + public ServerResponse addRolePermission(@RequestParam("roleId") @NotNull(message = BaseConst.BASEMSG_PREFIX+"请传入角色id") Integer roleId, + @RequestParam("permissionIds") @NotNull(message = BaseConst.BASEMSG_PREFIX+"请传入权限id的集合") ArrayList permissionIds){ + // todo + return null; + } + @ApiOperation("给角色批量删除权限") + @PostMapping("/deleteRolePermission") + public ServerResponse deleteRolePermission(@RequestParam("roleId") @NotNull(message = BaseConst.BASEMSG_PREFIX+"请传入角色id") Integer roleId, + @RequestParam("permissionIds") @NotNull(message = BaseConst.BASEMSG_PREFIX+"请传入权限id的集合") ArrayList permissionIds){ + // todo + return null; + } } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsPermissionMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsPermissionMapper.java index 680fe39..72e9faa 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsPermissionMapper.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsPermissionMapper.java @@ -1,6 +1,5 @@ package com.micro.fast.upms.dao; -import com.micro.fast.boot.starter.common.response.ServerResponse; import com.micro.fast.common.dao.SsmMapper; import com.micro.fast.upms.pojo.UpmsPermission; import org.apache.ibatis.annotations.Param; @@ -32,5 +31,7 @@ public interface UpmsPermissionMapper extends SsmMapper @Override int deleteByPrimaryKeys(List integers); + List selectByUserIdAndType(@Param("userId") Integer userId,@Param("pType") Integer pType,@Param("type") Integer type); + } diff --git a/ms/upms/src/main/resources/mappers/UpmsPermissionMapper.xml b/ms/upms/src/main/resources/mappers/UpmsPermissionMapper.xml index aabcd0b..9b548ba 100644 --- a/ms/upms/src/main/resources/mappers/UpmsPermissionMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsPermissionMapper.xml @@ -225,7 +225,7 @@ and id in (select permission_id from upms_user_permission where user_id = #{userId} and type =#{type} ) - + DELETE FROM upms_permission WHERE id IN #{item} diff --git a/pom.xml b/pom.xml index 0205071..329f148 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,9 @@ 1.2.2.RELEASE UTF-8 + 2.2.4 5.21.0 + 2.3.0 1.4.0.RELEASE registry.cn-hangzhou.aliyuncs.com/lishouyu/hub UTF-8 @@ -310,6 +312,12 @@ quartz-jobs ${quartz.version} + + + io.gatling.highcharts + gatling-charts-highcharts + ${gatling.version} + @@ -405,6 +413,12 @@ + + + io.gatling + gatling-maven-plugin + ${gatling-plugin.version} +