FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fetch:资源修改

Browse Source
This commit is contained in:
root
2021-07-02 17:32:26 +08:00
parent 4a8b94408d
commit afee88a408
12 changed files with 91 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-main/src/main/resources/application-dev.properties
+7 -7
View File
@@ -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
# ==============================================
adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class SarUserPersonalMenuServiceImpl extends ServiceImpl<SarUserPersonalM
return Result.error("userId不能为空");
}
QueryWrapper<SarUserPersonalMenu> 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());
adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java
+2 -2
View File
@@ -31,8 +31,8 @@ public class TsResourceController extends BaseController<TsResource> {
@ApiOperation("查询所有资源")
@GetMapping
public ResponseMessage<List<TsResource>> getAll(){
List<TsResource> tsResources=tsResourceService.getAll();
public ResponseMessage<List<TsResource>> getAll(TsResource tsResource){
List<TsResource> tsResources=tsResourceService.getAll(tsResource);
return Result.success(tsResources);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java
+47 -12
View File
@@ -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<TsResource> children;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java
+3 -2
View File
@@ -16,7 +16,7 @@ import java.util.List;
*/
public interface ITsResourceService extends IService<TsResource> {
List<TsResource> getAll();
List<TsResource> getAll(TsResource tsResource);
ResponseMessage<Object> addResource(TsResource tsResource);
@@ -27,7 +27,8 @@ public interface ITsResourceService extends IService<TsResource> {
/**
* 通过Ids查询menu
* @param resourceIds :菜单Ids
* @param sorDivide
* @return List<Menu>
*/
List<TsResource> getResourceByIds(List<String> resourceIds);
List<TsResource> getResourceByIds(List<String> resourceIds, String sorDivide);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
+13 -5
View File
@@ -28,12 +28,16 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
private TsResourceDao dao;
/**
* 查询所有菜单
* @param tsResource
*/
@Override
public List<TsResource> getAll() {
QueryWrapper<TsResource> TsResourceQueryWrapper=new QueryWrapper<>();
TsResourceQueryWrapper.isNull("PARENT_ID");
List<TsResource> TsResources=dao.selectList(TsResourceQueryWrapper);
public List<TsResource> getAll(TsResource tsResource) {
QueryWrapper<TsResource> tsResourceQueryWrapper=new QueryWrapper<>();
if(tsResource.getSorDivide()!=null){
tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide());
}
tsResourceQueryWrapper.isNull("PARENT_ID");
List<TsResource> TsResources=dao.selectList(tsResourceQueryWrapper);
for(TsResource TsResource:TsResources){
TsResource.setChildren(recursionGetChildren((TsResource)));
}
@@ -98,12 +102,16 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
/**
* 通过Ids查询Resource
* @param resourceIds :菜单Ids
* @param sorDivide
* @return List<Resource>
*/
@Override
public List<TsResource> getResourceByIds(List<String> resourceIds) {
public List<TsResource> getResourceByIds(List<String> resourceIds, String sorDivide) {
if(resourceIds!=null&&resourceIds.size()>0){
QueryWrapper<TsResource> TsResourceQueryWrapper=new QueryWrapper<>();
if(sorDivide!=null){
TsResourceQueryWrapper.eq("sor_divide",sorDivide);
}
TsResourceQueryWrapper.in("id",resourceIds);
return dao.selectList(TsResourceQueryWrapper);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java
+7 -2
View File
@@ -52,7 +52,7 @@ public class TsRoleController extends BaseController<TsRole> {
@ApiOperation("新增角色")
@PostMapping
public ResponseMessage<Object> addRole(@Validated(TsRole.insert.class) TsRole tsRole){
public ResponseMessage<Object> 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<TsRole> {
@ApiOperation("编辑角色")
@PutMapping
public ResponseMessage<Object> updateRole(@Validated(TsRole.update.class) TsRole tsRole){
public ResponseMessage<Object> 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<TsRole> {
@GetMapping("/id")
public ResponseMessage<TsRole> 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);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java
+4
View File
@@ -119,5 +119,9 @@ public class TsRole extends BaseEntity {
@TableField(exist = false)
private List<TsRole> children;
@ApiModelProperty("父节点名称")
@TableField(exist = false)
private String parent;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java
+1 -1
View File
@@ -115,7 +115,7 @@ public class TsRoleServiceImpl extends ServiceImpl<TsRoleDao, TsRole> implements
*/
@Override
public ResponseMessage<Object> updateRole(TsRole tsRole) {
TsRole oldRole=tsRoleDao.selectById(tsRole.getParentId());
TsRole oldRole=tsRoleDao.selectById(tsRole.getId());
if(oldRole==null){
return Result.error("该角色不存在");
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java
+2 -2
View File
@@ -58,8 +58,8 @@ public class TsUserController extends BaseController<TsUser> {
@ApiOperation("查询当前登录用户资源")
@GetMapping("/resource")
public ResponseMessage<List<TsResource>> getResource(){
List<TsResource> resources=tsUserService.getResource();
public ResponseMessage<List<TsResource>> getResource(TsResource tsResource){
List<TsResource> resources=tsUserService.getResource(tsResource);
return Result.success(resources);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java
+1 -1
View File
@@ -47,7 +47,7 @@ public interface ITsUserService extends IService<TsUser> {
*/
List<SarMenu> getMenu();
List<TsResource> getResource();
List<TsResource> getResource(TsResource tsResource);
/**
* 配置个人菜单
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java
+3 -2
View File
@@ -132,16 +132,17 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
/**
* 查询当前登录的用户资源
* @return List<SarMenu>
* @param tsResource
*/
@Override
public List<TsResource> getResource() {
public List<TsResource> getResource(TsResource tsResource) {
UserEO userEO=UserUtils.getUser();
String userId= userEO.getUsid();
System.out.println(userId);
List<String> positionIds=tsUserDao.selectPositionIds(userId);
List<String> roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds);
List<String> resourceIds=tsRoleService.getResourceIdsByRoleIds(roleIds);
return tsResourceService.getResourceByIds(resourceIds);
return tsResourceService.getResourceByIds(resourceIds,tsResource.getSorDivide());
}
/**