| @@ -43,7 +43,7 @@ public class InvestCustomerController extends InvestBaseController{ | |||
| */ | |||
| @ApiOperation("客户信息列表") | |||
| @SystemControllerLog(description = "客户信息列表") | |||
| @PostMapping("/list/simple") | |||
| @GetMapping("/list/simple") | |||
| public InvestResultData<InvestPageResult<InvestCustomerEntity>> list(InvestPageQuery<InvestCustomerEntity> params) { | |||
| return execute(params, p -> investCustomerService.queryPage(p)); | |||
| } | |||
| @@ -89,7 +89,7 @@ public class InvestRemindController extends InvestBaseController { | |||
| * 删除登录用户全部提醒 | |||
| */ | |||
| @SystemServiceLog | |||
| @PostMapping("/deleteAll") | |||
| //@PostMapping("/deleteAll") | |||
| public InvestResultData deleteAll() { | |||
| return execute(null, p -> investRemindService.removeAll()); | |||
| } | |||
| @@ -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; | |||
| } | |||
| @@ -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; | |||
| } | |||
| @@ -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; | |||
| } | |||
| @@ -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 | |||
| * @date 2019-09-23 18:40:43 | |||
| */ | |||
| @Mapper | |||
| public interface WxLogicPermissionMapper extends CommonMapper<WxLogicPermission,Long> { | |||
| List<WxLogicPermission> findList(WxLogicPermission param); | |||
| } | |||
| @@ -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<MallPermission> queryListParentId(Long parentId, List<Long> 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<MallPermission> btnList = mallPermissionMapper.queryBtnListByParentId(entity.getId()); | |||
| if (CollectionUtils.isNotEmpty(btnList)) { | |||
| entity.setBtnChildren(btnList); | |||
| List<MallPermission> subPermisson = getMenuTreeList(queryListParentId(entity.getId(), menuIdList, boolNav), menuIdList, boolNav); | |||
| List<MallPermission> 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<MallPermission> getLogicPermisson(MallPermission entity) { | |||
| List<MallPermission> mallPermissionList = new ArrayList<>(); | |||
| if (entity.getParentId() != 0) { | |||
| return mallPermissionList; | |||
| } | |||
| WxLogicPermission query = new WxLogicPermission(); | |||
| query.setParentId(entity.getId()); | |||
| List<WxLogicPermission> logicPermissionList = logicPermissionDao.findList(query); | |||
| for (WxLogicPermission logicPermission : logicPermissionList) { | |||
| MallPermission permission = new MallPermission(); | |||
| permission.setName(logicPermission.getName()); | |||
| List<MallPermission> mallPermissions = mallPermissionMapper.selectBatchIds(JSONArray.parseArray(logicPermission.getPermission(), Long.class)); | |||
| permission.setChildren(mallPermissions); | |||
| mallPermissionList.add(permission); | |||
| } | |||
| return mallPermissionList; | |||
| } | |||
| @Override | |||
| public PageInfo<MallPermission> listAsPage(MallPermission record, Integer pageIndex, Integer pageSize) { | |||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallPermissionMapper.findList(record)); | |||
| @@ -0,0 +1,41 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | |||
| <mapper namespace="com.iformall.mapper.WxLogicPermissionMapper"> | |||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxLogicPermission"> | |||
| <id column="id" jdbcType="BIGINT" property="id"/> | |||
| <result column="parent_id" jdbcType="BIGINT" property="parentId"/> | |||
| <result column="name" jdbcType="VARCHAR" property="name"/> | |||
| <result column="permission" jdbcType="VARCHAR" property="permission"/> | |||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | |||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`parent_id`,`name`,`permission`,`create_date`,`update_date` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||
| where 1 = 1 | |||
| <if test=" null != id "> | |||
| and `id` = #{id} | |||
| </if> | |||
| <if test=" null != parentId "> | |||
| and `parent_id` = #{parentId} | |||
| </if> | |||
| <if test=" null != name "> | |||
| and `name` like concat('%',#{name},'%') | |||
| </if> | |||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||
| </sql> | |||
| <select id="findList" parameterType="com.iformall.domain.po.WxLogicPermission" resultMap="BaseResultMap"> | |||
| select | |||
| <include refid="allColumns"/> | |||
| from wx_logic_permission | |||
| <include refid="dynamicWhereConditions"/> | |||
| </select> | |||
| </mapper> | |||