From afee88a408a9a2a75ad84264d6f60b1c56611950 Mon Sep 17 00:00:00 2001 From: root <8964602+zxylbj@user.noreply.gitee.com> Date: Fri, 2 Jul 2021 17:32:26 +0800 Subject: [PATCH] =?UTF-8?q?fetch:=E8=B5=84=E6=BA=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-dev.properties | 14 ++--- .../impl/SarUserPersonalMenuServiceImpl.java | 2 +- .../controller/TsResourceController.java | 4 +- .../slrs/sarResource/entity/TsResource.java | 59 +++++++++++++++---- .../service/ITsResourceService.java | 5 +- .../service/impl/TsResourceServiceImpl.java | 18 ++++-- .../sarRole/controller/TsRoleController.java | 9 ++- .../adc/da/slrs/sarRole/entity/TsRole.java | 4 ++ .../service/impl/TsRoleServiceImpl.java | 2 +- .../sarUser/controller/TsUserController.java | 4 +- .../slrs/sarUser/service/ITsUserService.java | 2 +- .../service/impl/TsUserServiceImpl.java | 5 +- 12 files changed, 91 insertions(+), 37 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 3b50c583..f952ebd8 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -14,8 +14,8 @@ application.code=20200101 application.center=1 #============================================== #Eruept -eureka.client.allow-redirects=true -eureka.client.register-with-eureka=true +eureka.client.allow-redirects=false +eureka.client.register-with-eureka=false eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #============================================== @@ -35,11 +35,11 @@ spring.mail.port=587 # ============================================== # rabbitMQ # ============================================== -spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc -spring.rabbitmq.port=5672 -spring.rabbitmq.virtual-host=uat_pcms -spring.rabbitmq.username=uat_pcms -spring.rabbitmq.password=VxsBLL5bJruwzXfS +#spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +#spring.rabbitmq.port=5672 +#spring.rabbitmq.virtual-host=uat_pcms +#spring.rabbitmq.username=uat_pcms +#spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true # ============================================== diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java index b1b3ceae..79226046 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java @@ -39,7 +39,7 @@ public class SarUserPersonalMenuServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); - queryWrapper.eq("user_id",queryWrapper); + queryWrapper.eq("user_id",eo.getUserId()); if(eo.getMenuUrl()!=null)queryWrapper.eq("menu_url",eo.getMenuUrl()); if(eo.getMenuName()!=null&&eo.getMenuName().trim().length()>0)queryWrapper.like("menu_name",eo.getMenuName().trim()); if(eo.getState()!=null)queryWrapper.eq("state",eo.getState()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java index 3c7ad27e..f287dc62 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java @@ -31,8 +31,8 @@ public class TsResourceController extends BaseController { @ApiOperation("查询所有资源") @GetMapping - public ResponseMessage> getAll(){ - List tsResources=tsResourceService.getAll(); + public ResponseMessage> getAll(TsResource tsResource){ + List tsResources=tsResourceService.getAll(tsResource); return Result.success(tsResources); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java index 4cddc2ef..f950192c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java @@ -1,6 +1,9 @@ package com.adc.da.slrs.sarResource.entity; import com.adc.da.base.entity.BaseEntity; +import com.adc.da.slrs.sarMenu.entity.SarMenu; +import com.adc.da.utils.treetool.annotation.TreeNodeName; +import com.adc.da.utils.treetool.annotation.TreeNodeParentId; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,6 +14,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; +import java.util.Date; import java.util.List; /** @@ -31,23 +35,54 @@ public class TsResource extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "路径") - private String href; - @ApiModelProperty(value = "父节点ID") - private String parentId; - @ApiModelProperty(value = "资源名称") - private String name; - - @TableId(type = IdType.UUID) - @NotNull(message = "id不能为空",groups = {update.class}) - @ApiModelProperty(value = "ID") + @NotNull(message = "id不能为空",groups = {SarMenu.update.class}) + @ApiModelProperty(value = "主键") + @TableId(value = "ID",type = IdType.UUID) private String id; + @ApiModelProperty(value = "标准法规划分") + @TableField("SOR_DIVIDE") + private String sorDivide; + + @TreeNodeName + @ApiModelProperty(value = "目录名称") + @TableField("MENU_NAME") + private String menuName; + + @TreeNodeParentId + @ApiModelProperty(value = "父级ID") + @TableField("PARENT_ID") + private String parentId; + + @ApiModelProperty(value = "父级ID集合") + @TableField("PARENT_IDS") + private String parentIds; + + @ApiModelProperty(value = "排序序号") + @TableField("DISPLAY_SEQ") + private Integer displaySeq; + + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private Integer validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + private Date modifyTime; + + @ApiModelProperty(value = "备注") + @TableField("REMARKS") + private String remarks; + + @ApiModelProperty(value = "子菜单") @TableField(exist = false) - @ApiModelProperty("子节点") private List children; - } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java index 0dfe5a24..ba1d7fe4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java @@ -16,7 +16,7 @@ import java.util.List; */ public interface ITsResourceService extends IService { - List getAll(); + List getAll(TsResource tsResource); ResponseMessage addResource(TsResource tsResource); @@ -27,7 +27,8 @@ public interface ITsResourceService extends IService { /** * 通过Ids查询menu * @param resourceIds :菜单Ids + * @param sorDivide * @return List */ - List getResourceByIds(List resourceIds); + List getResourceByIds(List resourceIds, String sorDivide); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index 3c284b46..e15836fb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -28,12 +28,16 @@ public class TsResourceServiceImpl extends ServiceImpl getAll() { - QueryWrapper TsResourceQueryWrapper=new QueryWrapper<>(); - TsResourceQueryWrapper.isNull("PARENT_ID"); - List TsResources=dao.selectList(TsResourceQueryWrapper); + public List getAll(TsResource tsResource) { + QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); + if(tsResource.getSorDivide()!=null){ + tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide()); + } + tsResourceQueryWrapper.isNull("PARENT_ID"); + List TsResources=dao.selectList(tsResourceQueryWrapper); for(TsResource TsResource:TsResources){ TsResource.setChildren(recursionGetChildren((TsResource))); } @@ -98,12 +102,16 @@ public class TsResourceServiceImpl extends ServiceImpl */ @Override - public List getResourceByIds(List resourceIds) { + public List getResourceByIds(List resourceIds, String sorDivide) { if(resourceIds!=null&&resourceIds.size()>0){ QueryWrapper TsResourceQueryWrapper=new QueryWrapper<>(); + if(sorDivide!=null){ + TsResourceQueryWrapper.eq("sor_divide",sorDivide); + } TsResourceQueryWrapper.in("id",resourceIds); return dao.selectList(TsResourceQueryWrapper); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index d29f9159..3f33c2cd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -52,7 +52,7 @@ public class TsRoleController extends BaseController { @ApiOperation("新增角色") @PostMapping - public ResponseMessage addRole(@Validated(TsRole.insert.class) TsRole tsRole){ + public ResponseMessage addRole(@Validated(TsRole.insert.class) @RequestBody TsRole tsRole){ //设置操作人 UserEO userEO=UserUtils.getUser(); tsRole.setOperator(userEO.getUname()); @@ -61,10 +61,11 @@ public class TsRoleController extends BaseController { @ApiOperation("编辑角色") @PutMapping - public ResponseMessage updateRole(@Validated(TsRole.update.class) TsRole tsRole){ + public ResponseMessage updateRole(@Validated(TsRole.update.class)@RequestBody TsRole tsRole){ //设置操作人 UserEO userEO=UserUtils.getUser(); tsRole.setOperator(userEO.getUname()); + System.out.println(tsRole); return tsRoleService.updateRole(tsRole); } @@ -84,6 +85,10 @@ public class TsRoleController extends BaseController { @GetMapping("/id") public ResponseMessage getRoleById(@RequestParam String roleId){ TsRole tsRole=tsRoleService.getById(roleId); + if(tsRole.getParentId()!=null){ + TsRole parent=tsRoleService.getById(tsRole.getParentId()); + tsRole.setParent(parent.getName()); + } return Result.success(tsRole); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java index 3745aeaa..a2a705b2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java @@ -119,5 +119,9 @@ public class TsRole extends BaseEntity { @TableField(exist = false) private List children; + @ApiModelProperty("父节点名称") + @TableField(exist = false) + private String parent; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index 3db343a2..fc4d2e8d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -115,7 +115,7 @@ public class TsRoleServiceImpl extends ServiceImpl implements */ @Override public ResponseMessage updateRole(TsRole tsRole) { - TsRole oldRole=tsRoleDao.selectById(tsRole.getParentId()); + TsRole oldRole=tsRoleDao.selectById(tsRole.getId()); if(oldRole==null){ return Result.error("该角色不存在"); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java index 8aec0495..32a5091a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java @@ -58,8 +58,8 @@ public class TsUserController extends BaseController { @ApiOperation("查询当前登录用户资源") @GetMapping("/resource") - public ResponseMessage> getResource(){ - List resources=tsUserService.getResource(); + public ResponseMessage> getResource(TsResource tsResource){ + List resources=tsUserService.getResource(tsResource); return Result.success(resources); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 00560dd3..7e84c625 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -47,7 +47,7 @@ public interface ITsUserService extends IService { */ List getMenu(); - List getResource(); + List getResource(TsResource tsResource); /** * 配置个人菜单 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index dc6b96fa..7f732335 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -132,16 +132,17 @@ public class TsUserServiceImpl extends ServiceImpl implements /** * 查询当前登录的用户资源 * @return List + * @param tsResource */ @Override - public List getResource() { + public List getResource(TsResource tsResource) { UserEO userEO=UserUtils.getUser(); String userId= userEO.getUsid(); System.out.println(userId); List positionIds=tsUserDao.selectPositionIds(userId); List roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds); List resourceIds=tsRoleService.getResourceIdsByRoleIds(roleIds); - return tsResourceService.getResourceByIds(resourceIds); + return tsResourceService.getResourceByIds(resourceIds,tsResource.getSorDivide()); } /**