drew пре 6 година
родитељ
комит
b8c71d6b56

+ 4 - 10
src/main/resources/templates/ControllerTemplate.ftl

@@ -15,7 +15,7 @@ import ${model.basePackage}.utils.excel.ExcelUtils;
 <#if subPackage == true>
 
 </#if>
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -26,17 +26,12 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/${model.className?uncap_first}")
+@AllArgsConstructor
 public class ${model.className}Controller extends BaseController {
-    /*generatedStart*/
-    @Autowired
     private ${model.className}Service ${model.className?uncap_first}Service;
-
-    @Autowired
     private ${model.className}Repo ${model.className?uncap_first}Repo;
-    /*generatedEnd*/
 
-    /*generatedStart*/
-    @PreAuthorize("hasRole('ADMIN')")
+    //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public ${model.className} save(@RequestBody ${model.className} record) {
         if (record.getId() != null) {
@@ -48,7 +43,7 @@ public class ${model.className}Controller extends BaseController {
     }
 
 
-    @PreAuthorize("hasRole('ADMIN')")
+    //@PreAuthorize("hasRole('ADMIN')")
     @GetMapping("/all")
     public Page<${model.className}> all(PageQuery pageQuery) {
         return ${model.className?uncap_first}Repo.findAll(toSpecification(pageQuery,${model.className}.class), toPageRequest(pageQuery));
@@ -70,6 +65,5 @@ public class ${model.className}Controller extends BaseController {
         List<${model.className}> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
-    /*generatedEnd*/
 }
 

+ 9 - 13
src/main/resources/templates/ListViewTemplate.ftl

@@ -22,11 +22,6 @@
                              width="50">
             </el-table-column>
             <el-table-column prop="id" label="ID" width="100">
-                <template slot="header" slot-scope="{column}">
-                    <sortable-header :column="column" :current-sort="sort"
-                                     @changeSort="changeSort">
-                    </sortable-header>
-                </template>
             </el-table-column>
             <#list model.fields as field>
                 <#if field.showInList>
@@ -38,10 +33,12 @@
                         <#elseif field.formType == 'select' && field.apiFlag == '1'>
                             :formatter="${field.modelName}Formatter"
                         </#if>>
-                        <template slot="header" slot-scope="{column}">
-                            <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort">
-                            </sortable-header>
-                        </template>
+                        <#if field.sortable>
+                            <template slot="header" slot-scope="{column}">
+                                <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort">
+                                </sortable-header>
+                            </template>
+                        </#if>
                         <#if field.formType == 'singleImage'>
                             <template slot-scope="{row}">
                                 <el-image style="width: 30px; height: 30px"
@@ -78,15 +75,14 @@
             </el-table-column>
         </el-table>
         <div class="pagination-wrapper">
-            <div class="multiple-mode-wrapper">
-                <el-button v-if="!multipleMode"
-                           @click="toggleMultipleMode(true)">批量编辑</el-button>
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
                 <el-button-group v-else>
                     <el-button @click="operation1">批量操作1</el-button>
                     <el-button @click="operation2">批量操作2</el-button>
                     <el-button @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
-            </div>
+            </div> -->
             <el-pagination background @size-change="onSizeChange"
                            @current-change="onCurrentChange" :current-page="page"
                            :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"

+ 2 - 2
src/main/resources/templates/ServiceTemplate.ftl

@@ -2,13 +2,13 @@ package ${model.basePackage}.service<#if model.genPackage??>.${model.genPackage}
 
 import ${model.basePackage}.domain.<#if model.genPackage??>${model.genPackage}.</#if>${model.className};
 import ${model.basePackage}.repo.<#if model.genPackage??>${model.genPackage}.</#if>${model.className}Repo;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 @Service
+@AllArgsConstructor
 public class ${model.className}Service {
 
-    @Autowired
     private ${model.className}Repo ${model.className?uncap_first}Repo;
 
 }