Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dian...

MrShi

4 天以前 acf90ad8e6bea592124541324467360cef565ff5

 server/admin/src/main/java/com/doumee/api/business/CategoryController.java

@@ -20,6 +20,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;

@@ -85,6 +86,12 @@
    public ApiResponse<PageData<Category>> findPage (@RequestBody PageWrap<Category> pageWrap) {
        return ApiResponse.success(categoryService.findPage(pageWrap));
    }
    @ApiOperation("列表查询")
    @PostMapping("/list")
    @RequiresPermissions("business:category:query")
    public ApiResponse<List<Category>> findList (@RequestBody  Category pageWrap) {
        return ApiResponse.success(categoryService.findList(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
@@ -99,4 +106,14 @@
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(categoryService.findById(id));
    }


    @ApiOperation("战区信息同步")
    @GetMapping("/syncZhanQu")
    public ApiResponse syncZhanQu() throws IOException {
        categoryService.syncZhanQu();
        return ApiResponse.success("同步成功");
    }


}