diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/file/FileServiceImpl.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/file/FileServiceImpl.java index 7a6f4673..c5793d6e 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/file/FileServiceImpl.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/file/FileServiceImpl.java @@ -83,7 +83,7 @@ public class FileServiceImpl implements FileService { trendsDO.setTableName(tableName); trendsDO.setTableId(tableId); trendsDO.setType(TrendsTypeEnum.UPLOAD_ANNEX.getType()); - trendsDO.setContent(name); + trendsDO.setContent("上传了" + name); trendsMapper.insert(trendsDO); return url; } @@ -102,7 +102,7 @@ public class FileServiceImpl implements FileService { trendsDO.setTableName(file.getTableName()); trendsDO.setTableId(file.getTableId()); trendsDO.setType(TrendsTypeEnum.DELETE_ANNEX.getType()); - trendsDO.setContent(file.getName()); + trendsDO.setContent("删除了" + file.getName()); trendsMapper.insert(trendsDO); // 删除记录 fileMapper.deleteById(id); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleBaseVO.java index 17abfc68..da1b9e5d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleBaseVO.java @@ -24,14 +24,12 @@ public class RuleBaseVO { @NotNull(message = "优先级不能为空") private Integer priority; - @Schema(description = "代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "代码不能为空") - private String code; - @Schema(description = "名称") private String name; + @Schema(description = "状态") private Integer status; + @Schema(description = "描述") private String description; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RulePageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RulePageReqVO.java index 5524c5c9..15d8be60 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RulePageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RulePageReqVO.java @@ -21,9 +21,6 @@ public class RulePageReqVO extends PageParam { @Schema(description = "优先级") private Integer priority; - @Schema(description = "代码") - private String code; - @Schema(description = "名称") private String name; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/rule/RuleDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/rule/RuleDO.java index df9ff9ac..ad215647 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/rule/RuleDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/rule/RuleDO.java @@ -33,11 +33,6 @@ public class RuleDO extends BaseDO { * 优先级 */ private Integer priority; - /** - * 代码 - */ - @TableField(value = "`code`") - private String code; /** * 名称 */ @@ -61,9 +56,4 @@ public class RuleDO extends BaseDO { * 配置 */ private String configuration; - /** - * 权限所属人员id - */ - private Long ruleUserid; - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java index 1af3b3c0..c54de1b9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java @@ -15,15 +15,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface RuleMapper extends BaseMapperX { - default RuleDO selectByCode(String code) { - return selectOne(RuleDO::getCode, code); - } - default PageResult selectPage(RulePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(RuleDO::getStrategyCode, reqVO.getStrategyCode()) .eqIfPresent(RuleDO::getPriority, reqVO.getPriority()) - .eqIfPresent(RuleDO::getCode, reqVO.getCode()) .likeIfPresent(RuleDO::getName, reqVO.getName()) .eqIfPresent(RuleDO::getDescription, reqVO.getDescription()) .eqIfPresent(RuleDO::getCondition, reqVO.getCondition()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java index 1289ea3c..fee13235 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java @@ -1,6 +1,5 @@ package com.win.module.wms.service.rule; -import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; @@ -39,7 +38,7 @@ public class RuleServiceImpl implements RuleService { @Override public Long createRule(RuleCreateReqVO createReqVO) { - validateRuleForCreateOrUpdate(createReqVO.getId(),createReqVO.getCode(),createReqVO.getStrategyCode(),createReqVO.getPriority()); + validateRuleForCreateOrUpdate(createReqVO.getId(),createReqVO.getStrategyCode(),createReqVO.getPriority()); // 插入 RuleDO rule = RuleConvert.INSTANCE.convert(createReqVO); ruleMapper.insert(rule); @@ -50,7 +49,7 @@ public class RuleServiceImpl implements RuleService { @Override public void updateRule(RuleUpdateReqVO updateReqVO) { // 校验存在 - validateRuleForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getCode(),updateReqVO.getStrategyCode(),updateReqVO.getPriority()); + validateRuleForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getStrategyCode(),updateReqVO.getPriority()); // 更新 RuleDO updateObj = RuleConvert.INSTANCE.convert(updateReqVO); ruleMapper.updateById(updateObj); @@ -79,12 +78,11 @@ public class RuleServiceImpl implements RuleService { return ruleMapper.selectPage(pageReqVO); } - private void validateRuleForCreateOrUpdate(Long id, String code, String strategyCode,Integer priority) { + private void validateRuleForCreateOrUpdate(Long id, String strategyCode,Integer priority) { // 关闭数据权限,避免因为没有数据权限,查询不到数据,进而导致唯一校验不正确 DataPermissionUtils.executeIgnore(() -> { validateRuleExists(id); // 校验code唯一 - validateCode(code); validateStrategyCode(strategyCode); validatePriority(priority); }); @@ -99,15 +97,6 @@ public class RuleServiceImpl implements RuleService { } } - @VisibleForTesting - private void validateCode(String code) { - if (code.isEmpty()) { - throw exception(RULE_CODE_NOT_EXISTS); - } - if (StrUtil.isBlank(code)) { - return; - } - } @VisibleForTesting private void validateStrategyCode(String strategyCode) { if (strategyCode.isEmpty()) {