修复部分bug

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/ModelStorage.java

@@ -102,39 +102,38 @@ public class ModelStorage {
         if(!templateData.containsKey(type))
         {
             CliData rt=new CliData();
-//            if(type.equals(TemplateFileType.api))
-//            {
-//
-//                getSystemModel().getApis().forEach(item->{
-//                    CliOption opt=newCliOption(TemplateFileType.api).baseData(item,item.getCodeName().toLowerCase());
-//                    rt.addOption(opt);
-//                });
-//
-//            }
-//            else if(type.equals(TemplateFileType.apiEntity))
-//            {
-//                getSystemModel().getApis().forEach(api->{
-//                    api.getApiEntities().forEach(item->{
-//                        CliOption opt=newCliOption(TemplateFileType.apiEntity).baseData(item,item.getCodeName().toString()).set("apis",api.getCodeName().toLowerCase());
-//                        rt.addOption(opt);
-//                    });
-//                });
-//            }
-//            else if (type.equals(TemplateFileType.apiDto)) {
-//                getSystemModel().getApis().forEach(api -> {
-//                    api.getApiEntities().forEach(item -> {
-//                        item.getDtos().forEach(dto -> {
-//                            CliOption opt = newCliOption(TemplateFileType.apiDto)
-//                                    .setCliSubType(dto.getType())
-//                                    .baseData(dto, dto.getCodeName())
-//                                    .set("apiDtos",dto.getCodeName()).set("apis",dto.getApi().getCodeName().toLowerCase());
-//                            rt.addOption(opt);
-//                        });
-//                    });
-//                });
-//            }
-//            else if(type.equals(TemplateFileType.app))
-            if(type.equals(TemplateFileType.app))
+            if(type.equals(TemplateFileType.api))
+            {
+
+                getSystemModel().getApis().forEach(item->{
+                    CliOption opt=newCliOption(TemplateFileType.api).baseData(item,item.getCodeName().toLowerCase());
+                    rt.addOption(opt);
+                });
+
+            }
+            else if(type.equals(TemplateFileType.apiEntity))
+            {
+                getSystemModel().getApis().forEach(api->{
+                    api.getApiEntities().forEach(item->{
+                        CliOption opt=newCliOption(TemplateFileType.apiEntity).baseData(item,item.getCodeName().toString()).set("apis",api.getCodeName().toLowerCase());
+                        rt.addOption(opt);
+                    });
+                });
+            }
+            else if (type.equals(TemplateFileType.apiDto)) {
+                getSystemModel().getApis().forEach(api -> {
+                    api.getApiEntities().forEach(item -> {
+                        item.getDtos().forEach(dto -> {
+                            CliOption opt = newCliOption(TemplateFileType.apiDto)
+                                    .setCliSubType(dto.getType())
+                                    .baseData(dto, dto.getCodeName())
+                                    .set("apiDtos",dto.getCodeName()).set("apis",dto.getApi().getCodeName().toLowerCase());
+                            rt.addOption(opt);
+                        });
+                    });
+                });
+            }
+            else if(type.equals(TemplateFileType.app))
             {
                 getSystemModel().getApps().forEach(item->{
                     CliOption opt=newCliOption(TemplateFileType.app).baseData(item,item.getCodeName().toLowerCase());

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/java/{{packageName}}/core/{{modules}}/domain/{{entities@SQL}}.java.hbs

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.DigestUtils;

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/java/{{packageName}}/core/{{modules}}/filter/{{entities@SQL}}SearchContext.java.hbs

@@ -7,7 +7,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
-
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -156,7 +157,7 @@ public class {{entity.codeName}}SearchContext extends QueryWrapperContext<{{enti
             this.getSearchCond().and( wrapper ->
                      wrapper.like("{{lowerCase field.name}}", query)
             {{else}}
-                        .or.like("{{lowerCase field.name}}", query)
+                        .or().like("{{lowerCase field.name}}", query)
             {{/if}}
             {{#if @last}}
             );

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/java/{{packageName}}/core/{{modules}}/service/I{{entities@SQL}}Service.java.hbs

@@ -75,8 +75,8 @@ public interface I{{entity.codeName}}Service extends IService<{{entity.codeName}
 
     {{/each}}
     {{#entity.dataSets}}
-    Page<{{#if enableGroup}}Map{{else}}{{entity.codeName}}{{/if}}> search{{codeName}}({{entity.codeName}}SearchContext context);
-    List<{{#if enableGroup}}Map{{else}}{{entity.codeName}}{{/if}}> list{{codeName}}({{entity.codeName}}SearchContext context);
+    Page<{{#if enableGroup}}Map{{else}}{{entity.codeName}}{{/if}}> search{{pascalCase codeName}}({{entity.codeName}}SearchContext context);
+    List<{{#if enableGroup}}Map{{else}}{{entity.codeName}}{{/if}}> list{{pascalCase codeName}}({{entity.codeName}}SearchContext context);
 
     {{/entity.dataSets}}
     {{#entity.references}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/java/{{packageName}}/core/{{modules}}/service/impl/{{entities@SQL}}ServiceImpl.java.hbs

@@ -269,7 +269,7 @@ public class {{entity.codeName}}ServiceImpl extends ServiceImpl<{{entity.codeNam
         {{camelCase entityCodeName}}Service.resetBy{{pascalCase fkField.codeName}}(key);
                     {{/eq}}
                     {{#eq removeActionType 3}}
-        if(!ObjectUtils.isEmpty({{camelCase entityCodeName}}Service.removeBy{{pascalCase fkField.codeName}}(key))
+        if(!ObjectUtils.isEmpty({{camelCase entityCodeName}}Service.removeBy{{pascalCase fkField.codeName}}(key)))
             throw new BadRequestAlertException("删除数据失败，当前数据存在关系实体[{{camelCase entityCodeName}}]数据，无法删除!","","");
                     {{/eq}}
                 {{/unless}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-provider/{{projectName}}-provider-{{apis}}/src/main/java/{{packageName}}/{{apis}}/rest/{{apiEntities}}Resource.java.hbs

@@ -57,12 +57,12 @@ public class {{apiEntity.codeName}}Resource {
 {{#each apiEntity.methods}}
     @ApiOperation(value = "{{apiEntity.entity.logicName}}", tags = {"{{apiEntity.entity.logicName}}" },  notes = "{{apiEntity.entity.logicName}}")
     @RequestMapping(method = RequestMethod.{{requestMethod}}, value = "{{requestPath}}")
-    public ResponseEntity {{camelCase name}}({{#each pathVariables}}{{#unless @first}}, {{/unless}}@PathVariable("{{camelCase name}}") {{type.java}} {{camelCase name}}{{/each}}{{#if body}}{{#if pathVariables}}, {{/if}}@Validated @RequestBody {{body}} {{camelCase body}}{{/if}}) {
+    public ResponseEntity {{camelCase name}}{{#each pathVariables}}{{#if @first}}By{{else}}And{{/if}}{{pascalCase name}}{{/each}}({{#each pathVariables}}{{#unless @first}}, {{/unless}}@PathVariable("{{camelCase name}}") {{type.java}} {{camelCase name}}{{/each}}{{#if body}}{{#if pathVariables}}, {{/if}}@Validated @RequestBody {{body}} {{camelCase body}}{{/if}}) {
     {{!行为}}
     {{#eq methodType "DEACTION"}}
     {{!行为参数准备}}
     {{#eq input.type "DTO"}}
-        {{apiEntity.entity.codeName}} {{camelCase apiEntity.entity.codeName}} = {{camelCase input.pSDEMethodDTO.name}}Mapping.toDomain({{camelCase body}});
+        {{apiEntity.entity.codeName}} {{camelCase apiEntity.entity.codeName}} = {{camelCase input.psDEMethodDTO.name}}Mapping.toDomain({{camelCase body}});
     {{#each pathVariables}}
         {{#if @last}}
         {{camelCase apiEntity.entity.codeName}}.set{{pascalCase name}}({{camelCase name}});
@@ -80,7 +80,7 @@ public class {{apiEntity.codeName}}Resource {
     {{/eq}}
     {{!返回处理}}
     {{#eq return.type "DTO"}}
-        return ResponseEntity.status(HttpStatus.OK).body({{camelCase return.pSDEMethodDTO.name}}Mapping.toDto({{camelCase apiEntity.entity.codeName}}));
+        return ResponseEntity.status(HttpStatus.OK).body({{camelCase return.psDEMethodDTO.name}}Mapping.toDto({{camelCase apiEntity.entity.codeName}}));
     {{/eq}}
     {{#eq return.type "SIMPLE"}}
         return ResponseEntity.status(HttpStatus.OK).body(0);
@@ -100,7 +100,7 @@ public class {{apiEntity.codeName}}Resource {
         {{/if}}
     {{/each}}
         Page<{{apiEntity.entity.codeName}}> domains = {{camelCase apiEntity.entity.codeName}}Service.search{{pSDEDataSet.codeName}}({{camelCase body}}) ;
-            List<{{return.pSDEMethodDTO.name}}> list = {{camelCase return.pSDEMethodDTO.name}}Mapping.toDto(domains.getContent());
+            List<{{return.psDEMethodDTO.name}}> list = {{camelCase return.psDEMethodDTO.name}}Mapping.toDto(domains.getContent());
             return ResponseEntity.status(HttpStatus.OK)
             .header("x-page", String.valueOf({{camelCase body}}.getPageable().getPageNumber()))
             .header("x-per-page", String.valueOf({{camelCase body}}.getPageable().getPageSize()))