sys.name 替换为 pub.name 代替deployId

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

@@ -151,7 +151,7 @@ public class AppModel extends BaseModel{
 
     private Map<String,Catalog> dictMaps;
     public Map<String,Catalog> getDictMaps() {
-        return getDictMaps("");
+        return getDictMaps(system.getModelFolderPath());
     }
     public Collection<Catalog> getDicts() {
         return getDictMaps().values();
@@ -186,6 +186,8 @@ public class AppModel extends BaseModel{
             if(this.getApplication().getAllPSAppCodeLists()!=null)
             {
                 this.getApplication().getAllPSAppCodeLists().forEach(codeList->{
+                    if(codeList.getCodeName().equals("CL_TYYW_36"))
+                        System.out.println(1);
                     Catalog catalog=catalogs.get(codeList.getCodeName());
                     if(catalog!=null)
                     {

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

@@ -60,6 +60,15 @@ public class Catalog extends BaseModel
 		}
 		return sets;
 	}
+	@JsonIgnore
+	@JSONField(serialize = false)
+	public Collection getOptionItems()
+	{
+		if (getSets().size()>100)
+			return options;
+		else
+			return sets.values();
+	}
 
 	private void loop(Option opt) {
 		sets.put(opt.getValue().toString(),opt);

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

@@ -317,6 +317,7 @@ public class CtrlModel extends BaseModel{
                 editForm.getPSDEFormPages().forEach(page->{
                     loopItem(page.getPSDEFormDetails()).forEach(item->{
                         VoFieldModel field=new VoFieldModel(this,item);
+                        field.setPosition(voItems.size()+1);
                         voItems.add(field);
                     });
                 });

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

@@ -59,6 +59,7 @@ public class ModelStorage {
             try {
                 IPSSystem iPSSystem = psModelService.getPSSystem();
                 systemModel = new SystemModel(iPSSystem);
+                systemModel.setModelFolderPath(strPSModelFolderPath);
                 Assert.notNull(iPSSystem, "加载系统模型错误:" + strPSModelFolderPath);
                 if (!StringUtils.isEmpty(config.getAdditionalProperties().get(CodegenConstants.PROJECT_NAME)))
                     systemModel.setProjectName(config.getAdditionalProperties().get(CodegenConstants.PROJECT_NAME).toString());

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

 package cn.ibizlab.codegen.model;
 
 import cn.ibizlab.codegen.templating.TemplateFileType;
+import cn.ibizlab.codegen.utils.StringAdvUtils;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -47,7 +48,7 @@ public class SystemModel extends BaseModel {
             this.setCodeName(this.pub.getCodeName());
             this.setName(system.getName());
             this.setProjectName(this.pub.getCodeName().toLowerCase());
-            this.setProjectDesc(this.pub.getName());
+            this.setProjectDesc(StringAdvUtils.pascalcase(this.pub.getCodeName().toLowerCase()));
             this.setPackageName(this.pub.getPKGCodeName());
         } else {
             this.setCodeName(system.getCodeName());
@@ -70,6 +71,8 @@ public class SystemModel extends BaseModel {
 
     private String packageName;
 
+    private String modelFolderPath;
+
     private boolean enableDS = false;
     private boolean enableES = false;
     private boolean enableMongo = false;
@@ -212,6 +215,18 @@ public class SystemModel extends BaseModel {
         return apisMap;
     }
 
+    private String apiProfileId;
+    public String getApiProfileId()
+    {
+        if(apiProfileId==null)
+        {
+            if(!ObjectUtils.isEmpty(getApisMap())){
+                apiProfileId=apisMap.values().iterator().next().getCodeName();
+            }
+        }
+        return apiProfileId;
+    }
+
     public Collection<ApiModel> getApis() {
         return getApisMap().values();
     }

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

@@ -35,6 +35,7 @@ public class VoFieldModel extends BaseModel {
     }
 
 
+    private int position;
 
     public IPSDEFormItem getPSDEFormItem() {
         return (IPSDEFormItem) opt;
@@ -109,6 +110,8 @@ public class VoFieldModel extends BaseModel {
                 IPSCodeListEditor codeListEditor=(IPSCodeListEditor)getPSDEFormItem().getPSEditor();
                 if(codeListEditor.getPSAppCodeList()!=null) {
                     dictCodeName = codeListEditor.getPSAppCodeList().getCodeName();
+                    if(dictCodeName.equals("CL_TYYW_36"))
+                        System.out.println(1);
                     dict=this.getVoModel().getApp().getDictMaps().get(dictCodeName);
                     if(dict==null)
                     {

modules/ibizlab-template/ibizlab-template-doc/{{dicts}}Dict.java.hbs → modules/ibizlab-template/ibizlab-template-apivo/src/main/resources/templ/{{projectName}}-api/src/main/java/{{packageName}}/api/{{apps}}/dict/{{dicts}}Dict.java.hbs

@@ -6,14 +6,16 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
+import cn.ibizlab.util.annotation.SwaggerDisplayEnum;
 
 /**
  * 字典：{{dict.name}}
  */
-@ApiModel(value = "{{dict.codeName}}", description = "字典：{{dict.name}}")
+@SwaggerDisplayEnum
+@ApiModel(value = "字典：{{dict.name}}", description = "{{dict.codeName}}")
 public enum {{pascalCase dict.codeName}}Dict {
 
-    {{#each dict.sets}}
+    {{#each dict.optionItems}}
         {{#eq dict.valueType "String"}}
     {{name}} ("{{value}}","{{label}}",{{#if parent}}"{{parent}}"{{else}}null{{/if}}){{#if @last}};{{else}},{{/if}}
         {{/eq}}

modules/ibizlab-template/ibizlab-template-apivo/src/main/resources/templ/{{projectName}}-api/src/main/java/{{packageName}}/api/{{apps}}/dto/{{pascalCase appEntities}}/{{pascalCase ctrls@FORM}}AddDto.java.hbs

@@ -29,7 +29,7 @@ import {{packageName}}.api.{{apps}}.dict.*;
  * {{ctrl.appEntity.entity.logicName}}AddDTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}
  */
 @Data
-@ApiModel(value = "{{ctrl.appEntity.entity.codeName}}-{{ctrl.codeName}}-Add", description = "{{ctrl.appEntity.entity.logicName}}AddDTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}")
+@ApiModel(value = "{{ctrl.appEntity.entity.logicName}}AddDTO对象-{{pascalCase ctrl.codeName}}AddDto]-{{replace ctrl.logicName "表单" ""}}", description = "{{ctrl.appEntity.entity.codeName}}-{{ctrl.codeName}}-Add")
 public class {{pascalCase ctrl.codeName}}AddDto extends {{pascalCase ctrl.codeName}}BaseDto {
 
 	private static final long serialVersionUID = 1L;
@@ -48,7 +48,7 @@ public class {{pascalCase ctrl.codeName}}AddDto extends {{pascalCase ctrl.codeNa
             {{#eq javaType "Long"}}
     @JsonSerialize(using = ToStringSerializer.class)
             {{/eq}}
-    @ApiModelProperty(value = "{{logicName}}{{#if dict}}，字典：{{dict.name}}{{/if}}{{#if timeType}}，格式：{{format}}{{/if}}"{{#if timeType}}, notes = "格式：{{format}}"{{/if}}{{#if dict}}, notes = "字典：{{dict.name}}", dataType = "{{lowerCase type.java}}", reference = "{{dictCodeName}}"{{/if}}{{#if required}}, required = true{{/if}}{{#if hidden}}, hidden = true{{/if}}{{#if example}}, example = "{{example}}"{{/if}})
+    @ApiModelProperty(value = "{{logicName}}{{#if dict}}，【字典：{{dict.name}}】{{/if}}{{#if timeType}}，格式：{{format}}{{/if}}", position = {{position}}{{#if timeType}}, notes = "格式：{{format}}"{{/if}}{{#if dict}}, notes = "字典：{{dict.name}}", dataType = "{{lowerCase type.java}}", reference = "{{dictCodeName}}"{{/if}}{{#if required}}, required = true{{/if}}{{#if hidden}}, hidden = true{{/if}}{{#if example}}, example = "{{example}}"{{/if}})
     protected {{javaType}} {{camelCase codeName}} {{#if createDefaultValue}}= {{createDefaultValue}}{{/if}};
 
     {{/if}}

modules/ibizlab-template/ibizlab-template-apivo/src/main/resources/templ/{{projectName}}-api/src/main/java/{{packageName}}/api/{{apps}}/dto/{{pascalCase appEntities}}/{{pascalCase ctrls@FORM}}BaseDto.java.hbs

@@ -29,7 +29,7 @@ import {{packageName}}.api.{{apps}}.dict.*;
  * {{ctrl.appEntity.entity.logicName}}BaseDTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}
  */
 @Data
-@ApiModel(value = "{{ctrl.appEntity.entity.codeName}}-{{ctrl.codeName}}-Base", description = "{{ctrl.appEntity.entity.logicName}}BaseDTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}")
+@ApiModel(value = "{{ctrl.appEntity.entity.logicName}}BaseDTO对象-{{pascalCase ctrl.codeName}}BaseDto-{{replace ctrl.logicName "表单" ""}}", description = "{{ctrl.appEntity.entity.codeName}}-{{ctrl.codeName}}-Base")
 public class {{pascalCase ctrl.codeName}}BaseDto implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -48,7 +48,7 @@ public class {{pascalCase ctrl.codeName}}BaseDto implements Serializable {
             {{#eq javaType "Long"}}
     @JsonSerialize(using = ToStringSerializer.class)
             {{/eq}}
-    @ApiModelProperty(value = "{{logicName}}{{#if dict}}，字典：{{dict.name}}{{/if}}{{#if timeType}}，格式：{{format}}{{/if}}"{{#if timeType}}, notes = "格式：{{format}}"{{/if}}{{#if dict}}, notes = "字典：{{dict.name}}", dataType = "{{lowerCase type.java}}", reference = "{{dictCodeName}}"{{/if}}{{#if required}}, required = true{{/if}}{{#if hidden}}, hidden = true{{/if}}{{#if example}}, example = "{{example}}"{{/if}})
+    @ApiModelProperty(value = "{{logicName}}{{#if dict}}，【字典：{{dict.name}}】{{/if}}{{#if timeType}}，格式：{{format}}{{/if}}", position = {{position}}{{#if timeType}}, notes = "格式：{{format}}"{{/if}}{{#if dict}}, notes = "字典：{{dict.name}}", dataType = "{{lowerCase type.java}}", reference = "{{dictCodeName}}"{{/if}}{{#if required}}, required = true{{/if}}{{#if hidden}}, hidden = true{{/if}}{{#if example}}, example = "{{example}}"{{/if}})
     protected {{javaType}} {{camelCase codeName}};
 
     {{/unless}}

modules/ibizlab-template/ibizlab-template-apivo/src/main/resources/templ/{{projectName}}-api/src/main/java/{{packageName}}/api/{{apps}}/dto/{{pascalCase appEntities}}/{{pascalCase ctrls@FORM}}Dto.java.hbs

@@ -29,7 +29,7 @@ import {{packageName}}.api.{{apps}}.dict.*;
  * {{ctrl.appEntity.entity.logicName}}DTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}
  */
 @Data
-@ApiModel(value = "{{ctrl.appEntity.entity.codeName}}-{{ctrl.codeName}}", description = "{{ctrl.appEntity.entity.logicName}}DTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}")
+@ApiModel(value = "{{ctrl.appEntity.entity.logicName}}DTO对象-{{pascalCase ctrl.codeName}}Dto-{{replace ctrl.logicName "表单" ""}}", description = "{{ctrl.appEntity.entity.codeName}}-{{ctrl.codeName}}")
 public class {{pascalCase ctrl.codeName}}Dto extends {{pascalCase ctrl.codeName}}BaseDto {
 
 	private static final long serialVersionUID = 1L;
@@ -48,7 +48,7 @@ public class {{pascalCase ctrl.codeName}}Dto extends {{pascalCase ctrl.codeName}
             {{#eq javaType "Long"}}
     @JsonSerialize(using = ToStringSerializer.class)
             {{/eq}}
-    @ApiModelProperty(value = "{{logicName}}{{#if dict}}，字典：{{dict.name}}{{/if}}{{#if timeType}}，格式：{{format}}{{/if}}"{{#if timeType}}, notes = "格式：{{format}}"{{/if}}{{#if dict}}, notes = "字典：{{dict.name}}", dataType = "{{lowerCase type.java}}", reference = "{{dictCodeName}}"{{/if}}{{#if required}}, required = true{{/if}}{{#if hidden}}, hidden = true{{/if}}{{#if example}}, example = "{{example}}"{{/if}})
+    @ApiModelProperty(value = "{{logicName}}{{#if dict}}，【字典：{{dict.name}}】{{/if}}{{#if timeType}}，格式：{{format}}{{/if}}", position = {{position}}{{#if timeType}}, notes = "格式：{{format}}"{{/if}}{{#if dict}}, notes = "字典：{{dict.name}}", dataType = "{{lowerCase type.java}}", reference = "{{dictCodeName}}"{{/if}}{{#if required}}, required = true{{/if}}{{#if hidden}}, hidden = true{{/if}}{{#if example}}, example = "{{example}}"{{/if}})
     protected {{javaType}} {{camelCase codeName}};
 
     {{/if}}

modules/ibizlab-template/ibizlab-template-apivo/src/main/resources/templ/{{projectName}}-api/src/main/java/{{packageName}}/api/{{apps}}/dto/{{pascalCase appEntities}}/{{pascalCase ctrls@FORM}}UpdateDto.java.hbs

@@ -29,7 +29,7 @@ import {{packageName}}.api.{{apps}}.dict.*;
  * {{ctrl.appEntity.entity.logicName}}UpdateDTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}
  */
 @Data
-@ApiModel(value = "{{ctrl.appEntity.entity.codeName}}-{{ctrl.codeName}}-Update", description = "{{ctrl.appEntity.entity.logicName}}UpdateDTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}")
+@ApiModel(value = "{{ctrl.appEntity.entity.logicName}}-{{pascalCase ctrl.codeName}}UpdateDto-{{replace ctrl.logicName "表单" ""}}", description = "{{ctrl.appEntity.entity.codeName}}-{{ctrl.codeName}}-Update")
 public class {{pascalCase ctrl.codeName}}UpdateDto extends {{pascalCase ctrl.codeName}}BaseDto {
 
 	private static final long serialVersionUID = 1L;
@@ -48,7 +48,7 @@ public class {{pascalCase ctrl.codeName}}UpdateDto extends {{pascalCase ctrl.cod
             {{#eq javaType "Long"}}
     @JsonSerialize(using = ToStringSerializer.class)
             {{/eq}}
-    @ApiModelProperty(value = "{{logicName}}{{#if dict}}，字典：{{dict.name}}{{/if}}{{#if timeType}}，格式：{{format}}{{/if}}"{{#if timeType}}, notes = "格式：{{format}}"{{/if}}{{#if dict}}, notes = "字典：{{dict.name}}", dataType = "{{lowerCase type.java}}", reference = "{{dictCodeName}}"{{/if}}{{#if required}}, required = true{{/if}}{{#if hidden}}, hidden = true{{/if}}{{#if example}}, example = "{{example}}"{{/if}})
+    @ApiModelProperty(value = "{{logicName}}{{#if dict}}，【字典：{{dict.name}}】{{/if}}{{#if timeType}}，格式：{{format}}{{/if}}", position = {{position}}{{#if timeType}}, notes = "格式：{{format}}"{{/if}}{{#if dict}}, notes = "字典：{{dict.name}}", dataType = "{{lowerCase type.java}}", reference = "{{dictCodeName}}"{{/if}}{{#if required}}, required = true{{/if}}{{#if hidden}}, hidden = true{{/if}}{{#if example}}, example = "{{example}}"{{/if}})
     protected {{javaType}} {{camelCase codeName}} {{#if updateDefaultValue}}= {{updateDefaultValue}}{{/if}};
 
     {{/if}}

modules/ibizlab-template/ibizlab-template-apivo/src/main/resources/templ/{{projectName}}-rest/src/main/java/{{packageName}}/api/{{apps}}/rest/{{pascalCase appEntities}}Resource.java.hbs

@@ -48,7 +48,7 @@ public class {{pascalCase appEntity.codeName}}Resource {
 
     @ApiOperation(value = "更新[{{codeName}}]{{replace logicName "表单" ""}}", tags = {"{{appEntity.entity.logicName}}" },  notes = "更新[{{codeName}}]{{replace logicName "表单" ""}}")
     @RequestMapping(method = RequestMethod.PUT, value = "/{{lowerCase codeName}}/{id}")
-    public ResponseEntity<{{pascalCase codeName}}Dto> update{{pascalCase codeName}}(@ApiParam("{{appEntity.entity.keyField.logicName}}") @PathVariable("{id}") {{appEntity.entity.keyField.type.java}} {{camelCase appEntity.entity.keyField.codeName}},@Validated @RequestBody {{pascalCase codeName}}UpdateDto dto) {
+    public ResponseEntity<{{pascalCase codeName}}Dto> update{{pascalCase codeName}}(@ApiParam("{{appEntity.entity.keyField.logicName}}") @PathVariable("id") {{appEntity.entity.keyField.type.java}} {{camelCase appEntity.entity.keyField.codeName}},@Validated @RequestBody {{pascalCase codeName}}UpdateDto dto) {
         return null;
     }
     {{/each}}

modules/ibizlab-template/ibizlab-template-ibizboot/src/main/resources/templ/pom.xml.hbs

@@ -7,7 +7,7 @@
     <groupId>{{packageName}}</groupId>
     <version>{{system.pub.versionString}}</version>
     <name>{{projectDesc}}</name>
-    <description></description>
+    <description>{{#if system.pub.memo}}{{system.pub.memo}}{{else}}{{system.pub.name}}{{/if}}</description>
     <packaging>pom</packaging>
 
     <parent>

modules/ibizlab-template/ibizlab-template-ibizboot/src/main/resources/templ/{{projectName}}-core/pom.xml.hbs

@@ -10,8 +10,8 @@
     </parent>
 
     <artifactId>{{projectName}}-core</artifactId>
-    <name>{{projectDesc}} Generator Code [{{projectName}}-core]</name>
-    <description>{{projectDesc}} 模板生成代码，再次发布会覆盖，建议不要直接修改，修改请在{{projectName}}-boot项目中重写</description>
+    <name>{{projectDesc}} Code</name>
+    <description>{{projectDesc}} Core，模板生成代码，再次发布会覆盖，建议不要直接修改，修改请在{{projectName}}-provider项目中重写</description>
 
     <dependencies>
         <dependency>

modules/ibizlab-template/ibizlab-template-ibizboot/src/main/resources/templ/{{projectName}}-core/src/main/java/{{packageName}}/runtime/SystemRuntimeBase.java.hbs

@@ -14,7 +14,7 @@ public class SystemRuntimeBase extends BootSystemRuntime implements ISystemRunti
 
     @Override
     public String getName() {
-        return "{{system.name}}";
+        return "{{system.pub.name}}";
     }
 
     @Override

modules/ibizlab-template/ibizlab-template-ibizboot/src/main/resources/templ/{{projectName}}-provider/pom.xml.hbs

@@ -9,9 +9,9 @@
         <version>{{system.pub.versionString}}</version>
     </parent>
 
+    <groupId>{{packageName}}</groupId>
     <artifactId>{{projectName}}-provider</artifactId>
-    <name>{{projectDesc}} Boot [{{projectName}}-provider]</name>
-    <description>{{projectDesc}} Boot</description>
+    <version>{{system.pub.versionString}}</version>
 
     <dependencies>
 		<dependency>
@@ -61,7 +61,7 @@
 		</profile>
 
         <profile>
-            <id>runtime</id>
+            <id>{{lowerCase system.apiProfileId}}</id>
             <build>
                 <resources>
                     <resource>

modules/ibizlab-template/ibizlab-template-ibizboot/src/main/resources/templ/{{projectName}}-provider/src/main/resources/application-boot.yml.hbs

@@ -36,12 +36,12 @@ ibiz:
             serviceurl: ${zookeeper.address:127.0.0.1:2181}
           cache:
             serviceurl: ${spring.redis.host:127.0.0.1}:${spring.redis.port:6379}
-    {{lowerCase system.name}}:
+    {{lowerCase system.pub.name}}:
       runtimeClassName: {{packageName}}.runtime.SystemRuntime
       settings:
         sysdbscheme:
           default:
-            datasource: {{lowerCase system.name}}__default
+            datasource: {{lowerCase system.pub.name}}__default
             dbtype: ${spring.datasource.dbtype:MYSQL}
         {{#if system.subServiceApiModules}}
         subsysserviceapi:
@@ -54,7 +54,7 @@ ibiz:
         {{/each}}
         {{/if}}
   servicehub:
-    id: {{lowerCase system.name}}
+    id: {{lowerCase system.pub.name}}
     register-naming-service: true
     publish-config: true
     enableAppGateway: true
@@ -64,7 +64,7 @@ ibiz:
     fileFolder: ${ibiz.filePath:/app/file/}
     loadDeploySystems:
       - gateway
-      - {{lowerCase system.name}}
+      - {{lowerCase system.pub.name}}
     systemSettings:
       cloudclientutil:
         serviceurl: lb://ebsx-oldapi