From 7d75b5898b5fe7c70ae8e123548efafbe9c50886 Mon Sep 17 00:00:00 2001 From: wangjingsheng Date: Mon, 11 Apr 2022 17:26:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9test2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/BizModelRequirementInfoService.java | 7 +++--- .../BizModelRequirementInfoServiceImpl.java | 24 ++++++++----------- .../ModelControlDemandController.java | 7 +++--- .../ocp/service/ModelBaseVersionService.java | 4 ++-- .../service/ModelPropertyVersionService.java | 5 ++-- .../impl/ModelBaseVersionServiceImpl.java | 6 ++--- .../impl/ModelPropertyVersionServiceImpl.java | 10 +++++--- 7 files changed, 33 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java b/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java index 00e1cc1..685a4af 100644 --- a/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java +++ b/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java @@ -50,11 +50,12 @@ public interface BizModelRequirementInfoService { /** * 删除模型需求 * - * @param demandId - * @param modelId + * @param objId + * @param requirementCode + * @param modelCode * @return */ - Integer deleteModelRequirementInfo(String demandId, String modelId); + Integer deleteModelRequirementInfo(String objId, String requirementCode, String modelCode); /** * 删除模型属性需求 diff --git a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java b/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java index 74fac73..553c5c4 100644 --- a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java +++ b/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java @@ -99,10 +99,6 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn @Override public Integer createModelPropertyRequirementInfo(ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) { -// ModelRequirement modelRequirement = new ModelRequirement(); -// BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelRequirement); -// modelRequirement.setCtime(LocalDateTime.now()); - ModelPropertyVersion modelPropertyVersion = new ModelPropertyVersion(); BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelPropertyVersion); modelPropertyVersion.setRequirementCode(modelPropertyVersionRequirementDTO.getRequirementCode()); @@ -135,6 +131,7 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn return 1; } + @Transactional @Override public Integer updateModelPropertyRequirementInfo(ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) { ModelRequirement modelRequirement = new ModelRequirement(); @@ -152,26 +149,25 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn @Transactional @Override - public Integer deleteModelRequirementInfo(String demandId, String modelId) { + public Integer deleteModelRequirementInfo(String objId, String requirementCode, String modelCode) { + + modelRequirementService.deleteModelRequirement(objId, requirementCode); - modelRequirementService.deleteModelRequirement(modelId, demandId); + if (StringUtils.isNotEmpty(requirementCode)) { - if (StringUtils.isNotEmpty(modelId)) { + modelBaseVersionService.deleteModelBaseVersion(requirementCode, modelCode); + modelPropertyVersionService.deleteModelPropertyVersion(requirementCode, modelCode, null); - modelBaseVersionService.deleteModelBaseVersion(modelId, demandId); } return 1; } + @Transactional @Override - public Integer deleteModelPropertyRequirementInfo(String demandId, String modelId, String proId) { - modelRequirementService.deleteModelRequirement(modelId, demandId); - - if (StringUtils.isNotEmpty(proId)) { + public Integer deleteModelPropertyRequirementInfo(String requirementCode, String modelCode, String propCode) { - modelPropertyVersionService.deleteModelPropertyVersion(demandId, proId); - } + modelPropertyVersionService.deleteModelPropertyVersion(requirementCode, modelCode, propCode); return 1; } diff --git a/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java b/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java index b66a96b..a073988 100644 --- a/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java +++ b/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java @@ -64,9 +64,10 @@ public class ModelControlDemandController { */ @ApiOperation("模型需求-删除") @PostMapping("/delete/modelRequirement") - public ResponseVO deleteModelRequirement(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, - @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) { - return ResponseVO.ok(bizModelRequirementInfoService.deleteModelRequirementInfo(objId, modelCode)); + public ResponseVO deleteModelRequirement(@ApiParam(value = "需求编号") @RequestParam(value = "objId", required = false) String objId, + @ApiParam(value = "需求编码") @RequestParam(value = "requirementCode") String requirementCode, + @ApiParam(value = "模型编码") @RequestParam(value = "modelCode") String modelCode) { + return ResponseVO.ok(bizModelRequirementInfoService.deleteModelRequirementInfo(objId, requirementCode, modelCode)); } /** diff --git a/src/main/java/com/pms/ocp/service/ModelBaseVersionService.java b/src/main/java/com/pms/ocp/service/ModelBaseVersionService.java index 3c1ffe6..c0cd238 100644 --- a/src/main/java/com/pms/ocp/service/ModelBaseVersionService.java +++ b/src/main/java/com/pms/ocp/service/ModelBaseVersionService.java @@ -25,11 +25,11 @@ public interface ModelBaseVersionService { /** * 删除模型基础版本信息 * - * @param modelId + * @param requirementCode * @param modelCode * @return */ - Integer deleteModelBaseVersion(String modelId, String modelCode); + Integer deleteModelBaseVersion(String requirementCode, String modelCode); /** * 更新模型基础版本信息 diff --git a/src/main/java/com/pms/ocp/service/ModelPropertyVersionService.java b/src/main/java/com/pms/ocp/service/ModelPropertyVersionService.java index 3d9cfd8..ce3fd2b 100644 --- a/src/main/java/com/pms/ocp/service/ModelPropertyVersionService.java +++ b/src/main/java/com/pms/ocp/service/ModelPropertyVersionService.java @@ -24,10 +24,11 @@ public interface ModelPropertyVersionService { * 删除模型属性版本信息 * * @param propCode - * @param propId + * @param modelCode + * @param requirementCode * @return */ - Integer deleteModelPropertyVersion(String propId, String propCode); + Integer deleteModelPropertyVersion(String requirementCode, String modelCode, String propCode); /** * 更新模型属性版本信息 diff --git a/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java index 4351978..437b849 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java @@ -31,11 +31,11 @@ public class ModelBaseVersionServiceImpl implements ModelBaseVersionService { } @Override - public Integer deleteModelBaseVersion(String objId, String modelCode) { + public Integer deleteModelBaseVersion(String requirementCode, String modelCode) { QueryWrapper queryWrapper = new QueryWrapper(); - if (StringUtils.isNotEmpty(objId)) { - queryWrapper.lambda().eq(ModelBaseVersion::getObjId, objId); + if (StringUtils.isNotEmpty(requirementCode)) { + queryWrapper.lambda().eq(ModelBaseVersion::getObjId, requirementCode); } if (StringUtils.isNotEmpty(modelCode)) { diff --git a/src/main/java/com/pms/ocp/service/impl/ModelPropertyVersionServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelPropertyVersionServiceImpl.java index 7115151..45965a1 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelPropertyVersionServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelPropertyVersionServiceImpl.java @@ -32,11 +32,15 @@ public class ModelPropertyVersionServiceImpl implements ModelPropertyVersionServ } @Override - public Integer deleteModelPropertyVersion(String propId, String propCode) { + public Integer deleteModelPropertyVersion(String requirementCode, String modelCode, String propCode) { QueryWrapper queryWrapper = new QueryWrapper(); - if (StringUtils.isNotEmpty(propId)) { - queryWrapper.lambda().eq(ModelPropertyVersion::getObjId, propId); + if (StringUtils.isNotEmpty(requirementCode)) { + queryWrapper.lambda().eq(ModelPropertyVersion::getRequirementCode, requirementCode); + } + + if (StringUtils.isNotEmpty(modelCode)) { + queryWrapper.lambda().eq(ModelPropertyVersion::getModelCode, modelCode); } if (StringUtils.isNotEmpty(propCode)) { -- 2.26.0