From 44931b0a2b60829dec492acafbfc6820b98eefec Mon Sep 17 00:00:00 2001 From: Burce Date: Wed, 16 Oct 2019 18:31:53 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86]adjust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invest/InvestCustomerController.java | 2 +- .../invest/InvestRemindController.java | 2 +- .../com/iformall/tenant/TenantInfoImpl.java | 4 ++ .../iformall/domain/po/MallPermission.java | 4 -- .../iformall/domain/po/WxLogicPermission.java | 28 +++++++++++++ .../mapper/WxLogicPermissionMapper.java | 19 +++++++++ .../impl/MallPermissionServiceImpl.java | 37 ++++++++++++++--- .../mapper/WxLogicPermissionMapper.xml | 41 +++++++++++++++++++ 8 files changed, 125 insertions(+), 12 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxLogicPermission.java create mode 100755 mallinkService/src/main/java/com/iformall/mapper/WxLogicPermissionMapper.java create mode 100644 mallinkService/src/main/resources/mapper/WxLogicPermissionMapper.xml diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java index 26f0274a4..6be4f75cd 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestCustomerController.java @@ -43,7 +43,7 @@ public class InvestCustomerController extends InvestBaseController{ */ @ApiOperation("客户信息列表") @SystemControllerLog(description = "客户信息列表") - @PostMapping("/list/simple") + @GetMapping("/list/simple") public InvestResultData> list(InvestPageQuery params) { return execute(params, p -> investCustomerService.queryPage(p)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java index c1e0be3e9..e5ba087d5 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java @@ -89,7 +89,7 @@ public class InvestRemindController extends InvestBaseController { * 删除登录用户全部提醒 */ @SystemServiceLog - @PostMapping("/deleteAll") + //@PostMapping("/deleteAll") public InvestResultData deleteAll() { return execute(null, p -> investRemindService.removeAll()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 5aaa2fc83..0df1360ac 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -78,6 +78,10 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_data_rule_target".equals(tableName)) { return true; } + + if ("wx_logic_permission".equals(tableName)) { + return true; + } return false; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java index 7adeec629..d056d2497 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java @@ -69,8 +69,4 @@ public class MallPermission extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="子菜单",name="children") private List children; - @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="页面按钮",name="btnChildren") - private List btnChildren; - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLogicPermission.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLogicPermission.java new file mode 100644 index 000000000..fb93f546d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLogicPermission.java @@ -0,0 +1,28 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@Data +@TableName(value = "wx_logic_permission") +@EqualsAndHashCode(callSuper = true) +public class WxLogicPermission extends BaseEntity { + private static final long serialVersionUID = 1L; + + @io.swagger.annotations.ApiModelProperty(value = "id", name = "主键") + protected Long id; + @io.swagger.annotations.ApiModelProperty(value = "名称", name = "name") + private String name; + @io.swagger.annotations.ApiModelProperty(value = "权限父ID", name = "parentId") + private Long parentId; + @io.swagger.annotations.ApiModelProperty(value = "权限列表", name = "permission") + private String permission; + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") + private Date createDate; + @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate") + private Date updateDate; +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxLogicPermissionMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxLogicPermissionMapper.java new file mode 100755 index 000000000..5a44c3b47 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxLogicPermissionMapper.java @@ -0,0 +1,19 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxLogicPermission; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 客户列表 + * + * @author + * @email + * @date 2019-09-23 18:40:43 + */ +@Mapper +public interface WxLogicPermissionMapper extends CommonMapper { + List findList(WxLogicPermission param); +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index 021eb2f7c..afd3f9f0b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -2,10 +2,12 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; +import com.iformall.domain.po.WxLogicPermission; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.MallPermission; import com.iformall.domain.po.MallUserInfo; @@ -14,9 +16,9 @@ import com.iformall.enums.EnumPermissionType; import com.iformall.enums.EnumUserAdmin; import com.iformall.mapper.MallPermissionMapper; import com.iformall.mapper.MallUserInfoMapper; +import com.iformall.mapper.WxLogicPermissionMapper; import com.iformall.mapper.WxMallMapper; import com.iformall.service.MallPermissionService; -import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +38,8 @@ public class MallPermissionServiceImpl implements MallPermissionService { @Autowired private WxMallMapper wxMallMapper; + @Autowired + private WxLogicPermissionMapper logicPermissionDao; @Override public List queryListParentId(Long parentId, List menuIdList, boolean boolNav) { @@ -51,6 +55,10 @@ public class MallPermissionServiceImpl implements MallPermissionService { continue; } } + + if (Objects.equals(menu.getResourceType(), EnumPermissionType.BUTTON.getCode())) { + continue; + } if(menuIdList.contains(menu.getId())){ userMenuList.add(menu); } @@ -135,11 +143,10 @@ public class MallPermissionServiceImpl implements MallPermissionService { for(MallPermission entity : menuList){ //目录 if(entity.getResourceType().equals(EnumPermissionType.CATALOG.getCode())){ - entity.setChildren(getMenuTreeList(queryListParentId(entity.getId(), menuIdList, boolNav), menuIdList, boolNav)); - } - List btnList = mallPermissionMapper.queryBtnListByParentId(entity.getId()); - if (CollectionUtils.isNotEmpty(btnList)) { - entity.setBtnChildren(btnList); + List subPermisson = getMenuTreeList(queryListParentId(entity.getId(), menuIdList, boolNav), menuIdList, boolNav); + List logicPermisson = getLogicPermisson(entity); + subPermisson.addAll(logicPermisson); + entity.setChildren(subPermisson); } subMenuList.add(entity); } @@ -147,6 +154,24 @@ public class MallPermissionServiceImpl implements MallPermissionService { return subMenuList; } + private List getLogicPermisson(MallPermission entity) { + List mallPermissionList = new ArrayList<>(); + if (entity.getParentId() != 0) { + return mallPermissionList; + } + WxLogicPermission query = new WxLogicPermission(); + query.setParentId(entity.getId()); + List logicPermissionList = logicPermissionDao.findList(query); + for (WxLogicPermission logicPermission : logicPermissionList) { + MallPermission permission = new MallPermission(); + permission.setName(logicPermission.getName()); + List mallPermissions = mallPermissionMapper.selectBatchIds(JSONArray.parseArray(logicPermission.getPermission(), Long.class)); + permission.setChildren(mallPermissions); + mallPermissionList.add(permission); + } + return mallPermissionList; + } + @Override public PageInfo listAsPage(MallPermission record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallPermissionMapper.findList(record)); diff --git a/mallinkService/src/main/resources/mapper/WxLogicPermissionMapper.xml b/mallinkService/src/main/resources/mapper/WxLogicPermissionMapper.xml new file mode 100644 index 000000000..199106c3a --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxLogicPermissionMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + `id`,`parent_id`,`name`,`permission`,`create_date`,`update_date` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `parent_id` = #{parentId} + + + + and `name` like concat('%',#{name},'%') + + order by ${sortColumns} + + + + +