代码生成没有设置主键出现的bug修复、ftl模板更新

lms/nladmin-system/src/main/java/org/nl/sso/generator/utils/GenUtil.java

@@ -277,6 +277,12 @@ public class GenUtil {
         genMap.put("hasQuery", false);
         // 自增主键
         genMap.put("auto", false);
+        // 存储主键类型(未标明主键)
+        genMap.put("pkColumnType", "Long");
+        // 存储小写开头的字段名(未标明主键)
+        genMap.put("pkChangeColName", "id");
+        // 存储大写开头的字段名(未标明主键)
+        genMap.put("pkCapitalColName", "Id");
         // 存在字典
         genMap.put("hasDict", false);
         // 存在日期注解

lms/nladmin-system/src/main/resources/template/generator/admin/Controller.ftl

@@ -1,7 +1,8 @@
 
 package ${package}.rest;
 
-
+import ${package}.service.${className}Service;
+import ${package}.service.dto.${className}Dto;
 import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
 import org.nl.modules.logging.annotation.Log;
@@ -57,7 +58,7 @@ public class ${className}Controller {
     @ApiOperation("删除${apiAlias}")
     //@SaCheckPermission("@el.check('${changeClassName}:del')")
     @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody ${pkColumnType}[] ids) {
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
         ${changeClassName}Service.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }

lms/nladmin-system/src/main/resources/template/generator/admin/Dto.ftl

@@ -4,6 +4,9 @@ import lombok.Data;
 <#if hasTimestamp>
 import java.sql.Timestamp;
 </#if>
+<#if hasDate>
+import java.util.Date;
+</#if>
 <#if hasBigDecimal>
 import java.math.BigDecimal;
 </#if>

lms/nladmin-system/src/main/resources/template/generator/admin/Entity.ftl

@@ -13,8 +13,8 @@ import javax.persistence.*;
     import javax.persistence.Table;
     import org.hibernate.annotations.*;
 </#if>
-<#if hasTimestamp>
+<#if hasDate>
-    import java.sql.Timestamp;
+    import java.util.Date;
 </#if>
 <#if hasBigDecimal>
     import java.math.BigDecimal;
@@ -48,10 +48,10 @@ public class ${className} implements Serializable {
         </#if>
         </#if>
         <#if (column.dateAnnotation)?? && column.dateAnnotation != ''>
-            <#if column.dateAnnotation = 'CreationTimestamp'>
+            <#if column.dateAnnotation = 'CreationDate'>
-            @CreationTimestamp
+
             <#else>
-            @UpdateTimestamp
+            @UpdateDate
             </#if>
         </#if>
         <#if column.remark != ''>

lms/nladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl

@@ -2,8 +2,8 @@
 package ${package}.service.dto;
 
 import lombok.Data;
-<#if queryHasTimestamp>
+<#if queryHasDate>
-import java.sql.Timestamp;
+import java.util.Date;
 </#if>
 <#if queryHasBigDecimal>
 import java.math.BigDecimal;

lms/nladmin-system/src/main/resources/template/generator/admin/Service.ftl

@@ -1,6 +1,6 @@
-
 package ${package}.service;
 
+import ${package}.service.dto.${className}Dto;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
 import java.util.List;

lms/nladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl

@@ -1,9 +1,12 @@
 
 package ${package}.service.impl;
 
-
+import ${package}.service.${className}Service;
+import ${package}.service.dto.${className}Dto;
+import com.alibaba.fastjson.JSON;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.nl.modules.common.exception.BadRequestException;
 import org.springframework.transaction.annotation.Transactional;
 
 import org.springframework.data.domain.Pageable;
@@ -14,7 +17,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.sso.tools.SecurityUtils;
+import org.nl.modules.common.utils.SecurityUtils;
 import org.nl.modules.wql.core.bean.ResultBean;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;

lms/nladmin-system/src/main/resources/template/generator/front/index.ftl

@@ -85,7 +85,7 @@
             {{ dict.label.${column.dictName}[scope.row.${column.changeColumnName}] }}
           </template>
         </el-table-column>
-          <#elseif column.columnType != 'Timestamp'>
+          <#elseif column.columnType != 'Date'>
         <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :min-width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')"/>
                 <#else>
         <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :min-width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')">
@@ -113,6 +113,7 @@
 </template>
 
 <script>
+import crud${className} from './${changeClassName}'
 import CRUD, {crud, form, header, presenter} from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'