From eb95498a07c672b742607f4b7785a1b03bef73c3 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sun, 30 Jun 2024 14:22:54 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E5=A4=87=E8=B4=A7=E5=8C=BA=E4=B8=8E?= =?UTF-8?q?=E6=B0=94=E8=83=80=E8=BD=B4=E5=BA=93=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BstIvtShafttubeivtController.java | 12 ++++++++++-- .../service/IBstIvtShafttubeivtService.java | 3 +++ .../impl/BstIvtShafttubeivtServiceImpl.java | 16 ++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/controller/BstIvtShafttubeivtController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/controller/BstIvtShafttubeivtController.java index 4a01ea591..2c6f721bf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/controller/BstIvtShafttubeivtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/controller/BstIvtShafttubeivtController.java @@ -1,5 +1,6 @@ package org.nl.b_lms.bst.ivt.shafttubeivt.controller; +import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.bst.ivt.shafttubeivt.service.dto.BstIvtShafttubeivtQuery; import org.nl.common.TableDataInfo; @@ -37,8 +38,7 @@ public class BstIvtShafttubeivtController { @PostMapping @Log("新增穿拔轴区点位库存管理") //@SaCheckPermission("@el.check('bstIvtShafttubeivt:add')") - public ResponseEntity - create(@Validated @RequestBody BstIvtShafttubeivt entity){ + public ResponseEntity create(@Validated @RequestBody BstIvtShafttubeivt entity){ bstIvtShafttubeivtService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @@ -58,4 +58,12 @@ public class BstIvtShafttubeivtController { bstIvtShafttubeivtService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } + + @Log("设置是否有轴") + //@SaCheckPermission("@el.check('bstIvtShafttubeivt:del')") + @PostMapping("/setHaveShaft") + public ResponseEntity setHaveShaft(@RequestBody JSONObject param) { + bstIvtShafttubeivtService.setHaveShaft(param); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java index 9d358fdfb..28505e434 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java @@ -1,5 +1,6 @@ package org.nl.b_lms.bst.ivt.shafttubeivt.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.b_lms.bst.ivt.shafttubeivt.service.dto.BstIvtShafttubeivtQuery; import org.nl.common.domain.query.PageQuery; @@ -92,4 +93,6 @@ public interface IBstIvtShafttubeivtService extends IService * @return */ List getNotTaskShaftCacheEmpty(BstIvtShafttubeivt startPoint); + + void setHaveShaft(JSONObject param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java index b3e9a85e3..2e01aefd2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java @@ -3,6 +3,8 @@ package org.nl.b_lms.bst.ivt.shafttubeivt.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -12,6 +14,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.bst.ivt.shafttubeivt.service.dto.BstIvtShafttubeivtQuery; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; +import org.nl.common.utils.TaskUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; @@ -24,6 +27,7 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.function.Consumer; /** * @description 服务实现 @@ -128,4 +132,16 @@ public class BstIvtShafttubeivtServiceImpl extends ServiceImpl list = data.toJavaList(BstIvtShafttubeivt.class); + list.forEach(bs -> { + bs.setHave_qzz(have_qzz); + TaskUtils.updateOptMessageByBShaftPoint(bs); + }); + this.updateBatchById(list); + } + }