From 9d1428ab85cd1b2f385f3e7a3b622bd0f859c63d Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Thu, 1 Apr 2021 09:57:05 +0800
Subject: [PATCH] 优化生成器模板：让生成的代码更简洁，流程相关代码默认不生成 优化生成模板：一对多代码生成（ERP模板）生成的子表实体ApiModel注释中value为附表名称 #2365 minio上传文件，文件名包含点的时候拼接文件名有问题 issues/I3CLFL 日志里把具体的文件加上吧 issues/I3BJDQ

---
 jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java                                                                               |  2 +-
 jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java                                                                         |  2 +-
 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/CommonController.java                                                                      |  1 -
 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai               |  2 +-
 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei     | 16 ++++++++++++++++
 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai                   |  2 +-
 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai           |  2 +-
 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei | 16 ++++++++++++++++
 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai                  |  2 +-
 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei        | 16 ++++++++++++++++
 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai                   |  2 +-
 11 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java
index a4de765..bbff3a4 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java
@@ -75,7 +75,7 @@ public class MinioUtil {
                 orgName=file.getName();
             }
             orgName = CommonUtils.getFileName(orgName);
-            String objectName = bizPath+"/"+orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.indexOf("."));
+            String objectName = bizPath+"/"+orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."));
 
             // 使用putObject上传一个本地文件到存储桶中。
             if(objectName.startsWith("/")){
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java
index fa5c493..28a0ba9 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java
@@ -111,7 +111,7 @@ public class OssBootUtil {
               orgName=file.getName();
             }
             orgName = CommonUtils.getFileName(orgName);
-            String fileName = orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.indexOf("."));
+            String fileName = orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."));
             if (!fileDir.endsWith("/")) {
                 fileDir = fileDir.concat("/");
             }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/CommonController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/CommonController.java
index 22ce002..9df690c 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/CommonController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/CommonController.java
@@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLDecoder;
-
 /**
  * <p>
  * 用户表 前端控制器
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index f2249e7..4d192d0 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -21,7 +21,7 @@ import java.io.UnsupportedEncodingException;
  * @Date:   ${.now?string["yyyy-MM-dd"]}
  * @Version: V1.0
  */
-@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}")
+@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}")
 @Data
 @TableName("${subTab.tableName}")
 public class ${subTab.entityName} implements Serializable {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
index c86fbdd..0f74399 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
@@ -8,6 +8,7 @@
 <#assign form_popup = false>
 <#assign form_cat_tree = false>
 <#assign form_cat_back = "">
+<#assign bpm_flag=false>
 <#assign form_span = 24>
 <#if tableVo.fieldRowNum==2>
     <#assign form_span = 12>
@@ -17,6 +18,9 @@
     <#assign form_span = 6>
 </#if>
 <#list columns as po>
+<#if po.fieldDbName=='bpm_status'>
+  <#assign bpm_flag=true>
+</#if>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
@@ -134,7 +138,9 @@
   </#if>
 </#list>
     </a-tabs>
+    <#if bpm_flag>
     <a-row v-if="showFlowSubmitButton" style="text-align: center;width: 100%;margin-top: 16px;"><a-button @click="handleOk">提 交</a-button></a-row>
+     </#if>
   </a-spin>
 </template>
 
@@ -379,6 +385,7 @@
       }
     },
     props: {
+    <#if bpm_flag>
       //流程表单data
       formData: {
         type: Object,
@@ -391,6 +398,7 @@
         default: false,
         required: false
       },
+       </#if>
       //表单禁用
       disabled: {
         type: Boolean,
@@ -400,14 +408,17 @@
     },
     computed: {
       formDisabled(){
+       <#if bpm_flag>
         if(this.formBpm===true){
           if(this.formData.disabled===false){
             return false
           }
           return true
         }
+         </#if>
         return this.disabled
       },
+       <#if bpm_flag>
       showFlowSubmitButton(){
         if(this.formBpm===true){
           if(this.formData.disabled===false){
@@ -416,10 +427,13 @@
         }
         return false
       }
+        </#if>
     },
     created () {
+     <#if bpm_flag>
       //如果是流程中表单，则需要加载流程表单data
       this.showFlowData();
+       </#if>
     },
     methods: {
       addBefore(){
@@ -497,6 +511,7 @@
 </#list>
         }
       },
+        <#if bpm_flag>
       //渲染流程表单数据
       showFlowData(){
         if(this.formBpm === true){
@@ -508,6 +523,7 @@
           })
         }
       },
+        </#if>
       validateError(msg){
         this.$message.error(msg)
       },
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index 980d814..1cfdcf7 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -24,7 +24,7 @@ import java.io.UnsupportedEncodingException;
  */
 @Data
 @TableName("${subTab.tableName}")
