Skip to content

H
haoban-manage3.0
Commit 2f54e0bd by 徐高华
Options

好办小程序权限调整

parent b13d7880
Showing with 72 additions and 117 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanRoleApiService.java
......@@ -44,6 +44,8 @@ public interface HaobanRoleApiService {
*/
ServiceResponse<HaobanRoleDTO> getMenuByWxEnterpriseIdAndClerkType(String wxEnterpriseId, Integer clerkType,Integer systemFlag);
ServiceResponse<HaobanRoleDTO> getMenuByWxEnterpriseIdAndClerkType(String wxEnterpriseId, Integer clerkType,Integer systemFlag , String enterpriseId);
/**
*
* 默认生成好办小程序权限
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/role/TabHaobanMenu.java
......@@ -57,52 +57,6 @@ public class TabHaobanMenu implements Serializable {
private int authControl ;
private String btnCodeRel ;
private String appCode ;
private Integer funType ;
private Integer noOpenFlag ;
private Integer expireFlag ;
private String appVersions ;
public String getAppCode() {
return appCode;
}
public void setAppCode(String appCode) {
this.appCode = appCode;
}
public Integer getFunType() {
return funType;
}
public void setFunType(Integer funType) {
this.funType = funType;
}
public Integer getNoOpenFlag() {
return noOpenFlag;
}
public void setNoOpenFlag(Integer noOpenFlag) {
this.noOpenFlag = noOpenFlag;
}
public Integer getExpireFlag() {
return expireFlag;
}
public void setExpireFlag(Integer expireFlag) {
this.expireFlag = expireFlag;
}
public String getAppVersions() {
return appVersions;
}
public void setAppVersions(String appVersions) {
this.appVersions = appVersions;
}
public int getAuthControl() {
return authControl;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/role/HaobanMenuBO.java
......@@ -64,52 +64,6 @@ public class HaobanMenuBO implements Serializable {
private int authControl ;
private String btnCodeRel ;
private String appCode ;
private Integer funType ;
private Integer noOpenFlag ;
private Integer expireFlag ;
private String appVersions ;
public String getAppCode() {
return appCode;
}
public void setAppCode(String appCode) {
this.appCode = appCode;
}
public Integer getFunType() {
return funType;
}
public void setFunType(Integer funType) {
this.funType = funType;
}
public Integer getNoOpenFlag() {
return noOpenFlag;
}
public void setNoOpenFlag(Integer noOpenFlag) {
this.noOpenFlag = noOpenFlag;
}
public Integer getExpireFlag() {
return expireFlag;
}
public void setExpireFlag(Integer expireFlag) {
this.expireFlag = expireFlag;
}
public String getAppVersions() {
return appVersions;
}
public void setAppVersions(String appVersions) {
this.appVersions = appVersions;
}
public int getAuthControl() {
return authControl;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java
......@@ -238,6 +238,11 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
@Override
public ServiceResponse<HaobanRoleDTO> getMenuByWxEnterpriseIdAndClerkType(String wxEnterpriseId, Integer clerkType, Integer systemFlag) {
return this.getMenuByWxEnterpriseIdAndClerkType(wxEnterpriseId,clerkType,systemFlag,null) ;
}
@Override
public ServiceResponse<HaobanRoleDTO> getMenuByWxEnterpriseIdAndClerkType(String wxEnterpriseId, Integer clerkType, Integer systemFlag, String enterpriseId) {
HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType, systemFlag);
if (haobanRoleBO != null) {
List<String> menuCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId(wxEnterpriseId, haobanRoleBO.getRoleId());
......@@ -266,6 +271,10 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
continue ;
}
}
// 查询gic配置的权限
if(StringUtils.isNotBlank(enterpriseId) && !"-1".equals(enterpriseId)) {
}
haobanRoleBO.setMenuCodes(menuCodes);
haobanRoleBO.setMenuList(EntityUtil.changeEntityListNew(HaobanMenuDTO.class, haobanMenuList));
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/HaobanMenuService.java
......@@ -95,4 +95,6 @@ public interface HaobanMenuService {
void deleteAll();
void deleteByMenuCode(String menuCode) ;
void saveMenuFromGicNoitic(String enterpriseId) ;
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanMenuServiceImpl.java
package com.gic.haoban.manage.service.service.role.impl;
import com.alibaba.fastjson.JSONObject;
import com.gic.commons.util.EntityUtil;
import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
import com.gic.haoban.manage.service.dao.mapper.role.TabHaobanMenuMapper;
import com.gic.haoban.manage.service.dao.mapper.role.TabHaobanRoleMapper;
import com.gic.haoban.manage.service.dao.mapper.role.TabHaobanRoleMenuMapper;
import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
import com.gic.haoban.manage.service.entity.role.TabHaobanMenu;
import com.gic.haoban.manage.service.entity.role.TabHaobanRole;
import com.gic.haoban.manage.service.entity.role.TabHaobanRoleMenu;
import com.gic.haoban.manage.service.pojo.bo.role.HaobanMenuBO;
import com.gic.haoban.manage.service.service.MemberQueryService;
import com.gic.haoban.manage.service.service.role.HaobanMenuService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -21,9 +31,16 @@ import java.util.List;
*/
@Service
public class HaobanMenuServiceImpl implements HaobanMenuService {
private static final Logger logger = LogManager.getLogger(HaobanMenuService.class);
@Autowired
private TabHaobanMenuMapper tabHaobanMenuMapper;
@Autowired
private WxEnterpriseRelatedMapper wxEnterpriseRelatedMapper ;
@Autowired
private TabHaobanRoleMapper roleMapper ;
@Autowired
private TabHaobanRoleMenuMapper roleMenuMapper ;
@Override
public TabHaobanMenu queryById(String menuCode) {
......@@ -163,4 +180,43 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
public void deleteByMenuCode(String menuCode) {
this.tabHaobanMenuMapper.deleteByMenuCode(menuCode);
}
@Override
public void saveMenuFromGicNoitic(String enterpriseId) {
List<String> menuCodeList = new ArrayList<>();
List<Integer> addRoleTypeList = new ArrayList<>();
logger.info("保存菜单={}",enterpriseId);
List<TabHaobanWxEnterpriseRelated> wxEnterpriseList = this.wxEnterpriseRelatedMapper.listByEnterpriseId(enterpriseId) ;
logger.info("gic关联的企微={}", JSONObject.toJSONString(wxEnterpriseList));
Date now = new Date() ;
if(CollectionUtils.isNotEmpty(wxEnterpriseList)) {
for(int i=0;i<wxEnterpriseList.size();i++) {
TabHaobanWxEnterpriseRelated item = wxEnterpriseList.get(i) ;
String wxEnterpriseId = item.getWxEnterpriseId() ;
List<TabHaobanRoleMenu> insertMenuList = new ArrayList<>() ;
List<TabHaobanRole> list = this.roleMapper.getListByWxEnterpriseId(wxEnterpriseId,null) ;
TabHaobanRoleMenu menu = null ;
for(TabHaobanRole role : list) {
Long roleId = role.getRoleId() ;
int roleType = role.getClerkType() ;
if(addRoleTypeList.contains(roleType)) {
continue;
}
for(String menuCode : menuCodeList) {
menu = new TabHaobanRoleMenu() ;
menu.setRoleId(roleId);
menu.setUpdateTime(now);
menu.setCreateTime(now);
menu.setStatusFlag(1);
menu.setWxEnterpriseId(wxEnterpriseId);
menu.setMenuCode(menuCode);
insertMenuList.add(menu) ;
}
}
if(CollectionUtils.isNotEmpty(insertMenuList)) {
this.roleMenuMapper.insertBatch(insertMenuList);
}
}
}
}
}
haoban-manage3-service/src/main/resources/mapper/role/TabHaobanMenuMapper.xml
......@@ -17,17 +17,11 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="authControl" column="auth_control"/>
<result property="btnCodeRel" column="btn_code_rel"/>
<result column="app_code" property="appCode"/>
<result column="fun_type" property="funType"/>
<result column="no_open_flag" property="noOpenFlag"/>
<result column="expire_flag" property="expireFlag"/>
<result column="app_versions" property="appVersions"/>
</resultMap>
<sql id="Base_Column_List">
menu_code , auth_control , btn_code_rel
, menu_name, menu_url, icon_url, menu_type, menu_sort, parent_code, status_flag,route_path,owner_ship, create_time, update_time
, app_code ,fun_type ,no_open_flag , expire_flag,app_versions
</sql>
<!--查询单个-->
......@@ -41,10 +35,9 @@
<!--新增所有列-->
<insert id="insert" keyProperty="menuId" useGeneratedKeys="true">
insert into tab_haoban_menu(menu_code, menu_name, menu_url, icon_url, menu_type, menu_sort, parent_code,
status_flag, route_path, owner_ship, create_time, update_time , app_code ,fun_type ,no_open_flag , expire_flag,app_versions)
status_flag, route_path, owner_ship, create_time, update_time )
values (#{menuCode}, #{menuName}, #{menuUrl}, #{iconUrl}, #{menuType}, #{menuSort}, #{parentCode},
#{statusFlag}, #{routePath}, #{ownerShip}, #{createTime}, #{updateTime}
, #{appCode} ,#{funType} ,#{noOpenFlag} , #{expireFlag},#{appVersions}
)
</insert>
......@@ -98,21 +91,6 @@
<if test="updateTime != null">
update_time = #{updateTime},
</if>
<if test="appCode != null">
app_code = #{appCode},
</if>
<if test="funType != null">
fun_type = #{funType},
</if>
<if test="noOpenFlag != null">
no_open_flag = #{noOpenFlag},
</if>
<if test="expireFlag != null">
expire_flag = #{expireFlag},
</if>
<if test="appVersions != null">
app_versions = #{appVersions},
</if>
</set>
where menu_code = #{menuCode}
</update>
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
......@@ -1484,7 +1484,7 @@ public class WxStaffController extends WebBaseController {
* @return
*/
@RequestMapping(value = "/queryMenuCodesByClerkType", method = RequestMethod.GET)
public RestResponse<HaobanRoleDTO> queryMenuByClerkType(Integer clerkType, String staffId, String wxEnterpriseId) {
public RestResponse<HaobanRoleDTO> queryMenuByClerkType(Integer clerkType, String staffId, String wxEnterpriseId , String enterpriseId) {
if (clerkType == null) {
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_2.getCode()), HaoBanErrCode.ERR_2.getMsg());
}
......@@ -1503,7 +1503,7 @@ public class WxStaffController extends WebBaseController {
return RestResponse.successResult(serviceResponse.getResult());
}
ServiceResponse<HaobanRoleDTO> serviceResponse = haobanRoleApiService
.getMenuByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType, 1);
.getMenuByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType, 1 , enterpriseId);
return RestResponse.successResult(serviceResponse.getResult());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment