From 32346a6a1f1660858a60a7452b5cf700c47b1ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E7=A7=80=E6=AD=A6?= <18621965254@yeah.net> Date: Tue, 22 Mar 2022 19:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=A1=E7=A7=80=E6=AD=A6:=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/ocp/common/constants/CodeEnum.java | 3 +- .../controller/ModelClassifyController.java | 4 +- .../pms/ocp/model/entity/ModelClassify.java | 1 + .../impl/ModelClassifyServiceImpl.java | 41 +++++++++++-------- .../impl/ModelSubscribeServiceImpl.java | 4 +- 5 files changed, 33 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/pms/ocp/common/constants/CodeEnum.java b/src/main/java/com/pms/ocp/common/constants/CodeEnum.java index 2b646e5..0b4e57c 100644 --- a/src/main/java/com/pms/ocp/common/constants/CodeEnum.java +++ b/src/main/java/com/pms/ocp/common/constants/CodeEnum.java @@ -42,7 +42,8 @@ public enum CodeEnum { NO_DATA("200", "数据库无数据", false), UP_DATA_FAIL("401005", "更新失败", false), INSERT_FAIL("401006", "插入数据失败", false), - DELETE_FAIL("401007", "修改失败", false); + DELETE_FAIL("401007", "修改失败", false), + DATA_REPETITION("250", "分类编码或分类名称重复", false); /** * 构造函数 diff --git a/src/main/java/com/pms/ocp/controller/ModelClassifyController.java b/src/main/java/com/pms/ocp/controller/ModelClassifyController.java index 4e513c4..c6687e5 100644 --- a/src/main/java/com/pms/ocp/controller/ModelClassifyController.java +++ b/src/main/java/com/pms/ocp/controller/ModelClassifyController.java @@ -94,6 +94,8 @@ public class ModelClassifyController { Integer integer = modelClassifyService.deleteModelClassify(modelClassify.getObjId(), modelClassify.getModelGroupCode(), modelClassify.getGroupCompanyCode()); if (integer.intValue() == -1) { ResponseVO.ok(ResultCode.NO_DELETE); + }else if (integer.intValue() == 0){ + ResponseVO.error("前端未传入分类编码!!!"); } return ResponseVO.ok(integer); } @@ -105,7 +107,7 @@ public class ModelClassifyController { * @author huxiuwu * @date 2022/3/9 **/ - @ApiOperation("删除") + //@ApiOperation("删除") @GetMapping("/delete") public ResponseVO delete(String modelGroupCode) { return modelClassifyService.delete(modelGroupCode); diff --git a/src/main/java/com/pms/ocp/model/entity/ModelClassify.java b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java index 4bcb250..3be93a4 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelClassify.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java @@ -82,4 +82,5 @@ public class ModelClassify { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date groupUpdateTime; + } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java index 3a2651e..7a2836d 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.common.utils.PageUtil; import com.pms.ocp.mapper.ModelClassifyMapper; +import com.pms.ocp.mapper.OcpModelGroupMapper; import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.model.vo.OcpModelGroupVO; import com.pms.ocp.model.vo.ResponseVO; @@ -16,6 +17,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; import java.util.function.Function; +import java.util.function.Supplier; import java.util.stream.Collectors; /** @@ -32,6 +34,9 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { @Resource private OcpModelGroupService ocpService; + @Resource + private OcpModelGroupMapper ocpModelGroupMapper; + /** * currentPage pageSize * 模型分类-导航树 @@ -90,6 +95,9 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { **/ @Override public ResponseVO update(List list) { + if (getModelClassify(list,()->new QueryWrapper().ne("obj_id",list.get(0).getObjId()))){ + return ResponseVO.error(CodeEnum.DATA_REPETITION); + } boolean isUpdateSucceed = ocpService.saveOrUpdateBatch(list); if (!isUpdateSucceed) { ResponseVO.error(CodeEnum.UP_DATA_FAIL); @@ -97,6 +105,17 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { return ResponseVO.ok(); } + private boolean getModelClassify(List list,Supplier> supplier) { + ModelClassify data = list.get(0); + QueryWrapper queryWrapper = supplier.get(); + queryWrapper.and(QueryWrapper-> QueryWrapper.eq("model_group_code",data.getModelGroupCode()).or().eq("model_group_name",data.getModelGroupName())); + List modelClassifyList = ocpModelGroupMapper.selectList(queryWrapper); + if (CollectionUtil.isNotEmpty(modelClassifyList)){ + return true; + } + return false; + } + /** * 删除 * @return pms.ocp.model.vo.ResponseVO @@ -121,6 +140,9 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { **/ @Override public ResponseVO insert(List list) { + if (getModelClassify(list,()->new QueryWrapper())){ + return ResponseVO.error(CodeEnum.DATA_REPETITION); + } boolean result = ocpService.saveBatch(list); if (!result) { return ResponseVO.error(CodeEnum.INSERT_FAIL); @@ -194,22 +216,6 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { return result; } - /** - * - * @author huxiuwu - * @date 2022/3/10 - * @param parent 父类 - * @param treeNodes 需要遍历list - **/ -// private void addLevel(OcpModelGroupVO parent, List treeNodes) { -// int level = parent.getLevel(); -// parent.setLevel(level++); -// for (OcpModelGroupVO treeNode : treeNodes) { -// if (treeNode != null && parent.getModelGroupCode().equals(treeNode.getModelGroupPcode())) { -// addLevel(treeNode, treeNodes); -// } -// } -// } /** * 生成构造器 * @author huxiuwu @@ -247,6 +253,9 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { List opList = classifyMapper.selectList(queryWrapper); if (!opList.isEmpty()) { + if (StringUtils.isEmpty(objId)) { + return 0; + } if (StringUtils.isNotEmpty(objId)) { queryWrapper.lambda().eq(OcpModelGroupVO::getObjId, objId); } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java index c0466ca..cecac40 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java @@ -12,9 +12,9 @@ import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelSubscribeService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.LinkedList; import java.util.List; @@ -28,7 +28,7 @@ import java.util.List; @Service public class ModelSubscribeServiceImpl implements ModelSubscribeService { - @Autowired + @Resource private ModelSubscribeMapper modelSubscribeMapper; @Override -- 2.26.0