From 907e3256d863e357f1207d89af946f7046b6ac06 Mon Sep 17 00:00:00 2001 From: wangjingsheng Date: Wed, 13 Apr 2022 00:01:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9test4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/impl/BizModelRequirementInfoServiceImpl.java | 2 +- .../com/pms/ocp/common/constants/ResultCode.java | 1 + .../ocp/controller/ModelControlDemandController.java | 5 +++-- .../com/pms/ocp/service/ModelBaseVersionService.java | 8 +++----- .../service/impl/ModelBaseVersionServiceImpl.java | 7 +++---- .../ocp/service/impl/ModelRelationServiceImpl.java | 12 ++++++++---- 6 files changed, 19 insertions(+), 16 deletions(-) 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 821e4d1..65f34ba 100644 --- a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java +++ b/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java @@ -66,7 +66,7 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn modelRequirementApproval.setApprovalStats(0); // 校验是否模型名称重复 - ModelBaseVersion modelBaseVersion1 = modelBaseVersionService.getModelBaseVersion(modelVersionRequirementDTO.getObjId(), modelVersionRequirementDTO.getModelCode(), modelVersionRequirementDTO.getModelName()); + ModelBaseVersion modelBaseVersion1 = modelBaseVersionService.getModelBaseVersion(modelVersionRequirementDTO.getModelTable(), null, null); if (modelBaseVersion1 != null) { return -1; diff --git a/src/main/java/com/pms/ocp/common/constants/ResultCode.java b/src/main/java/com/pms/ocp/common/constants/ResultCode.java index a4e292f..dcac669 100644 --- a/src/main/java/com/pms/ocp/common/constants/ResultCode.java +++ b/src/main/java/com/pms/ocp/common/constants/ResultCode.java @@ -117,6 +117,7 @@ public enum ResultCode { FILE_MUST_IS_PIC(21020, "图片格式不合法,请重新上传!"), NAME_CONFLICT(21021, "该组织机构下名称重复,请修改名称!"), ENCRYPT_ERROR_CODE(21022, "解密失败"), + MODEL_NAME_REPETITION(251, "模型名称不能重复"), /* ===========================JoyhrError======================== **/ SIGN_ERROR(80001,"签名验证错误!"), diff --git a/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java b/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java index cf367e2..09dd038 100644 --- a/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java +++ b/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*; * @Description:模型库管理管控需求接口 */ +@ControllerAdvice @Slf4j @RequestMapping("/model-control/v1") @RestController @@ -39,8 +40,8 @@ public class ModelControlDemandController { Integer integer = bizModelRequirementInfoService.createModelRequirementInfo(modelVersionRequirementDTO); - if (integer == -1) { - return ResponseVO.ok(CodeEnum.MODEL_NAME_REPETITION); + if (integer.equals(-1)) { + return ResponseVO.ok(CodeEnum.MODEL_NAME_REPETITION.getDesc()); } return ResponseVO.ok(integer); diff --git a/src/main/java/com/pms/ocp/service/ModelBaseVersionService.java b/src/main/java/com/pms/ocp/service/ModelBaseVersionService.java index c0cd238..04f9e67 100644 --- a/src/main/java/com/pms/ocp/service/ModelBaseVersionService.java +++ b/src/main/java/com/pms/ocp/service/ModelBaseVersionService.java @@ -1,9 +1,6 @@ package com.pms.ocp.service; -import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.ModelBaseVersion; -import com.pms.ocp.model.entity.ModelPropertyVersion; -import com.pms.ocp.model.vo.ResponseVO; import java.util.List; @@ -50,10 +47,11 @@ public interface ModelBaseVersionService { /** * 获取模型基础版本信息 * - * @param objId + * @param modelTable * @param modelCode + * @param modelName * @return */ - ModelBaseVersion getModelBaseVersion(String objId, String modelCode, String modelName); + ModelBaseVersion getModelBaseVersion(String modelTable, String modelCode, String modelName); } 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 a38be57..741f244 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java @@ -2,7 +2,6 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.pms.ocp.mapper.ModelBaseVersionMapper; import com.pms.ocp.model.entity.ModelBaseVersion; import com.pms.ocp.service.ModelBaseVersionService; @@ -78,11 +77,11 @@ public class ModelBaseVersionServiceImpl implements ModelBaseVersionService { } @Override - public ModelBaseVersion getModelBaseVersion(String objId, String modelCode, String modelName) { + public ModelBaseVersion getModelBaseVersion(String modelTable, String modelCode, String modelName) { QueryWrapper queryWrapper = new QueryWrapper(); - if (StringUtils.isNotEmpty(objId)) { - queryWrapper.lambda().eq(ModelBaseVersion::getObjId, objId); + if (StringUtils.isNotEmpty(modelTable)) { + queryWrapper.lambda().eq(ModelBaseVersion::getModelTable, modelTable); } if (StringUtils.isNotEmpty(modelCode)) { diff --git a/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java index c5ff0a2..5d01d3f 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelRelationServiceImpl.java @@ -156,11 +156,15 @@ public class ModelRelationServiceImpl implements ModelRelationService { for (ModelRelationVO modelRelationVO : modelRelationVOList) { String modelCode1 = modelRelationVO.getModelCode(); - ModelRelation modelRelation = map1.get(modelCode1).get(0); + List modelRelationList1 = map1.get(modelCode1); - modelRelationVO.setModelPropCode(modelRelation.getModelPropCode()); - modelRelationVO.setRelationModeCode(modelRelation.getRelationModeCode()); - modelRelationVO.setRelationModePropCode(modelRelation.getRelationModePropCode()); + if (modelRelationList1 == null) { + continue; + } + + modelRelationVO.setModelPropCode(modelRelationList1.get(0).getRelationModeCode()); + modelRelationVO.setRelationModeCode(modelRelationList1.get(0).getModelCode()); + modelRelationVO.setRelationModePropCode(modelRelationList1.get(0).getModelPropCode()); modelRelationVO.setModelPropertyList(map.get(modelCode1)); -- 2.26.0