From bb809ceda79f25ed58ef1e764ba7ffcae3254faa Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 06 十一月 2024 14:05:34 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
index e1641d5..d0e2cb7 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
@@ -2,13 +2,16 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.acs.common.constant.CommonConstant;
+import com.zy.acs.common.utils.GsonUtils;
+import com.zy.acs.common.utils.Utils;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
-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.entity.Code;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -40,7 +43,7 @@
return R.ok().add(codeService.list());
}
- @PreAuthorize("hasAuthority('system:code:list')")
+ @PreAuthorize("hasAuthority('manager:code:list')")
@PostMapping({"/code/many/{ids}", "/codes/many/{ids}"})
public R many(@PathVariable Long[] ids) {
return R.ok().add(codeService.listByIds(Arrays.asList(ids)));
@@ -56,6 +59,8 @@
@OperationLog("Create Code")
@PostMapping("/code/save")
public R save(@RequestBody Code code) {
+ code.setData(Utils.zeroFill(code.getData(), CommonConstant.QR_CODE_LEN));
+ code.setUuid("code".concat(code.getData()));
code.setCreateBy(getLoginUserId());
code.setCreateTime(new Date());
code.setUpdateBy(getLoginUserId());
@@ -70,6 +75,7 @@
@OperationLog("Update Code")
@PostMapping("/code/update")
public R update(@RequestBody Code code) {
+ code.setData(Utils.zeroFill(code.getData(), CommonConstant.QR_CODE_LEN));
code.setUpdateBy(getLoginUserId());
code.setUpdateTime(new Date());
if (!codeService.updateById(code)) {
@@ -108,4 +114,28 @@
ExcelUtil.build(ExcelUtil.create(codeService.list(), Code.class), response);
}
+ @PreAuthorize("hasAuthority('manager:code:save')")
+ @PostMapping("/code/import")
+ public R importBatch(@RequestBody List<Map<String, Object>> list) {
+ Date now = new Date(); Long userId = getLoginUserId();
+ for (Map<String, Object> map : list) {
+ Code code = Cools.conver(map, Code.class);
+ if (null != codeService.selectByData(code.getData())) {
+ continue;
+ }
+ code.setData(Utils.zeroFill(code.getData(), CommonConstant.QR_CODE_LEN));
+ code.setUuid("code".concat(code.getData()));
+ code.setConcer(0);
+ code.setScale(GsonUtils.toJson(Cools.add("x", 1).add("y", 1)));
+ code.setCreateBy(userId);
+ code.setCreateTime(now);
+ code.setUpdateBy(userId);
+ code.setUpdateTime(now);
+ if (!codeService.save(code)) {
+
+ }
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1