From 0e723c25f7460d7899808875db8a95eff3edda1b Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 24 十一月 2023 17:10:05 +0800
Subject: [PATCH] 大屏车间管理接口修改
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
index b0d1347..1ee528d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
@@ -8,6 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
@@ -224,22 +225,24 @@
@AutoLog(value = "澶у睆杞﹂棿淇℃伅-鏂板澶у睆杞﹂棿涓庤澶囧叧绯�")
@ApiOperation(value = "澶у睆杞﹂棿淇℃伅-鏂板澶у睆杞﹂棿涓庤澶囧叧绯�", notes = "澶у睆杞﹂棿淇℃伅-鏂板澶у睆杞﹂棿涓庤澶囧叧绯�")
@PostMapping(value = "/addWorkshopEquipment")
- public Result addWorkshopEquipment(MdcWorkshopEquipmentVo mdcWorkshopEquipmentVo) {
+ public Result addWorkshopEquipment(@RequestBody MdcWorkshopEquipmentVo mdcWorkshopEquipmentVo) {
try {
String workshopId = mdcWorkshopEquipmentVo.getWorkshopId();
for (String equipmentId : mdcWorkshopEquipmentVo.getEquipmentIdList()) {
- MdcWorkshopEquipment mdcWorkshopEquipment = new MdcWorkshopEquipment();
- mdcWorkshopEquipment.setWorkshopId(workshopId);
- mdcWorkshopEquipment.setEquipmentId(equipmentId);
- mdcWorkshopEquipment.setCoordinateLeft(0);
- mdcWorkshopEquipment.setCoordinateTop(0);
- mdcWorkshopEquipment.setVw(100);
- mdcWorkshopEquipment.setVh(100);
- LambdaQueryWrapper<MdcWorkshopEquipment> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(MdcWorkshopEquipment::getWorkshopId, workshopId).eq(MdcWorkshopEquipment::getEquipmentId, equipmentId);
- MdcWorkshopEquipment one = mdcWorkshopEquipmentService.getOne(queryWrapper);
- if (one == null) {
- mdcWorkshopEquipmentService.save(mdcWorkshopEquipment);
+ if (!StringUtils.isEmpty(equipmentId) && !"null".equals(equipmentId)) {
+ MdcWorkshopEquipment mdcWorkshopEquipment = new MdcWorkshopEquipment();
+ mdcWorkshopEquipment.setWorkshopId(workshopId);
+ mdcWorkshopEquipment.setEquipmentId(equipmentId);
+ mdcWorkshopEquipment.setCoordinateLeft(0);
+ mdcWorkshopEquipment.setCoordinateTop(0);
+ mdcWorkshopEquipment.setVw(100);
+ mdcWorkshopEquipment.setVh(100);
+ LambdaQueryWrapper<MdcWorkshopEquipment> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(MdcWorkshopEquipment::getWorkshopId, workshopId).eq(MdcWorkshopEquipment::getEquipmentId, equipmentId);
+ MdcWorkshopEquipment one = mdcWorkshopEquipmentService.getOne(queryWrapper);
+ if (one == null) {
+ mdcWorkshopEquipmentService.save(mdcWorkshopEquipment);
+ }
}
}
return Result.OK("娣诲姞鎴愬姛锛�");
--
Gitblit v1.9.3