From 8a69fb8eeebf6f66bc16ff32798692320914a863 Mon Sep 17 00:00:00 2001 From: winLsy <18332763730@163.com> Date: Wed, 14 Mar 2018 22:17:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oauth/UserDetailsServiceImpl.java | 19 +++ .../src/main/resources/application-dev.yml | 19 ++- all/sql/upms.sql | 52 ++++---- .../com/micro/fast/oauth/dto/UpmsUser.java | 3 + .../UpmsOrganizationController.java | 16 ++- .../controller/UpmsPermissionController.java | 8 +- .../upms/controller/UpmsRoleController.java | 14 +-- .../upms/controller/UpmsSystemController.java | 10 +- .../upms/controller/UpmsUserController.java | 13 +- .../UpmsUserPermissionController.java | 33 ----- .../upms/dao/UpmsUserPermissionMapper.java | 21 ---- .../fast/upms/pojo/UpmsUserPermission.java | 108 ---------------- .../service/UpmsUserPermissionService.java | 10 -- .../impl/UpmsUserPermissionServiceImpl.java | 20 --- .../mappers/UpmsOrganizationMapper.xml | 4 +- .../mappers/UpmsUserPermissionMapper.xml | 119 ------------------ 16 files changed, 93 insertions(+), 376 deletions(-) create mode 100644 all-in-one/src/main/java/com/lishouyu/oauth/UserDetailsServiceImpl.java delete mode 100644 ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserPermissionController.java delete mode 100644 ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserPermissionMapper.java delete mode 100644 ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserPermission.java delete mode 100644 ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserPermissionService.java delete mode 100644 ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserPermissionServiceImpl.java delete mode 100644 ms/upms/src/main/resources/mappers/UpmsUserPermissionMapper.xml diff --git a/all-in-one/src/main/java/com/lishouyu/oauth/UserDetailsServiceImpl.java b/all-in-one/src/main/java/com/lishouyu/oauth/UserDetailsServiceImpl.java new file mode 100644 index 0000000..d23dd31 --- /dev/null +++ b/all-in-one/src/main/java/com/lishouyu/oauth/UserDetailsServiceImpl.java @@ -0,0 +1,19 @@ +package com.lishouyu.oauth; + +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Component; + +/** + * 根据用户名获取用户的详细信息,必须为此名称msUserDetailsServiceImpl + * @author lsy + */ + +@Component("msUserDetailsServiceImpl") +public class UserDetailsServiceImpl implements UserDetailsService { + @Override + public UserDetails loadUserByUsername(String s) throws UsernameNotFoundException { + return null; + } +} diff --git a/all-in-one/src/main/resources/application-dev.yml b/all-in-one/src/main/resources/application-dev.yml index f7d3ffe..8226b50 100644 --- a/all-in-one/src/main/resources/application-dev.yml +++ b/all-in-one/src/main/resources/application-dev.yml @@ -68,9 +68,6 @@ server: port: 8080 tomcat: uri-encoding: utf-8 -feign: - hystrix: - enabled: true #开启监控熔断 # 健康检查的相关配置 management: security: @@ -84,6 +81,16 @@ mybatis: mappers: classpath:/mappers/*.xml pageHelperProperties: - dialect:mysql -#　-------------------------- -# /自定义的配置参数 -# -------------------------- +# boot-satrter-security-oauth模块自定义的配置 +ms: + security: + code: + image: + width: 67 + height: 23 + length: 4 + expireIn: 300 + oauth2: + clients[0]: + clientId: ms + clientSecret: ms \ No newline at end of file diff --git a/all/sql/upms.sql b/all/sql/upms.sql index 7092c2a..4561f45 100644 --- a/all/sql/upms.sql +++ b/all/sql/upms.sql @@ -273,32 +273,32 @@ CREATE TABLE upms_user_role ( ENGINE = InnoDB DEFAULT CHARSET = utf8; --- ---------------------------------- --- upms_user_permission 用户_权限关联表 --- ---------------------------------- -DROP TABLE IF EXISTS upms_user_permission; -DROP TABLE IF EXISTS upms_user_permissioon; -CREATE TABLE upms_user_permission ( - `id` INT(10) UNSIGNED AUTO_INCREMENT NOT NULL - COMMENT '编号', - `user_id` INT(10) UNSIGNED NOT NULL - COMMENT '用户编号', - `permission_id` INT(10) UNSIGNED NOT NULL - COMMENT '权限编号', - `type` TINYINT(4) NOT NULL - COMMENT '权限类型 -1 减权限', - `ctime` BIGINT(20) UNSIGNED DEFAULT NULL - COMMENT '创建时间', - `uptime` BIGINT(20) UNSIGNED DEFAULT NULL - COMMENT '修改时间', - `version` INT(10) UNSIGNED DEFAULT 0 - COMMENT '数据版本', - PRIMARY KEY (`id`), - KEY `upms_user_permission_user_id_index` (`user_id`) USING BTREE COMMENT 'B+树索引', - KEY `upms_user_permission_permission_id_index` (`permission_id`) USING BTREE COMMENT 'B+树索引' -) - ENGINE = InnoDB - DEFAULT CHARSET utf8; +# -- ---------------------------------- +# -- upms_user_permission 用户_权限关联表 +# -- ---------------------------------- +# DROP TABLE IF EXISTS upms_user_permission; +# DROP TABLE IF EXISTS upms_user_permissioon; +# CREATE TABLE upms_user_permission ( +# `id` INT(10) UNSIGNED AUTO_INCREMENT NOT NULL +# COMMENT '编号', +# `user_id` INT(10) UNSIGNED NOT NULL +# COMMENT '用户编号', +# `permission_id` INT(10) UNSIGNED NOT NULL +# COMMENT '权限编号', +# `type` TINYINT(4) NOT NULL +# COMMENT '权限类型 -1 减权限', +# `ctime` BIGINT(20) UNSIGNED DEFAULT NULL +# COMMENT '创建时间', +# `uptime` BIGINT(20) UNSIGNED DEFAULT NULL +# COMMENT '修改时间', +# `version` INT(10) UNSIGNED DEFAULT 0 +# COMMENT '数据版本', +# PRIMARY KEY (`id`), +# KEY `upms_user_permission_user_id_index` (`user_id`) USING BTREE COMMENT 'B+树索引', +# KEY `upms_user_permission_permission_id_index` (`permission_id`) USING BTREE COMMENT 'B+树索引' +# ) +# ENGINE = InnoDB +# DEFAULT CHARSET utf8; -- ---------------------------------- -- upms_role_permission 角色_权限关联表 diff --git a/ms/oauth/src/main/java/com/micro/fast/oauth/dto/UpmsUser.java b/ms/oauth/src/main/java/com/micro/fast/oauth/dto/UpmsUser.java index 6307cdd..a88cf0f 100644 --- a/ms/oauth/src/main/java/com/micro/fast/oauth/dto/UpmsUser.java +++ b/ms/oauth/src/main/java/com/micro/fast/oauth/dto/UpmsUser.java @@ -6,6 +6,9 @@ import lombok.Setter; import java.io.Serializable; +/** + * @author lsy + */ @JsonInclude(JsonInclude.Include.NON_EMPTY) @Getter @Setter diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsOrganizationController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsOrganizationController.java index 2e01c5c..bf640d7 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsOrganizationController.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsOrganizationController.java @@ -6,7 +6,6 @@ import com.micro.fast.upms.pojo.UpmsOrganization; import com.micro.fast.upms.service.UpmsOrganizationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.models.auth.In; import org.hibernate.validator.constraints.NotBlank; import org.hibernate.validator.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; @@ -15,7 +14,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.ArrayList; -import java.util.List; /** * @@ -37,14 +35,14 @@ public class UpmsOrganizationController { } @ApiOperation("根据id查询详细信息") - @GetMapping("/{id}") + @GetMapping public ServerResponse getUpmsOrganizationById( - @PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ + @RequestParam("id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ return upmsOrganizationService.getById(Integer.valueOf(id)); } @ApiOperation("根据条件分页查询") - @GetMapping + @GetMapping("/getPageByCondition") public ServerResponse getUpmsOrganizationByCondition(UpmsOrganization upmsOrganization, @RequestParam(defaultValue = "1",required = false) int pageNum, @RequestParam(defaultValue = "10",required = false)int pageSize, @@ -53,9 +51,9 @@ public class UpmsOrganizationController { } @ApiOperation("修改信息") - @PutMapping("/{id}") + @PutMapping public ServerResponse updateUpmsOrganization(@Valid UpmsOrganization upmsOrganization, - @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ + @RequestParam("id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ upmsOrganization.setId(Integer.valueOf(id)); return upmsOrganizationService.update(upmsOrganization); } @@ -67,8 +65,8 @@ public class UpmsOrganizationController { } @ApiOperation("根据用户id查询组织") - @GetMapping("/organization/{userId}") - public ServerResponse getOrganization(@PathVariable(value = "userId") Integer userId) { + @GetMapping("/organization") + public ServerResponse getOrganization(@RequestParam("userId") Integer userId) { return upmsOrganizationService.getOrganizationByUserId(userId); } } 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 e09143c..2e32ff7 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 @@ -37,7 +37,7 @@ public class UpmsPermissionController { } @ApiOperation("根据id查询详细信息") - @GetMapping("/{id}") + @GetMapping public ServerResponse getUpmsPermissionById( @PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ return upmsPermissionService.getById(Integer.valueOf(id)); @@ -49,7 +49,7 @@ public class UpmsPermissionController { @ApiImplicitParam(name = "systemId",value = "系统id",dataType = "integer"), @ApiImplicitParam(name = "status",value = "权限状态",dataType = "string") }) - @GetMapping + @GetMapping("/getPageByCondition") public ServerResponse getUpmsPermissionByCondition(UpmsPermission upmsPermission, @RequestParam(defaultValue = "1",required = false) int pageNum, @RequestParam(defaultValue = "10",required = false)int pageSize, @@ -58,9 +58,9 @@ public class UpmsPermissionController { } @ApiOperation("修改信息") - @PutMapping("/{id}") + @PutMapping public ServerResponse updateUpmsPermission(UpmsPermission upmsPermission, - @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ + @RequestParam("id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ upmsPermission.setId(Integer.valueOf(id)); return upmsPermissionService.update(upmsPermission); } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsRoleController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsRoleController.java index 9eeae66..1fc2a8e 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsRoleController.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsRoleController.java @@ -36,14 +36,14 @@ public class UpmsRoleController { } @ApiOperation("根据id查询详细信息") - @GetMapping("/{id}") + @GetMapping public ServerResponse getUpmsRoleById( - @PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ + @RequestParam(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ return upmsRoleService.getById(Integer.valueOf(id)); } @ApiOperation("根据条件分页查询") - @GetMapping + @GetMapping("/getPageByCondition") public ServerResponse getUpmsRoleByCondition(UpmsRole upmsRole, @RequestParam(defaultValue = "1",required = false) int pageNum, @RequestParam(defaultValue = "10",required = false)int pageSize, @@ -52,9 +52,9 @@ public class UpmsRoleController { } @ApiOperation("修改信息") - @PutMapping("/{id}") + @PutMapping public ServerResponse updateUpmsRole(UpmsRole upmsRole, - @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ + @RequestParam("id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ upmsRole.setId(Integer.valueOf(id)); return upmsRoleService.update(upmsRole); } @@ -66,8 +66,8 @@ public class UpmsRoleController { } @ApiOperation("根据用户id查询角色") - @GetMapping("/userId/{userId}") - public ServerResponse getRolesByUserId(@PathVariable("userId") Integer userId){ + @GetMapping("/userId") + public ServerResponse getRolesByUserId(@RequestParam("userId") Integer userId){ return upmsRoleService.getRolesByUserId(userId); } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsSystemController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsSystemController.java index f85664f..b489c34 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsSystemController.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsSystemController.java @@ -38,14 +38,14 @@ public class UpmsSystemController { } @ApiOperation("根据id查询详细信息") - @GetMapping("/{id}") + @GetMapping public ServerResponse getSystemById( - @PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ + @RequestParam(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ return upmsSystemService.getById(Integer.valueOf(id)); } @ApiOperation("根据条件分页查询") - @GetMapping + @GetMapping("/getPageByCondition") public ServerResponse getSystemByCondition(UpmsSystem upmsSystem, @RequestParam(defaultValue = "1",required = false) int pageNum, @RequestParam(defaultValue = "10",required = false)int pageSize, @@ -54,9 +54,9 @@ public class UpmsSystemController { } @ApiOperation("修改信息") - @PutMapping("/{id}") + @PutMapping public ServerResponse updateSystem( UpmsSystem upmsSystem, - @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ + @RequestParam("id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ upmsSystem.setId(Integer.valueOf(id)); return upmsSystemService.update(upmsSystem); } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserController.java index 10e0962..8af41a3 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserController.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import javax.validation.constraints.NotNull; import java.util.ArrayList; +import java.util.Arrays; /** * 权限管理系统用户管理 @@ -64,14 +65,14 @@ public class UpmsUserController { } @ApiOperation("根据id查询详细信息") - @GetMapping("/{id}") + @GetMapping public ServerResponse getUserById( - @PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX + "请传入id") String id) { + @RequestParam(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX + "请传入id") String id) { return upmsUserService.getById(Integer.valueOf(id)); } @ApiOperation("根据条件分页查询") - @GetMapping + @GetMapping("/getPageByCondition") public ServerResponse getUserByCondition(UpmsUser upmsUser, @RequestParam(defaultValue = "1", required = false) int pageNum, @RequestParam(defaultValue = "10", required = false) int pageSize, @@ -80,9 +81,9 @@ public class UpmsUserController { } @ApiOperation("修改信息") - @PutMapping("/{id}") + @PutMapping public ServerResponse updateUser(UpmsUser upmsUser, - @NotBlank(message = BaseConst.BASEMSG_PREFIX + "请传入id") String id) { + @RequestParam("id") @NotBlank(message = BaseConst.BASEMSG_PREFIX + "请传入id") String id) { upmsUser.setId(Integer.valueOf(id)); return upmsUserService.update(upmsUser); } @@ -95,7 +96,7 @@ public class UpmsUserController { } @ApiOperation("根据组织id还有用户信息查询用户") - @GetMapping("/organization") + @GetMapping("/organization/getPageByCondition") public ServerResponse getUsersByOrgId(UpmsUser upmsUser, @RequestParam(defaultValue = "1", required = false) int pageNum, @RequestParam(defaultValue = "10", required = false) int pageSize, diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserPermissionController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserPermissionController.java deleted file mode 100644 index 6f2a737..0000000 --- a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserPermissionController.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.micro.fast.upms.controller; - -import com.micro.fast.boot.starter.common.response.ServerResponse; -import com.micro.fast.upms.service.UpmsUserPermissionService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -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 java.util.ArrayList; - -/** -* -* @author lsy -*/ -@Api("upmsUserPermission") -@RestController -@RequestMapping("/upmsUserPermission") -public class UpmsUserPermissionController { - - @Autowired - private UpmsUserPermissionService upmsUserPermissionService; - - @ApiOperation("批量添加用户和组织的关系,一个用户可以属于多个组织") - @PostMapping("/batch/oneUserWithManyOrganization") - public ServerResponse batchAddUpmsUserPermission(@RequestParam("userId") Integer userId,@RequestParam("orgIds") ArrayList orgIds) { - - return null; - } -} diff --git a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserPermissionMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserPermissionMapper.java deleted file mode 100644 index dc1bed5..0000000 --- a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserPermissionMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.micro.fast.upms.dao; - -import com.micro.fast.upms.pojo.UpmsUserPermission; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface UpmsUserPermissionMapper { - int deleteByPrimaryKey(Integer id); - - int insert(UpmsUserPermission record); - - int insertSelective(UpmsUserPermission record); - - UpmsUserPermission selectByPrimaryKey(Integer userPermissionId); - - int updateByPrimaryKeySelective(UpmsUserPermission record); - - int updateByPrimaryKey(UpmsUserPermission record); - -} \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserPermission.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserPermission.java deleted file mode 100644 index ec3b29c..0000000 --- a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserPermission.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.micro.fast.upms.pojo; - -import java.io.Serializable; - -public class UpmsUserPermission implements Serializable { - private Integer id; - - private Integer userId; - - private Integer permissionId; - - private Byte type; - - private Long ctime; - - private Long uptime; - - private Integer version; - - private static final long serialVersionUID = 1L; - - public UpmsUserPermission(Integer id, Integer userId, Integer permissionId, Byte type, Long ctime, Long uptime, Integer version) { - this.id = id; - this.userId = userId; - this.permissionId = permissionId; - this.type = type; - this.ctime = ctime; - this.uptime = uptime; - this.version = version; - } - - public UpmsUserPermission() { - super(); - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public Integer getPermissionId() { - return permissionId; - } - - public void setPermissionId(Integer permissionId) { - this.permissionId = permissionId; - } - - public Byte getType() { - return type; - } - - public void setType(Byte type) { - this.type = type; - } - - public Long getCtime() { - return ctime; - } - - public void setCtime(Long ctime) { - this.ctime = ctime; - } - - public Long getUptime() { - return uptime; - } - - public void setUptime(Long uptime) { - this.uptime = uptime; - } - - public Integer getVersion() { - return version; - } - - public void setVersion(Integer version) { - this.version = version; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", userId=").append(userId); - sb.append(", permissionId=").append(permissionId); - sb.append(", type=").append(type); - sb.append(", ctime=").append(ctime); - sb.append(", uptime=").append(uptime); - sb.append(", version=").append(version); - sb.append("]"); - return sb.toString(); - } -} \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserPermissionService.java b/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserPermissionService.java deleted file mode 100644 index 938eed7..0000000 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserPermissionService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.micro.fast.upms.service; - -/** -* @author lsy -*/ -public interface UpmsUserPermissionService{ - - - -} \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserPermissionServiceImpl.java b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserPermissionServiceImpl.java deleted file mode 100644 index d6cfd52..0000000 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserPermissionServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.micro.fast.upms.service.impl; - -import com.micro.fast.boot.starter.common.response.ServerResponse; -import com.micro.fast.upms.dao.UpmsUserPermissionMapper; -import com.micro.fast.upms.service.UpmsUserPermissionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** -* @author lsy -*/ -@Service -public class UpmsUserPermissionServiceImpl implements UpmsUserPermissionService{ - - @Autowired - private UpmsUserPermissionMapper mapper; - -} diff --git a/ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml b/ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml index 1527c03..0a08cb9 100644 --- a/ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml @@ -25,7 +25,7 @@ delete from upms_organization where id = #{id,jdbcType=INTEGER} - + insert into upms_organization (id, pid, name, description, ctime, uptime, version) @@ -33,7 +33,7 @@ #{description,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, #{uptime,jdbcType=BIGINT}, #{version,jdbcType=INTEGER}) - + insert into upms_organization diff --git a/ms/upms/src/main/resources/mappers/UpmsUserPermissionMapper.xml b/ms/upms/src/main/resources/mappers/UpmsUserPermissionMapper.xml deleted file mode 100644 index 9a66d1d..0000000 --- a/ms/upms/src/main/resources/mappers/UpmsUserPermissionMapper.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - id, user_id, permission_id, type, ctime, uptime, version - - - - delete from upms_user_permission - where id = #{id,jdbcType=INTEGER} - - - insert into upms_user_permission (id, user_id, permission_id, - type, ctime, uptime, - version) - values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{permissionId,jdbcType=INTEGER}, - #{type,jdbcType=TINYINT}, #{ctime,jdbcType=BIGINT}, #{uptime,jdbcType=BIGINT}, - #{version,jdbcType=INTEGER}) - - - insert into upms_user_permission - - - id, - - - user_id, - - - permission_id, - - - type, - - - ctime, - - - uptime, - - - version, - - - - - #{id,jdbcType=INTEGER}, - - - #{userId,jdbcType=INTEGER}, - - - #{permissionId,jdbcType=INTEGER}, - - - #{type,jdbcType=TINYINT}, - - - #{ctime,jdbcType=BIGINT}, - - - #{uptime,jdbcType=BIGINT}, - - - #{version,jdbcType=INTEGER}, - - - - - update upms_user_permission - - - user_id = #{userId,jdbcType=INTEGER}, - - - permission_id = #{permissionId,jdbcType=INTEGER}, - - - type = #{type,jdbcType=TINYINT}, - - - ctime = #{ctime,jdbcType=BIGINT}, - - - uptime = #{uptime,jdbcType=BIGINT}, - - - version = #{version,jdbcType=INTEGER}, - - - where id = #{id,jdbcType=INTEGER} - - - update upms_user_permission - set user_id = #{userId,jdbcType=INTEGER}, - permission_id = #{permissionId,jdbcType=INTEGER}, - type = #{type,jdbcType=TINYINT}, - ctime = #{ctime,jdbcType=BIGINT}, - uptime = #{uptime,jdbcType=BIGINT}, - version = #{version,jdbcType=INTEGER} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file