feat:权限

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/role/HaobanRoleMenuQDTO.java

+package com.gic.haoban.manage.api.dto.qdto.role;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 好办小程序权限(TabHaobanRole)实体类
+ *
+ * @author mozhu
+ * @since 2022-09-06 16:35:07
+ */
+public class HaobanRoleMenuQDTO implements Serializable {
+
+    private static final long serialVersionUID = 554109287178364863L;
+    private Long roleId;
+    /**
+     * 0:导购；1:店长；3:区经
+     */
+    private Integer clerkType;
+    /**
+     * 权限id
+     */
+    private List<String> menuCodes;
+
+    private List<String> delMenuCodes;
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+
+    public Integer getClerkType() {
+        return clerkType;
+    }
+
+    public void setClerkType(Integer clerkType) {
+        this.clerkType = clerkType;
+    }
+
+    public List<String> getMenuCodes() {
+        return menuCodes;
+    }
+
+    public void setMenuCodes(List<String> menuCodes) {
+        this.menuCodes = menuCodes;
+    }
+
+    public List<String> getDelMenuCodes() {
+        return delMenuCodes;
+    }
+
+    public void setDelMenuCodes(List<String> delMenuCodes) {
+        this.delMenuCodes = delMenuCodes;
+    }
+}
+

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/role/HaobanRoleQDTO.java

 package com.gic.haoban.manage.api.dto.qdto.role;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 好办小程序权限(TabHaobanRole)实体类
