feat:新增导入菜单接口

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

@@ -35,6 +35,7 @@ public class StaffClerkRelationDTO implements Serializable {
     private String qwUserId;
     private String openUserId;
     private Integer manageFlag;
+    private Integer clerkType;
 
     public String getQwUserId() {
         return qwUserId;
@@ -165,4 +166,12 @@ public class StaffClerkRelationDTO implements Serializable {
     public void setManageFlag(Integer manageFlag) {
         this.manageFlag = manageFlag;
     }
+
+    public Integer getClerkType() {
+        return clerkType;
+    }
+
+    public void setClerkType(Integer clerkType) {
+        this.clerkType = clerkType;
+    }
 }

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

+package com.gic.haoban.manage.api.dto.qdto.role;
+
+import java.io.Serializable;
+
+/**
+ *
+ *
+ * @author mozhu
+ * @since 2022-09-06 16:35:10
+ */
+public class HaobanMenuQDTO implements Serializable {
+
+    private static final long serialVersionUID = 909873156099677525L;
+
+    /**
+     * 菜单code
+     */
+    private String menuCode;
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+    /**
+     * 菜单url
+     */
+    private String menuUrl;
+    /**
+     * 菜单图标url
+     */
+    private String iconUrl;
+    /**
+     * 层级
+     */
+    private Integer menuLevel;
+    /**
+     * 0:菜单；1:按钮
+     */
+    private Integer menuType;
+    /**
+     * 排序
+     */
+    private Integer menuSort;
+    /**
+     * 父code
+     */
+    private String parentCode;
+
+    private String routePath;
+
+    public String getMenuCode() {
+        return menuCode;
+    }
+
+    public void setMenuCode(String menuCode) {
+        this.menuCode = menuCode;
+    }
+
+    public String getMenuName() {
+        return menuName;
+    }
+
+    public void setMenuName(String menuName) {
+        this.menuName = menuName;
+    }
+
+    public String getMenuUrl() {
+        return menuUrl;
+    }
+
+    public void setMenuUrl(String menuUrl) {
+        this.menuUrl = menuUrl;
+    }
+
+    public String getIconUrl() {
+        return iconUrl;
+    }
+
+    public void setIconUrl(String iconUrl) {
+        this.iconUrl = iconUrl;
+    }
+
+    public Integer getMenuLevel() {
+        return menuLevel;
+    }
+
+    public void setMenuLevel(Integer menuLevel) {
+        this.menuLevel = menuLevel;
+    }
+
+    public Integer getMenuType() {
+        return menuType;
+    }
+
+    public void setMenuType(Integer menuType) {
+        this.menuType = menuType;
+    }
+
+    public Integer getMenuSort() {
+        return menuSort;
+    }
+
+    public void setMenuSort(Integer menuSort) {
+        this.menuSort = menuSort;
+    }
+
+    public String getParentCode() {
+        return parentCode;
+    }
+
+    public void setParentCode(String parentCode) {
+        this.parentCode = parentCode;
+    }
+
+
+    public String getRoutePath() {
+        return routePath;
+    }
+
+    public void setRoutePath(String routePath) {
+        this.routePath = routePath;
+    }
+}
+

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

 package com.gic.haoban.manage.api.service.role;
 
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.haoban.manage.api.dto.qdto.role.HaobanMenuQDTO;
 import com.gic.haoban.manage.api.dto.role.HaobanMenuDTO;
 
 import java.util.List;
@@ -12,6 +13,14 @@ import java.util.List;
 public interface HaobanMenuApiService {
 
     /**
+     * 添加
+     *
+     * @param haobanMenuDTOList haoban菜单dto
+     * @return {@link ServiceResponse}
+     */
+    ServiceResponse add(List<HaobanMenuQDTO> haobanMenuDTOList);
+
+    /**
      * 得到所有菜单列表
      *
      * @return {@link ServiceResponse}<{@link List}<{@link HaobanMenuDTO}>>

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

@@ -101,5 +101,7 @@ public interface TabHaobanMenuMapper {
     List<TabHaobanMenu> getHaobanMenuListByCode(@Param("menuCodes") List<String> menuCodes);
 
     TabHaobanMenu getMenuByCode(@Param("menuCode") String menuCode);
+
+    void deleteAll();
 }
 

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

@@ -28,6 +28,7 @@ public class TabHaobanStaffClerkRelation implements Serializable {
 
     private Integer openConcatFlag;
     private Integer manageFlag;
+    private Integer clerkType;
 
 
     public String getStaffClerkRelationId() {
@@ -125,4 +126,12 @@ public class TabHaobanStaffClerkRelation implements Serializable {
     public void setManageFlag(Integer manageFlag) {
         this.manageFlag = manageFlag;
     }
+
+    public Integer getClerkType() {
+        return clerkType;
+    }
+
+    public void setClerkType(Integer clerkType) {
+        this.clerkType = clerkType;
+    }
 }
\ No newline at end of file

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

@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.ToolUtil;
 import com.gic.haoban.base.api.common.BasePageInfo;
@@ -63,6 +65,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
     private WxEnterpriseService wxEnterpriseService;
     @Autowired
     private MemberApiService memberApiService;
+    @Autowired
+    private ClerkService clerkService;
 
     @Override
     public List<StaffClerkRelationDTO> listBindCode(String enterpriseId, Set<String> clerkCodeList) {
@@ -141,6 +145,10 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
             logger.error("员工不存在:{}", staffId);
             return "";
         }
+        ClerkDTO clerkDTO = clerkService.getClerkByClerkId(dto.getClerkId());
+        if (clerkDTO != null) {
+            dto.setClerkType(clerkDTO.getClerkType());
+        }
         Date now = new Date();
         dto.setStaffClerkRelationId(ToolUtil.randomUUID());
         dto.setStatusFlag(1);

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

@@ -2,8 +2,10 @@ package com.gic.haoban.manage.service.service.out.impl.role;
 
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
+import com.gic.haoban.manage.api.dto.qdto.role.HaobanMenuQDTO;
 import com.gic.haoban.manage.api.dto.role.HaobanMenuDTO;
 import com.gic.haoban.manage.api.service.role.HaobanMenuApiService;
+import com.gic.haoban.manage.service.entity.role.TabHaobanMenu;
 import com.gic.haoban.manage.service.pojo.bo.role.HaobanMenuBO;
 import com.gic.haoban.manage.service.service.role.HaobanMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +20,13 @@ public class HaobanMenuApiServiceImpl implements HaobanMenuApiService {
     private HaobanMenuService haobanMenuService;
 
     @Override
+    public ServiceResponse add(List<HaobanMenuQDTO> haobanMenuDTOList) {
+        haobanMenuService.deleteAll();
+        haobanMenuService.insertBatch(EntityUtil.changeEntityListNew(TabHaobanMenu.class,haobanMenuDTOList));
+        return ServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse<List<String>> getAllMenuList() {
         List<String> allMenuList = haobanMenuService.getAllMenuList();
         return ServiceResponse.success(allMenuList);

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

@@ -29,6 +29,8 @@ public interface HaobanMenuService {
      */
     int insert(TabHaobanMenu tabHaobanMenu);
 
+    int insertBatch(List<TabHaobanMenu> tabHaobanMenus);
+
     /**
      * 修改数据
      *
@@ -89,4 +91,6 @@ public interface HaobanMenuService {
     List<HaobanMenuBO> getHaobanMenuList(List<String> menuCodes);
 
     HaobanMenuBO getMenuByCode(String menuCode);
+
+    void deleteAll();
 }

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

@@ -43,6 +43,16 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
         return this.tabHaobanMenuMapper.insert(tabHaobanMenu);
     }
 
+    @Override
+    public int insertBatch(List<TabHaobanMenu> tabHaobanMenus) {
+        for (TabHaobanMenu tabHaobanMenu : tabHaobanMenus) {
+            tabHaobanMenu.setStatusFlag(1);
+            tabHaobanMenu.setCreateTime(new Date());
+            tabHaobanMenu.setUpdateTime(new Date());
+        }
+        return tabHaobanMenuMapper.insertBatch(tabHaobanMenus);
+    }
+
     /**
      * 修改数据
      *
@@ -117,6 +127,11 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
         return EntityUtil.changeEntityNew(HaobanMenuBO.class,tabHaobanMenuMapper.getMenuByCode(menuCode));
     }
 
+    @Override
+    public void deleteAll() {
+        tabHaobanMenuMapper.deleteAll();
+    }
+
     public List<HaobanMenuBO> iterateMenus(List<HaobanMenuBO> menuBOList, String pCode) {
         List<HaobanMenuBO> result = new ArrayList<>();
         for (HaobanMenuBO haobanMenuBO : menuBOList) {

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -14,10 +14,11 @@
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
         <result column="open_concat_flag" property="openConcatFlag" jdbcType="INTEGER"/>
         <result column="manage_flag" property="manageFlag" jdbcType="INTEGER"/>
+        <result column="clerk_type" property="clerkType" jdbcType="INTEGER"/>
     </resultMap>
     <sql id="Base_Column_List">
         staff_clerk_relation_id, staff_id, wx_enterprise_id, enterprise_id, store_id,
-    clerk_id, clerk_code, status_flag, create_time, update_time,open_concat_flag,manage_flag
+    clerk_id, clerk_code, status_flag, create_time, update_time,open_concat_flag,manage_flag,clerk_type
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
@@ -30,12 +31,12 @@
         insert into tab_haoban_staff_clerk_relation (staff_clerk_relation_id, staff_id, wx_enterprise_id,
                                                      enterprise_id, store_id,
                                                      clerk_id, clerk_code, status_flag,
-                                                     create_time, update_time,open_concat_flag,manage_flag)
+                                                     create_time, update_time,open_concat_flag,manage_flag,clerk_type)
         values (#{staffClerkRelationId,jdbcType=VARCHAR}, #{staffId,jdbcType=VARCHAR},
                 #{wxEnterpriseId,jdbcType=VARCHAR},
                 #{enterpriseId,jdbcType=VARCHAR}, #{storeId,jdbcType=VARCHAR},
                 #{clerkId,jdbcType=VARCHAR}, #{clerkCode,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER},
-                #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{openConcatFlag},#{manageFlag})
+                #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{openConcatFlag},#{manageFlag},#{clerkType})
     </insert>
 
 

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

@@ -197,5 +197,9 @@
         where status_flag = 1 and menu_code = #{menuCode}
     </select>
 
+    <delete id="deleteAll">
+       delete from tab_haoban_menu
+    </delete>
+
 </mapper>
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleController.java

@@ -3,8 +3,10 @@ package com.gic.haoban.manage.web.controller;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
+import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.RolesListUtils;
+import com.gic.haoban.manage.api.dto.qdto.role.HaobanMenuQDTO;
 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.dto.role.HaobanMenuDTO;
@@ -143,4 +145,17 @@ public class HaobanRoleController extends WebBaseController {
         return RestResponse.successResult(serviceResponse.getResult());
     }
 
+    /**
+     * 新增菜单
+     *
+     * @param haobanMenuQDTOList
+     * @return
+     */
+    @RequestMapping(value = "/addMenu", method = RequestMethod.POST)
+    @IgnoreLogin
+    public RestResponse addMenu(@RequestBody List<HaobanMenuQDTO> haobanMenuQDTOList) {
+        haobanMenuApiService.add(haobanMenuQDTOList);
+        return RestResponse.successResult();
+    }
+
 }