From 7c4d3d957c431aad12f90511770e2fe429bcd380 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 十二月 2024 16:38:25 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java
index 4c307dc..bf5b8a7 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/LocController.java
@@ -6,15 +6,14 @@
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.framework.exception.CoolException;
-import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
import com.zy.acs.manager.common.domain.PageParam;
+import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.controller.param.LocInitParam;
import com.zy.acs.manager.manager.entity.Loc;
import com.zy.acs.manager.manager.entity.Zone;
-import com.zy.acs.manager.manager.enums.LocStsType;
import com.zy.acs.manager.manager.service.LocService;
import com.zy.acs.manager.manager.service.ZoneService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -24,6 +23,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("/api")
@@ -39,7 +39,7 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
- return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(false)));
}
@PreAuthorize("hasAuthority('manager:loc:list')")
@@ -84,6 +84,22 @@
return R.error("Update Fail");
}
return R.ok("Update Success").add(loc);
+ }
+
+ @PreAuthorize("hasAuthority('manager:loc:update')")
+ @OperationLog("Update Loc")
+ @PostMapping("/loc/update/many")
+ public R updateMany(@RequestBody List<Loc> locList) {
+ if (!Cools.isEmpty(locList)) {
+ for (Loc loc : locList) {
+ loc.setUpdateBy(getLoginUserId());
+ loc.setUpdateTime(new Date());
+ if (!locService.updateById(loc)) {
+ return R.error("Update Fail");
+ }
+ }
+ }
+ return R.ok("Update Success").add(locList.stream().map(Loc::getId).collect(Collectors.toList()));
}
@PreAuthorize("hasAuthority('manager:loc:remove')")
@@ -141,13 +157,13 @@
locNo, // 搴撲綅缂栧彿
null, // 鍚嶇О
null, // 鏉＄爜
- LocStsType.IDLE.val(), // 搴撲綅鐘舵��
+ param.getLocSts(), // 搴撲綅鐘舵��
offset, // 鍋忕Щ閲�
r, // 鎺�
b, // 鍒�
l, // 灞�
null, // 鎵樼洏鐮�
- null, // 搴撲綅绫诲瀷
+ param.getLocType(), // 搴撲綅绫诲瀷
null, // 鐘舵�乕闈炵┖]
null, // 鏄惁鍒犻櫎[闈炵┖]
null, // 绉熸埛
@@ -157,6 +173,7 @@
null, // 淇敼鏃堕棿
null // 澶囨敞
);
+ loc.setCompDirect(param.getCompDirect());
if (locService.count(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, locNo)) > 0) {
throw new CoolException(locNo + " location has exist !");
}
--
Gitblit v1.9.1