From 8bfe1168a42d4e3750a15b0c0fb0a7629d6cf91c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 01 四月 2026 17:46:53 +0800
Subject: [PATCH] #日志清理与手动操作权限
---
src/main/java/com/zy/asrs/controller/WrkMastController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 7bb2d16..9ef23d0 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -6,11 +6,19 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.domain.param.CreateOutTaskBatchParam;
+import com.zy.asrs.domain.param.CancelTaskParam;
+import com.zy.asrs.domain.param.CompleteTaskParam;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
+import com.zy.common.service.CommonService;
import com.zy.common.web.BaseController;
+import com.zy.system.service.HighPrivilegeGrantService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -23,6 +31,10 @@
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private HighPrivilegeGrantService highPrivilegeGrantService;
@RequestMapping(value = "/wrkMast/list/auth")
@ManagerAuth
@@ -47,15 +59,52 @@
return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper));
}
+ @PostMapping(value = "/wrkBatchOut/create/auth")
+ @ManagerAuth(memo = "鐢熸垚鍑哄簱浠诲姟")
+ @Transactional
+ public R createBatchOutTask(@RequestBody CreateOutTaskBatchParam param) {
+ if (param == null) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ boolean result = commonService.createOutTaskBatch(param);
+ if (result) {
+ return R.ok();
+ }
+ return R.error("鐢熸垚鎵归噺鍑哄簱浠诲姟澶辫触");
+ }
+
+ @PostMapping(value = "/wrkMast/complete/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ畬鎴愪换鍔�")
+ public R completeTask(@RequestBody CompleteTaskParam param) {
+ if (param == null) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ highPrivilegeGrantService.assertGranted(request.getHeader("token"), "瀹屾垚浠诲姟");
+ return commonService.completeTask(param) ? R.ok() : R.error("浠诲姟瀹屾垚澶辫触");
+ }
+
+ @PostMapping(value = "/wrkMast/cancel/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ彇娑堜换鍔�")
+ public R cancelTask(@RequestBody CancelTaskParam param) {
+ if (param == null) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ highPrivilegeGrantService.assertGranted(request.getHeader("token"), "鍙栨秷浠诲姟");
+ return commonService.cancelTask(param) ? R.ok() : R.error("浠诲姟鍙栨秷澶辫触");
+ }
+
private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
if (val.contains(RANGE_TIME_LINK)){
String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
+ } else if ("io_type".equals(column) || "wrk_sts".equals(column)) {
+ wrapper.eq(column, val);
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.like(column, val);
}
}
}
--
Gitblit v1.9.1