@@ -13,29 +12,23 @@ public class HaobanRoleQDTO implements Serializable {
 
     private static final long serialVersionUID = 554109287178364863L;
 
-    private Long roleId;
     /**
      * 权限名称
      */
     private String roleName;
+
     /**
-     * 0:导购；1:店长；3:区经
+     * 导购权限
      */
-    private Integer clerkType;
+    private HaobanRoleMenuQDTO clerkMenus;
     /**
-     * 权限id
+     * 店长
      */
-    private List<Long> menuIds;
-
-    private List<Long> delMenuIds;
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
+    private HaobanRoleMenuQDTO manegeClerkMenus;
+    /**
+     * 区经
+     */
+    private HaobanRoleMenuQDTO managerMenus;
 
     public String getRoleName() {
         return roleName;
@@ -45,28 +38,28 @@ public class HaobanRoleQDTO implements Serializable {
         this.roleName = roleName;
     }
 
-    public List<Long> getMenuIds() {
-        return menuIds;
+    public HaobanRoleMenuQDTO getClerkMenus() {
+        return clerkMenus;
     }
 
-    public void setMenuIds(List<Long> menuIds) {
-        this.menuIds = menuIds;
+    public void setClerkMenus(HaobanRoleMenuQDTO clerkMenus) {
+        this.clerkMenus = clerkMenus;
     }
 
-    public Integer getClerkType() {
-        return clerkType;
+    public HaobanRoleMenuQDTO getManegeClerkMenus() {
+        return manegeClerkMenus;
     }
 
-    public void setClerkType(Integer clerkType) {
-        this.clerkType = clerkType;
+    public void setManegeClerkMenus(HaobanRoleMenuQDTO manegeClerkMenus) {
+        this.manegeClerkMenus = manegeClerkMenus;
     }
 
-    public List<Long> getDelMenuIds() {
-        return delMenuIds;
+    public HaobanRoleMenuQDTO getManagerMenus() {
+        return managerMenus;
     }
 
-    public void setDelMenuIds(List<Long> delMenuIds) {
-        this.delMenuIds = delMenuIds;
+    public void setManagerMenus(HaobanRoleMenuQDTO managerMenus) {
+        this.managerMenus = managerMenus;
     }
 }
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/role/HaobanMenuDTO.java

@@ -14,7 +14,6 @@ public class HaobanMenuDTO implements Serializable {
 
     private static final long serialVersionUID = 909873156099677525L;
 
-    private Long menuId;
     /**
      * 菜单code
      */
@@ -51,21 +50,14 @@ public class HaobanMenuDTO implements Serializable {
      * 1:正常；0:删除
      */
     private Integer statusFlag;
-    private Integer customFlag;
 
     private Date createTime;
 
     private Date updateTime;
 
-    private List<HaobanMenuDTO> menuBOList;
-
-    public Long getMenuId() {
-        return menuId;
-    }
+    private String routePath;
 
-    public void setMenuId(Long menuId) {
-        this.menuId = menuId;
-    }
+    private List<HaobanMenuDTO> menuBOList;
 
     public String getMenuCode() {
         return menuCode;
@@ -155,14 +147,6 @@ public class HaobanMenuDTO implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public Integer getCustomFlag() {
-        return customFlag;
-    }
-
-    public void setCustomFlag(Integer customFlag) {
-        this.customFlag = customFlag;
-    }
-
     public List<HaobanMenuDTO> getMenuBOList() {
         return menuBOList;
     }
@@ -170,5 +154,13 @@ public class HaobanMenuDTO implements Serializable {
     public void setMenuBOList(List<HaobanMenuDTO> menuBOList) {
         this.menuBOList = menuBOList;
     }
+
+    public String getRoutePath() {
+        return routePath;
+    }
+
+    public void setRoutePath(String routePath) {
+        this.routePath = routePath;
+    }
 }
 

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/role/HaobanRoleDTO.java

@@ -26,8 +26,6 @@ public class HaobanRoleDTO implements Serializable {
 
     private String wxEnterpriseId;
 
-    private String enterpriseId;
-
     private String creatorId;
 
     private String creatorName;
@@ -77,14 +75,6 @@ public class HaobanRoleDTO implements Serializable {
         this.wxEnterpriseId = wxEnterpriseId;
     }
 
-    public String getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(String enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
     public String getCreatorId() {
         return creatorId;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanMenuMapper.java

@@ -16,10 +16,10 @@ public interface TabHaobanMenuMapper {
     /**
      * 通过ID查询单条数据
      *
-     * @param menuId 主键
+     * @param menuCode 主键
      * @return 实例对象
      */
-    TabHaobanMenu queryById(Long menuId);
+    TabHaobanMenu queryById(String menuCode);
 
     /**
      * 新增数据

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanRoleMapper.java

@@ -58,20 +58,5 @@ public interface TabHaobanRoleMapper {
     List<TabHaobanRole> getByEnterpriseIdAndClerkType(@Param("enterpriseId") String enterpriseId,
                                                       @Param("wxEnterpriseId") String wxEnterpriseId,
                                                       @Param("clerkType") Integer clerkType);
-
-    List<Long> queryByMenuIds(@Param("menuIds") List<Long> menuIds,
-                              @Param("enterpriseId") String enterpriseId,
-                              @Param("wxEnterpriseId") String wxEnterpriseId,
-                              @Param("clerkType") Integer clerkType);
-
-    List<Long> queryByUnMenuIds(@Param("menuIds") List<Long> menuIds,
-                              @Param("enterpriseId") String enterpriseId,
-                              @Param("wxEnterpriseId") String wxEnterpriseId,
-                              @Param("clerkType") Integer clerkType);
-
-    Long queryByMenuId( @Param("menuId") Long menuId,
-                       @Param("enterpriseId") String enterpriseId,
-                       @Param("wxEnterpriseId") String wxEnterpriseId,
-                       @Param("clerkType") Integer clerkType);
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanRoleMenuMapper.java

@@ -53,5 +53,14 @@ public interface TabHaobanRoleMenuMapper {
      */
     int deleteById(Long roleMenuId);
 
+    /**
+     * 按角色删除id
+     *
+     * @param roleId 角色id
+     * @return int
+     * @author mozhu
+     * @date 2022-09-09 17:19:31
+     */
+    int deleteByRoleId(Long roleId);
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/role/TabHaobanMenu.java

@@ -13,7 +13,6 @@ public class TabHaobanMenu implements Serializable {
 
     private static final long serialVersionUID = 909873156099677525L;
 
-    private Long menuId;
     /**
      * 菜单code
      */
@@ -46,28 +45,17 @@ public class TabHaobanMenu implements Serializable {
      * 父code
      */
     private String parentCode;
+
+    private String routePath;
     /**
      * 1:正常；0:删除
      */
     private Integer statusFlag;
-    /**
-     * 是否定制菜单：1：是
-     */
-    private Integer customFlag;
 
     private Date createTime;
 
     private Date updateTime;
 
-
-    public Long getMenuId() {
-        return menuId;
-    }
-
-    public void setMenuId(Long menuId) {
-        this.menuId = menuId;
-    }
-
     public String getMenuCode() {
         return menuCode;
     }
@@ -156,12 +144,12 @@ public class TabHaobanMenu implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public Integer getCustomFlag() {
-        return customFlag;
+    public String getRoutePath() {
+        return routePath;
     }
 
-    public void setCustomFlag(Integer customFlag) {
-        this.customFlag = customFlag;
+    public void setRoutePath(String routePath) {
+        this.routePath = routePath;
     }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/role/TabHaobanRole.java

@@ -25,8 +25,6 @@ public class TabHaobanRole implements Serializable {
 
     private String wxEnterpriseId;
 
-    private String enterpriseId;
-
     private String creatorId;
 
     private String creatorName;
@@ -76,14 +74,6 @@ public class TabHaobanRole implements Serializable {
         this.wxEnterpriseId = wxEnterpriseId;
     }
 
-    public String getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(String enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
     public String getCreatorId() {
         return creatorId;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/role/HaobanMenuBO.java

@@ -14,7 +14,6 @@ public class HaobanMenuBO implements Serializable {
 
     private static final long serialVersionUID = 909873156099677525L;
 
-    private Long menuId;
     /**
      * 菜单code
      */
@@ -47,11 +46,12 @@ public class HaobanMenuBO implements Serializable {
      * 父code
      */
     private String parentCode;
+
+    private String routePath;
     /**
      * 1:正常；0:删除
      */
     private Integer statusFlag;
-    private Integer customFlag;
 
     private Date createTime;
 
@@ -59,15 +59,6 @@ public class HaobanMenuBO implements Serializable {
 
     private List<HaobanMenuBO> menuBOList;
 
-
-    public Long getMenuId() {
-        return menuId;
-    }
-
-    public void setMenuId(Long menuId) {
-        this.menuId = menuId;
-    }
-
     public String getMenuCode() {
         return menuCode;
     }
@@ -156,14 +147,6 @@ public class HaobanMenuBO implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public Integer getCustomFlag() {
-        return customFlag;
-    }
-
-    public void setCustomFlag(Integer customFlag) {
-        this.customFlag = customFlag;
-    }
-
     public List<HaobanMenuBO> getMenuBOList() {
         return menuBOList;
     }
@@ -171,5 +154,13 @@ public class HaobanMenuBO implements Serializable {
     public void setMenuBOList(List<HaobanMenuBO> menuBOList) {
         this.menuBOList = menuBOList;
     }
+
+    public String getRoutePath() {
+        return routePath;
+    }
+
+    public void setRoutePath(String routePath) {
+        this.routePath = routePath;
+    }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/role/HaobanRoleBO.java

@@ -26,8 +26,6 @@ public class HaobanRoleBO implements Serializable {
 
     private String wxEnterpriseId;
 
-    private String enterpriseId;
-
     private String creatorId;
 
     private String creatorName;
@@ -77,14 +75,6 @@ public class HaobanRoleBO implements Serializable {
         this.wxEnterpriseId = wxEnterpriseId;
     }
 
-    public String getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(String enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
     public String getCreatorId() {
         return creatorId;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/HaobanMenuService.java

@@ -16,10 +16,12 @@ public interface HaobanMenuService {
     /**
      * 通过ID查询单条数据
      *
-     * @param menuId 主键
-     * @return 实例对象
+     * @param menuCode 菜单代码
+     * @return {@link TabHaobanMenu }
+     * @author mozhu
+     * @date 2022-09-09 16:33:26
      */
-    TabHaobanMenu queryById(Long menuId);
+    TabHaobanMenu queryById(String menuCode);
 
     /**
      * 新增数据
@@ -27,7 +29,7 @@ public interface HaobanMenuService {
      * @param tabHaobanMenu 实例对象
      * @return 实例对象
      */
-    TabHaobanMenu insert(TabHaobanMenu tabHaobanMenu);
+    int insert(TabHaobanMenu tabHaobanMenu);
 
     /**
      * 修改数据
@@ -35,7 +37,7 @@ public interface HaobanMenuService {
      * @param tabHaobanMenu 实例对象
      * @return 实例对象
      */
-    TabHaobanMenu update(TabHaobanMenu tabHaobanMenu);
+    int update(TabHaobanMenu tabHaobanMenu);
 
     /**
      * 菜单树

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/HaobanRoleMenuService.java

@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.service.role;
 
 import com.gic.haoban.manage.service.entity.role.TabHaobanRoleMenu;
 
+import java.util.List;
+
 /**
  * 好办小程序权限菜单(TabHaobanRoleMenu)表服务接口
  *
@@ -24,7 +26,18 @@ public interface HaobanRoleMenuService {
      * @param tabHaobanRoleMenu 实例对象
      * @return 实例对象
      */
-    TabHaobanRoleMenu insert(TabHaobanRoleMenu tabHaobanRoleMenu);
+    int insert(TabHaobanRoleMenu tabHaobanRoleMenu);
+
+
+    /**
+     * 批量新增数据
+     *
+     * @param roleMenuList 角色菜单列表
+     * @return int
+     * @author mozhu
+     * @date 2022-09-09 16:32:24
+     */
+    int insertBatch(List<TabHaobanRoleMenu> roleMenuList);
 
     /**
      * 修改数据
@@ -32,7 +45,7 @@ public interface HaobanRoleMenuService {
      * @param tabHaobanRoleMenu 实例对象
      * @return 实例对象
      */
-    TabHaobanRoleMenu update(TabHaobanRoleMenu tabHaobanRoleMenu);
+    int update(TabHaobanRoleMenu tabHaobanRoleMenu);
 
     /**
      * 通过主键删除数据
@@ -42,4 +55,14 @@ public interface HaobanRoleMenuService {
      */
     boolean deleteById(Long roleMenuId);
 
+    /**
+     * 按角色删除id
+     *
+     * @param roleId 角色id
+     * @return boolean
+     * @author mozhu
+     * @date 2022-09-09 17:18:19
+     */
+    boolean deleteByRoleId(Long roleId);
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/HaobanRoleService.java

@@ -67,54 +67,5 @@ public interface HaobanRoleService {
      */
     List<HaobanRoleBO> getByEnterpriseIdAndClerkType(String enterpriseId, String wxEnterpriseId, Integer clerkType);
 
-    /**
-     * 查询菜单id
-     *
-     * @param menuIds        菜单id
-     * @param enterpriseId   企业标识
-     * @param wxEnterpriseId wx企业标识
-     * @param clerkType      职员类型
-     * @return {@link List }<{@link Long }>
-     * @author mozhu
-     * @date 2022-09-07 14:32:17
-     */
-    List<Long> queryByMenuIds(List<Long> menuIds,String enterpriseId, String wxEnterpriseId,Integer clerkType);
-
-    /**
-     * 查询被删除的菜单id
-     *
-     * @param menuIds        菜单id
-     * @param enterpriseId   企业标识
-     * @param wxEnterpriseId wx企业标识
-     * @param clerkType      职员类型
-     * @return {@link List }<{@link Long }>
-     * @author mozhu
-     * @date 2022-09-07 14:32:20
-     */
-    List<Long> queryByUnMenuIds(List<Long> menuIds,String enterpriseId, String wxEnterpriseId,Integer clerkType);
-
-
-    /**
-     * 通过菜单id查询
-     *
-     * @param menuId         菜单id
-     * @param enterpriseId   企业标识
-     * @param wxEnterpriseId wx企业标识
-     * @param clerkType      职员类型
-     * @return {@link Long }
-     * @author mozhu
-     * @date 2022-09-07 17:03:50
-     */
-    Long queryByMenuId(Long menuId,String enterpriseId, String wxEnterpriseId,Integer clerkType);
-
-    /**
-     * 删除权限
-     *
-     * @param roleIds 角色id
-     * @return int
-     * @author mozhu
-     * @date 2022-09-07 14:47:18
-     */
-    void delByRoleIds(List<Long> roleIds);
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanMenuServiceImpl.java

@@ -25,18 +25,12 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
     @Autowired
     private TabHaobanMenuMapper tabHaobanMenuMapper;
 
-    /**
-     * 通过ID查询单条数据
-     *
-     * @param menuId 主键
-     * @return 实例对象
-     */
+
     @Override
-    public TabHaobanMenu queryById(Long menuId) {
-        return this.tabHaobanMenuMapper.queryById(menuId);
+    public TabHaobanMenu queryById(String menuCode) {
+        return this.tabHaobanMenuMapper.queryById(menuCode);
     }
 
-
     /**
      * 新增数据
      *
@@ -44,11 +38,10 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
      * @return 实例对象
      */
     @Override
-    public TabHaobanMenu insert(TabHaobanMenu tabHaobanMenu) {
+    public int insert(TabHaobanMenu tabHaobanMenu) {
         tabHaobanMenu.setCreateTime(new Date());
         tabHaobanMenu.setUpdateTime(new Date());
-        this.tabHaobanMenuMapper.insert(tabHaobanMenu);
-        return tabHaobanMenu;
+        return this.tabHaobanMenuMapper.insert(tabHaobanMenu);
     }
 
     /**
@@ -58,10 +51,9 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
      * @return 实例对象
      */
     @Override
-    public TabHaobanMenu update(TabHaobanMenu tabHaobanMenu) {
+    public int update(TabHaobanMenu tabHaobanMenu) {
         tabHaobanMenu.setUpdateTime(new Date());
-        this.tabHaobanMenuMapper.update(tabHaobanMenu);
-        return this.queryById(tabHaobanMenu.getMenuId());
+        return this.tabHaobanMenuMapper.update(tabHaobanMenu);
     }
 
     @Override

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanRoleMenuServiceImpl.java

 package com.gic.haoban.manage.service.service.role.impl;
 
+import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.manage.service.dao.mapper.role.TabHaobanRoleMenuMapper;
 import com.gic.haoban.manage.service.entity.role.TabHaobanRoleMenu;
 import com.gic.haoban.manage.service.service.role.HaobanRoleMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 好办小程序权限菜单(TabHaobanRoleMenu)表服务实现类
  *
@@ -37,9 +41,17 @@ public class HaobanRoleMenuServiceImpl implements HaobanRoleMenuService {
      * @return 实例对象
      */
     @Override
-    public TabHaobanRoleMenu insert(TabHaobanRoleMenu tabHaobanRoleMenu) {
-        this.tabHaobanRoleMenuMapper.insert(tabHaobanRoleMenu);
-        return tabHaobanRoleMenu;
+    public int insert(TabHaobanRoleMenu tabHaobanRoleMenu) {
+        tabHaobanRoleMenu.setRoleId(UniqueIdUtils.uniqueLong());
+        tabHaobanRoleMenu.setCreateTime(new Date());
+        tabHaobanRoleMenu.setUpdateTime(new Date());
+        return this.tabHaobanRoleMenuMapper.insert(tabHaobanRoleMenu);
+    }
+
+
+    @Override
+    public int insertBatch(List<TabHaobanRoleMenu> roleMenuList) {
+        return this.tabHaobanRoleMenuMapper.insertBatch(roleMenuList);
     }
 
     /**
@@ -49,9 +61,8 @@ public class HaobanRoleMenuServiceImpl implements HaobanRoleMenuService {
      * @return 实例对象
      */
     @Override
-    public TabHaobanRoleMenu update(TabHaobanRoleMenu tabHaobanRoleMenu) {
-        this.tabHaobanRoleMenuMapper.update(tabHaobanRoleMenu);
-        return this.queryById(tabHaobanRoleMenu.getRoleMenuId());
+    public int update(TabHaobanRoleMenu tabHaobanRoleMenu) {
+        return this.tabHaobanRoleMenuMapper.update(tabHaobanRoleMenu);
     }
 
     /**
@@ -64,4 +75,9 @@ public class HaobanRoleMenuServiceImpl implements HaobanRoleMenuService {
     public boolean deleteById(Long roleMenuId) {
         return this.tabHaobanRoleMenuMapper.deleteById(roleMenuId) > 0;
     }
+
+    @Override
+    public boolean deleteByRoleId(Long roleId) {
+        return tabHaobanRoleMenuMapper.deleteByRoleId(roleId) > 0;
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanRoleServiceImpl.java

@@ -53,11 +53,6 @@ public class HaobanRoleServiceImpl implements HaobanRoleService {
 
     @Override
     public int insertBatch(List<TabHaobanRole> tabHaobanRoles) {
-        tabHaobanRoles.forEach(c->{
-            c.setRoleId(UniqueIdUtils.uniqueLong());
-            c.setCreateTime(new Date());
-            c.setUpdateTime(new Date());
-        });
         return tabHaobanRoleMapper.insertBatch(tabHaobanRoles);
     }
 
@@ -91,28 +86,4 @@ public class HaobanRoleServiceImpl implements HaobanRoleService {
         return EntityUtil.changeEntityListNew(HaobanRoleBO.class,haobanRoles);
     }
 
-    @Override
-    public List<Long> queryByMenuIds(List<Long> menuIds, String enterpriseId, String wxEnterpriseId, Integer clerkType) {
-        return tabHaobanRoleMapper.queryByMenuIds(menuIds,enterpriseId,wxEnterpriseId,clerkType);
-    }
-
-    @Override
-    public List<Long> queryByUnMenuIds(List<Long> menuIds, String enterpriseId, String wxEnterpriseId, Integer clerkType) {
-        return tabHaobanRoleMapper.queryByUnMenuIds(menuIds,enterpriseId,wxEnterpriseId,clerkType);
-    }
-
-    @Override
-    public Long queryByMenuId(Long menuId, String enterpriseId, String wxEnterpriseId, Integer clerkType) {
-        return tabHaobanRoleMapper.queryByMenuId(menuId,enterpriseId,wxEnterpriseId,clerkType);
-    }
-
-    @Override
-    public void delByRoleIds(List<Long> roleIds) {
-        for (Long roleId : roleIds) {
-            TabHaobanRole tabHaobanRole = new TabHaobanRole();
-            tabHaobanRole.setStatusFlag(0);
-            tabHaobanRole.setRoleId(roleId);
-            tabHaobanRoleMapper.update(tabHaobanRole);
-        }
-    }
 }

haoban-manage3-service/src/main/resources/mapper/role/TabHaobanMenuMapper.xml

@@ -3,7 +3,6 @@
 <mapper namespace="com.gic.haoban.manage.service.dao.mapper.role.TabHaobanMenuMapper">
 
     <resultMap type="com.gic.haoban.manage.service.entity.role.TabHaobanMenu" id="TabHaobanMenuMap">
-        <result property="menuId" column="menu_id" jdbcType="INTEGER"/>
         <result property="menuCode" column="menu_code" jdbcType="VARCHAR"/>
         <result property="menuName" column="menu_name" jdbcType="VARCHAR"/>
         <result property="menuUrl" column="menu_url" jdbcType="VARCHAR"/>
@@ -12,14 +11,14 @@
         <result property="menuType" column="menu_type" jdbcType="INTEGER"/>
         <result property="menuSort" column="menu_sort" jdbcType="INTEGER"/>
         <result property="parentCode" column="parent_code" jdbcType="VARCHAR"/>
-        <result property="customFlag" column="custom_flag" jdbcType="INTEGER"/>
+        <result property="routePath" column="route_path" jdbcType="VARCHAR"/>
         <result property="statusFlag" column="status_flag" jdbcType="INTEGER"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-    menu_id, menu_code, menu_name, menu_url, icon_url, menu_level, menu_type, menu_sort, parent_code, status_flag,custom_flag, create_time, update_time
+    menu_code, menu_name, menu_url, icon_url, menu_level, menu_type, menu_sort, parent_code, status_flag,route_path, create_time, update_time
   </sql>
 
     <!--查询单个-->
@@ -27,22 +26,22 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_menu
-        where menu_id = #{menuId}
+        where menu_code = #{menuCode}
     </select>
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="menuId" useGeneratedKeys="true">
-        insert into tab_haoban_menu(menu_id, menu_code, menu_name, menu_url, icon_url, menu_level, menu_type, menu_sort, parent_code, status_flag,custom_flag, create_time, update_time)
-        values (#{menuId}, #{menuCode}, #{menuName}, #{menuUrl}, #{iconUrl}, #{menuLevel}, #{menuType}, #{menuSort}, #{parentCode}, #{statusFlag},#{customFlag}, #{createTime}, #{updateTime})
+        insert into tab_haoban_menu(menu_code, menu_name, menu_url, icon_url, menu_level, menu_type, menu_sort, parent_code, status_flag,route_path, create_time, update_time)
+        values (#{menuCode}, #{menuName}, #{menuUrl}, #{iconUrl}, #{menuLevel}, #{menuType}, #{menuSort}, #{parentCode}, #{statusFlag},#{routePath}, #{createTime}, #{updateTime})
     </insert>
 
     <insert id="insertBatch" keyProperty="menuId" useGeneratedKeys="true">
-        insert into tab_haoban_menu(menu_id, menu_code, menu_name, menu_url, icon_url, menu_level, menu_type,
-        menu_sort, parent_code, status_flag,custom_flag, create_time, update_time)
+        insert into tab_haoban_menu(menu_code, menu_name, menu_url, icon_url, menu_level, menu_type,
+        menu_sort, parent_code, status_flag,route_path, create_time, update_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.menuId}, #{entity.menuCode}, #{entity.menuName}, #{entity.menuUrl}, #{entity.iconUrl},
-            #{entity.menuLevel}, #{entity.menuType}, #{entity.menuSort}, #{entity.parentCode}, #{entity.statusFlag},#{entity.customFlag},
+            (#{entity.menuCode}, #{entity.menuName}, #{entity.menuUrl}, #{entity.iconUrl},
+            #{entity.menuLevel}, #{entity.menuType}, #{entity.menuSort}, #{entity.parentCode}, #{entity.statusFlag},#{entity.routePath},
             #{entity.createTime}, #{entity.updateTime})
         </foreach>
     </insert>
@@ -52,9 +51,6 @@
     <update id="update">
         update tab_haoban_menu
         <set>
-            <if test="menuCode != null and menuCode != ''">
-                menu_code = #{menuCode},
-            </if>
             <if test="menuName != null and menuName != ''">
                 menu_name = #{menuName},
             </if>
@@ -79,8 +75,8 @@
             <if test="statusFlag != null">
                 status_flag = #{statusFlag},
             </if>
-            <if test="customFlag != null">
-                custom_flag = #{customFlag},
+            <if test="routePath != null">
+                route_path = #{routePath},
             </if>
             <if test="createTime != null">
                 create_time = #{createTime},
@@ -89,7 +85,7 @@
                 update_time = #{updateTime},
             </if>
         </set>
-        where menu_id = #{menuId}
+        where  menu_code = #{menuCode}
     </update>
 
 

haoban-manage3-service/src/main/resources/mapper/role/TabHaobanRoleMapper.xml

@@ -7,7 +7,6 @@
         <result property="roleName" column="role_name" jdbcType="VARCHAR"/>
         <result property="clerkType" column="clerk_type" jdbcType="INTEGER"/>
         <result property="wxEnterpriseId" column="wx_enterprise_id" jdbcType="VARCHAR"/>
-        <result property="enterpriseId" column="enterprise_id" jdbcType="VARCHAR"/>
         <result property="creatorId" column="creator_id" jdbcType="VARCHAR"/>
         <result property="creatorName" column="creator_name" jdbcType="VARCHAR"/>
         <result property="modifierId" column="modifier_id" jdbcType="VARCHAR"/>
@@ -18,7 +17,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-    role_id, role_name, clerk_type, wx_enterprise_id, enterprise_id, creator_id, creator_name, modifier_id, modifier_name, status_flag, create_time, update_time
+    role_id, role_name, clerk_type, wx_enterprise_id, creator_id, creator_name, modifier_id, modifier_name, status_flag, create_time, update_time
   </sql>
 
     <!--查询单个-->
@@ -31,17 +30,17 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="roleId" useGeneratedKeys="true">
-        insert into tab_haoban_role(role_id, role_name,  clerk_type, wx_enterprise_id, enterprise_id, creator_id, creator_name, modifier_id, modifier_name, status_flag, create_time, update_time)
-        values (#{roleId}, #{roleName}, #{clerkType}, #{wxEnterpriseId}, #{enterpriseId}, #{creatorId}, #{creatorName}, #{modifierId}, #{modifierName}, #{statusFlag}, #{createTime}, #{updateTime})
+        insert into tab_haoban_role(role_id, role_name,  clerk_type, wx_enterprise_id,  creator_id, creator_name, modifier_id, modifier_name, status_flag, create_time, update_time)
+        values (#{roleId}, #{roleName}, #{clerkType}, #{wxEnterpriseId},  #{creatorId}, #{creatorName}, #{modifierId}, #{modifierName}, #{statusFlag}, #{createTime}, #{updateTime})
     </insert>
 
     <insert id="insertBatch" keyProperty="roleId" useGeneratedKeys="true">
-        insert into tab_haoban_role(role_id, role_name, clerk_type, wx_enterprise_id, enterprise_id,
+        insert into tab_haoban_role(role_id, role_name, clerk_type, wx_enterprise_id,
         creator_id, creator_name, modifier_id, modifier_name, status_flag, create_time, update_time)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.roleId}, #{entity.roleName}, #{entity.clerkType},
-            #{entity.wxEnterpriseId}, #{entity.enterpriseId}, #{entity.creatorId}, #{entity.creatorName},
+            #{entity.wxEnterpriseId},  #{entity.creatorId}, #{entity.creatorName},
             #{entity.modifierId}, #{entity.modifierName}, #{entity.statusFlag}, #{entity.createTime},
             #{entity.updateTime})
         </foreach>
@@ -61,9 +60,6 @@
             <if test="wxEnterpriseId != null and wxEnterpriseId != ''">
                 wx_enterprise_id = #{wxEnterpriseId},
             </if>
-            <if test="enterpriseId != null and enterpriseId != ''">
-                enterprise_id = #{enterpriseId},
-            </if>
             <if test="creatorId != null and creatorId != ''">
                 creator_id = #{creatorId},
             </if>
@@ -99,42 +95,5 @@
         and clerk_type = #{clerkType}
     </select>
 
-    <select id="queryByMenuIds" resultType="java.lang.Long">
-        select
-        role_id
-        from tab_haoban_role
-        where wx_enterprise_id = #{wxEnterpriseId}
-        and enterprise_id = #{enterpriseId}
-        and clerk_type = #{clerkType}
-        and menu_id in
-        <foreach collection="menuIds" item="id" index="index" open="(" close=")" separator=",">
-            #{id,jdbcType=VARCHAR}
-        </foreach>
-    </select>
-
-    <select id="queryByUnMenuIds" resultType="java.lang.Long">
-        select
-        role_id
-        from tab_haoban_role
-        where wx_enterprise_id = #{wxEnterpriseId}
-        and enterprise_id = #{enterpriseId}
-        and clerk_type = #{clerkType}
-        and menu_id not in
-        <foreach collection="menuIds" item="id" index="index" open="(" close=")" separator=",">
-            #{id,jdbcType=VARCHAR}
-        </foreach>
-    </select>
-
-
-    <select id="queryByMenuId" resultType="java.lang.Long">
-        select
-        role_id
-        from tab_haoban_role
-        where wx_enterprise_id = #{wxEnterpriseId}
-        and enterprise_id = #{enterpriseId}
-        and clerk_type = #{clerkType}
-        and menu_id = #{menuId}
-    </select>
-
 </mapper>
 

haoban-manage3-service/src/main/resources/mapper/role/TabHaobanRoleMenuMapper.xml

@@ -71,5 +71,10 @@
         delete from tab_haoban_role_menu where role_menu_id = #{roleMenuId}
     </delete>
 
+
+    <delete id="deleteByRoleId">
+        delete from tab_haoban_role_menu where role_id = #{roleId}
+    </delete>
+
 </mapper>