-@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}")
+@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}")
 public class ${subTab.entityName} implements Serializable {
     private static final long serialVersionUID = 1L;
 
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index 23169be..af1a16d 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -22,7 +22,7 @@ import java.io.UnsupportedEncodingException;
  * @Date:   ${.now?string["yyyy-MM-dd"]}
  * @Version: V1.0
  */
-@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}")
+@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}")
 @Data
 @TableName("${subTab.tableName}")
 public class ${subTab.entityName} implements Serializable {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
index 88b514e..f892a36 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
@@ -8,8 +8,12 @@
 <#assign form_popup = false>
 <#assign form_cat_tree = false>
 <#assign form_cat_back = "">
+<#assign bpm_flag=false>
 <#assign form_span = 24>
 <#list columns as po>
+<#if po.fieldDbName=='bpm_status'>
+  <#assign bpm_flag=true>
+</#if>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
 <#assign form_field_dictCode="">
   <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
@@ -125,7 +129,9 @@
   </#if>
 </#list>
       </a-tabs>
+       <#if bpm_flag>
        <a-row v-if="showFlowSubmitButton" style="text-align: center;width: 100%;margin-top: 16px;"><a-button @click="handleOk">提 交</a-button></a-row>
+       </#if>
     </a-spin>
 </template>
 
@@ -362,6 +368,7 @@
       }
     },
     props: {
+     <#if bpm_flag>
       //流程表单data
       formData: {
         type: Object,
@@ -374,6 +381,7 @@
         default: false,
         required: false
       },
+      </#if>
       //表单禁用
       disabled: {
         type: Boolean,
@@ -383,14 +391,17 @@
     },
     computed: {
       formDisabled(){
+       <#if bpm_flag>
         if(this.formBpm===true){
           if(this.formData.disabled===false){
             return false
           }
           return true
         }
+         </#if>
         return this.disabled
       },
+       <#if bpm_flag>
       showFlowSubmitButton(){
         if(this.formBpm===true){
           if(this.formData.disabled===false){
@@ -399,10 +410,13 @@
         }
         return false
       }
+       </#if>
     },
     created () {
+     <#if bpm_flag>
       //如果是流程中表单，则需要加载流程表单data
       this.showFlowData();
+       </#if>
     },
     methods: {
      addBefore(){
@@ -475,6 +489,7 @@
 </#list>
         }
       },
+        <#if bpm_flag>
       //渲染流程表单数据
      showFlowData(){
         if(this.formBpm === true){
@@ -486,6 +501,7 @@
             })
          }
       },
+       </#if>
       validateError(msg){
         this.$message.error(msg)
       },
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index ab311f5..114e402 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -21,7 +21,7 @@ import java.io.UnsupportedEncodingException;
  * @Date:   ${.now?string["yyyy-MM-dd"]}
  * @Version: V1.0
  */
-@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}")
+@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}")
 @Data
 @TableName("${subTab.tableName}")
 public class ${subTab.entityName} implements Serializable {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
index 5cb83bf..46b15fc 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
@@ -8,6 +8,7 @@
 <#assign form_popup = false>
 <#assign form_cat_tree = false>
 <#assign form_cat_back = "">
+<#assign bpm_flag=false>
 <#assign form_span = 24>
 <#if tableVo.fieldRowNum==2>
     <#assign form_span = 12>
@@ -17,6 +18,9 @@
     <#assign form_span = 6>
 </#if>
 <#list columns as po>
+<#if po.fieldDbName=='bpm_status'>
+  <#assign bpm_flag=true>
+</#if>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
@@ -134,7 +138,9 @@
   </#if>
 </#list>
     </a-tabs>
+    <#if bpm_flag>
     <a-row v-if="showFlowSubmitButton" style="text-align: center;width: 100%;margin-top: 16px;"><a-button @click="handleOk">提 交</a-button></a-row>
+    </#if>
   </a-spin>
 </template>
 
@@ -385,6 +391,7 @@
       }
     },
     props: {
+    <#if bpm_flag>
       //流程表单data
       formData: {
         type: Object,
@@ -397,6 +404,7 @@
         default: false,
         required: false
       },
+      </#if>
       //表单禁用
       disabled: {
         type: Boolean,
@@ -406,14 +414,17 @@
     },
     computed: {
       formDisabled(){
+         <#if bpm_flag>
         if(this.formBpm===true){
           if(this.formData.disabled===false){
             return false
           }
           return true
         }
+         </#if>
         return this.disabled
       },
+       <#if bpm_flag>
       showFlowSubmitButton(){
         if(this.formBpm===true){
           if(this.formData.disabled===false){
@@ -422,10 +433,13 @@
         }
         return false
       }
+      </#if>
     },
     created () {
+     <#if bpm_flag>
       //如果是流程中表单，则需要加载流程表单data
       this.showFlowData();
+     </#if>
     },
     methods: {
       addBefore(){
@@ -503,6 +517,7 @@
 </#list>
         }
       },
+      <#if bpm_flag>
       //渲染流程表单数据
       showFlowData(){
         if(this.formBpm === true){
@@ -514,6 +529,7 @@
           })
         }
       },
+      </#if>
       validateError(msg){
         this.$message.error(msg)
       },
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index 112fa9d..e568b12 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -21,7 +21,7 @@ import java.io.UnsupportedEncodingException;
  * @Date:   ${.now?string["yyyy-MM-dd"]}
  * @Version: V1.0
  */
-@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}")
+@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}")
 @Data
 @TableName("${subTab.tableName}")
 public class ${subTab.entityName} implements Serializable {
--
libgit2 0.22.2