From 4219f8c4f69e5e7648a2041f00606ab7276d063d Mon Sep 17 00:00:00 2001 From: x_z Date: Sun, 16 Oct 2022 22:50:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E5=9E=9B=E5=8F=B7=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/StackRulesController.java | 12 ++++++------ .../udi/admin/service/basic/StackRulesService.java | 14 +++++++++----- src/main/java/com/glxp/udi/admin/util/IdUtil.java | 6 ++++++ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/glxp/udi/admin/controller/basic/StackRulesController.java b/src/main/java/com/glxp/udi/admin/controller/basic/StackRulesController.java index 582209b..53acb51 100644 --- a/src/main/java/com/glxp/udi/admin/controller/basic/StackRulesController.java +++ b/src/main/java/com/glxp/udi/admin/controller/basic/StackRulesController.java @@ -58,9 +58,9 @@ public class StackRulesController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "规则重复"); } //校验规则启用数量 - boolean verifyResult = stackRulesService.verifyStatus(stackRulesEntity); - if (!verifyResult) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "至少启用一个规则"); + String verifyResult = stackRulesService.verifyStatus(stackRulesEntity); + if (!"success".equals(verifyResult)) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, verifyResult); } stackRulesService.addStackRules(stackRulesEntity); return ResultVOUtils.success(); @@ -83,9 +83,9 @@ public class StackRulesController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "规则重复"); } //校验规则启用数量 - boolean verifyResult = stackRulesService.verifyStatus(stackRulesEntity); - if (!verifyResult) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "至少启用一个规则"); + String verifyResult = stackRulesService.verifyStatus(stackRulesEntity); + if (!"success".equals(verifyResult)) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, verifyResult); } stackRulesService.updateStackRules(stackRulesEntity); return ResultVOUtils.success(); diff --git a/src/main/java/com/glxp/udi/admin/service/basic/StackRulesService.java b/src/main/java/com/glxp/udi/admin/service/basic/StackRulesService.java index 52d203e..7d246dd 100644 --- a/src/main/java/com/glxp/udi/admin/service/basic/StackRulesService.java +++ b/src/main/java/com/glxp/udi/admin/service/basic/StackRulesService.java @@ -151,7 +151,11 @@ public class StackRulesService { * @param stackRules * @return true：可以修改 / 添加 false：不可修改 / 添加 */ - public boolean verifyStatus(StackRulesEntity stackRules) { + public String verifyStatus(StackRulesEntity stackRules) { + //如果状态为禁用，则不校验 + if (stackRules.getStatus().equals(0)) { + return "success"; + } QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("status", 1) .eq("customerId", stackRules.getCustomerId()); @@ -159,18 +163,18 @@ public class StackRulesService { if (stackRules.getStatus().equals(ConstantStatus.STACK_RULES_ENABLE)) { //当前规则为启用状态，判断此规则是否为当前的规则，且启用规则数量 <= 1 if (list.size() == 0) { - return true; + return "success"; } else if (list.size() == 1) { for (StackRulesEntity stackRulesEntity : list) { if (stackRulesEntity.getId().equals(stackRules.getId())) { - return true; + return "succcess"; } } } - return false; + return "只能启用一个规则"; } else { //当前规则为禁用状态，判断当前是否至少有一个启用的规则 - return list.size() > 1; + return "只能启用一个规则"; } } } diff --git a/src/main/java/com/glxp/udi/admin/util/IdUtil.java b/src/main/java/com/glxp/udi/admin/util/IdUtil.java index 8bfd8c5..49b3457 100644 --- a/src/main/java/com/glxp/udi/admin/util/IdUtil.java +++ b/src/main/java/com/glxp/udi/admin/util/IdUtil.java @@ -1,5 +1,7 @@ package com.glxp.udi.admin.util; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.glxp.udi.admin.entity.basic.StackRulesEntity; import com.glxp.udi.admin.service.basic.StackRulesService; @@ -33,6 +35,10 @@ public class IdUtil { //拼接起始数 if (StrUtil.isBlank(stackRulesEntity.getStartNum())) { stackId.append(stackRulesEntity.getStartNum()); + } else { + //默认起始数为当天的日期 + String startNum = DateUtil.date().toString(DatePattern.PURE_DATE_PATTERN); + stackId.append(startNum + "001"); } //查找该客户上一个垛号