优化代码生成器模块：1、代码生成器配置页支持刷新字典；2、修改 Mapper.xml 中字典的查询方式；3、其它细节优化

smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java

@@ -13,16 +13,13 @@ import net.lab1024.sa.base.common.util.SmartStringUtil;
 import net.lab1024.sa.base.module.support.codegenerator.domain.entity.CodeGeneratorConfigEntity;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.*;
-import net.lab1024.sa.base.module.support.codegenerator.service.variable.backend.ControllerVariableService;
+import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
-import net.lab1024.sa.base.module.support.codegenerator.service.variable.backend.DaoVariableService;
+import net.lab1024.sa.base.module.support.codegenerator.service.variable.backend.*;
-import net.lab1024.sa.base.module.support.codegenerator.service.variable.backend.ManagerVariableService;
-import net.lab1024.sa.base.module.support.codegenerator.service.variable.backend.ServiceVariableService;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.backend.domain.*;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.front.ApiVariableService;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.front.ConstVariableService;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.front.FormVariableService;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.front.ListVariableService;
-import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
 import net.lab1024.sa.base.module.support.codegenerator.util.CodeGeneratorTool;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.velocity.Template;
@@ -36,7 +33,7 @@ import javax.annotation.PostConstruct;
 import java.io.File;
 import java.io.OutputStream;
 import java.io.StringWriter;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -94,7 +91,7 @@ public class CodeGeneratorTemplateService {
                 String fileName = templateFile.startsWith("java") ? upperCamel + templateSplit[templateSplit.length - 1] : lowerHyphen + "-" + templateSplit[templateSplit.length - 1];
                 String fullPathFileName = templateFile.replaceAll(templateSplit[templateSplit.length - 1], fileName);
                 fullPathFileName = fullPathFileName.replaceAll("java/", "java/" + basic.getModuleName().toLowerCase() + "/");
-                fullPathFileName = fullPathFileName.replaceAll("js/", "js/" + basic.getModuleName().toLowerCase() + "/");
+                fullPathFileName = fullPathFileName.replaceAll("js/", "js/" + lowerHyphen + "/");
 
                 String fileContent = generate(tableName, templateFile, codeGeneratorConfigEntity);
                 File file = new File(uuid + "/" + fullPathFileName);
@@ -130,7 +127,7 @@ public class CodeGeneratorTemplateService {
         }
 
 
-        ZipUtil.zip(outputStream, Charset.forName("utf-8"), false, null, dir);
+        ZipUtil.zip(outputStream, StandardCharsets.UTF_8, false, null, dir);
 
         FileUtil.del(dir);
 

smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java

@@ -65,7 +65,15 @@ public class MapperVariableService extends CodeGenerateBaseVariableService {
                     stringBuilder.append("\n            )");
                 }
                 fieldMap.put("likeStr", stringBuilder.toString());
-            } else {
+            } else if (CodeQueryFieldQueryTypeEnum.DICT.equalsValue(queryField.getQueryTypeEnum())) {
+                String stringBuilder = "AND INSTR(" +
+                        form.getTableName() + "." + queryField.getColumnNameList().get(0) +
+                        ",#{queryForm." +
+                        queryField.getFieldName() +
+                        "})";
+                fieldMap.put("likeStr", stringBuilder);
+            }
+            else {
                 fieldMap.put("columnName", queryField.getColumnNameList().get(0));
             }
         }

smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java

@@ -2,6 +2,7 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.backen
 
 import cn.hutool.core.bean.BeanUtil;
 import net.lab1024.sa.base.common.util.SmartEnumUtil;
