From de643e472c23effd85604d124c5893ef39bd34df Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 26 Jun 2025 11:36:05 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E7=AD=96=E7=95=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dict/SysDictController.java | 20 ++++++++++++++++--- .../system/service/dict/ISysDictService.java | 5 +++++ .../dict/dao/mapper/SysDictMapper.java | 6 ++++++ .../service/dict/dao/mapper/SysDictMapper.xml | 4 +++- .../service/dict/impl/SysDictServiceImpl.java | 8 ++++++++ .../StSectStrategyController.java | 13 ++---------- .../StStrategyConfigController.java | 4 ++-- .../IStSectStrategyService.java | 4 ++-- .../dao/StSectStrategy.java | 2 +- .../dao/mapper/StSectStrategyMapper.java | 2 +- .../dao/mapper/xml/StSectStrategyMapper.xml | 0 .../dto/SectStrategyQuery.java | 2 +- .../impl/StSectStrategyServiceImpl.java | 4 ++-- .../IStStrategyConfigService.java | 2 +- .../dao/StStrategyConfig.java | 2 +- .../dao/mapper/StStrategyConfigMapper.java | 2 +- .../dao/mapper/xml/StStrategyConfigMapper.xml | 0 .../dto/StrategyQuery.java | 2 +- .../impl/StStrategyConfigServiceImpl.java | 4 ++-- .../sectStrategy/AddDialog.vue | 15 ++++++++++++-- 20 files changed, 69 insertions(+), 32 deletions(-) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/{ => sectStrategy}/StSectStrategyController.java (77%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/{ => strategyConfig}/StStrategyConfigController.java (95%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/{ => sectStrategy}/IStSectStrategyService.java (62%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/{ => sectStrategy}/dao/StSectStrategy.java (93%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/{ => sectStrategy}/dao/mapper/StSectStrategyMapper.java (80%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/{ => sectStrategy}/dao/mapper/xml/StSectStrategyMapper.xml (100%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/{ => sectStrategy}/dto/SectStrategyQuery.java (91%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/{ => sectStrategy}/impl/StSectStrategyServiceImpl.java (77%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/{ => strategyConfig}/IStStrategyConfigService.java (94%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/{ => strategyConfig}/dao/StStrategyConfig.java (96%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/{ => strategyConfig}/dao/mapper/StStrategyConfigMapper.java (91%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/{ => strategyConfig}/dao/mapper/xml/StStrategyConfigMapper.xml (100%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/{ => strategyConfig}/dto/StrategyQuery.java (90%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/{ => strategyConfig}/impl/StStrategyConfigServiceImpl.java (95%) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java index a3e0432..4543171 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java @@ -1,9 +1,11 @@ package org.nl.system.controller.dict; +import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; import org.nl.common.logging.annotation.Log; import org.nl.system.service.dict.ISysDictService; import org.nl.system.service.dict.dao.Dict; @@ -36,12 +38,12 @@ public class SysDictController { @Log("查询字典") @GetMapping - + public ResponseEntity query(@RequestParam Map whereJson, PageQuery pageable){ return new ResponseEntity<>(TableDataInfo.build(dictService.queryAll(whereJson,pageable)), HttpStatus.OK); } - + @GetMapping(value = "/all") public ResponseEntity queryAll(){ return new ResponseEntity<>(dictService.queryAll(),HttpStatus.OK); @@ -74,7 +76,7 @@ public class SysDictController { return new ResponseEntity<>(TableDataInfo.build(dictService.queryAllDetail(dictQuery,pageable)),HttpStatus.OK); } - + @GetMapping(value = "/dictDetail/map") public ResponseEntity getDictDetailMaps(@RequestParam String dictName){ String[] names = dictName.split("[,，]"); @@ -106,5 +108,17 @@ public class SysDictController { return new ResponseEntity<>(HttpStatus.OK); } + @GetMapping("/getTableEnum") + @SaIgnore + public ResponseEntity getTableEnum(@RequestParam Map criteria) { + Object type = criteria.get("code"); + Object label = criteria.get("label"); + Object value = criteria.get("value"); + if (type == null||label == null||value == null){ + throw new BadRequestException("参数不能为空"); + } + List maps = dictService.dynamicTableEnum((String) type, (String) label, (String) value); + return new ResponseEntity<>(maps, HttpStatus.OK); + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java index f56a0ba..d989b22 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java @@ -85,4 +85,9 @@ public interface ISysDictService extends IService { * @return */ List queryAll(); + + /** + * 动态枚举信息 + */ + List dynamicTableEnum(String table,String label,String value); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java index d83ff61..ea6ed3c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java @@ -1,8 +1,12 @@ package org.nl.system.service.dict.dao.mapper; +import org.apache.ibatis.annotations.Param; import org.nl.system.service.dict.dao.Dict; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import java.util.Map; + /** *

* 字典表 Mapper 接口 @@ -13,4 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SysDictMapper extends BaseMapper { + List dynamicTableEnum(@Param("table") String table, @Param("label")String label, @Param("value")String value); + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.xml index d4acd65..8200f6d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.xml @@ -1,5 +1,7 @@ - + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java index 5bd1845..da9ba0f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; @@ -194,4 +195,11 @@ public class SysDictServiceImpl extends ServiceImpl impleme .groupBy(Dict::getCode, Dict::getName)); } + @Override + public List dynamicTableEnum(String table, String label, String value) { + if (StringUtils.isEmpty(table)||StringUtils.isEmpty(label)||StringUtils.isEmpty(value)){ + throw new BadRequestException("参数不能为空"); + } + return this.sysDictMapper.dynamicTableEnum(table,label,value); + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/StSectStrategyController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/sectStrategy/StSectStrategyController.java similarity index 77% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/StSectStrategyController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/sectStrategy/StSectStrategyController.java index 7ec7feb..efcf7b9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/StSectStrategyController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/sectStrategy/StSectStrategyController.java @@ -1,27 +1,18 @@ -package org.nl.wms.decision_manage.controller; +package org.nl.wms.decision_manage.controller.sectStrategy; -import cn.dev33.satoken.annotation.SaIgnore; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; -import org.nl.common.utils.MapOf; -import org.nl.wms.decision_manage.service.IStSectStrategyService; +import org.nl.wms.decision_manage.service.sectStrategy.IStSectStrategyService; import org.nl.wms.decision_manage.service.dao.StSectStrategy; -import org.nl.wms.decision_manage.service.dao.StStrategyConfig; import org.nl.wms.decision_manage.service.dto.SectStrategyQuery; -import org.nl.wms.decision_manage.service.dto.StrategyQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; -import java.util.Map; /** *

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/StStrategyConfigController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/strategyConfig/StStrategyConfigController.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/StStrategyConfigController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/strategyConfig/StStrategyConfigController.java index 43bb76d..c604ebc 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/StStrategyConfigController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/strategyConfig/StStrategyConfigController.java @@ -1,4 +1,4 @@ -package org.nl.wms.decision_manage.controller; +package org.nl.wms.decision_manage.controller.strategyConfig; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.*; import cn.dev33.satoken.annotation.SaIgnore; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.common.utils.MapOf; -import org.nl.wms.decision_manage.service.IStStrategyConfigService; +import org.nl.wms.decision_manage.service.strategyConfig.IStStrategyConfigService; import org.nl.wms.decision_manage.service.dao.StStrategyConfig; import org.nl.wms.decision_manage.service.dto.StrategyQuery; import java.util.ArrayList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/IStSectStrategyService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/IStSectStrategyService.java similarity index 62% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/IStSectStrategyService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/IStSectStrategyService.java index 4ee0631..36d7cb8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/IStSectStrategyService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/IStSectStrategyService.java @@ -1,7 +1,7 @@ -package org.nl.wms.decision_manage.service; +package org.nl.wms.decision_manage.service.sectStrategy; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.decision_manage.service.dao.StSectStrategy; +import org.nl.wms.decision_manage.service.sectStrategy.dao.StSectStrategy; /** *

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/StSectStrategy.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/StSectStrategy.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/StSectStrategy.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/StSectStrategy.java index 584c574..79c5715 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/StSectStrategy.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/StSectStrategy.java @@ -1,4 +1,4 @@ -package org.nl.wms.decision_manage.service.dao; +package org.nl.wms.decision_manage.service.sectStrategy.dao; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/mapper/StSectStrategyMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/StSectStrategyMapper.java similarity index 80% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/mapper/StSectStrategyMapper.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/StSectStrategyMapper.java index 6fb9364..87df405 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/mapper/StSectStrategyMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/StSectStrategyMapper.java @@ -1,4 +1,4 @@ -package org.nl.wms.decision_manage.service.dao.mapper; +package org.nl.wms.decision_manage.service.sectStrategy.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.decision_manage.service.dao.StSectStrategy; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/mapper/xml/StSectStrategyMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/xml/StSectStrategyMapper.xml similarity index 100% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/mapper/xml/StSectStrategyMapper.xml rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/xml/StSectStrategyMapper.xml diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dto/SectStrategyQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dto/SectStrategyQuery.java similarity index 91% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dto/SectStrategyQuery.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dto/SectStrategyQuery.java index 1b193f6..eff62a8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dto/SectStrategyQuery.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dto/SectStrategyQuery.java @@ -1,4 +1,4 @@ -package org.nl.wms.decision_manage.service.dto; +package org.nl.wms.decision_manage.service.sectStrategy.dto; import lombok.Data; import org.nl.common.domain.query.BaseQuery; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/impl/StSectStrategyServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/impl/StSectStrategyServiceImpl.java similarity index 77% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/impl/StSectStrategyServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/impl/StSectStrategyServiceImpl.java index ef5f91f..43f6da7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/impl/StSectStrategyServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/impl/StSectStrategyServiceImpl.java @@ -1,7 +1,7 @@ -package org.nl.wms.decision_manage.service.impl; +package org.nl.wms.decision_manage.service.sectStrategy.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.wms.decision_manage.service.IStSectStrategyService; +import org.nl.wms.decision_manage.service.sectStrategy.IStSectStrategyService; import org.nl.wms.decision_manage.service.dao.StSectStrategy; import org.nl.wms.decision_manage.service.dao.mapper.StSectStrategyMapper; import org.springframework.stereotype.Service; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/IStStrategyConfigService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/IStStrategyConfigService.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/IStStrategyConfigService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/IStStrategyConfigService.java index e88841e..7df10ec 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/IStStrategyConfigService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/IStStrategyConfigService.java @@ -1,4 +1,4 @@ -package org.nl.wms.decision_manage.service; +package org.nl.wms.decision_manage.service.strategyConfig; import org.nl.common.domain.query.PageQuery; import org.nl.wms.decision_manage.service.dao.StStrategyConfig; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/StStrategyConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/StStrategyConfig.java similarity index 96% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/StStrategyConfig.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/StStrategyConfig.java index a2c7c02..7d0042a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/StStrategyConfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/StStrategyConfig.java @@ -1,4 +1,4 @@ -package org.nl.wms.decision_manage.service.dao; +package org.nl.wms.decision_manage.service.strategyConfig.dao; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/mapper/StStrategyConfigMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/StStrategyConfigMapper.java similarity index 91% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/mapper/StStrategyConfigMapper.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/StStrategyConfigMapper.java index eeb89b9..b6b4e1a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/mapper/StStrategyConfigMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/StStrategyConfigMapper.java @@ -1,4 +1,4 @@ -package org.nl.wms.decision_manage.service.dao.mapper; +package org.nl.wms.decision_manage.service.strategyConfig.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/mapper/xml/StStrategyConfigMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/xml/StStrategyConfigMapper.xml similarity index 100% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dao/mapper/xml/StStrategyConfigMapper.xml rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/xml/StStrategyConfigMapper.xml diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dto/StrategyQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dto/StrategyQuery.java similarity index 90% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dto/StrategyQuery.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dto/StrategyQuery.java index a0a04ed..e97e104 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/dto/StrategyQuery.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dto/StrategyQuery.java @@ -1,4 +1,4 @@ -package org.nl.wms.decision_manage.service.dto; +package org.nl.wms.decision_manage.service.strategyConfig.dto; import lombok.Data; import org.nl.common.domain.query.BaseQuery; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/impl/StStrategyConfigServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/impl/StStrategyConfigServiceImpl.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/impl/StStrategyConfigServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/impl/StStrategyConfigServiceImpl.java index a89d6aa..a99bebd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/impl/StStrategyConfigServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/impl/StStrategyConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.wms.decision_manage.service.impl; +package org.nl.wms.decision_manage.service.strategyConfig.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -13,7 +13,7 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.nl.wms.decision_manage.service.IStStrategyConfigService; +import org.nl.wms.decision_manage.service.strategyConfig.IStStrategyConfigService; import org.nl.wms.decision_manage.service.dao.StStrategyConfig; import org.nl.wms.decision_manage.service.dao.mapper.StStrategyConfigMapper; import org.nl.wms.decision_manage.service.dto.StrategyQuery; diff --git a/nladmin-ui/src/views/wms/decision_manage/sectStrategy/AddDialog.vue b/nladmin-ui/src/views/wms/decision_manage/sectStrategy/AddDialog.vue index ec7e8a8..7f9f2ae 100644 --- a/nladmin-ui/src/views/wms/decision_manage/sectStrategy/AddDialog.vue +++ b/nladmin-ui/src/views/wms/decision_manage/sectStrategy/AddDialog.vue @@ -8,8 +8,19 @@ - - + + + +