aipvo

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

@@ -16,68 +16,33 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
+			<version>2.11.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
+			<version>1.2.83</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
+			<version>1.18.16</version>
 		</dependency>
 		<dependency>
 			<groupId>io.swagger</groupId>
 			<artifactId>swagger-annotations</artifactId>
+			<version>1.5.22</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.validation</groupId>
 			<artifactId>jakarta.validation-api</artifactId>
+			<version>2.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
+			<version>2.11.3</version>
 		</dependency>
 	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>${basedir}/src/main/resources</directory>
-				<includes>
-					<include>**/**</include>
-				</includes>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>cn.ibizlab</groupId>
-				<artifactId>ibizlab-generator-plugin</artifactId>
-				<version>1.0-SNAPSHOT</version>
-				<configuration>
-					<output>
-						../
-					</output>
-					<inputSpec>
-					    ../../XFOnline_1_3/model
-					</inputSpec>
-					<templateDirs>
-						${basedir}/src/main/resources/templ
-					</templateDirs>
-					<packageName>
-						${project.groupId}
-					</packageName>
-					<name>
-						${parent.artifactId}
-					</name>
-				</configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>cn.ibizlab</groupId>
-                        <artifactId>ibizlab-template-apivo</artifactId>
-                        <version>1.0-SNAPSHOT</version>
-                    </dependency>
-                </dependencies>
-			</plugin>
-		</plugins>
-	</build>
 
 </project>

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

@@ -22,15 +22,13 @@ import lombok.*;
 import lombok.experimental.Accessors;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 import {{packageName}}.api.{{apps}}.dict.*;
 
 /**
  * {{ctrl.appEntity.entity.logicName}}AddDTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}
  */
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 @ApiModel(value = "{{ctrl.appEntity.entity.codeName}}-{{ctrl.codeName}}-Add", description = "{{ctrl.appEntity.entity.logicName}}AddDTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}")
 public class {{pascalCase ctrl.codeName}}AddDto extends {{pascalCase ctrl.codeName}}BaseDto {
 
@@ -44,12 +42,13 @@ public class {{pascalCase ctrl.codeName}}AddDto extends {{pascalCase ctrl.codeNa
     @JsonProperty("{{camelCase codeName}}")
             {{#timeType}}
     @JsonFormat(pattern = "{{format}}", locale = "zh", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "{{format}}")
             {{/timeType}}
     @JSONField(name = "{{jsonName}}"{{#timeType}} , format = "{{format}}"{{/timeType}})
             {{#eq javaType "Long"}}
     @JsonSerialize(using = ToStringSerializer.class)
             {{/eq}}
-    @ApiModelProperty(value = "{{logicName}}"{{#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}}"{{#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

@@ -22,14 +22,13 @@ import lombok.*;
 import lombok.experimental.Accessors;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 import {{packageName}}.api.{{apps}}.dict.*;
 
 /**
  * {{ctrl.appEntity.entity.logicName}}BaseDTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}
  */
-@Getter
-@Setter
-@NoArgsConstructor
+@Data
 @ApiModel(value = "{{ctrl.appEntity.entity.codeName}}-{{ctrl.codeName}}-Base", description = "{{ctrl.appEntity.entity.logicName}}BaseDTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}")
 public class {{pascalCase ctrl.codeName}}BaseDto implements Serializable {
 
@@ -43,12 +42,13 @@ public class {{pascalCase ctrl.codeName}}BaseDto implements Serializable {
     @JsonProperty("{{camelCase codeName}}")
             {{#timeType}}
     @JsonFormat(pattern = "{{format}}", locale = "zh", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "{{format}}")
             {{/timeType}}
     @JSONField(name = "{{jsonName}}"{{#timeType}} , format = "{{format}}"{{/timeType}})
             {{#eq javaType "Long"}}
     @JsonSerialize(using = ToStringSerializer.class)
             {{/eq}}
-    @ApiModelProperty(value = "{{logicName}}"{{#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}}"{{#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

@@ -22,15 +22,13 @@ import lombok.*;
 import lombok.experimental.Accessors;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 import {{packageName}}.api.{{apps}}.dict.*;
 
 /**
  * {{ctrl.appEntity.entity.logicName}}DTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}
  */
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 @ApiModel(value = "{{ctrl.appEntity.entity.codeName}}-{{ctrl.codeName}}", description = "{{ctrl.appEntity.entity.logicName}}DTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}")
 public class {{pascalCase ctrl.codeName}}Dto extends {{pascalCase ctrl.codeName}}BaseDto {
 
@@ -44,12 +42,13 @@ public class {{pascalCase ctrl.codeName}}Dto extends {{pascalCase ctrl.codeName}
     @JsonProperty("{{camelCase codeName}}")
             {{#timeType}}
     @JsonFormat(pattern = "{{format}}", locale = "zh", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "{{format}}")
             {{/timeType}}
     @JSONField(name = "{{jsonName}}"{{#timeType}} , format = "{{format}}"{{/timeType}})
             {{#eq javaType "Long"}}
     @JsonSerialize(using = ToStringSerializer.class)
             {{/eq}}
-    @ApiModelProperty(value = "{{logicName}}"{{#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}}"{{#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

@@ -22,15 +22,13 @@ import lombok.*;
 import lombok.experimental.Accessors;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 import {{packageName}}.api.{{apps}}.dict.*;
 
 /**
  * {{ctrl.appEntity.entity.logicName}}UpdateDTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}
  */
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
+@Data
 @ApiModel(value = "{{ctrl.appEntity.entity.codeName}}-{{ctrl.codeName}}-Update", description = "{{ctrl.appEntity.entity.logicName}}UpdateDTO对象[{{ctrl.codeName}}]{{replace ctrl.logicName "表单" ""}}")
 public class {{pascalCase ctrl.codeName}}UpdateDto extends {{pascalCase ctrl.codeName}}BaseDto {
 
@@ -44,12 +42,13 @@ public class {{pascalCase ctrl.codeName}}UpdateDto extends {{pascalCase ctrl.cod
     @JsonProperty("{{camelCase codeName}}")
             {{#timeType}}
     @JsonFormat(pattern = "{{format}}", locale = "zh", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "{{format}}")
             {{/timeType}}
     @JSONField(name = "{{jsonName}}"{{#timeType}} , format = "{{format}}"{{/timeType}})
             {{#eq javaType "Long"}}
     @JsonSerialize(using = ToStringSerializer.class)
             {{/eq}}
-    @ApiModelProperty(value = "{{logicName}}"{{#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}}"{{#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

@@ -35,7 +35,7 @@ import {{packageName}}.api.{{apps}}.dict.*;
 @Slf4j
 @Api(tags = {"{{appEntity.entity.logicName}}" })
 @RestController("{{lowerCase appEntity.app.codeName}}-{{lowerCase appEntity.entity.codeName}}")
-@RequestMapping("/{{lowerCase appEntity.app.codeName}}/{{pluralize codeName}}")
+@RequestMapping("/{{lowerCase appEntity.app.codeName}}/{{pluralize appEntity.entity.codeName}}")
 public class {{pascalCase appEntity.codeName}}Resource {