+import net.lab1024.sa.base.common.util.SmartStringUtil;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeQueryFieldQueryTypeEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
@@ -41,14 +42,11 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService {
 
 
     public ImmutablePair<List<String>, List<Map<String, Object>>> getPackageListAndFields(CodeGeneratorConfigForm form) {
+
         List<CodeQueryField> fields = form.getQueryFields();
-        if (CollectionUtils.isEmpty(fields)) {
-            return ImmutablePair.of(new ArrayList<>(), new ArrayList<>());
-        }
 
         HashSet<String> packageList = new HashSet<>();
 
-
         /**
          * 1、LocalDate、LocalDateTime、BigDecimal 类型的包名
          * 2、排序
@@ -106,6 +104,14 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService {
 
                     finalFieldMap.put("javaType", codeField.getJavaType());
                     break;
+                case DICT:
+                    codeField = getCodeFieldByColumnName(field.getColumnNameList().get(0), form);
+                    if (SmartStringUtil.isNotEmpty(codeField.getDict())) {
+                        finalFieldMap.put("dict", "\n    @JsonDeserialize(using = DictValueVoDeserializer.class)");
+                        packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
+                        packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;");
+                    }
+                    finalFieldMap.put("javaType", "String");
                 default:
                     finalFieldMap.put("javaType", "String");
             }
@@ -113,13 +119,11 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService {
             finalFieldList.add(finalFieldMap);
         }
 
-
         // lombok
         packageList.add("import lombok.Data;");
         packageList.add("import lombok.EqualsAndHashCode;");
 
-        List<String> packageNameList = packageList.stream().filter(Objects::nonNull).collect(Collectors.toList());
+        List<String> packageNameList = packageList.stream().filter(Objects::nonNull).sorted().collect(Collectors.toList());
-        Collections.sort(packageNameList);
         return ImmutablePair.of(packageNameList, finalFieldList);
     }
 

smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/FormVariableService.java

@@ -57,19 +57,20 @@ public class FormVariableService extends CodeGenerateBaseVariableService {
 
             fieldsVariableList.add(objectMap);
 
-            if (CodeFrontComponentEnum.ENUM_SELECT.getValue().equals(field.getFrontComponent())) {
+            if (CodeFrontComponentEnum.ENUM_SELECT.equalsValue(field.getFrontComponent())) {
                 frontImportSet.add("import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';");
             }
 
-            if (CodeFrontComponentEnum.BOOLEAN_SELECT.getValue().equals(field.getFrontComponent())) {
+            if (CodeFrontComponentEnum.BOOLEAN_SELECT.equalsValue(field.getFrontComponent())) {
                 frontImportSet.add("import BooleanSelect from '/@/components/framework/boolean-select/index.vue';");
             }
 
-            if (CodeFrontComponentEnum.DICT_SELECT.getValue().equals(field.getFrontComponent())) {
+            if (CodeFrontComponentEnum.DICT_SELECT.equalsValue(field.getFrontComponent())) {
                 frontImportSet.add("import DictSelect from '/@/components/support/dict-select/index.vue';");
             }
 
-            if (CodeFrontComponentEnum.FILE_UPLOAD.getValue().equals(field.getFrontComponent())) {
+            if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
+                frontImportSet.add("import { FILE_FOLDER_TYPE_ENUM } from '/@/constants/support/file-const';");
                 frontImportSet.add("import FileUpload from '/@/components/support/file-upload/index.vue';");
             }
         }

smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.google.common.base.CaseFormat;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeQueryFieldQueryTypeEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
+import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeQueryField;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
 
@@ -35,19 +36,23 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
 
         for (CodeQueryField queryField : queryFields) {
             Map<String, Object> objectMap = BeanUtil.beanToMap(queryField);
-            variableList.add(objectMap);
 
-            if("Enum".equals(queryField.getQueryTypeEnum())){
+            CodeField codeField = getCodeFieldByColumnName(queryField.getColumnNameList().get(0), form);
+            objectMap.put("frontEnumName", codeField.getEnumName());
+            objectMap.put("dict", codeField.getDict());
+
+            if(CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum())){
                 frontImportSet.add("import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';");
             }
 
-            if("Dict".equals(queryField.getQueryTypeEnum())){
+            if(CodeQueryFieldQueryTypeEnum.DICT.equalsValue(queryField.getQueryTypeEnum())){
                 frontImportSet.add("import DictSelect from '/@/components/support/dict-select/index.vue';");
             }
 
-            if(CodeQueryFieldQueryTypeEnum.DATE_RANGE.getValue().equals(queryField.getQueryTypeEnum())){
+            if(CodeQueryFieldQueryTypeEnum.DATE_RANGE.equalsValue(queryField.getQueryTypeEnum())){
                 frontImportSet.add("import { defaultTimeRanges } from '/@/lib/default-time-ranges';");
             }
+            variableList.add(objectMap);
 
         }
         variablesMap.put("queryFields",variableList);

smart-admin-api/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm

@@ -23,7 +23,7 @@ import javax.validation.Valid;
  */
 
 @RestController
-@Tag(name = "")
+@Tag(name = "${basic.description}")
 public class ${name.upperCamel}Controller {
 
     @Resource

smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm

@@ -23,7 +23,12 @@
                 ${queryField.likeStr}
             </if>
 #end
-#if(${queryField.queryTypeEnum} == "Equal" || ${queryField.queryTypeEnum} == "Enum" || ${queryField.queryTypeEnum} == "Dict")
+#if(${queryField.queryTypeEnum} == "Dict")
+            <if test="queryForm.${queryField.fieldName} != null and queryForm.${queryField.fieldName} != ''">
+                ${queryField.likeStr}
+            </if>
+#end
+#if(${queryField.queryTypeEnum} == "Equal" || ${queryField.queryTypeEnum} == "Enum")
             <if test="queryForm.${queryField.fieldName} != null">
                 AND ${tableName}.${queryField.columnName} = #{queryForm.${queryField.fieldName}}
             </if>

smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm

@@ -20,7 +20,6 @@
   >
     <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" >
 #if($insertAndUpdate.countPerLine == 1)
-          <a-row>
   #foreach ($field in $formFields)
       #if($field.frontComponent == "Input")
         <a-form-item label="$!{field.label}"  name="${field.fieldName}">
@@ -74,9 +73,7 @@
         </a-form-item>
       #end
   #end
-          </a-row>
 #end
-
     #if($insertAndUpdate.countPerLine > 1)
       <a-row>
           #set($span=24 / $!insertAndUpdate.countPerLine )
@@ -171,6 +168,10 @@
     if (rowData && !_.isEmpty(rowData)) {
       Object.assign(form, rowData);
     }
+    // 使用字典时把下面这注释修改成自己的字典字段 有多个字典字段就复制多份同理修改 不然打开表单时不显示字典初始值
+    // if (form.status && form.status.length > 0) {
+    //   form.status = form.status.map((e) => e.valueCode);
+    // }
     visibleFlag.value = true;
     nextTick(() => {
       formRef.value.clearValidate();

smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm

@@ -72,7 +72,7 @@
                 </a-button>
 #end
 #if($deleteInfo.isSupportDelete && ($deleteInfo.deleteEnum == "Batch"||$deleteInfo.deleteEnum == "SingleAndBatch"))
-                <a-button @click="confirmBatchDelete" type="danger" size="small" :disabled="selectedRowKeyList.length == 0">
+                <a-button @click="confirmBatchDelete" type="primary" danger size="small" :disabled="selectedRowKeyList.length == 0">
                     <template #icon>
                         <DeleteOutlined />
                     </template>
@@ -99,7 +99,21 @@
             :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
 #end
         >
-            <template #bodyCell="{ record, column }">
+            <template #bodyCell="{ text, record, column }">
+
+	    <!-- 有图片预览时 注释解开并把下面的'picture'修改成自己的图片字段名即可 -->
+              <!-- <template v-if="column.dataIndex === 'picture'">
+                  <FilePreview :fileList="text" type="picture" />
+                </template> -->
+
+	    <!-- 使用字典时 注释解开并把下面的'dict'修改成自己的字典字段名即可 有多个字典字段就复制多份同理修改 不然不显示字典 -->
+              <!-- 方便修改tag的颜色 orange green purple success processing error default warning -->
+              <!-- <template v-if="column.dataIndex === 'dict'">
+                <a-tag color="cyan">
+                  {{ text && text.length > 0 ? text.map((e) => e.valueName).join(',') : '暂无' }}
+                </a-tag>
+              </template> -->
+
                 <template v-if="column.dataIndex === 'action'">
                     <div class="smart-table-operate">
 #if($insertAndUpdate.isSupportInsertAndUpdate)
@@ -145,6 +159,7 @@
 #foreach ($import in $frontImportList)
     $!{import}
 #end
+    //import FilePreview from '/@/components/support/file-preview/index.vue'; // 图片预览组件
 
     // ---------------------------- 表格列 ----------------------------
 

smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-key-select/index.vue

@@ -27,9 +27,13 @@
 </template>
 
 <script setup>
-  import { computed, onMounted, ref, watch } from 'vue';
+  import { computed, onMounted, ref, watch, defineExpose } from 'vue';
   import { dictApi } from '/src/api/support/dict-api';
 
+  defineExpose({
+    queryDict,
+  });
+
   const props = defineProps({
     value: [Array, String],
     placeholder: {

smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js

@@ -86,7 +86,7 @@ FrontComponentMap.set('varchar', 'Input');
 FrontComponentMap.set('tinytext', 'Input');
 FrontComponentMap.set('text', 'Textarea');
 FrontComponentMap.set('longtext', 'Textarea');
-FrontComponentMap.set('blob', 'Upload');
+FrontComponentMap.set('blob', 'FileUpload');
 FrontComponentMap.set('date', 'Date');
 FrontComponentMap.set('datetime', 'DateTime');
 

smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue

@@ -73,7 +73,7 @@
     //表单
     let deleteInfo = config.deleteInfo;
 
-    formData.isSupportDelete = deleteInfo && deleteInfo.isSupportDelete;
+    formData.isSupportDelete = deleteInfo ? deleteInfo.isSupportDelete : true;
     formData.isPhysicallyDeleted = deleteInfo && deleteInfo.isPhysicallyDeleted ? deleteInfo.isPhysicallyDeleted : !deletedFlagColumn;
     formData.deleteEnum = deleteInfo && deleteInfo.deleteEnum ? deleteInfo.deleteEnum : CODE_DELETE_ENUM.SINGLE_AND_BATCH.value;
   }

smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue

@@ -11,6 +11,10 @@
   <a-alert :closable="true" message="请务必将每一个字段的 “ 字段名词 ” 填写完整！！！" type="success" show-icon>
     <template #icon><smile-outlined /></template>
   </a-alert>
+  <!-- 为了方便再配置时中途新增字典后 可以重新刷新字典下拉 (需要先随便选择一个字典后才能看到最新的字典) -->
+  <div style="float: right; padding: 10px 0px">
+    <a-button type="primary" @click="refreshDict">刷新字典</a-button>
+  </div>
   <a-table
     :scroll="{ x: 1300 }"
     size="small"
@@ -64,7 +68,7 @@
       </template>
 
       <template v-if="column.dataIndex === 'dict'">
-        <DictKeySelect v-model:value="record.dict" />
+        <DictKeySelect ref="dictRef" v-model:value="record.dict" />
       </template>
 
       <template v-if="column.dataIndex === 'enumName'">
@@ -81,6 +85,11 @@
   import { convertUpperCamel, convertLowerCamel } from '/@/utils/str-util';
   import _ from 'lodash';
 
+  const dictRef = ref();
+  function refreshDict() {
+    dictRef.value.queryDict();
+  }
+
   //------------------------ 全局数据 ---------------------
   const tableInfo = inject('tableInfo');
 

smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue

@@ -37,9 +37,9 @@
 </template>
 
 <script setup>
-  import { computed, nextTick, ref, watch } from 'vue';
+  import { computed, nextTick, ref } from 'vue';
   import { codeGeneratorApi } from '/@/api/support/code-generator-api';
-  import { JAVA_FILE_LIST, LANGUAGE_LIST, JS_FILE_LIST, TS_FILE_LIST, JAVA_DOMAIN_FILE_LIST } from '../../code-generator-util';
+  import { JAVA_FILE_LIST, LANGUAGE_LIST, JS_FILE_LIST, TS_FILE_LIST } from '../../code-generator-util';
   import { smartSentry } from '/@/lib/smart-sentry';
   import { lineNumbersBlock } from '/@/lib/highlight-line-number';
   import hljs from 'highlight.js';