🐛 生成字段丢失

generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java

@@ -52,17 +52,14 @@ public class VmsServiceImpl implements VmsService {
         String sql = dto.getSql();
 
         // 表格属性名 和 列信息
-        TableMetaData tableMetaData;
+        TableMetaData tableMetaData = StringUtils.hasText(dto.getSql())
-        List<ColumnMetaData> columnInfoList;
+                ? sqlParserDatabaseInfo.getTableMetadata(dto.getSql())
+                : databaseInfoCore.getTableMetadata(dto.getTableName());
+
+        List<ColumnMetaData> columnInfoList = StringUtils.hasText(sql)
+                ? sqlParserDatabaseInfo.tableColumnInfo(sql)
+                : databaseInfoCore.tableColumnInfo(tableName).stream().distinct().toList();
 
-        // 判断是否有 SQL 如果有SQL 优先解析并生成SQL相关内容
-        if (StringUtils.hasText(sql)) {
-            tableMetaData = sqlParserDatabaseInfo.getTableMetadata(sql);
-            columnInfoList = sqlParserDatabaseInfo.tableColumnInfo(sql);
-        } else {
-            tableMetaData = databaseInfoCore.getTableMetadata(tableName);
-            columnInfoList = databaseInfoCore.tableColumnInfo(tableName).stream().distinct().toList();
-        }
 
         return dto.getPath().stream().map(path -> {
             // 生成模板

generator-code-server/generator-code/src/main/resources/vms/server/controller/controller.java.vm

@@ -21,42 +21,42 @@ import java.util.List;
  * @author ${author}
  * @since ${date}
  */
-@Tag(name = "${comment}", description = "${comment}相关接口")
+@Tag(name = "${comment}" , description = "${comment}相关接口" )
 @RestController
-@RequestMapping("${requestMapping}/${classLowercaseName}")
+@RequestMapping("${requestMapping}/${classLowercaseName}" )
 public class ${classUppercaseName}Controller {
 
     @Resource
     private ${classUppercaseName}Service ${classLowercaseName}Service;
 
-    @Operation(summary = "分页查询${comment}", description = "分页${comment}", tags = "${classLowercaseName}::query")
+    @Operation(summary = "分页查询${comment}" , description = "分页${comment}" )
-    @GetMapping("{page}/{limit}")
+    @GetMapping("{page}/{limit}" )
     public Result<PageResult<${classUppercaseName}Vo>> get${classUppercaseName}Page(
-            @Parameter(name = "page", description = "当前页", required = true)
+            @Parameter(name = "page" , description = "当前页" , required = true)
-            @PathVariable("page") Integer page,
+            @PathVariable("page" ) Integer page,
-            @Parameter(name = "limit", description = "每页记录数", required = true)
+            @Parameter(name = "limit" , description = "每页记录数" , required = true)
-            @PathVariable("limit") Integer limit,
+            @PathVariable("limit" ) Integer limit,
             ${classUppercaseName}Dto dto) {
         Page<${classUppercaseName}> pageParams = new Page<>(page, limit);
         PageResult<${classUppercaseName}Vo> pageResult = ${classLowercaseName}Service.get${classUppercaseName}Page(pageParams, dto);
         return Result.success(pageResult);
     }
 
-    @Operation(summary = "添加${comment}", description = "添加${comment}", tags = "${classLowercaseName}::add")
+    @Operation(summary = "添加${comment}" , description = "添加${comment}" )
     @PostMapping()
-    public Result<String> add${classUppercaseName}(@Valid @RequestBody ${classUppercaseName}AddDto dto) {
+    public Result<String> add${classUppercaseName}(@Valid @RequestBody ${classUppercaseName}to dto) {
             ${classLowercaseName}Service.add${classUppercaseName}(dto);
         return Result.success(ResultCodeEnum.ADD_SUCCESS);
     }
 
-    @Operation(summary = "更新${comment}", description = "更新${comment}", tags = "${classLowercaseName}::update")
+    @Operation(summary = "更新${comment}" , description = "更新${comment}" )
     @PutMapping()
-    public Result<String> update${classUppercaseName}(@Valid @RequestBody ${classUppercaseName}UpdateDto dto) {
+    public Result<String> update${classUppercaseName}(@Valid @RequestBody ${classUppercaseName}Dto dto) {
             ${classLowercaseName}Service.update${classUppercaseName}(dto);
         return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
     }
 
-    @Operation(summary = "删除${comment}", description = "删除${comment}", tags = "${classLowercaseName}::delete")
+    @Operation(summary = "删除${comment}" , description = "删除${comment}" )
     @DeleteMapping()
     public Result<String> delete${classUppercaseName}(@RequestBody List<Long> ids) {
             ${classLowercaseName}Service.delete${classUppercaseName}(ids);

generator-code-server/generator-code/src/main/resources/vms/server/mapper/mapper.java.vm

@@ -27,10 +27,4 @@ public interface ${classUppercaseName}Mapper extends BaseMapper<${classUppercase
      */
     IPage<${classUppercaseName}Vo> selectListByPage(@Param("page" ) Page<${classUppercaseName}> pageParams, @Param("dto" ) ${classUppercaseName}Dto dto);
 
-    /**
-     * 物理删除${comment}
-     *
-     * @param ids 删除 id 列表
-     */
-    void deleteBatchIdsWithPhysics(List<Long> ids);
 }

generator-code-server/generator-code/src/main/resources/vms/server/mapper/resourceMapper.xml.vm

@@ -33,13 +33,4 @@
         </where>
     </select>
 
-    <!-- 物理删除${comment} -->
-    <delete id="deleteBatchIdsWithPhysics">
-        delete from ${tableName}
-        where id in
-        <foreach collection="ids" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-
 </mapper>

generator-code-server/generator-code/src/main/resources/vms/web/hook.tsx.vm

@@ -23,7 +23,7 @@ export function onAdd() {
         props: {
             formInline: {
                 #foreach($item in $columnInfoList)
-                        $!{item.fieldName}: undefined,
+                        $!{item.columnName}: undefined,
                 #end
             },
         },
@@ -53,7 +53,7 @@ export function onUpdate(row: any) {
         props: {
             formInline: {
                 #foreach($item in $columnInfoList)
-                        $!{item.fieldName}: row.$!{item.fieldName},
+                        $!{item.columnName}: row.$!{item.fieldName},
                 #end
             }
         },

generator-code-server/generator-code/src/main/resources/vms/web/store.ts.vm

@@ -16,7 +16,7 @@ export const use${classUppercaseName}Store = defineStore('${lowercaseName}Store'
             form: {
                 #foreach($item in $columnInfoList)
                     // $!{item.comment}
-                        $!{item.fieldName}: undefined,
+                        $!{item.columnName}: undefined,
                 #end
             },
             // 分页查询结果

generator-code-server/generator-code/src/main/resources/vms/web/types.ts.vm

@@ -3,9 +3,9 @@ export interface FormItemProps {
     #foreach($field in $columnInfoList)
         // $field.comment
         #if($field.javascriptType == "object")
-                $field.fieldName: any
+                $field.columnName: any
         #else
-                $field.fieldName:  $field.javascriptType
+                $field.columnName:  $field.javascriptType
         #end
     #end
 }