diff --git a/all/ms/Upmsuser.png b/all/ms/Upmsuser.png new file mode 100644 index 0000000..bcb2c4d Binary files /dev/null and b/all/ms/Upmsuser.png differ diff --git a/all/ms/deploy.md b/all/ms/deploy.md index 32fb99e..7b3d695 100644 --- a/all/ms/deploy.md +++ b/all/ms/deploy.md @@ -21,6 +21,7 @@ 省略 #### 安装mysql5.7+ 默认端口改为3317,数据库账号为root,数据库密码为studyj2e。 +导入[sql脚本](../sql) 如果不想修改本地mysql配置,可以fork [config-server](https://gitee.com/kklt1996/config-server)到自己仓库,对config-server 中的数据库连接配置修改。然后ms项目中需要修改config-server模块的配置仓库的指向为自己的仓库url #### 安装flume1.8.0 diff --git a/all/ms/index.png b/all/ms/index.png new file mode 100644 index 0000000..c7aeef4 Binary files /dev/null and b/all/ms/index.png differ diff --git a/all/ms/login.png b/all/ms/login.png new file mode 100644 index 0000000..8e8a27a Binary files /dev/null and b/all/ms/login.png differ diff --git a/all/ms/organization.png b/all/ms/organization.png new file mode 100644 index 0000000..fa0d865 Binary files /dev/null and b/all/ms/organization.png differ diff --git a/all/ms/permission.png b/all/ms/permission.png new file mode 100644 index 0000000..daaa794 Binary files /dev/null and b/all/ms/permission.png differ diff --git a/all/ms/role.png b/all/ms/role.png new file mode 100644 index 0000000..103ed51 Binary files /dev/null and b/all/ms/role.png differ diff --git a/all/ms/serviceInfo.png b/all/ms/serviceInfo.png new file mode 100644 index 0000000..0f9848f Binary files /dev/null and b/all/ms/serviceInfo.png differ diff --git a/all/ms/serviceManage.png b/all/ms/serviceManage.png new file mode 100644 index 0000000..28a920f Binary files /dev/null and b/all/ms/serviceManage.png differ diff --git a/all/ms/serviceRank.png b/all/ms/serviceRank.png new file mode 100644 index 0000000..0cbfdf5 Binary files /dev/null and b/all/ms/serviceRank.png differ diff --git a/all/ms/system.png b/all/ms/system.png new file mode 100644 index 0000000..ba59353 Binary files /dev/null and b/all/ms/system.png differ diff --git a/all/ms/zipkin.png b/all/ms/zipkin.png new file mode 100644 index 0000000..cba7920 Binary files /dev/null and b/all/ms/zipkin.png differ diff --git a/ms/config-server/src/main/resources/application.yml b/ms/config-server/src/main/resources/application.yml index 7fbb471..95d4738 100644 --- a/ms/config-server/src/main/resources/application.yml +++ b/ms/config-server/src/main/resources/application.yml @@ -5,6 +5,8 @@ management: health: diskspace: enabled: true + security: + enabled: false port: 10001 # info 信息的获取 info: diff --git a/ms/gateway/src/main/java/com/micro/fast/gateway/controller/BigShowController.java b/ms/gateway/src/main/java/com/micro/fast/gateway/controller/BigShowController.java new file mode 100644 index 0000000..35fa55f --- /dev/null +++ b/ms/gateway/src/main/java/com/micro/fast/gateway/controller/BigShowController.java @@ -0,0 +1,43 @@ +package com.micro.fast.gateway.controller; + +import com.micro.fast.boot.starter.common.response.ServerResponse; +import com.micro.fast.gateway.filter.RecordInformationFilter; +import com.micro.fast.gateway.pojo.ServiceRank; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ZSetOperations; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +/** + * 展示数据 + * @author lsy + */ +@RestController +@RequestMapping("/bigShow") +@Api(description = "服务调用数据展示") +public class BigShowController { + + @Autowired + private RedisTemplate redisTemplate; + + @GetMapping("/serviceRank") + @ApiOperation("获取服务调用排行") + public ServerResponse ServiceRank(){ + List serviceRanks = new ArrayList<>(); + Set> typedTuples = redisTemplate.opsForZSet().rangeWithScores(RecordInformationFilter.SERVICE_RANK_KEY, 0, 10); + typedTuples.forEach(item -> { + ServiceRank serviceRank = new ServiceRank(item.getValue(),item.getScore()); + serviceRanks.add(serviceRank); + }); + serviceRanks.sort((a,b) -> a.getNumber().equals(b.getNumber()) ? 0 : (a.getNumber() > b.getNumber() ? -1 : 1)); + return ServerResponse.successMsgData("获取服务调用排行成功",serviceRanks); + } +} diff --git a/ms/gateway/src/main/java/com/micro/fast/gateway/filter/PreRequestFilter.java b/ms/gateway/src/main/java/com/micro/fast/gateway/filter/PreRequestFilter.java index 211a725..562884e 100644 --- a/ms/gateway/src/main/java/com/micro/fast/gateway/filter/PreRequestFilter.java +++ b/ms/gateway/src/main/java/com/micro/fast/gateway/filter/PreRequestFilter.java @@ -37,6 +37,7 @@ public class PreRequestFilter extends ZuulFilter { @Override public Object run() { + //校验登录状态和访问权限 RequestContext requestContext = RequestContext.getCurrentContext(); HttpServletRequest request = requestContext.getRequest(); ServerResponse validate = ValidateJwtToken.validate(request, signingKey); @@ -55,7 +56,6 @@ public class PreRequestFilter extends ZuulFilter { requestContext.setResponseStatusCode(HttpStatus.UNAUTHORIZED.value()); } } - return null; } } diff --git a/ms/gateway/src/main/java/com/micro/fast/gateway/filter/RecordInformationFilter.java b/ms/gateway/src/main/java/com/micro/fast/gateway/filter/RecordInformationFilter.java new file mode 100644 index 0000000..5e95942 --- /dev/null +++ b/ms/gateway/src/main/java/com/micro/fast/gateway/filter/RecordInformationFilter.java @@ -0,0 +1,70 @@ +package com.micro.fast.gateway.filter; + +import com.netflix.zuul.ZuulFilter; +import com.netflix.zuul.context.RequestContext; +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ZSetOperations; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import java.util.Set; +import java.util.SortedMap; + +/** + * 对服务访问者的信息进行记录 + * @author lsy + */ +@Component +@Slf4j +public class RecordInformationFilter extends ZuulFilter { + + public static final String SERVICE_RANK_KEY = "gateway:ServiceCount"; + + public static final String SERVICE_COUNT_KEY = "gateway:ServiceCount"; + + @Autowired + private RedisTemplate redisTemplate; + + /** + * 过滤器类型 + * @return + */ + @Override + public String filterType() { + return "pre"; + } + + /** + * 过滤器排序 + * @return + */ + @Override + public int filterOrder() { + return 0; + } + + /** + * 是否启用该过滤器 + * @return + */ + @Override + public boolean shouldFilter() { + return true; + } + + @Override + public Object run() { + RequestContext currentContext = RequestContext.getCurrentContext(); + HttpServletRequest request = currentContext.getRequest(); + String requestURI = request.getRequestURI(); + String[] split = requestURI.split("/"); + // 统计网管访问服务数量 + redisTemplate.opsForZSet().incrementScore(SERVICE_RANK_KEY,split[1],1); + // 统计服务调用总量 + redisTemplate.opsForValue().increment(SERVICE_COUNT_KEY,1); + return null; + } +} diff --git a/ms/gateway/src/main/java/com/micro/fast/gateway/pojo/ServiceRank.java b/ms/gateway/src/main/java/com/micro/fast/gateway/pojo/ServiceRank.java new file mode 100644 index 0000000..a8127bf --- /dev/null +++ b/ms/gateway/src/main/java/com/micro/fast/gateway/pojo/ServiceRank.java @@ -0,0 +1,17 @@ +package com.micro.fast.gateway.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 服务调用排行 + * @author lsy + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ServiceRank { + private String name; + private Double number; +} 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 ccb1930..73e785c 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 @@ -26,41 +26,6 @@ import java.util.List; public class UpmsRolePermissionController { @Autowired - private UpmsRolePermissionService upmsRolePermissionService; + private UpmsRolePermissionService upmsRolePermissionService; - @ApiOperation("添加信息") - @PostMapping - public ServerResponse addUpmsRolePermission(@Valid UpmsRolePermission upmsRolePermission) throws BindException { - return upmsRolePermissionService.add(upmsRolePermission); - } - - @ApiOperation("根据id查询详细信息") - @GetMapping("/{id}") - public ServerResponse getUpmsRolePermissionById( - @PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ - return upmsRolePermissionService.getById(Integer.valueOf(id)); - } - - @ApiOperation("根据条件分页查询") - @GetMapping - public ServerResponse getUpmsRolePermissionByCondition(UpmsRolePermission upmsRolePermission, - @RequestParam(defaultValue = "1",required = false) int pageNum, - @RequestParam(defaultValue = "10",required = false)int pageSize, - @RequestParam(required = false) String orderBy){ - return upmsRolePermissionService.getByCondition(upmsRolePermission,pageNum,pageSize,orderBy); - } - - @ApiOperation("修改信息") - @PutMapping("/{id}") - public ServerResponse updateUpmsRolePermission(UpmsRolePermission upmsRolePermission, - @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ - upmsRolePermission.setRolePermissionId(Integer.valueOf(id)); - return upmsRolePermissionService.update(upmsRolePermission); - } - - @ApiOperation("根据id删除,传入数组") - @DeleteMapping - public ServerResponse deleteUpmsRolePermission(@NotEmpty(message = BaseConst.BASEMSG_PREFIX+"请传入ids") @RequestParam("ids") ArrayList ids){ - return upmsRolePermissionService.deleteByIds(ids); - } } 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 e323f65..10e0962 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,7 +8,6 @@ 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; @@ -17,7 +16,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import javax.validation.constraints.NotNull; import java.util.ArrayList; -import java.util.List; /** * 权限管理系统用户管理 @@ -95,4 +93,14 @@ public class UpmsUserController { @NotEmpty(message = BaseConst.BASEMSG_PREFIX + "请传入id") @RequestParam("ids") ArrayList ids) { return upmsUserService.deleteByIds(ids); } + + @ApiOperation("根据组织id还有用户信息查询用户") + @GetMapping("/organization") + public ServerResponse getUsersByOrgId(UpmsUser upmsUser, + @RequestParam(defaultValue = "1", required = false) int pageNum, + @RequestParam(defaultValue = "10", required = false) int pageSize, + @RequestParam(required = false) String orderBy, + @RequestParam(value = "organizationId",required = false) Integer orgId ) { + return upmsUserService.getUsersByOrgId(upmsUser, orgId, pageNum, pageSize, orderBy); + } } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserOrganizationController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserOrganizationController.java index c979dda..c7f0b2e 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserOrganizationController.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserOrganizationController.java @@ -1,66 +1,36 @@ 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.UpmsUserOrganization; import com.micro.fast.upms.service.UpmsUserOrganizationService; 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 javax.validation.Valid; import java.util.ArrayList; -import java.util.List; /** * * @author lsy */ -@Api("upmsUserOrganization") +@Api(description = "用户组织关系维护") @RestController @RequestMapping("/upmsUserOrganization") public class UpmsUserOrganizationController { @Autowired - private UpmsUserOrganizationService upmsUserOrganizationService; + private UpmsUserOrganizationService upmsUserOrganizationService; - @ApiOperation("添加信息") - @PostMapping - public ServerResponse addUpmsUserOrganization(@Valid UpmsUserOrganization upmsUserOrganization) throws BindException { - return upmsUserOrganizationService.add(upmsUserOrganization); + @ApiOperation("批量添加用户和组织的关系") + @PostMapping("/batch") + public ServerResponse batchAdd(@RequestParam("userId") Integer userId, + @RequestParam("organizationIds") ArrayList organizationIds){ + return upmsUserOrganizationService.batchInsert(userId,organizationIds); } - - @ApiOperation("根据id查询详细信息") - @GetMapping("/{id}") - public ServerResponse getUpmsUserOrganizationById( - @PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ - return upmsUserOrganizationService.getById(Integer.valueOf(id)); - } - - @ApiOperation("根据条件分页查询") - @GetMapping - public ServerResponse getUpmsUserOrganizationByCondition(UpmsUserOrganization upmsUserOrganization, - @RequestParam(defaultValue = "1",required = false) int pageNum, - @RequestParam(defaultValue = "10",required = false)int pageSize, - @RequestParam(required = false) String orderBy){ - return upmsUserOrganizationService.getByCondition(upmsUserOrganization,pageNum,pageSize,orderBy); - } - - @ApiOperation("修改信息") - @PutMapping("/{id}") - public ServerResponse updateUpmsUserOrganization(UpmsUserOrganization upmsUserOrganization, - @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ - upmsUserOrganization.setUserOrganizationId(Integer.valueOf(id)); - return upmsUserOrganizationService.update(upmsUserOrganization); - } - - @ApiOperation("根据id删除,传入数组") - @DeleteMapping - public ServerResponse deleteUpmsUserOrganization(@NotEmpty(message = BaseConst.BASEMSG_PREFIX+"请传入ids") @RequestParam("ids") ArrayList ids){ - return upmsUserOrganizationService.deleteByIds(ids); + @ApiOperation("批量删除用户和组织的关系") + @DeleteMapping("/batch") + public ServerResponse batchDelete(@RequestParam("userId") Integer userId, + @RequestParam("organizationIds") ArrayList organizationIds){ + return upmsUserOrganizationService.batchDelete(userId,organizationIds); } } 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 index c572171..6f2a737 100644 --- 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 @@ -1,20 +1,16 @@ 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.UpmsUserPermission; import com.micro.fast.upms.service.UpmsUserPermissionService; 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 java.util.ArrayList; -import java.util.List; /** * @@ -26,41 +22,12 @@ import java.util.List; public class UpmsUserPermissionController { @Autowired - private UpmsUserPermissionService upmsUserPermissionService; + private UpmsUserPermissionService upmsUserPermissionService; - @ApiOperation("添加信息") - @PostMapping - public ServerResponse addUpmsUserPermission(@Valid UpmsUserPermission upmsUserPermission) throws BindException { - return upmsUserPermissionService.add(upmsUserPermission); - } + @ApiOperation("批量添加用户和组织的关系,一个用户可以属于多个组织") + @PostMapping("/batch/oneUserWithManyOrganization") + public ServerResponse batchAddUpmsUserPermission(@RequestParam("userId") Integer userId,@RequestParam("orgIds") ArrayList orgIds) { - @ApiOperation("根据id查询详细信息") - @GetMapping("/{id}") - public ServerResponse getUpmsUserPermissionById( - @PathVariable(value = "id") @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ - return upmsUserPermissionService.getById(Integer.valueOf(id)); - } - - @ApiOperation("根据条件分页查询") - @GetMapping - public ServerResponse getUpmsUserPermissionByCondition(UpmsUserPermission upmsUserPermission, - @RequestParam(defaultValue = "1",required = false) int pageNum, - @RequestParam(defaultValue = "10",required = false)int pageSize, - @RequestParam(required = false) String orderBy){ - return upmsUserPermissionService.getByCondition(upmsUserPermission,pageNum,pageSize,orderBy); - } - - @ApiOperation("修改信息") - @PutMapping("/{id}") - public ServerResponse updateUpmsUserPermission(UpmsUserPermission upmsUserPermission, - @NotBlank(message = BaseConst.BASEMSG_PREFIX+"请传入id") String id){ - upmsUserPermission.setUserPermissionId(Integer.valueOf(id)); - return upmsUserPermissionService.update(upmsUserPermission); - } - - @ApiOperation("根据id删除,传入数组") - @DeleteMapping - public ServerResponse deleteUpmsUserPermission(@NotEmpty(message = BaseConst.BASEMSG_PREFIX+"请传入ids") @RequestParam("ids") ArrayList ids){ - return upmsUserPermissionService.deleteByIds(ids); + return null; } } 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 8d984d9..bfead7e 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,7 +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 org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java index 1dae1e2..14139bf 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java @@ -1,7 +1,6 @@ package com.micro.fast.upms.dao; import com.micro.fast.common.dao.SsmMapper; -import com.micro.fast.upms.pojo.UpmsOrganization; import com.micro.fast.upms.pojo.UpmsUser; import org.apache.ibatis.annotations.Param; @@ -60,5 +59,5 @@ public interface UpmsUserMapper extends SsmMapper{ * 根据组织id还有用户的其他信息查询 * @return */ - List selectJoinWithOrgId(UpmsUser record, @Param("orgid") Integer orgid); + List selectJoinWithOrgId(@Param("user") UpmsUser record, @Param("orgid") Integer orgid); } \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserOrganizationMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserOrganizationMapper.java index e0f156b..93e1e1a 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserOrganizationMapper.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserOrganizationMapper.java @@ -1,24 +1,18 @@ package com.micro.fast.upms.dao; -import com.micro.fast.common.dao.SsmMapper; -import com.micro.fast.upms.pojo.UpmsUserOrganization; +import org.apache.ibatis.annotations.Param; -public interface UpmsUserOrganizationMapper extends SsmMapper { - @Override - int deleteByPrimaryKey(Integer userOrganizationId); +import java.util.List; - @Override - int insert(UpmsUserOrganization record); +public interface UpmsUserOrganizationMapper { - @Override - int insertSelective(UpmsUserOrganization record); + /** + * 批量插入一个用户和多个组织的关系 + * @param userId + * @param orgIds + * @return + */ + int batchInsertOneUserWithManyOrg(@Param("userId") Integer userId, @Param("orgIds") List orgIds); - @Override - UpmsUserOrganization selectByPrimaryKey(Integer userOrganizationId); - - @Override - int updateByPrimaryKeySelective(UpmsUserOrganization record); - - @Override - int updateByPrimaryKey(UpmsUserOrganization record); + int batchDeleteByUserIdOrganizationId(@Param("userId")Integer userId,@Param("orgIds")List orgs); } \ No newline at end of file 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 index 7d68eff..aeaa907 100644 --- 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 @@ -1,9 +1,11 @@ package com.micro.fast.upms.dao; -import com.micro.fast.common.dao.SsmMapper; import com.micro.fast.upms.pojo.UpmsUserPermission; +import org.apache.ibatis.annotations.Param; -public interface UpmsUserPermissionMapper extends SsmMapper { +import java.util.List; + +public interface UpmsUserPermissionMapper { int deleteByPrimaryKey(Integer userPermissionId); int insert(UpmsUserPermission record); @@ -15,4 +17,5 @@ public interface UpmsUserPermissionMapper extends SsmMapper extends SsmService{ +public interface UpmsRolePermissionService{ } \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserOrganizationService.java b/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserOrganizationService.java index d69acce..7b98616 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserOrganizationService.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserOrganizationService.java @@ -1,10 +1,27 @@ package com.micro.fast.upms.service; +import com.micro.fast.boot.starter.common.response.ServerResponse; import com.micro.fast.common.service.SsmService; +import java.util.List; + /** * @author lsy */ -public interface UpmsUserOrganizationService extends SsmService{ +public interface UpmsUserOrganizationService{ + /** + * 批量建立用户和组织的关系 + * @param userId + * @param orgIds + * @return + */ + ServerResponse batchInsert(Integer userId, List orgIds); + /** + * 批量删除用户和组织的关系 + * @param userId + * @param orgIds + * @return + */ + ServerResponse batchDelete(Integer userId,List orgIds); } \ 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 index 251c5cf..938eed7 100644 --- 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 @@ -1,10 +1,10 @@ package com.micro.fast.upms.service; -import com.micro.fast.common.service.SsmService; - /** * @author lsy */ -public interface UpmsUserPermissionService extends SsmService{ +public interface UpmsUserPermissionService{ + + } \ No newline at end of file diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserService.java b/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserService.java index 9f8b4b3..e60b3ec 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserService.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserService.java @@ -33,4 +33,9 @@ public interface UpmsUserService extends SsmService { */ ServerResponse checkEmail(String email); + /** + * 根据组织等信息查询用户 + */ + ServerResponse getUsersByOrgId(UpmsUser upmsUser, Integer orgId, int pageNum, int pageSize, String order_by); + } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsRolePermissionServiceImpl.java b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsRolePermissionServiceImpl.java index 62f76cf..4e65f99 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsRolePermissionServiceImpl.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsRolePermissionServiceImpl.java @@ -1,10 +1,7 @@ package com.micro.fast.upms.service.impl; -import com.micro.fast.common.service.impl.SsmServiceImpl; import com.micro.fast.upms.dao.UpmsRolePermissionMapper; -import com.micro.fast.upms.pojo.UpmsRolePermission; import com.micro.fast.upms.service.UpmsRolePermissionService; -import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -12,17 +9,9 @@ import org.springframework.stereotype.Service; * @author lsy */ @Service -public class UpmsRolePermissionServiceImpl extends SsmServiceImpl -implements UpmsRolePermissionService,InitializingBean { +public class UpmsRolePermissionServiceImpl implements UpmsRolePermissionService { @Autowired private UpmsRolePermissionMapper mapper; - /** - * 在这个bean初始化完成后覆盖父类的mapper - */ - @Override - public void afterPropertiesSet() throws Exception { - super.setMapper(this.mapper); - } } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserOrganizationServiceImpl.java b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserOrganizationServiceImpl.java index fd5a259..7b14c44 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserOrganizationServiceImpl.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserOrganizationServiceImpl.java @@ -1,28 +1,39 @@ package com.micro.fast.upms.service.impl; -import com.micro.fast.common.service.impl.SsmServiceImpl; +import com.micro.fast.boot.starter.common.response.ServerResponse; import com.micro.fast.upms.dao.UpmsUserOrganizationMapper; -import com.micro.fast.upms.pojo.UpmsUserOrganization; import com.micro.fast.upms.service.UpmsUserOrganizationService; -import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author lsy */ @Service -public class UpmsUserOrganizationServiceImpl extends SsmServiceImpl -implements UpmsUserOrganizationService,InitializingBean { +public class UpmsUserOrganizationServiceImpl implements UpmsUserOrganizationService { @Autowired private UpmsUserOrganizationMapper mapper; - /** - * 在这个bean初始化完成后覆盖父类的mapper - */ @Override - public void afterPropertiesSet() throws Exception { - super.setMapper(this.mapper); + public ServerResponse batchInsert(Integer userId, List orgIds) { + int i = mapper.batchInsertOneUserWithManyOrg(userId, orgIds); + if (i>0) { + return ServerResponse.successMsg("加入组织成功"); + } else { + return ServerResponse.errorMsg("加入组织失败"); + } + } + + @Override + public ServerResponse batchDelete(Integer userId, List orgIds) { + int i = mapper.batchDeleteByUserIdOrganizationId(userId, orgIds); + if (i>0) { + return ServerResponse.successMsg("退出组织成功"); + } else { + return ServerResponse.errorMsg("退出组织失败"); + } } } 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 index ca4cff0..d6cfd52 100644 --- 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 @@ -1,28 +1,20 @@ package com.micro.fast.upms.service.impl; -import com.micro.fast.common.service.impl.SsmServiceImpl; +import com.micro.fast.boot.starter.common.response.ServerResponse; import com.micro.fast.upms.dao.UpmsUserPermissionMapper; -import com.micro.fast.upms.pojo.UpmsUserPermission; import com.micro.fast.upms.service.UpmsUserPermissionService; -import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author lsy */ @Service -public class UpmsUserPermissionServiceImpl extends SsmServiceImpl -implements UpmsUserPermissionService,InitializingBean { +public class UpmsUserPermissionServiceImpl implements UpmsUserPermissionService{ @Autowired private UpmsUserPermissionMapper mapper; - /** - * 在这个bean初始化完成后覆盖父类的mapper - */ - @Override - public void afterPropertiesSet() throws Exception { - super.setMapper(this.mapper); - } } diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserServiceImpl.java b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserServiceImpl.java index 6cbaf0c..35629af 100644 --- a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserServiceImpl.java +++ b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserServiceImpl.java @@ -1,7 +1,10 @@ package com.micro.fast.upms.service.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.micro.fast.boot.starter.common.exception.SystemException; import com.micro.fast.boot.starter.common.exception.UserException; +import com.micro.fast.boot.starter.common.response.BaseConst; import com.micro.fast.boot.starter.common.response.BaseConst.SystemResponse; import com.micro.fast.boot.starter.common.response.BaseConst.UserResponse; import com.micro.fast.boot.starter.common.response.ServerResponse; @@ -14,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author lsy */ @@ -82,6 +87,15 @@ public class UpmsUserServiceImpl extends SsmServiceImpl upmsUsers = upmsUserMapper.selectJoinWithOrgId(upmsUser, orgId); + PageInfo pageInfo = new PageInfo(upmsUsers); + return ServerResponse.successMsgData("根据组织查询用户成功",pageInfo); + } + @Override public void afterPropertiesSet() throws Exception { super.setMapper(this.upmsUserMapper); diff --git a/ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml b/ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml index b9cc4d5..07eda68 100644 --- a/ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml @@ -119,7 +119,7 @@ \ 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 bb5df31..d3a5732 100644 --- a/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml @@ -181,16 +181,16 @@ SELECT FROM micro.upms_user - username like "%"#{username}"%" + username like #{username} - and realname like "%"#{realname}"%" + and realname like #{realname} - and phone like "%"#{phone}"%" + and phone like #{phone} - and email like "%"#{email}"%" + and email like #{email} and sex = #{sex} @@ -203,20 +203,20 @@ and id IN (SELECT user_id FROM upms_user_organization WHERE organization_id = #{orgid}) - - and username like "%"#{username}"%" + + and username like #{user.username} - - and realname like "%"#{realname}"%" + + and realname like #{user.realname} - - and phone like "%"#{phone}"%" + + and phone like #{user.phone} - - and email like "%"#{email}"%" + + and email like #{user.email} - - and sex = #{sex} + + and sex = #{user.sex} diff --git a/ms/upms/src/main/resources/mappers/UpmsUserOrganizationMapper.xml b/ms/upms/src/main/resources/mappers/UpmsUserOrganizationMapper.xml index 072b787..589b146 100644 --- a/ms/upms/src/main/resources/mappers/UpmsUserOrganizationMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsUserOrganizationMapper.xml @@ -11,63 +11,18 @@ user_organization_id, user_id, organization_id - - - delete from upms_user_organization - where user_organization_id = #{userOrganizationId,jdbcType=INTEGER} + + + insert into upms_user_organization ( user_id, organization_id) + values + + (#{userId},#{item}) + + + + DELETE FROM upms_user_organization WHERE user_id = #{userId} and organization_id in + + #{item} + - - insert into upms_user_organization (user_organization_id, user_id, organization_id - ) - values (#{userOrganizationId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{organizationId,jdbcType=INTEGER} - ) - - - insert into upms_user_organization - - - user_organization_id, - - - user_id, - - - organization_id, - - - - - #{userOrganizationId,jdbcType=INTEGER}, - - - #{userId,jdbcType=INTEGER}, - - - #{organizationId,jdbcType=INTEGER}, - - - - - update upms_user_organization - - - user_id = #{userId,jdbcType=INTEGER}, - - - organization_id = #{organizationId,jdbcType=INTEGER}, - - - where user_organization_id = #{userOrganizationId,jdbcType=INTEGER} - - - update upms_user_organization - set user_id = #{userId,jdbcType=INTEGER}, - organization_id = #{organizationId,jdbcType=INTEGER} - where user_organization_id = #{userOrganizationId,jdbcType=INTEGER} - \ No newline at end of file diff --git a/ms/upms/src/main/resources/mappers/UpmsUserPermissionMapper.xml b/ms/upms/src/main/resources/mappers/UpmsUserPermissionMapper.xml index 1a56ba9..2455bf5 100644 --- a/ms/upms/src/main/resources/mappers/UpmsUserPermissionMapper.xml +++ b/ms/upms/src/main/resources/mappers/UpmsUserPermissionMapper.xml @@ -59,7 +59,7 @@ - + update upms_user_permission @@ -81,4 +81,5 @@ type = #{type,jdbcType=TINYINT} where user_permission_id = #{userPermissionId,jdbcType=INTEGER} + \ No newline at end of file