Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-06-19 7e01b349c769045abeeeb6cf98241c8d60d0aeb3

 server/platform/src/main/java/com/doumee/api/business/CompanyController.java

@@ -13,6 +13,7 @@
import com.doumee.service.business.CompanyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -42,10 +43,19 @@
        companyService.startSignAuth(company.getId());
        return ApiResponse.success(null);
    }
    @PreventRepeat
    @ApiOperation("新建商户")
    @PostMapping("/createShop")
    @RequiresPermissions("business:company:createShop")
    public ApiResponse createShop(@RequestBody Company company) {
        companyService.createShop(company);
        companyService.startSignAuth(company.getId());
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:company:delete")
    @RequiresPermissions(value = {"business:company:delete", "business:company:deleteShop"}, logical = Logical.OR)
    public ApiResponse deleteById(@PathVariable Integer id) {
        companyService.deleteById(id);
        return ApiResponse.success(null);
@@ -53,7 +63,7 @@

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:company:delete")
    @RequiresPermissions(value = {"business:company:delete", "business:company:deleteShop"}, logical = Logical.OR)
    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
@@ -66,7 +76,7 @@

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:company:update")
    @RequiresPermissions(value = {"business:company:update", "business:company:updateShop"}, logical = Logical.OR)
    public ApiResponse updateById(@RequestBody Company company) {
        companyService.updateById(company);
        companyService.startSignAuth(company.getId());
@@ -75,21 +85,21 @@

    @ApiOperation("根据ID禁用启用")
    @PostMapping("/updateStatus")
    @RequiresPermissions("business:company:update")
    @RequiresPermissions(value = {"business:company:update", "business:company:updateShop"}, logical = Logical.OR)
    public ApiResponse updateStatus(@RequestBody Company company) {
        companyService.updateStatus(company);
        return ApiResponse.success(null);
    }
    @ApiOperation("修改保险方案")
    @PostMapping("/updateSolutions")
    @RequiresPermissions("business:company:update")
    @RequiresPermissions(value = {"business:company:update", "business:company:updateShop"}, logical = Logical.OR)
    public ApiResponse updateSolutions(@RequestBody Company company) {
        companyService.updateSolutions(company);
        return ApiResponse.success(null);
    }
    @ApiOperation("企业更换手机号")
    @PostMapping("/updatePhone")
    @RequiresPermissions("business:company:update")
    @RequiresPermissions(value = {"business:company:update", "business:company:updateShop"}, logical = Logical.OR)
    public ApiResponse updatePhone(@RequestBody Company company) {
        companyService.updatePhone(company);
        return ApiResponse.success(null);
@@ -104,7 +114,7 @@

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:company:query")
    @RequiresPermissions(value = {"business:company:query", "business:company:queryShop"}, logical = Logical.OR)
    public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap) {
        //权限范围内
        return ApiResponse.success(companyService.findPage(pageWrap));
@@ -116,7 +126,13 @@
        pageWrap.setQueryFlag(Constants.ONE);//查询全部
        return ApiResponse.success(companyService.findList(pageWrap));
    }

    @ApiOperation("查询全部数据")
    @PostMapping("/list")
    @RequiresPermissions(value = {"business:company:query", "business:company:queryShop"}, logical = Logical.OR)
    public ApiResponse<List<Company>> findList (@RequestBody  Company pageWrap) {
        pageWrap.setQueryFlag(Constants.ZERO);//查询全部权限范围内
        return ApiResponse.success(companyService.findList(pageWrap));
    }
    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:company:exportExcel")
@@ -126,7 +142,7 @@

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:company:query")
    @RequiresPermissions(value = {"business:company:query", "business:company:queryShop"}, logical = Logical.OR)
    public ApiResponse<Company> findById(@PathVariable Integer id) {

        return ApiResponse.success(companyService.findById(id));
@@ -134,7 +150,7 @@

    @ApiOperation("企业证件下载")
    @PostMapping("/exportFiles")
    @RequiresPermissions("business:locks:exportExcel")
    @RequiresPermissions("business:company:exportExcel")
    public void exportFiles(@RequestBody Company company,HttpServletResponse response) {
        if(company.getId() == null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);