From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
server/platform/src/main/java/com/doumee/api/business/CompanyController.java | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java b/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
index 2345fc5..0559c94 100644
--- a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
@@ -3,6 +3,8 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
@@ -11,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.*;
@@ -40,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);
@@ -51,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<>();
@@ -64,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());
@@ -73,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);
@@ -102,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));
@@ -110,9 +122,16 @@
@ApiOperation("鏌ヨ鍏ㄩ儴鏁版嵁(璐﹀彿鍒嗛厤浼佷笟浣跨敤)")
@PostMapping("/pageAll")
@RequiresPermissions("business:companypermission:create")
- public ApiResponse<PageData<Company>> findPageAll (@RequestBody PageWrap<Company> pageWrap) {
- pageWrap.getModel().setQueryFlag(Constants.ONE);//鏌ヨ鍏ㄩ儴
- return ApiResponse.success(companyService.findPage(pageWrap));
+ public ApiResponse<List<Company>> findPageAll (@RequestBody Company pageWrap) {
+ 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")
@@ -124,9 +143,19 @@
@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));
}
+
+ @ApiOperation("浼佷笟璇佷欢涓嬭浇")
+ @PostMapping("/exportFiles")
+ @RequiresPermissions("business:company:exportExcel")
+ public void exportFiles(@RequestBody Company company,HttpServletResponse response) {
+ if(company.getId() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ companyService.exportFiles(company.getId(),response);
+ }
}
--
Gitblit v1.9.3