feat:新增获取所有菜单和新增单个菜单接口

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

@@ -15,17 +15,24 @@ public interface HaobanMenuApiService {
     /**
      * 添加
      *
-     * @param haobanMenuDTOList haoban菜单dto
+     * @param haobanMenuDTO haoban菜单dto
      * @return {@link ServiceResponse}
      */
-    ServiceResponse add(List<HaobanMenuQDTO> haobanMenuDTOList);
+    ServiceResponse add(HaobanMenuQDTO haobanMenuDTO);
+
+    ServiceResponse addList(List<HaobanMenuQDTO> haobanMenuDTOList);
 
     /**
-     * 得到所有菜单列表
+     * 得到所有菜单code列表
      *
      * @return {@link ServiceResponse}<{@link List}<{@link HaobanMenuDTO}>>
      */
-    ServiceResponse<List<String>> getAllMenuList();
+    ServiceResponse<List<String>> getAllMenuCodeList();
+
+
+    ServiceResponse<List<HaobanMenuDTO>> getAllMenuList();
+
+
     /**
      * 获取菜单树
      *

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

@@ -43,7 +43,9 @@ public interface TabHaobanMenuMapper {
      */
     int update(TabHaobanMenu tabHaobanMenu);
 
-    List<String> getAllMenuList();
+    List<TabHaobanMenu> getAllMenuList();
+
+    List<String> getAllMenuCodeList();
 
     List<TabHaobanMenu> getPidMenuList();
 

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

@@ -19,29 +19,48 @@ public class HaobanMenuApiServiceImpl implements HaobanMenuApiService {
     @Autowired
     private HaobanMenuService haobanMenuService;
 
+
     @Override
-    public ServiceResponse add(List<HaobanMenuQDTO> haobanMenuDTOList) {
+    public ServiceResponse add(HaobanMenuQDTO haobanMenuDTO) {
+        TabHaobanMenu tabHaobanMenu = haobanMenuService.queryById(haobanMenuDTO.getMenuCode());
+        if (tabHaobanMenu != null) {
+            haobanMenuService.update(EntityUtil.changeEntityNew(TabHaobanMenu.class, haobanMenuDTO));
+            return ServiceResponse.success();
+        }
+        haobanMenuService.insert(EntityUtil.changeEntityNew(TabHaobanMenu.class, haobanMenuDTO));
+        return ServiceResponse.success();
+    }
+
+
+    @Override
+    public ServiceResponse addList(List<HaobanMenuQDTO> haobanMenuDTOList) {
         haobanMenuService.deleteAll();
-        haobanMenuService.insertBatch(EntityUtil.changeEntityListNew(TabHaobanMenu.class,haobanMenuDTOList));
+        haobanMenuService.insertBatch(EntityUtil.changeEntityListNew(TabHaobanMenu.class, haobanMenuDTOList));
         return ServiceResponse.success();
     }
 
     @Override
-    public ServiceResponse<List<String>> getAllMenuList() {
-        List<String> allMenuList = haobanMenuService.getAllMenuList();
+    public ServiceResponse<List<String>> getAllMenuCodeList() {
+        List<String> allMenuList = haobanMenuService.getAllMenuCodeList();
         return ServiceResponse.success(allMenuList);
     }
 
     @Override
+    public ServiceResponse<List<HaobanMenuDTO>> getAllMenuList() {
+        List<HaobanMenuBO> allMenuList = haobanMenuService.getAllMenuList();
+        return ServiceResponse.success(EntityUtil.changeEntityListNew(HaobanMenuDTO.class,allMenuList));
+    }
+
+    @Override
     public ServiceResponse<List<HaobanMenuDTO>> getMenuTreeList() {
         List<HaobanMenuBO> menuTreeList = haobanMenuService.getMenuTreeList();
-        return ServiceResponse.success(EntityUtil.changeEntityListNew(HaobanMenuDTO.class,menuTreeList));
+        return ServiceResponse.success(EntityUtil.changeEntityListNew(HaobanMenuDTO.class, menuTreeList));
     }
 
     @Override
     public ServiceResponse<List<HaobanMenuDTO>> getHaobanMenuTreeList(String wxEnterpriseId, Integer clerkType) {
         List<HaobanMenuBO> haobanMenuBOList = haobanMenuService.getHaobanMenuTreeList(wxEnterpriseId, clerkType);
-        return ServiceResponse.success(EntityUtil.changeEntityListNew(HaobanMenuDTO.class,haobanMenuBOList));
+        return ServiceResponse.success(EntityUtil.changeEntityListNew(HaobanMenuDTO.class, haobanMenuBOList));
     }
 
     @Override
@@ -52,7 +71,7 @@ public class HaobanMenuApiServiceImpl implements HaobanMenuApiService {
 
     @Override
     public ServiceResponse<HaobanMenuDTO> getMenuByCode(String menuCode) {
-        return ServiceResponse.success(EntityUtil.changeEntityNew(HaobanMenuDTO.class,haobanMenuService.getMenuByCode(menuCode)));
+        return ServiceResponse.success(EntityUtil.changeEntityNew(HaobanMenuDTO.class, haobanMenuService.getMenuByCode(menuCode)));
     }
 
     @Override

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

@@ -44,7 +44,9 @@ public interface HaobanMenuService {
      *
      * @return {@link List}<{@link HaobanMenuBO}>
      */
-    List<String> getAllMenuList();
+    List<String> getAllMenuCodeList();
+
+    List<HaobanMenuBO> getAllMenuList();
 
     /**
      * 菜单树

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

@@ -66,8 +66,14 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
     }
 
     @Override
-    public List<String> getAllMenuList() {
-        return tabHaobanMenuMapper.getAllMenuList();
+    public List<String> getAllMenuCodeList() {
+        return tabHaobanMenuMapper.getAllMenuCodeList();
+    }
+
+    @Override
+    public List<HaobanMenuBO> getAllMenuList() {
+        List<TabHaobanMenu> allMenuList = tabHaobanMenuMapper.getAllMenuList();
+        return EntityUtil.changeEntityListNew(HaobanMenuBO.class,allMenuList);
     }
 
     @Override

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

@@ -92,8 +92,13 @@
         where menu_code = #{menuCode}
     </update>
 
+    <select id="getAllMenuList" resultMap="TabHaobanMenuMap" >
+        select <include refid="Base_Column_List"></include>
+        from tab_haoban_menu
+        where status_flag = 1
+    </select>
 
-    <select id="getAllMenuList" resultType="java.lang.String">
+    <select id="getAllMenuCodeList" resultType="java.lang.String">
         select menu_code
         from tab_haoban_menu
         where status_flag = 1

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

@@ -157,12 +157,40 @@ public class HaobanRoleController extends WebBaseController {
     @RequestMapping(value = "/addMenu", method = RequestMethod.POST)
     @IgnoreLogin
     @com.gic.web.common.ano.IgnoreLogin
-    public RestResponse addMenu(@RequestBody List<HaobanMenuQDTO> haobanMenuQDTOList) {
+    public RestResponse addMenuList(@RequestBody List<HaobanMenuQDTO> haobanMenuQDTOList) {
         if (CollectionUtils.isEmpty(haobanMenuQDTOList)) {
             return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_2.getCode()),HaoBanErrCode.ERR_2.getMsg());
         }
-        haobanMenuApiService.add(haobanMenuQDTOList);
+        haobanMenuApiService.addList(haobanMenuQDTOList);
         return RestResponse.successResult();
     }
 
+    /**
+     * 新增单个菜单
+     * @param haobanMenuQDTO
+     * @return
+     */
+    @RequestMapping(value = "/add-menuCode", method = RequestMethod.POST)
+    @IgnoreLogin
+    @com.gic.web.common.ano.IgnoreLogin
+    public RestResponse addMenu(@RequestBody HaobanMenuQDTO haobanMenuQDTO) {
+        if (haobanMenuQDTO == null) {
+            return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_2.getCode()),HaoBanErrCode.ERR_2.getMsg());
+        }
+        haobanMenuApiService.add(haobanMenuQDTO);
+        return RestResponse.successResult();
+    }
+
+    /**
+     * 获取所有菜单
+     * @return
+     */
+    @RequestMapping(value = "/getAllMenu", method = RequestMethod.GET)
+    @IgnoreLogin
+    @com.gic.web.common.ano.IgnoreLogin
+    public RestResponse<List<HaobanMenuDTO>> getAllMenu() {
+        ServiceResponse<List<HaobanMenuDTO>> allMenuList = haobanMenuApiService.getAllMenuList();
+        return RestResponse.successResult(allMenuList.getResult());
+    }
+
 }