From 4014aef3bc15d24ffbb7dacfdffece321c1b9158 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 20 九月 2024 15:26:55 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
index cc7a045..4a440a2 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.annotation.OperationLog;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
@@ -12,6 +13,7 @@
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.controller.result.AgvResult;
import com.zy.acs.manager.manager.entity.Agv;
+import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.service.AgvDetailService;
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
@@ -19,6 +21,7 @@
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -83,13 +86,27 @@
@PreAuthorize("hasAuthority('manager:agv:save')")
@OperationLog("Create Agv")
@PostMapping("/agv/save")
+ @Transactional
public R save(@RequestBody Agv agv) {
- agv.setCreateBy(getLoginUserId());
- agv.setCreateTime(new Date());
- agv.setUpdateBy(getLoginUserId());
- agv.setUpdateTime(new Date());
+ if (agvService.count(new LambdaQueryWrapper<Agv>()
+ .eq(Agv::getUuid, agv.getUuid())) > 0) {
+ return R.error("agv no has already exist !");
+ }
+ Long loginUserId = getLoginUserId();
+ Date now = new Date();
+ agv.setCreateBy(loginUserId);
+ agv.setCreateTime(now);
+ agv.setUpdateBy(loginUserId);
+ agv.setUpdateTime(now);
if (!agvService.save(agv)) {
- return R.error("Save Fail");
+ throw new CoolException("Save Fail");
+ }
+ AgvDetail agvDetail = new AgvDetail();
+ agvDetail.setAgvId(agv.getId());
+ agvDetail.setCreateBy(loginUserId);
+ agvDetail.setUpdateBy(loginUserId);
+ if (!agvDetailService.save(agvDetail)) {
+ throw new CoolException("Save Fail");
}
return R.ok("Save Success").add(agv);
}
@@ -98,6 +115,11 @@
@OperationLog("Update Agv")
@PostMapping("/agv/update")
public R update(@RequestBody Agv agv) {
+ if (agvService.count(new LambdaQueryWrapper<Agv>()
+ .eq(Agv::getUuid, agv.getUuid())
+ .ne(Agv::getId, agv.getId())) > 0) {
+ return R.error("Update Fail");
+ }
agv.setUpdateBy(getLoginUserId());
agv.setUpdateTime(new Date());
if (!agvService.updateById(agv)) {
--
Gitblit v1.9.1