From ebdfa825c07189b5f8e89f147d96d1bc612589db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 08:32:17 +0800
Subject: [PATCH] 代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
index 470fa54..5b13799 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
@@ -10,8 +10,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.service.CheckOrderItemService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -22,7 +21,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-
import javax.servlet.http.HttpServletResponse;
import java.util.*;
@@ -40,37 +38,37 @@
private CheckOrderItemService checkOrderItemService;
- @PreAuthorize("hasAuthority('manager:checkItem:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/checkItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
- QueryWrapper<AsnOrderItem> wrapper = pageParam.buildWrapper(true);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true);
return R.ok().add(checkOrderItemService.page(pageParam, wrapper));
}
- @PreAuthorize("hasAuthority('manager:checkItem:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/checkItem/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(checkOrderItemService.list());
}
- @PreAuthorize("hasAuthority('manager:checkItem:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping({"/checkItem/many/{ids}", "/checkItem/many/{ids}"})
public R many(@PathVariable Long[] ids) {
return R.ok().add(checkOrderItemService.listByIds(Arrays.asList(ids)));
}
- @PreAuthorize("hasAuthority('manager:checkItem:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
@GetMapping("/checkItem/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(checkOrderItemService.getById(id));
}
- @PreAuthorize("hasAuthority('manager:checkItem:save')")
+ @PreAuthorize("hasAuthority('manager:check:save')")
@OperationLog("Create 瀛楀吀鏁版嵁闆�")
@PostMapping("/checkItem/save")
- public R save(@RequestBody AsnOrderItem order) {
+ public R save(@RequestBody WkOrderItem order) {
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, order);
if (Objects.isNull(ruleCode)) {
throw new RuntimeException("鐩樼偣鍗曞彿鐢熸垚澶辫触锛侊紒");
@@ -81,10 +79,10 @@
return R.ok("Save Success").add(order);
}
- @PreAuthorize("hasAuthority('manager:checkItem:update')")
+ @PreAuthorize("hasAuthority('manager:check:update')")
@OperationLog("Update 瀛楀吀鏁版嵁闆�")
@PostMapping("/checkItem/update")
- public R update(@RequestBody AsnOrderItem order) {
+ public R update(@RequestBody WkOrderItem order) {
order.setUpdateTime(null);
order.setUpdateBy(getLoginUserId());
if (!checkOrderItemService.updateById(order)) {
@@ -93,7 +91,7 @@
return R.ok("Update Success").add(order);
}
- @PreAuthorize("hasAuthority('manager:checkItem:remove')")
+ @PreAuthorize("hasAuthority('manager:check:remove')")
@OperationLog("Delete 瀛楀吀鏁版嵁闆�")
@PostMapping("/checkItem/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
@@ -103,13 +101,13 @@
return R.ok("Delete Success").add(ids);
}
- @PreAuthorize("hasAuthority('manager:checkItem:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/checkItem/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<AsnOrderItem> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<WkOrderItem> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(AsnOrderItem::getAsnCode, condition);
+ wrapper.like(WkOrderItem::getAsnCode, condition);
}
checkOrderItemService.page(new Page<>(1, 20), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getAsnCode()))
@@ -123,16 +121,16 @@
* @description: 鐩樼偣鍗曞鍑�
* @version 1.0
*/
- @PreAuthorize("hasAuthority('manager:checkItem:list')")
+ @PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/checkItem/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<AsnOrderItem> orders = new ArrayList<>();
+ List<WkOrderItem> orders = new ArrayList<>();
if (!Objects.isNull(map.get("ids"))) {
- orders = checkOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, map.get("ids")));
+ orders = checkOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getId, map.get("ids")));
} else {
orders = checkOrderItemService.list();
}
- ExcelUtil.build(ExcelUtil.create(orders, AsnOrderItem.class), response);
+ ExcelUtil.build(ExcelUtil.create(orders, WkOrderItem.class), response);
}
/**
@@ -144,7 +142,7 @@
*/
@PostMapping("/checkItem/template/download")
@ApiOperation("涓嬭浇鐩樼偣鍗曟ā鏉�")
- @PreAuthorize("hasAuthority('manager:checkItem:update')")
+ @PreAuthorize("hasAuthority('manager:check:update')")
public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class);
List<CheckOrderTemplate> list = Arrays.asList(template);
--
Gitblit v1.9.1