opt:策略管理包结构修改

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<Object> query(@RequestParam Map whereJson, PageQuery pageable){
         return new ResponseEntity<>(TableDataInfo.build(dictService.queryAll(whereJson,pageable)), HttpStatus.OK);
     }
 
-    
+
     @GetMapping(value = "/all")
     public ResponseEntity<Object> 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<Object> 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<Object> 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<Map> maps = dictService.dynamicTableEnum((String) type, (String) label, (String) value);
+        return new ResponseEntity<>(maps, HttpStatus.OK);
+    }
 }
 

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java

@@ -85,4 +85,9 @@ public interface ISysDictService extends IService<Dict> {
      * @return
      */
     List<Dict> queryAll();
+
+    /**
+     * 动态枚举信息
+     */
+    List<Map> dynamicTableEnum(String table,String label,String value);
 }

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;
+
 /**
  * <p>
  * 字典表 Mapper 接口
@@ -13,4 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SysDictMapper extends BaseMapper<Dict> {
 
+    List<Map> dynamicTableEnum(@Param("table") String table, @Param("label")String label, @Param("value")String value);
+
 }

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.system.service.dict.dao.mapper.SysDictMapper">
-
+    <select id="dynamicTableEnum" resultType="java.util.Map">
+        select ${label} as label,${value} as value from ${table}
+    </select>
 </mapper>

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<SysDictMapper, Dict> impleme
                 .groupBy(Dict::getCode, Dict::getName));
     }
 
+    @Override
+    public List<Map> 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);
+    }
 }

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;
 
 /**
  * <p>

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;

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;
 
 /**
  * <p>

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;

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;

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;

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;

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;

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;

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;

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;

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;

nladmin-ui/src/views/wms/decision_manage/sectStrategy/AddDialog.vue

@@ -8,8 +8,19 @@
     <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="策略名称:" prop="strategy_name">
-            <el-input v-model="form.strategy_name" style="width: 200px;" />
+          <el-form-item label="库区:" prop="sect_code">
+            <el-select
+              v-model="form.sect_code"
+              placeholder=""
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in sectList"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">