Skip to content

H
haoban-manage3.0
Commit 5fab39a4 by 墨竹
Options

fix:初始化数据

parent 79cdd02f
Showing with 158 additions and 16 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanMenuApiService.java
......@@ -12,6 +12,12 @@ import java.util.List;
public interface HaobanMenuApiService {
/**
* 得到所有菜单列表
*
* @return {@link ServiceResponse}<{@link List}<{@link HaobanMenuDTO}>>
*/
ServiceResponse<List<String>> getAllMenuList();
/**
* 获取菜单树
*
* @return {@link ServiceResponse }
......@@ -30,4 +36,14 @@ public interface HaobanMenuApiService {
*/
ServiceResponse<List<HaobanMenuDTO>> getHaobanMenuTreeList(String wxEnterpriseId,Integer clerkType);
/**
* 得到haoban菜单列表
*
* @param wxEnterpriseId wx企业标识
* @param clerkType 职员类型
* @return {@link ServiceResponse}<{@link List}<{@link HaobanMenuDTO}>>
*/
ServiceResponse<List<String>> getHaobanMenuList(String wxEnterpriseId, Integer clerkType);
}
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java
package com.gic.haoban.manage.web.controller.test;
import static org.slf4j.LoggerFactory.getLogger;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gic.commons.util.GICMQClientUtil;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.StaffDTO;
import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleMenuQDTO;
import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO;
import com.gic.haoban.manage.api.enums.QuartzEnum;
import com.gic.haoban.manage.api.enums.SyncTaskTypeEnum;
import com.gic.haoban.manage.api.enums.role.RoleClerkTypeEnum;
import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.TestApiService;
import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService;
import com.gic.haoban.manage.api.service.role.HaobanMenuApiService;
import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
import com.gic.haoban.manage.web.controller.WebBaseController;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.member.tag.api.service.MemberTagImportDealService;
......@@ -31,6 +25,17 @@ import com.gic.mq.sdk.GicMQClient;
import com.gic.sharing.core.service.api.service.MqApiService;
import com.task.allocation.qo.AllocationTaskQo;
import com.task.allocation.qo.TaskAllocationComputed;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import java.util.stream.Collectors;
import static org.slf4j.LoggerFactory.getLogger;
/**
* Created 2018/12/17.
......@@ -59,7 +64,11 @@ public class TestController extends WebBaseController {
@Autowired
private HaobanQywxFeeApiService haobanQywxFeeApiService;
@Autowired
private ExternalClerkRelatedApiService externalClerkRelatedApiService ;
private ExternalClerkRelatedApiService externalClerkRelatedApiService;
@Autowired
private HaobanRoleApiService haobanRoleApiService;
@Autowired
private HaobanMenuApiService haobanMenuApiService;
/**
* 创建定时器
......@@ -237,4 +246,52 @@ public class TestController extends WebBaseController {
haobanQywxFeeApiService.addFee(wxEnterpriseId);
return resultResponse(HaoBanErrCode.ERR_1);
}
@RequestMapping("/addHaobanRole")
public HaobanResponse addHaobanRole(String wxEnterpriseId, Integer systemFlag) {
if (systemFlag == null) {
systemFlag = 0;
}
WebLoginDTO webLoginDTO = new WebLoginDTO();
webLoginDTO.setWxEnterpriseId(wxEnterpriseId);
webLoginDTO.setClerkId("-1");
webLoginDTO.setClerkName("系统");
HaobanRoleQDTO haobanRoleQDTO = new HaobanRoleQDTO();
haobanRoleQDTO.setRoleName("系统模板");
HaobanRoleMenuQDTO clerkMenus = new HaobanRoleMenuQDTO();
clerkMenus.setClerkType(RoleClerkTypeEnum.CLERK.getCode());
if (systemFlag == 1) {
clerkMenus.setMenuCodes(haobanMenuApiService.getAllMenuList().getResult());
} else {
clerkMenus.setMenuCodes(haobanMenuApiService.getHaobanMenuList(wxEnterpriseId, RoleClerkTypeEnum.CLERK.getCode()).getResult());
}
HaobanRoleMenuQDTO manegeClerkMenus = new HaobanRoleMenuQDTO();
manegeClerkMenus.setClerkType(RoleClerkTypeEnum.SHOP.getCode());
if (systemFlag == 1) {
manegeClerkMenus.setMenuCodes(haobanMenuApiService.getAllMenuList().getResult());
} else {
manegeClerkMenus.setMenuCodes(haobanMenuApiService.getHaobanMenuList(wxEnterpriseId, RoleClerkTypeEnum.CLERK.getCode()).getResult());
}
HaobanRoleMenuQDTO managerMenus = new HaobanRoleMenuQDTO();
managerMenus.setClerkType(RoleClerkTypeEnum.MANAGE.getCode());
if (systemFlag == 1) {
managerMenus.setMenuCodes(haobanMenuApiService.getAllMenuList().getResult());
} else {
managerMenus.setMenuCodes(haobanMenuApiService.getHaobanMenuList(wxEnterpriseId, RoleClerkTypeEnum.CLERK.getCode()).getResult());
}
haobanRoleQDTO.setClerkMenus(clerkMenus);
haobanRoleQDTO.setManegeClerkMenus(manegeClerkMenus);
haobanRoleQDTO.setManagerMenus(managerMenus);
haobanRoleQDTO.setWxEnterpriseId(wxEnterpriseId);
haobanRoleApiService.add(haobanRoleQDTO, webLoginDTO);
return resultResponse(HaoBanErrCode.ERR_1);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanMenuMapper.java
......@@ -43,6 +43,8 @@ public interface TabHaobanMenuMapper {
*/
int update(TabHaobanMenu tabHaobanMenu);
List<String> getAllMenuList();
List<TabHaobanMenu> getPidMenuList();
List<TabHaobanMenu> getNotPidMenuList();
......@@ -60,5 +62,15 @@ public interface TabHaobanMenuMapper {
List<TabHaobanMenu> getHaobanNotPidMenuList(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("clerkType") Integer clerkType);
/**
* 得到haoban菜单列表
*
* @param wxEnterpriseId wx企业标识
* @param clerkType 职员类型
* @return {@link List}<{@link TabHaobanMenu}>
*/
List<String> getHaobanMenuListByClerkType(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("clerkType") Integer clerkType);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanMenuApiServiceImpl.java
......@@ -18,6 +18,12 @@ public class HaobanMenuApiServiceImpl implements HaobanMenuApiService {
private HaobanMenuService haobanMenuService;
@Override
public ServiceResponse<List<String>> getAllMenuList() {
List<String> allMenuList = haobanMenuService.getAllMenuList();
return ServiceResponse.success(allMenuList);
}
@Override
public ServiceResponse<List<HaobanMenuDTO>> getMenuTreeList() {
List<HaobanMenuBO> menuTreeList = haobanMenuService.getMenuTreeList();
return ServiceResponse.success(EntityUtil.changeEntityListNew(HaobanMenuDTO.class,menuTreeList));
......@@ -28,4 +34,10 @@ public class HaobanMenuApiServiceImpl implements HaobanMenuApiService {
List<HaobanMenuBO> haobanMenuBOList = haobanMenuService.getHaobanMenuTreeList(wxEnterpriseId, clerkType);
return ServiceResponse.success(EntityUtil.changeEntityListNew(HaobanMenuDTO.class,haobanMenuBOList));
}
@Override
public ServiceResponse<List<String>> getHaobanMenuList(String wxEnterpriseId, Integer clerkType) {
List<String> haobanMenuList = haobanMenuService.getHaobanMenuList(wxEnterpriseId, clerkType);
return ServiceResponse.success(haobanMenuList);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/HaobanMenuService.java
......@@ -40,6 +40,13 @@ public interface HaobanMenuService {
int update(TabHaobanMenu tabHaobanMenu);
/**
* 得到所有菜单列表
*
* @return {@link List}<{@link HaobanMenuBO}>
*/
List<String> getAllMenuList();
/**
* 菜单树
* @return
*/
......@@ -53,4 +60,15 @@ public interface HaobanMenuService {
* @return {@link List}<{@link HaobanMenuBO}>
*/
List<HaobanMenuBO> getHaobanMenuTreeList(String wxEnterpriseId, Integer clerkType);
/**
* 得到haoban菜单列表
*
* @param wxEnterpriseId wx企业标识
* @param clerkType 职员类型
* @return {@link List}<{@link HaobanMenuBO}>
*/
List<String> getHaobanMenuList(String wxEnterpriseId, Integer clerkType);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanMenuServiceImpl.java
......@@ -57,6 +57,11 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
}
@Override
public List<String> getAllMenuList() {
return tabHaobanMenuMapper.getAllMenuList();
}
@Override
public List<HaobanMenuBO> getMenuTreeList() {
List<TabHaobanMenu> pidMenuList = tabHaobanMenuMapper.getPidMenuList();
List<TabHaobanMenu> notPidMenuList = tabHaobanMenuMapper.getNotPidMenuList();
......@@ -82,6 +87,11 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
return pidMenuBOList;
}
@Override
public List<String> getHaobanMenuList(String wxEnterpriseId, Integer clerkType) {
return tabHaobanMenuMapper.getHaobanMenuListByClerkType(wxEnterpriseId, clerkType);
}
public List<HaobanMenuBO> iterateMenus(List<HaobanMenuBO> menuBOList, String pCode) {
List<HaobanMenuBO> result = new ArrayList<>();
for (HaobanMenuBO haobanMenuBO : menuBOList) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanRoleServiceImpl.java
......@@ -53,6 +53,9 @@ public class HaobanRoleServiceImpl implements HaobanRoleService {
@Override
public int insertBatch(List<TabHaobanRole> tabHaobanRoles) {
for (TabHaobanRole tabHaobanRole : tabHaobanRoles) {
tabHaobanRole.setCreateTime(new Date());
}
return tabHaobanRoleMapper.insertBatch(tabHaobanRoles);
}
......
haoban-manage3-service/src/main/resources/mapper/role/TabHaobanMenuMapper.xml
......@@ -35,7 +35,7 @@
</insert>
<insert id="insertBatch" keyProperty="menuId" useGeneratedKeys="true">
insert into tab_haoban_menu(menu_code, menu_name, menu_url, icon_url, menu_type,
insert into tab_haoban_menu(menu_code, menu_name, menu_url, icon_url, menu_type,
menu_sort, parent_code, status_flag,route_path, create_time, update_time)
values
<foreach collection="entities" item="entity" separator=",">
......@@ -86,9 +86,9 @@
</update>
<select id="getAllMenuList" resultMap="TabHaobanMenuMap">
<select id="getAllMenuList" resultType="java.lang.String">
select
<include refid="Base_Column_List"/>
menu_code
from tab_haoban_menu
where status_flag = 1 order by menu_sort
</select>
......@@ -136,5 +136,19 @@
order by c.menu_sort
</select>
<select id="getHaobanMenuListByClerkType" resultType="java.lang.String">
select
c.menu_code
from tab_haoban_role_menu a
left join tab_haoban_role b on a.role_id = b.role_id
left join tab_haoban_menu c on c.menu_code = a.menu_code
where
a.clerk_type = #{clerkType}
and a.wx_enterprise_id = #{wxEnterpriseId}
and c.status_flag = 1
order by c.menu_sort
</select>
</mapper>
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