From 052ee1f9c0b9e2bc8bbd4cf135ae45fed7422023 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 28 十月 2024 10:36:28 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvModelController.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvModelController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvModelController.java
index ce1ab5d..cde3cc3 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvModelController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvModelController.java
@@ -4,11 +4,12 @@
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.manager.common.utils.ExcelUtil;
+import com.zy.acs.framework.common.SnowflakeIdWorker;
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.AgvModel;
import com.zy.acs.manager.manager.service.AgvModelService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -25,6 +26,8 @@
@Autowired
private AgvModelService agvModelService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@PreAuthorize("hasAuthority('manager:agvModel:list')")
@PostMapping("/agvModel/page")
@@ -56,6 +59,18 @@
@OperationLog("Create AgvModel")
@PostMapping("/agvModel/save")
public R save(@RequestBody AgvModel agvModel) {
+ if (!Cools.isEmpty(agvModel.getName())) {
+ if (agvModelService.count(new LambdaQueryWrapper<AgvModel>()
+ .eq(AgvModel::getName, agvModel.getName())) > 0) {
+ return R.error("this model name has already exist !");
+ }
+ }
+ if (!Cools.isEmpty(agvModel.getType())) {
+ if (agvModelService.count(new LambdaQueryWrapper<AgvModel>()
+ .eq(AgvModel::getType, agvModel.getType())) > 0) {
+ return R.error("this model type has already exist !");
+ }
+ } agvModel.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
agvModel.setCreateBy(getLoginUserId());
agvModel.setCreateTime(new Date());
agvModel.setUpdateBy(getLoginUserId());
@@ -70,6 +85,18 @@
@OperationLog("Update AgvModel")
@PostMapping("/agvModel/update")
public R update(@RequestBody AgvModel agvModel) {
+ if (!Cools.isEmpty(agvModel.getName())) {
+ if (agvModelService.count(new LambdaQueryWrapper<AgvModel>()
+ .eq(AgvModel::getName, agvModel.getName()).ne(AgvModel::getId, agvModel.getId())) > 0) {
+ return R.error("this model name has already exist !");
+ }
+ }
+ if (!Cools.isEmpty(agvModel.getType())) {
+ if (agvModelService.count(new LambdaQueryWrapper<AgvModel>()
+ .eq(AgvModel::getType, agvModel.getType()).ne(AgvModel::getId, agvModel.getId())) > 0) {
+ return R.error("this model type has already exist !");
+ }
+ }
agvModel.setUpdateBy(getLoginUserId());
agvModel.setUpdateTime(new Date());
if (!agvModelService.updateById(agvModel)) {
--
Gitblit v1.9.1