From 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 一月 2024 09:37:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java b/server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java
index 9c9730b..201fd18 100644
--- a/server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java
+++ b/server/company/src/main/java/com/doumee/api/business/DispatchUnitController.java
@@ -4,13 +4,17 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.dao.business.dto.DispatchUnitQueryDTO;
+import com.doumee.dao.business.dto.SaveDispatchUnitDTO;
import com.doumee.dao.business.model.DispatchUnit;
import com.doumee.service.business.DispatchUnitService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -20,7 +24,7 @@
/**
* @author 姹熻箘韫�
- * @date 2024/01/15 11:15
+ * @date 2024/01/16 10:03
*/
@Api(tags = "娲鹃仯鍗曚綅淇℃伅琛�")
@RestController
@@ -34,9 +38,27 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@RequiresPermissions("business:dispatchunit:create")
- public ApiResponse create(@RequestBody DispatchUnit dispatchUnit) {
- return ApiResponse.success(dispatchUnitService.create(dispatchUnit));
+ public ApiResponse create(@RequestBody SaveDispatchUnitDTO saveDispatchUnitDTO) {
+ return ApiResponse.success(dispatchUnitService.create(saveDispatchUnitDTO));
}
+
+ @PreventRepeat
+ @ApiOperation("娣诲姞宸ョ")
+ @PostMapping("/createSolution")
+ @RequiresPermissions("business:dispatchunit:create")
+ public ApiResponse createSolution(@RequestBody SaveDispatchUnitDTO saveDispatchUnitDTO) {
+ return ApiResponse.success(dispatchUnitService.createSolution(saveDispatchUnitDTO));
+ }
+
+
+ @ApiOperation("淇敼淇℃伅")
+ @PostMapping("/editDispatchUnit")
+ @RequiresPermissions("business:dispatchunit:update")
+ public ApiResponse editDispatchUnit(@RequestBody SaveDispatchUnitDTO saveDispatchUnitDTO) {
+ dispatchUnitService.editDispatchUnit(saveDispatchUnitDTO);
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@@ -71,6 +93,8 @@
@PostMapping("/page")
@RequiresPermissions("business:dispatchunit:query")
public ApiResponse<PageData<DispatchUnit>> findPage (@RequestBody PageWrap<DispatchUnit> pageWrap) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ pageWrap.getModel().setCompanyId(user.getCompanyId());
return ApiResponse.success(dispatchUnitService.findPage(pageWrap));
}
@@ -78,13 +102,25 @@
@PostMapping("/exportExcel")
@RequiresPermissions("business:dispatchunit:exportExcel")
public void exportExcel (@RequestBody PageWrap<DispatchUnit> pageWrap, HttpServletResponse response) {
+
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ pageWrap.getModel().setCompanyId(user.getCompanyId());
ExcelExporter.build(DispatchUnit.class).export(dispatchUnitService.findPage(pageWrap).getRecords(), "娲鹃仯鍗曚綅淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:dispatchunit:query")
- public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(dispatchUnitService.findById(id));
+ public ApiResponse<DispatchUnit> findById(@PathVariable Integer id) {
+ return ApiResponse.success(dispatchUnitService.detailById(id));
}
+
+ @ApiOperation("鏁版嵁鍒楄〃")
+ @PostMapping("/findListByDTO")
+ @RequiresPermissions("business:dispatchunit:query")
+ public ApiResponse<List<DispatchUnit>> findListByDTO (@RequestBody DispatchUnitQueryDTO dispatchUnitQueryDTO) {
+ return ApiResponse.success(dispatchUnitService.findByDTO(dispatchUnitQueryDTO));
+ }
+
+
}
--
Gitblit v1.9.3