From 561db5e94d13f76ca6c5f2dfed5485350a2fff9d Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Thu, 20 Oct 2022 17:06:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=B5=84=E4=BA=A7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquipmentAssetDetailsController.java | 17 +++++++ .../main/resources/mapper/ReportMapper.xml | 45 ++++--------------- 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/EquipmentAssetDetailsController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/EquipmentAssetDetailsController.java index f6ae571e..cdb6bc31 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/EquipmentAssetDetailsController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/EquipmentAssetDetailsController.java @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.anomaly.controller; +import com.foreverwin.mesnac.anomaly.mapper.EquipmentAssetDetailsMapper; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.modular.core.util.R; import com.foreverwin.modular.core.util.FrontPage; @@ -28,6 +29,9 @@ public class EquipmentAssetDetailsController { @Autowired public EquipmentAssetDetailsService equipmentAssetDetailsService; + @Autowired + public EquipmentAssetDetailsMapper equipmentAssetDetailsMapper; + /** * 根据id查询 * @@ -98,6 +102,13 @@ public class EquipmentAssetDetailsController { String handle = StringUtil.createQUID(); String user = CommonMethods.getUser(); String site = CommonMethods.getSite(); + EquipmentAssetDetails details = new EquipmentAssetDetails(); + details.setAssetNumbers(equipmentAssetDetails.getAssetNumbers()); + List selectList = equipmentAssetDetailsService.selectList(details); + if (selectList.size() != 0){ + return R.failed("资产编号:"+ equipmentAssetDetails.getAssetNumbers() + "不允许重复"); + } + LocalDateTime now = LocalDateTime.now(); equipmentAssetDetails.setHandle(handle); equipmentAssetDetails.setSite(site); @@ -117,6 +128,12 @@ public class EquipmentAssetDetailsController { public R updateById(@RequestBody EquipmentAssetDetails equipmentAssetDetails) { String user = CommonMethods.getUser(); LocalDateTime now = LocalDateTime.now(); + EquipmentAssetDetails details = new EquipmentAssetDetails(); + details.setAssetNumbers(equipmentAssetDetails.getAssetNumbers()); + List selectList = equipmentAssetDetailsService.selectList(details); + if (selectList.size() != 0 && !selectList.get(0).getHandle().equals(equipmentAssetDetails.getHandle())){ + return R.failed("资产编号:"+ equipmentAssetDetails.getAssetNumbers() + "不允许重复"); + } equipmentAssetDetails.setUpdatedBy(user); equipmentAssetDetails.setUpdatedTime(now); return R.ok(equipmentAssetDetailsService.updateById(equipmentAssetDetails)); diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 34675ae6..9cf8ca11 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -2204,50 +2204,23 @@