From ee8540b5b6560650e28a0e55a7dddd8cac7eea5c Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 24 Mar 2023 09:58:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E8=99=9A=E6=8B=9F=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E8=B0=83=E5=8F=96=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthDummyInventoryInfoEOController.java | 9 ++++ .../IAuthDummyInventoryInfoEOService.java | 2 + .../AuthDummyInventoryInfoEOServiceImpl.java | 47 +++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java index 8cbff81f1..cc70ef79a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java @@ -13,6 +13,7 @@ import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; @@ -230,4 +231,12 @@ public class AuthDummyInventoryInfoEOController extends JeroController acquireAdd(@RequestBody JSONObject json) { + this.authDummyInventoryInfoEOService.acquireAdd(json); + return Result.OK("调取成功！"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java index 346f073c5..5b1281004 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java @@ -140,4 +140,6 @@ public interface IAuthDummyInventoryInfoEOService extends IService infoListCopy); + + void acquireAdd(JSONObject json); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 8c584e443..97b08724e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -22,6 +22,7 @@ import com.jero.modules.authDummy.service.IAuthDummyLogService; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.dummy.entity.DummyInventoryBaseEO; import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum; import com.jero.modules.dummy.service.impl.DummyLogEOServiceImpl; @@ -1180,4 +1181,50 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl baseQueryWrap = new QueryWrapper<>(); + List baseList = this.authDummyInventoryBaseEOService.list(baseQueryWrap.eq("id", authDummyInventoryBaseId)); + if(CollectionUtils.isNotEmpty(baseList)){ + if(StringUtils.isNotBlank(ids)){ + //要添加的认证虚拟清单 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(AuthDummyInventoryInfoEO::getId, Arrays.asList(ids.split(","))); + List authDummyInventoryInfoEOList = this.list(wrapper); + + //不需要验重，直接添加，此时可以存在多条编号一样的数据 + List addList = new ArrayList<>(); + for (AuthDummyInventoryInfoEO authDummyInventoryInfoEOTemp : authDummyInventoryInfoEOList) { + String id = UUID.randomUUID().toString().replace("-", ""); + authDummyInventoryInfoEOTemp.setId(id); + authDummyInventoryInfoEOTemp.setAuthDummyInventoryBaseId(authDummyInventoryBaseId); + authDummyInventoryInfoEOTemp.setCreateTime(new Date()); + authDummyInventoryInfoEOTemp.setUpdateTime(new Date()); + addList.add(authDummyInventoryInfoEOTemp); + } + this.saveBatch(addList); + + //更新log + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String username = sysUser.getUsername(); + String serialNumber = addList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); + String contentLog = username+"向清单中添加了“"+serialNumber+"”"; + String enContentLog = username+" added “"+serialNumber+"” to the list."; + authDummyLogService.updateLog(contentLog, authDummyInventoryBaseId,CutEnum.CN.getValue()); + authDummyLogService.updateLog(enContentLog, authDummyInventoryBaseId,CutEnum.EN.getValue()); + } + }else{ + if(CutEnum.CN.getValue().equals(cut)){ + throw new JeroBootException("该虚拟清单不存在,新增失败"); + }else{ + throw new JeroBootException("The virtual list does not exist, and adding failed."); + } + } + } }