From ebd2f4397a92c6a5096de1b86d59154363344720 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 五月 2025 08:48:15 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvModelController.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 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..2380ef6 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,13 +4,15 @@
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.manager.service.impl.AgvModelServiceImpl;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +27,8 @@
@Autowired
private AgvModelService agvModelService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@PreAuthorize("hasAuthority('manager:agvModel:list')")
@PostMapping("/agvModel/page")
@@ -56,6 +60,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,10 +86,34 @@
@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)) {
return R.error("Update Fail");
+ } else {
+ // update cache
+ for (Map.Entry<Long, AgvModel> entry : AgvModelServiceImpl.AGV_ID_MODEL_CACHE.entrySet()) {
+ if (entry.getValue().getId().equals(agvModel.getId())) {
+ entry.setValue(agvModel);
+ }
+ }
+ for (Map.Entry<String, AgvModel> entry : AgvModelServiceImpl.AGV_NO_MODEL_CACHE.entrySet()) {
+ if (entry.getValue().getId().equals(agvModel.getId())) {
+ entry.setValue(agvModel);
+ }
+ }
}
return R.ok("Update Success").add(agvModel);
}
--
Gitblit v1.9.1