Update 优化系统配置及代码生成模板

SERVER/VberAdminPlusV3/vber-admin/src/main/java/com/vber/web/controller/IndexController.java

@@ -2,6 +2,7 @@ package com.vber.web.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.vber.common.core.config.VbConfig;
+import com.vber.common.core.constant.ConfigKeyConstants;
 import com.vber.common.core.domain.R;
 import com.vber.common.core.utils.StringUtils;
 import com.vber.common.tenant.helper.TenantHelper;
@@ -45,9 +46,9 @@ public class IndexController {
         configVo.setCopyrightYear(vbConfig.getCopyrightYear());
         configVo.setTenantEnabled(TenantHelper.isEnable());
         configVo.setCaptchaEnabled(!"dev".equals(vbConfig.getMode()) && captchaProperties.getEnable());
-        String registerUser = sysConfigService.selectConfigByKey("sys.account.registerUser");
+        String registerUser = sysConfigService.selectConfigByKey(ConfigKeyConstants.SYS_ACCOUNT_REGISTER_USER);
         configVo.setRegisterEnabled(StringUtils.isNotEmpty(registerUser) ? Boolean.valueOf("true".equals(registerUser)) : vbConfig.getRegisterEnabled());
-        String previewListResource = sysConfigService.selectConfigByKey("sys.oss.previewListResource");
+        String previewListResource = sysConfigService.selectConfigByKey(ConfigKeyConstants.SYS_OSS_PREVIEW_LIST_RESOURCE);
         configVo.setOssPreviewEnabled(StringUtils.isNotEmpty(previewListResource) ? Boolean.valueOf("true".equals(previewListResource)) : vbConfig.getOssPreviewEnabled());
         configVo.setWorkflowEnabled(vbConfig.getWorkflowEnabled());
         return R.ok(configVo);

SERVER/VberAdminPlusV3/vber-common/vber-common-oss/src/main/java/com/vber/common/oss/constant/OssConstant.java

@@ -17,11 +17,6 @@ public interface OssConstant {
      */
     String DEFAULT_CONFIG_KEY = GlobalConstants.GLOBAL_REDIS_KEY + "sys_oss:default_config";
 
-    /**
-     * 预览列表资源开关Key
-     */
-    String PEREVIEW_LIST_RESOURCE_KEY = "sys.oss.previewListResource";
-
     /**
      * 系统数据ids
      */

SERVER/VberAdminPlusV3/vber-modules/vber-generator/src/main/java/com/vber/generator/util/GenUtils.java

@@ -65,7 +65,8 @@ public class GenUtils {
 
             // 数据库的数字字段与java不匹配 且很多数据库的数字字段很模糊 例如oracle只有number没有细分
             // 所以默认数字类型全为Long可在界面上自行编辑想要的类型 有什么特殊需求也可以在这里特殊处理
-            column.setJavaType(GenConstants.TYPE_LONG);
+
+            column.setJavaType(column.getColumnType().contains("int") || column.getColumnType().contains("integer") ? GenConstants.TYPE_INTEGER : column.getColumnType().contains("float") || column.getColumnType().contains("double") ? GenConstants.TYPE_DOUBLE : GenConstants.TYPE_LONG);
         }
 
         // BO对象 默认插入勾选

SERVER/VberAdminPlusV3/vber-modules/vber-generator/src/main/resources/vm/vue/view.vue.vm

@@ -42,7 +42,7 @@
             #elseif($column.list)
                 #if(($field.indexOf("Time")>0&&$field.indexOf("Time")==${field.length()} - 4)
                 ||($field.indexOf("Date")>0&&$field.indexOf("Date")==${field.length()} - 4))
-                  {field: "$field", name: "$comment", visible: true, isSort: $sort, width: 185},
+                  {field: "$field", name: "$comment", visible: true, isSort: $sort, width: 145},
                 #elseif($field=="remark")
                   {field: "$field", name: "$comment", visible: true, isSort: $sort, tooltip: true},
                 #elseif($column.dictType)
@@ -118,6 +118,11 @@
                           type: "select",
                         },
                       #end
+                    listeners: {
+                      change: () => {
+                        handleQuery()
+                      },
+                    },
                   #elseif($column.javaType == "Date")
                       #set($dateType="date")
                       #if($field.indexOf("Time")>0&&$field.indexOf("Time")==${field.length()} - 4)
@@ -139,6 +144,7 @@
                         listeners: {
                           change: (v: any) => {
                             queryParams.value.dateRange${AttrName} = v
+                            handleQuery()
                           },
                         },
                         span: 5,
@@ -154,7 +160,7 @@
               },
             #end
         #end
-    ] as any[],
+    ] as any,
     permission: "${permissionPrefix}",
     handleBtns: [],
     handleFuns: {
@@ -289,7 +295,7 @@
                 #end
             #end
         #end
-    ] as any[],
+    ] as any,
     resetForm: () => {
       form.value = emptyFormData.value
     },
@@ -346,7 +352,6 @@
     //
   }
 
-  /** 添加按钮操作 */
   function handleCreate() {
     tableRef.value.defaultHandleFuns.handleCreate()
   }
@@ -422,15 +427,24 @@
               </template>
             #elseif($column.list && $field.indexOf("Time")>0 && $field.indexOf("Time")==${field.length()} - 4)
               <template #${field}="{ row }">
-                {{ dayjs(row.${field}).format("YYYY-MM-DD HH:mm:ss") }}
+                <template v-if="row.${field}">
+                  {{ dayjs(row.${field}).format("YYYY-MM-DD HH:mm:ss") }}
+                </template>
+                <template v-else>-</template>
               </template>
             #elseif($column.list && $field.indexOf("Date")>0 && $field.indexOf("Date")==${field.length()} - 4)
               <template #${field}="{ row }">
-                {{ dayjs(row.${field}).format("YYYY-MM-DD") }}
+                <template v-if="row.${field}">
+                  {{ dayjs(row.${field}).format("YYYY-MM-DD") }}
+                </template>
+                <template v-else>-</template>
               </template>
             #elseif($column.list && $column.javaType == "Date")
               <template #${field}="{ row }">
-                {{ dayjs(row.${field}).format("YYYY-MM-DD") }}
+                <template v-if="row.${field}">
+                  {{ dayjs(row.${field}).format("YYYY-MM-DD") }}
+                </template>
+                <template v-else>-</template>
               </template>
             #elseif($column.list && "" != $column.dictType)
               <template #${field}="{ row }">

SERVER/VberAdminPlusV3/vber-modules/vber-system/src/main/java/com/vber/system/service/impl/SysConfigServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.vber.common.core.constant.CacheNames;
+import com.vber.common.core.constant.ConfigKeyConstants;
 import com.vber.common.core.constant.SystemConstants;
 import com.vber.common.core.exception.ServiceException;
 import com.vber.common.core.service.ConfigService;
@@ -89,7 +90,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
     @Override
     public boolean selectRegisterEnabled(String tenantId) {
         String configValue = TenantHelper.dynamic(tenantId, () ->
-                this.selectConfigByKey("sys.account.registerUser")
+                this.selectConfigByKey(ConfigKeyConstants.SYS_ACCOUNT_REGISTER_USER)
         );
         return Convert.toBool(configValue);
     }