diff --git a/all/sql/upms.sql b/all/sql/upms.sql index 08638ad..78e420e 100644 --- a/all/sql/upms.sql +++ b/all/sql/upms.sql @@ -146,7 +146,7 @@ CREATE TABLE upms_permission ( `description` VARCHAR(200) DEFAULT NULL COMMENT '权限描述', `type` TINYINT(4) DEFAULT NULL - COMMENT '类型 1.视图授权2.角色授权3.个性授权', + COMMENT '类型 1.视图授权2.数据授权', `permission_value` VARCHAR(50) DEFAULT NULL COMMENT '权限值', `uri` VARCHAR(100) DEFAULT NULL @@ -181,7 +181,7 @@ CREATE TABLE upms_system ( `basepath` VARCHAR(100) DEFAULT NULL COMMENT '根目录', `status` TINYINT(4) DEFAULT NULL - COMMENT '状态 -1 黑名单 1 正常', + COMMENT '状态 0 黑名单 1 正常', `name` VARCHAR(20) DEFAULT NULL COMMENT '系统名称', `route` VARCHAR(20) DEFAULT NULL diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/moudel_js.ftl b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/moudel_js.ftl index 6060f8b..0e77ee4 100644 --- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/moudel_js.ftl +++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/templates/moudel_js.ftl @@ -2,7 +2,7 @@ import request from '@/utils/request' import service from '@/api/config/const' import { paramToString, like, update } from '@/utils/param' -const baseUrl = '/upmsOrganization' +const baseUrl = '/upmsRole' /** * 添加 * @param pojo @@ -33,8 +33,7 @@ export function getByCondition(pojo, pageNum, pageSize, orderBy) { const data = {} // 拼接查询条件 if (pojo) { -pojo.name == null ? '' : data.name = like(pojo.name) -pojo.pid == null ? '' : data.pid = pojo.pid +getCondition(data, pojo, ['name', 'description']) } pageNum == null ? '' : data.pageNum = pageNum pageSize == null ? '' : data.pageSize = pageSize 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 1c8ca2b..2e01c5c 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,6 +6,7 @@ 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; @@ -64,4 +65,10 @@ public class UpmsOrganizationController { public ServerResponse deleteUpmsOrganization(@NotEmpty(message = BaseConst.BASEMSG_PREFIX+"请传入ids") @RequestParam("ids") ArrayList ids){ return upmsOrganizationService.deleteByIds(ids); } + + @ApiOperation("根据用户id查询组织") + @GetMapping("/organization/{userId}") + public ServerResponse getOrganization(@PathVariable(value = "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 47be9de..e09143c 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 @@ -5,6 +5,8 @@ import com.micro.fast.boot.starter.common.response.ServerResponse; import com.micro.fast.upms.pojo.UpmsPermission; import com.micro.fast.upms.service.UpmsPermissionService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.hibernate.validator.constraints.NotBlank; import org.hibernate.validator.constraints.NotEmpty; @@ -14,13 +16,12 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.ArrayList; -import java.util.List; /** * * @author lsy */ -@Api("upmsPermission") +@Api(description = "权限管理") @RestController @RequestMapping("/upmsPermission") public class UpmsPermissionController { @@ -31,6 +32,7 @@ public class UpmsPermissionController { @ApiOperation("添加信息") @PostMapping public ServerResponse addUpmsPermission(@Valid UpmsPermission upmsPermission) throws BindException { + upmsPermission.setCtime(System.currentTimeMillis()); return upmsPermissionService.add(upmsPermission); } @@ -42,6 +44,11 @@ public class UpmsPermissionController { } @ApiOperation("根据条件分页查询") + @ApiImplicitParams({ + @ApiImplicitParam(name = "name",value = "权限名称",dataType = "string"), + @ApiImplicitParam(name = "systemId",value = "系统id",dataType = "integer"), + @ApiImplicitParam(name = "status",value = "权限状态",dataType = "string") + }) @GetMapping public ServerResponse getUpmsPermissionByCondition(UpmsPermission upmsPermission, @RequestParam(defaultValue = "1",required = false) int pageNum, @@ -63,4 +70,10 @@ public class UpmsPermissionController { public ServerResponse deleteUpmsPermission(@NotEmpty(message = BaseConst.BASEMSG_PREFIX+"请传入ids") @RequestParam("ids") ArrayList ids){ return upmsPermissionService.deleteByIds(ids); } + + @ApiOperation("根据用户id,权限类型,增减权限查询权限") + @GetMapping("/permission") + public ServerResponse getPermissions(@RequestParam("userId") Integer userId,@RequestParam("type") Integer type,@RequestParam("pType") Integer pType) { + return upmsPermissionService.getPermissionsByUserIdandPTypeandType(userId, type, pType); + } } 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 a130d17..9eeae66 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 @@ -13,14 +13,14 @@ import org.springframework.validation.BindException; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import javax.websocket.server.PathParam; import java.util.ArrayList; -import java.util.List; /** * * @author lsy */ -@Api("upmsRole") +@Api(description = "角色管理") @RestController @RequestMapping("/upmsRole") public class UpmsRoleController { @@ -31,6 +31,7 @@ public class UpmsRoleController { @ApiOperation("添加信息") @PostMapping public ServerResponse addUpmsRole(@Valid UpmsRole upmsRole) throws BindException { + upmsRole.setCtime(System.currentTimeMillis()); return upmsRoleService.add(upmsRole); } @@ -63,4 +64,11 @@ public class UpmsRoleController { public ServerResponse deleteUpmsRole(@NotEmpty(message = BaseConst.BASEMSG_PREFIX+"请传入ids") @RequestParam("ids") ArrayList ids){ return upmsRoleService.deleteByIds(ids); } + + @ApiOperation("根据用户id查询角色") + @GetMapping("/userId/{userId}") + public ServerResponse getRolesByUserId(@PathVariable("userId") Integer userId){ + return upmsRoleService.getRolesByUserId(userId); + } + } 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 9d96fff..e323f65 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 @@ -8,6 +8,7 @@ import com.micro.fast.upms.pojo.UpmsUser; import com.micro.fast.upms.service.UpmsUserService; 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; @@ -94,6 +95,4 @@ public class UpmsUserController { @NotEmpty(message = BaseConst.BASEMSG_PREFIX + "请传入id") @RequestParam("ids") ArrayList ids) { return upmsUserService.deleteByIds(ids); } - - } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsOrganizationMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsOrganizationMapper.java index 9ebf96e..8d984d9 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsOrganizationMapper.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsOrganizationMapper.java @@ -2,6 +2,7 @@ package com.micro.fast.upms.dao; import com.micro.fast.common.dao.SsmMapper; import com.micro.fast.upms.pojo.UpmsOrganization; +import feign.Param; import java.util.List; @@ -29,4 +30,6 @@ public interface UpmsOrganizationMapper extends SsmMapper integers); + + List selectJionWithUserId(@Param("userId") Integer userId); } \ No newline at end of file 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 ffcf752..680fe39 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,7 +1,11 @@ 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; + +import java.util.List; public interface UpmsPermissionMapper extends SsmMapper { @Override @@ -22,4 +26,11 @@ public interface UpmsPermissionMapper extends SsmMapper @Override int updateByPrimaryKey(UpmsPermission record); + @Override + List selectByCondition(UpmsPermission record); + + @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/java/com/micro/fast/upms/dao/UpmsRoleMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsRoleMapper.java index aa4e194..5d32b8c 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsRoleMapper.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsRoleMapper.java @@ -2,17 +2,34 @@ package com.micro.fast.upms.dao; import com.micro.fast.common.dao.SsmMapper; import com.micro.fast.upms.pojo.UpmsRole; +import feign.Param; + +import javax.management.relation.Role; +import java.util.List; public interface UpmsRoleMapper extends SsmMapper { int deleteByPrimaryKey(Integer id); + @Override int insert(UpmsRole record); + @Override int insertSelective(UpmsRole record); + @Override UpmsRole selectByPrimaryKey(Integer id); + @Override int updateByPrimaryKeySelective(UpmsRole record); + @Override int updateByPrimaryKey(UpmsRole record); + + @Override + List selectByCondition(UpmsRole record); + + @Override + int deleteByPrimaryKeys(List integers); + + List selectRoleJoinWithUserId(@Param("userId") Integer userId); } \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsRolePermissionMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsRolePermissionMapper.java index fc31f5c..64b5fde 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsRolePermissionMapper.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsRolePermissionMapper.java @@ -3,6 +3,8 @@ package com.micro.fast.upms.dao; import com.micro.fast.common.dao.SsmMapper; import com.micro.fast.upms.pojo.UpmsRolePermission; +import java.util.List; + public interface UpmsRolePermissionMapper extends SsmMapper { int deleteByPrimaryKey(Integer rolePermissionId); @@ -15,4 +17,5 @@ public interface UpmsRolePermissionMapper extends SsmMapper{ * @return */ int countEmail(String email); + + /** + * 根据组织id还有用户的其他信息查询 + * @return + */ + List selectJoinWithOrgId(UpmsUser record, @Param("orgid") Integer orgid); } \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsPermission.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsPermission.java index a27c058..aa641dc 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsPermission.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsPermission.java @@ -1,22 +1,36 @@ package com.micro.fast.upms.pojo; + +import com.micro.fast.boot.starter.common.response.BaseConst; +import org.hibernate.validator.constraints.NotBlank; + +import javax.validation.constraints.NotNull; import java.io.Serializable; public class UpmsPermission implements Serializable { private Integer id; + @NotNull(message = BaseConst.BASEMSG_PREFIX+"请选择系统id") private Integer systemId; private Integer pid; + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请输入权限名称") private String name; + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请输入权限名称并尽可能详尽") private String description; + /** + * 0 表示数据权限 1 表示视图权限 + */ + @NotNull(message = BaseConst.BASEMSG_PREFIX+"请选择权限类型") private Byte type; + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请选择权限值") private String permissionValue; + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请输入权限路径") private String uri; private String icon; diff --git a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsRole.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsRole.java index 151c9e6..a92cc21 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsRole.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsRole.java @@ -1,12 +1,17 @@ package com.micro.fast.upms.pojo; +import com.micro.fast.boot.starter.common.response.BaseConst; +import org.hibernate.validator.constraints.NotBlank; + import java.io.Serializable; public class UpmsRole implements Serializable { private Integer id; + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请填写角色名称") private String name; + @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请填写角色描述") private String description; private Long ctime; diff --git a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java index 6c7b0d8..3822dab 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java @@ -1,12 +1,15 @@ package com.micro.fast.upms.pojo; import com.micro.fast.boot.starter.common.response.BaseConst; +import lombok.Data; import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.NotBlank; import javax.validation.constraints.Pattern; import java.io.Serializable; +import java.util.List; +@Data public class UpmsUser implements Serializable { private Integer id; @@ -42,132 +45,8 @@ public class UpmsUser implements Serializable { private Long ctime; + private List organizations; + private static final long serialVersionUID = 1L; - public UpmsUser(Integer id, String username, String password, String salt, String realname, String avatar, String phone, String email, Byte sex, Byte locked, Long ctime) { - this.id = id; - this.username = username; - this.password = password; - this.salt = salt; - this.realname = realname; - this.avatar = avatar; - this.phone = phone; - this.email = email; - this.sex = sex; - this.locked = locked; - this.ctime = ctime; - } - - public UpmsUser() { - super(); - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username == null ? null : username.trim(); - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password == null ? null : password.trim(); - } - - public String getSalt() { - return salt; - } - - public void setSalt(String salt) { - this.salt = salt == null ? null : salt.trim(); - } - - public String getRealname() { - return realname; - } - - public void setRealname(String realname) { - this.realname = realname == null ? null : realname.trim(); - } - - public String getAvatar() { - return avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar == null ? null : avatar.trim(); - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone == null ? null : phone.trim(); - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email == null ? null : email.trim(); - } - - public Byte getSex() { - return sex; - } - - public void setSex(Byte sex) { - this.sex = sex; - } - - public Byte getLocked() { - return locked; - } - - public void setLocked(Byte locked) { - this.locked = locked; - } - - public Long getCtime() { - return ctime; - } - - public void setCtime(Long ctime) { - this.ctime = ctime; - } - - @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(", username=").append(username); - sb.append(", password=").append(password); - sb.append(", salt=").append(salt); - sb.append(", realname=").append(realname); - sb.append(", avatar=").append(avatar); - sb.append(", phone=").append(phone); - sb.append(", email=").append(email); - sb.append(", sex=").append(sex); - sb.append(", locked=").append(locked); - sb.append(", ctime=").append(ctime); - sb.append("]"); - return sb.toString(); - } } \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserOrganization.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserOrganization.java index d42254a..61ee99a 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserOrganization.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserOrganization.java @@ -1,60 +1,22 @@ package com.micro.fast.upms.pojo; +import com.micro.fast.boot.starter.common.response.BaseConst; +import lombok.Data; + +import javax.validation.constraints.NotNull; import java.io.Serializable; +@Data public class UpmsUserOrganization implements Serializable { + private Integer userOrganizationId; + @NotNull(message = BaseConst.BASEMSG_PREFIX + "请输入用户的id") private Integer userId; + @NotNull(message = BaseConst.BASEMSG_PREFIX + "请输入组织的id") private Integer organizationId; private static final long serialVersionUID = 1L; - public UpmsUserOrganization(Integer userOrganizationId, Integer userId, Integer organizationId) { - this.userOrganizationId = userOrganizationId; - this.userId = userId; - this.organizationId = organizationId; - } - - public UpmsUserOrganization() { - super(); - } - - public Integer getUserOrganizationId() { - return userOrganizationId; - } - - public void setUserOrganizationId(Integer userOrganizationId) { - this.userOrganizationId = userOrganizationId; - } - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public Integer getOrganizationId() { - return organizationId; - } - - public void setOrganizationId(Integer organizationId) { - this.organizationId = organizationId; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", userOrganizationId=").append(userOrganizationId); - sb.append(", userId=").append(userId); - sb.append(", organizationId=").append(organizationId); - sb.append("]"); - return sb.toString(); - } } \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsOrganizationService.java b/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsOrganizationService.java index 23d3459..e9c1212 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsOrganizationService.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsOrganizationService.java @@ -1,10 +1,11 @@ package com.micro.fast.upms.service; +import com.micro.fast.boot.starter.common.response.ServerResponse; import com.micro.fast.common.service.SsmService; /** * @author lsy */ public interface UpmsOrganizationService extends SsmService{ - + ServerResponse getOrganizationByUserId(Integer userId); } \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsPermissionService.java b/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsPermissionService.java index 8b22bf1..3145395 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsPermissionService.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsPermissionService.java @@ -1,10 +1,11 @@ package com.micro.fast.upms.service; +import com.micro.fast.boot.starter.common.response.ServerResponse; import com.micro.fast.common.service.SsmService; /** * @author lsy */ public interface UpmsPermissionService extends SsmService{ - + ServerResponse getPermissionsByUserIdandPTypeandType(Integer userId,Integer type,Integer pType); } \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsRoleService.java b/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsRoleService.java index b49984d..46dba31 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsRoleService.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsRoleService.java @@ -1,10 +1,11 @@ package com.micro.fast.upms.service; +import com.micro.fast.boot.starter.common.response.ServerResponse; import com.micro.fast.common.service.SsmService; /** * @author lsy */ public interface UpmsRoleService extends SsmService{ - + ServerResponse getRolesByUserId(Integer useId); } \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsOrganizationServiceImpl.java b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsOrganizationServiceImpl.java index dca86fd..7019a65 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsOrganizationServiceImpl.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsOrganizationServiceImpl.java @@ -5,6 +5,7 @@ import com.micro.fast.common.service.impl.SsmServiceImpl; import com.micro.fast.upms.dao.UpmsOrganizationMapper; import com.micro.fast.upms.pojo.UpmsOrganization; import com.micro.fast.upms.service.UpmsOrganizationService; +import org.apache.http.protocol.ResponseServer; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -99,4 +100,10 @@ implements UpmsOrganizationService,InitializingBean { public void afterPropertiesSet() throws Exception { super.setMapper(this.mapper); } + + @Override + public ServerResponse getOrganizationByUserId(Integer userId) { + List upmsOrganizations = mapper.selectJionWithUserId(userId); + return ServerResponse.successMsgData("根据用户查询组织成功",upmsOrganizations); + } } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsPermissionServiceImpl.java b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsPermissionServiceImpl.java index cb1b018..4770dd0 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsPermissionServiceImpl.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsPermissionServiceImpl.java @@ -1,5 +1,6 @@ package com.micro.fast.upms.service.impl; +import com.micro.fast.boot.starter.common.response.ServerResponse; import com.micro.fast.common.service.impl.SsmServiceImpl; import com.micro.fast.upms.dao.UpmsPermissionMapper; import com.micro.fast.upms.pojo.UpmsPermission; @@ -8,6 +9,8 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author lsy */ @@ -25,4 +28,10 @@ implements UpmsPermissionService,InitializingBean { public void afterPropertiesSet() throws Exception { super.setMapper(this.mapper); } + + @Override + public ServerResponse getPermissionsByUserIdandPTypeandType(Integer userId, Integer type, Integer pType) { + List upmsPermissions = mapper.selectByUserIdAndType(userId, pType, type); + return ServerResponse.successMsgData("查询权限成功",upmsPermissions); + } } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsRoleServiceImpl.java b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsRoleServiceImpl.java index 23f52a0..2b2f283 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsRoleServiceImpl.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsRoleServiceImpl.java @@ -1,5 +1,6 @@ package com.micro.fast.upms.service.impl; +import com.micro.fast.boot.starter.common.response.ServerResponse; import com.micro.fast.common.service.impl.SsmServiceImpl; import com.micro.fast.upms.dao.UpmsRoleMapper; import com.micro.fast.upms.pojo.UpmsRole; @@ -8,6 +9,9 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.management.relation.Role; +import java.util.List; + /** * @author lsy */ @@ -25,4 +29,10 @@ implements UpmsRoleService,InitializingBean { public void afterPropertiesSet() throws Exception { super.setMapper(this.mapper); } + + @Override + public ServerResponse getRolesByUserId(Integer useId) { + List roles = mapper.selectRoleJoinWithUserId(useId); + return ServerResponse.successMsgData("根据用户id查询角色成功",roles); + } } diff --git a/ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml b/ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml index d024a8b..b9cc4d5 100644 --- a/ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml @@ -117,4 +117,9 @@ #{item} + + \ No newline at end of file diff --git a/ms/upms/src/main/resources/mappers/UpmsRoleMapper.xml b/ms/upms/src/main/resources/mappers/UpmsRoleMapper.xml index 48df0e0..a2cc04f 100644 --- a/ms/upms/src/main/resources/mappers/UpmsRoleMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsRoleMapper.xml @@ -92,4 +92,28 @@ orders = #{orders,jdbcType=BIGINT} where id = #{id,jdbcType=INTEGER} + + + + + DELETE FROM upms_role WHERE + id IN + #{item} + + + + \ No newline at end of file diff --git a/ms/upms/src/main/resources/mappers/UpmsRolePermissionMapper.xml b/ms/upms/src/main/resources/mappers/UpmsRolePermissionMapper.xml index 94151ef..4d02c07 100644 --- a/ms/upms/src/main/resources/mappers/UpmsRolePermissionMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsRolePermissionMapper.xml @@ -70,4 +70,6 @@ permission_id = #{permissionId,jdbcType=INTEGER} where role_permission_id = #{rolePermissionId,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml b/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml index 6eb5c8b..bb5df31 100644 --- a/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml @@ -197,6 +197,30 @@ + + delete from upms_user where id IN diff --git a/ms/upms/src/main/resources/mappers/UpmsUserRoleMapper.xml b/ms/upms/src/main/resources/mappers/UpmsUserRoleMapper.xml index de8e879..0869bec 100644 --- a/ms/upms/src/main/resources/mappers/UpmsUserRoleMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsUserRoleMapper.xml @@ -70,4 +70,5 @@ role_id = #{roleId,jdbcType=INTEGER} where user_role_id = #{userRoleId,jdbcType=INTEGER} + \ No newline at end of file