服务和WEB隔离

Former-commit-id: 8d0eb6621ab4ec8581b3406d02ffdae027702b0f

src/main/java/xyz/wbsite/dbtool/javafx/po/Field.java

@@ -276,6 +276,8 @@ public class Field extends Table {
             value = "true";
         } else if (fieldType.get().matches("Dict")) {
             value = "\"code\"";
+        }else if (fieldType.get().matches("Select")) {
+            value = "\"value\"";
         } else if (fieldType.get().matches("Byte")) {
             value = "(byte)1";
         } else if (fieldType.get().matches("Short")) {

src/main/resources/modules/SpringBoot/java/frame/validation/Dict.java

@@ -2,11 +2,16 @@ package ${domain}.frame.validation;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint(validatedBy = DictValidator.class)
+@Inherited
 public @interface Dict {
     String message() default "字典验证错误";
 

src/main/resources/modules/SpringBoot/java/frame/validation/Select.java

@@ -2,6 +2,7 @@ package ${domain}.frame.validation;
 
 import javax.validation.Constraint;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -9,6 +10,7 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint(validatedBy = SelectValidator.class)
+@Inherited
 public @interface Select {
     String message() default "选项验证错误";
 

src/main/resources/modules/SpringBoot/java/module/system/mpr/SequenceMapper.java

@@ -1,91 +0,0 @@
-package ${domain}.module.system.mpr;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import ${domain}.frame.auth.Token;
-import ${domain}.module.system.ent.Sequence;
-import ${domain}.module.system.req.SequenceFindRequest;
-
-import java.util.List;
-
-/**
- * SEQUENCE - 序列
- *
- * @author wangbing
- * @since 2020-06-27
- */
-@Mapper
-public interface SequenceMapper {
-
-    /**
-     * 插入
-     *
-     * @param request 请求对象
-     * @param token   令牌
-     * @return 返回数量
-     */
-    long insert(@Param("request") Sequence request, @Param("token") Token token);
-
-    /**
-     * 批量插入
-     *
-     * @param list  对象集合
-     * @param token 令牌
-     * @return 返回数量
-     */
-    long insertBatch(@Param("list") List<Sequence> list, @Param("token") Token token);
-
-    /**
-     * 逻辑删除
-     *
-     * @param id    主键
-     * @param token 令牌
-     * @return 返回数量
-     */
-    long delete(@Param("id") Long id, @Param("token") Token token);
-
-    /**
-     * 批量逻辑删除
-     *
-     * @param list  主键集合
-     * @param token 令牌
-     * @return 返回数量
-     */
-    long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
-
-    /**
-     * 更新
-     *
-     * @param request 请求对象
-     * @param token   令牌
-     * @return 返回数量
-     */
-    long update(@Param("request") Sequence request, @Param("token") Token token);
-
-    /**
-     * 查询
-     *
-     * @param request 请求对象
-     * @param token   令牌
-     * @return 返回对象
-     */
-    List<Sequence> find(@Param("request") SequenceFindRequest request, @Param("token") Token token);
-
-    /**
-     * 获得对象
-     *
-     * @param id    主键
-     * @param token 令牌
-     * @return 返回对象
-     */
-    Sequence getById(@Param("id") Long id, @Param("token") Token token);
-
-    /**
-     * 获得对象
-     *
-     * @param list  主键集合
-     * @param token 令牌
-     * @return 返回对象
-     */
-    List<Sequence> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
-}

src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl

@@ -15,6 +15,10 @@
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-input-number v-model="vm.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" controls-position="right" :min="-128" :max="127" :step="1" step-strictly></el-input-number>
             </el-form-item>
+        <#elseif item.getFieldTypeJava() =="Character">
+            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
+                <el-input v-model="vm.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" minlength="0" maxlength="1"></el-input>
+            </el-form-item>
         <#elseif item.getFieldTypeJava() =="Short">
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-input-number v-model="vm.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" controls-position="right" :min="-32768" :max="32767" :step="1" step-strictly></el-input-number>
@@ -35,18 +39,6 @@
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-input-number v-model="vm.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" controls-position="right" :step="0.01" step-strictly :precision="2"></el-input-number>
             </el-form-item>
-        <#elseif item.getFieldTypeJava() =="Character">
-            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="vm.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" minlength="0" maxlength="1"></el-input>
-            </el-form-item>
-        <#elseif item.getFieldTypeJava() =="String" &&  item.fieldType != "Dict">
-            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="vm.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}"></el-input>
-            </el-form-item>
-        <#elseif item.getFieldTypeJava() =="String" &&  item.fieldType == "Dict">
-            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input-dict v-model="vm.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" dict-name="${item.getFieldName()}" ></el-input-dict>
-            </el-form-item>
         <#elseif item.getFieldTypeJava() =="Date">
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-date-picker
@@ -62,6 +54,22 @@
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-input-number v-model="vm.${item.getFName()}"clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" :step="1" step-strictly :precision="2" :step="0.01"></el-input-number>
             </el-form-item>
+        <#elseif item.getFieldTypeJava() =="String" &&  item.fieldType == "Dict">
+            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
+                <el-input-dict v-model="vm.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" dict-name="${item.getFieldName()}" ></el-input-dict>
+            </el-form-item>
+        <#elseif item.getFieldTypeJava() =="String" &&  item.fieldType == "Select">
+            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
+                <el-select v-model="vm.${item.getFName()}" clearable size="mini" filterable placeholder="请输入${item.fieldComment?default("")}">
+                    <#list item.selectItems as st>
+                    <el-option key="${st.value}" label="${st.value}" value="${st.value}"></el-option>
+                    </#list>
+                </el-select>
+            </el-form-item>
+        <#elseif item.getFieldTypeJava() =="String">
+            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
+                <el-input v-model="vm.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}"></el-input>
+            </el-form-item>
         </#if>
     </#if>
 </#list>
@@ -262,28 +270,14 @@
                     <el-radio :label="false">否</el-radio>
                 </el-radio-group>
             </el-form-item>
-        <#elseif item.getFieldTypeJava() =="String" && item.getFieldLength() lte 50 &&  item.fieldType != "Dict">
-            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="form.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" maxlength="${item.getFieldLength()}"></el-input>
-            </el-form-item>
-        <#elseif item.getFieldTypeJava() =="String" && item.getFieldLength() gt 50 &&  item.fieldType != "Dict">
-            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="form.${item.getFName()}"
-                          clearable
-                          size="mini"
-                          placeholder="请输入${item.fieldComment?default("")}"
-                          type="textarea"
-                          maxlength="${item.getFieldLength()}"
-                          show-word-limit></el-input>
-            </el-form-item>
-        <#elseif item.getFieldTypeJava() =="String" &&  item.fieldType == "Dict">
-            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input-dict v-model="form.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" dict-name="${item.getFieldName()}" ></el-input-dict>
-            </el-form-item>
         <#elseif item.getFieldTypeJava() =="Byte">
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-input-number v-model="form.${item.getFName()}"clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" :min="-128" :max="127" :step="1" step-strictly></el-input-number>
             </el-form-item>
+        <#elseif item.getFieldTypeJava() =="Character">
+            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
+                <el-input v-model="form.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" minlength="0" maxlength="1"></el-input>
+            </el-form-item>
         <#elseif item.getFieldTypeJava() =="Short">
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-input-number v-model="form.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" :min="-32768" :max="32767" :step="1" step-strictly></el-input-number>
@@ -304,10 +298,6 @@
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-input-number v-model="form.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" :step="0.01" step-strictly :precision="2"></el-input-number>
             </el-form-item>
-        <#elseif item.getFieldTypeJava() =="Character">
-            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
-                <el-input v-model="form.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" minlength="0" maxlength="1"></el-input>
-            </el-form-item>
         <#elseif item.getFieldTypeJava() =="Date">
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-date-picker
@@ -323,6 +313,30 @@
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-input-number v-model="form.${item.getFName()}"clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" :step="1" step-strictly :precision="2" :step="0.01"></el-input-number>
             </el-form-item>
+        <#elseif item.getFieldTypeJava() =="String" &&  item.fieldType == "Dict">
+            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
+                <el-input-dict v-model="form.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" dict-name="${item.getFieldName()}" ></el-input-dict>
+            </el-form-item>
+        <#elseif item.getFieldTypeJava() =="String" &&  item.fieldType == "Select">
+            <el-select v-model="vm.${item.getFName()}" clearable size="mini" filterable placeholder="请输入${item.fieldComment?default("")}">
+                <#list item.selectItems as st>
+                    <el-option key="${st.value}" label="${st.value}" value="${st.value}"></el-option>
+                </#list>
+            </el-select>
+        <#elseif item.getFieldTypeJava() =="String" && item.getFieldLength() lte 50 &&  item.fieldType != "Dict">
+            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
+                <el-input v-model="form.${item.getFName()}" clearable size="mini" placeholder="请输入${item.fieldComment?default("")}" maxlength="${item.getFieldLength()}"></el-input>
+            </el-form-item>
+        <#elseif item.getFieldTypeJava() =="String" && item.getFieldLength() gt 50 &&  item.fieldType != "Dict">
+            <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
+                <el-input v-model="form.${item.getFName()}"
+                          clearable
+                          size="mini"
+                          placeholder="请输入${item.fieldComment?default("")}"
+                          type="textarea"
+                          maxlength="${item.getFieldLength()}"
+                          show-word-limit></el-input>
+            </el-form-item>
         </#if>
     </#if>
 </#list>