完善新增常量管理

guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/consts/model/params/SysConfigParam.java

 package cn.stylefeng.guns.sys.modular.consts.model.params;
 
-import lombok.Data;
 import cn.stylefeng.roses.kernel.model.validator.BaseValidatingParam;
-import java.util.Date;
+import lombok.Data;
+
 import java.io.Serializable;
-import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -46,6 +46,11 @@ public class SysConfigParam implements Serializable, BaseValidatingParam {
     private String dictTypeCode;
 
     /**
+     * 字典的值
+     */
+    private String dictValue;
+
+    /**
      * 属性值，如果是字典中的类型，则为dict的code
      */
     private String value;

guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/consts/service/impl/SysConfigServiceImpl.java

@@ -6,7 +6,7 @@ import cn.stylefeng.guns.sys.modular.consts.entity.SysConfig;
 import cn.stylefeng.guns.sys.modular.consts.mapper.SysConfigMapper;
 import cn.stylefeng.guns.sys.modular.consts.model.params.SysConfigParam;
 import cn.stylefeng.guns.sys.modular.consts.model.result.SysConfigResult;
-import  cn.stylefeng.guns.sys.modular.consts.service.SysConfigService;
+import cn.stylefeng.guns.sys.modular.consts.service.SysConfigService;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,18 +28,25 @@ import java.util.List;
 public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements SysConfigService {
 
     @Override
-    public void add(SysConfigParam param){
+    public void add(SysConfigParam param) {
         SysConfig entity = getEntity(param);
+
+        //如果是字典类型
+        if (ToolUtil.isNotEmpty(param.getDictFlag())
+                && param.getDictFlag().equalsIgnoreCase("Y")) {
+            entity.setValue(param.getDictValue());
+        }
+
         this.save(entity);
     }
 
     @Override
-    public void delete(SysConfigParam param){
+    public void delete(SysConfigParam param) {
         this.removeById(getKey(param));
     }
 
     @Override
-    public void update(SysConfigParam param){
+    public void update(SysConfigParam param) {
         SysConfig oldEntity = getOldEntity(param);
         SysConfig newEntity = getEntity(param);
         ToolUtil.copyProperties(newEntity, oldEntity);
@@ -47,23 +54,23 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
     }
 
     @Override
-    public SysConfigResult findBySpec(SysConfigParam param){
+    public SysConfigResult findBySpec(SysConfigParam param) {
         return null;
     }
 
     @Override
-    public List<SysConfigResult> findListBySpec(SysConfigParam param){
+    public List<SysConfigResult> findListBySpec(SysConfigParam param) {
         return null;
     }
 
     @Override
-    public LayuiPageInfo findPageBySpec(SysConfigParam param){
+    public LayuiPageInfo findPageBySpec(SysConfigParam param) {
         Page pageContext = getPageContext();
         IPage page = this.baseMapper.customPageList(pageContext, param);
         return LayuiPageFactory.createPageInfo(page);
     }
 
-    private Serializable getKey(SysConfigParam param){
+    private Serializable getKey(SysConfigParam param) {
         return param.getId();
     }
 

guns-sys/src/main/webapp/assets/modular/sysConfig/sysConfig_add.js

@@ -21,10 +21,14 @@ layui.use(['form', 'admin', 'ax'], function () {
     var form = layui.form;
     var admin = layui.admin;
 
+    //默认的激活状态 dict 或者 custom
+    var status = "dict";
+
     //初始化字典选择框
-    var initDictSelect = function () {
+    var activeDictSelect = function () {
         $("#dictCodeDiv").show();
         $("#customCodeDiv").hide();
+        status = "dict";
 
         //初始化所有字典类型
         $("#dictTypeCode").html('<option value="">请选择系统字典类型</option>');
@@ -44,13 +48,31 @@ layui.use(['form', 'admin', 'ax'], function () {
     };
 
     //初始化非字典选择
-    var initCustomSelect = function () {
+    var activeCustomSelect = function () {
         $("#dictCodeDiv").hide();
         $("#customCodeDiv").show();
+        status = "custom";
     };
 
     //表单提交事件
     form.on('submit(btnSubmit)', function (data) {
+
+        //如果是选择字典
+        if (status === "dict") {
+
+            var radio = $('input:radio[name="dictValue"]:checked').val();
+
+            if (!$("#dictTypeCode").val() || !radio) {
+                Feng.error("请选择具体字典！");
+                return false;
+            }
+        } else {
+            if (!$("#value").val()) {
+                Feng.error("请填写参数值！");
+                return false;
+            }
+        }
+
         var ajax = new $ax(Feng.ctxPath + "/sysConfig/addItem", function (data) {
             Feng.success("添加成功！");
             window.location.href = Feng.ctxPath + '/sysConfig'
@@ -66,9 +88,9 @@ layui.use(['form', 'admin', 'ax'], function () {
     //监听单选切换
     form.on('radio(dictChecked)', function (data) {
         if (data.value === "Y") {
-            initDictSelect();
+            activeDictSelect();
         } else {
-            initCustomSelect();
+            activeCustomSelect();
         }
     });
 
@@ -84,7 +106,7 @@ layui.use(['form', 'admin', 'ax'], function () {
             for (var i = 0; i < data.data.length; i++) {
                 var name = data.data[i].name;
                 var code = data.data[i].code;
-                $("#dictDetails").append('<input type="radio" name="value" value="' + code + '" title="' + name + '">');
+                $("#dictDetails").append('<input type="radio" name="dictValue" value="' + code + '" title="' + name + '">');
             }
             form.render();
 
@@ -101,6 +123,6 @@ layui.use(['form', 'admin', 'ax'], function () {
     });
 
     //显示字典编码选择
-    initDictSelect();
+    activeDictSelect();
 
 });
\ No newline at end of file

guns-sys/src/main/webapp/pages/modular/sysConfig/sysConfig_add.html

@@ -25,10 +25,10 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">取值范围<span style="color: red;">*</span></label>
                     <div class="layui-input-block">
-                        <input type="radio" name="dictFlag" value="Y" title="系统字典" lay-filter="dictChecked" checked="checked">
-                        <input type="radio" name="dictFlag" value="N" title="非系统字典" lay-filter="dictChecked">
+                        <input type="radio" name="dictFlag" value="Y" title="字典" lay-filter="dictChecked" checked="checked">
+                        <input type="radio" name="dictFlag" value="N" title="非字典" lay-filter="dictChecked">
                     </div>
-                    <div class="layui-form-mid layui-word-aux">如果选择系统字典，则取值来自于 系统管理->字典管理</div>
+                    <div class="layui-form-mid layui-word-aux">如果选择字典，则取值来自于 系统管理->字典管理</div>
                 </div>
 
                 <!-- 从字典取值 -->
@@ -42,18 +42,18 @@
                         </div>
                     </div>
                     <div class="layui-form-item">
-                        <label class="layui-form-label">字典值<span style="color: red;">*</span></label>
+                        <label class="layui-form-label">参数值<span style="color: red;">*</span></label>
                         <div class="layui-input-block" id="dictDetails">
-                            <input type="radio" name="value" value="" title="无" disabled="disabled">
+                            <input type="radio" name="dictValue" value="" title="无" disabled="disabled">
                         </div>
                     </div>
                 </div>
 
                 <!-- 手动输入 -->
                 <div class="layui-form-item" id="customCodeDiv">
-                    <label class="layui-form-label">自定义值<span style="color: red;">*</span></label>
+                    <label class="layui-form-label">参数值<span style="color: red;">*</span></label>
                     <div class="layui-input-block">
-                        <input id="value" name="value" placeholder="属性值" type="text" class="layui-input" lay-verify="required" required/>
+                        <input id="value" name="value" placeholder="属性值" type="text" class="layui-input"/>
                     </div>
                 </div>
                 <div class="layui-form-item">