修改代码生成器模板.

orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/entity/PageRequest.java

@@ -15,7 +15,6 @@ import org.hibernate.validator.constraints.Range;
 @Data
 public class PageRequest implements IPageRequest {
 
-    // TODO TEST
     @Range(min = 1, max = 10000)
     @Schema(description = "页码")
     private int page;

orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/config/OrionMybatisAutoConfiguration.java

@@ -15,7 +15,6 @@ import org.springframework.context.annotation.Bean;
 
 /**
  * mybatis 配置类
- * TODO 扫描的包
  *
  * @author Jiahang Li
  * @version 1.0.0

orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/handler/FieldFillHandler.java

@@ -21,6 +21,8 @@ public class FieldFillHandler implements MetaObjectHandler {
     @Resource
     private SecurityHolder securityHolder;
 
+    // TODO 删除fill baseConst
+
     @Override
     public void insertFill(MetaObject metaObject) {
         if (Objects.nonNull(metaObject) && metaObject.getOriginalObject() instanceof BaseDO) {
@@ -36,7 +38,6 @@ public class FieldFillHandler implements MetaObjectHandler {
                 baseDO.setUpdateTime(now);
             }
 
-            // TODO TEST
             Long userId = securityHolder.getLoginUserId();
             // 创建人
             if (Objects.nonNull(userId) && Objects.isNull(baseDO.getCreator())) {
@@ -60,7 +61,6 @@ public class FieldFillHandler implements MetaObjectHandler {
 
             // 更新人
             Object updater = getFieldValByName("updater", metaObject);
-            // TODO TEST
             Long userId = securityHolder.getLoginUserId();
             if (Objects.nonNull(userId) && Objects.isNull(updater)) {
                 setFieldValByName("updater", userId.toString(), metaObject);

orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/query/ValidateLambdaWrapper.java

@@ -7,8 +7,6 @@ import com.orion.lang.utils.Strings;
 import java.util.Collection;
 
 /**
- * TODO TEST
- * <p>
  * 有效性验证 wrapper
  *
  * @author Jiahang Li
@@ -38,23 +36,23 @@ public class ValidateLambdaWrapper<T> extends LambdaQueryWrapper<T> {
         for (Object object : objects) {
             // 非 null 检测
             if (object == null) {
-                return false;
+                return true;
             }
             // 字符串 非空校验
             if (object instanceof String) {
                 if (Strings.isBlank((String) object)) {
-                    return false;
+                    return true;
                 }
             }
             // 集合 非空校验
             if (object instanceof Collection<?>) {
                 if (((Collection<?>) object).isEmpty()) {
-                    return false;
-                }
-            }
-        }
                     return true;
                 }
+            }
+        }
+        return false;
+    }
 
     @Override
     public LambdaQueryWrapper<T> eq(SFunction<T, ?> column, Object val) {

orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-controller.java.vm

@@ -46,14 +46,14 @@ private ${type}Service ${typeLower}Service;
     @PostMapping("/create")
     @Operation(summary = "创建$!{table.comment}")
     @PreAuthorize("@ss.hasPermission('${package.ModuleName}:${typeHyphen}:create')")
-public Long create${type}(@Validated ${type}CreateRequest request){
+    public Long create${type}(@Validated @RequestBody ${type}CreateRequest request) {
         return ${typeLower}Service.create${type}(request);
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新$!{table.comment}")
     @PreAuthorize("@ss.hasPermission('${package.ModuleName}:${typeHyphen}:update')")
-public Integer update${type}(@Validated ${type}UpdateRequest request){
+    public Integer update${type}(@Validated @RequestBody ${type}UpdateRequest request) {
         return ${typeLower}Service.update${type}(request);
     }
 

orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-entity-dto.java.vm

@@ -1,9 +1,7 @@
 package ${currentPackage};
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.io.Serializable;
-
 import lombok.*;
 
 import java.util.*;

orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-entity-request-create.java.vm

@@ -1,9 +1,7 @@
 package ${currentPackage};
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.io.Serializable;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-entity-request-update.java.vm

@@ -1,9 +1,7 @@
 package ${currentPackage};
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.io.Serializable;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-entity-vo.java.vm

@@ -1,9 +1,7 @@
 package ${currentPackage};
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.io.Serializable;
-
 import lombok.*;
 
 import java.util.*;

orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-service-impl.java.vm

@@ -42,9 +42,7 @@ public Long create${type}(${type}CreateRequest request){
         ${type}DO record = ${type}Convert.MAPPER.to(request);
         record.setId(null);
         // 查询是否存在
-        if(this.check${type}Present(record)){
+        this.checkTestTablePresent(record);
-        throw ErrorCode.DATA_PRESENT.exception();
-        }
         // 插入
         int effect = ${typeLower}DAO.insert(record);
         log.info("${type}Service-add${type} effect: {}, domain: {}", effect, JSON.toJSONString(record));
@@ -55,11 +53,9 @@ public Long create${type}(${type}CreateRequest request){
     public Integer update${type}(${type}UpdateRequest request) {
         // 转换
         ${type}DO record = ${type}Convert.MAPPER.to(request);
-        Valid.notNull(request.getId(),ErrorMessage.ID_MISSING);
+        Valid.notNull(record.getId(), ErrorMessage.ID_MISSING);
         // 查询是否存在
-        if(this.check${type}Present(record)){
+        this.checkTestTablePresent(record);
-        throw ErrorCode.DATA_PRESENT.exception();
-        }
         // 更新
         int effect = ${typeLower}DAO.updateById(record);
         log.info("${type}Service-update${type} effect: {}, domain: {}", effect, JSON.toJSONString(record));
@@ -113,17 +109,19 @@ public Integer batchDelete${type}(List<Long> idList){
      * 检测对象是否存在
      *
      * @param domain domain
- * @return 是否存在
      */
-private boolean check${type}Present(${type}DO domain){
+    private void check${type}Present(${type}DO domain) {
         // 构造条件
         LambdaQueryWrapper<${type}DO> wrapper = Conditions.wrapper(${type}DO.class)
                 .eq(${type}DO::getId, domain.getId());
         // .eq(XXXDO::getXXX, domain.getXXX());
         // 检查是否存在
-        return ${typeLower}DAO.of()
+        boolean present = testTableDAO.of()
             .wrapper(wrapper)
             .present();
+        if (present) {
+            throw ErrorCode.DATA_PRESENT.exception();
+        }
     }
 
 }

orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/OrionSwaggerAutoConfiguration.java

@@ -55,7 +55,7 @@ public class OrionSwaggerAutoConfiguration {
         Map<String, SecurityScheme> securitySchemas = this.buildSecuritySchemes();
         OpenAPI api = new OpenAPI()
                 // 接口信息
-                .info(buildInfo(properties))
+                .info(this.buildInfo(properties))
                 // 接口安全配置
                 .components(new Components().securitySchemes(securitySchemas));
         securitySchemas.keySet()
@@ -109,13 +109,12 @@ public class OrionSwaggerAutoConfiguration {
                 propertyResolverUtils, openApiBuilderCustomizers, serverBaseUrlCustomizers, javadocProvider);
     }
 
-
     /**
      * @return 所有模块的 api 分组
      */
     @Bean
     public GroupedOpenApi allGroupedOpenApi() {
-        return buildGroupedOpenApi("全部", "");
+        return buildGroupedOpenApi("全部", "*");
     }
 
     /**

orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/handler/GlobalExceptionHandler.java

@@ -74,8 +74,8 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(value = BindException.class)
     public HttpWrapper<?> paramBindExceptionHandler(BindException ex) {
         log.error("paramBindExceptionHandler", ex);
-        FieldError error = ex.getFieldError();
+        FieldError error = Objects.requireNonNull(ex.getFieldError());
-        return ErrorCode.BAD_REQUEST.wrapper().msg(Objects.requireNonNull(error).getDefaultMessage());
+        return ErrorCode.BAD_REQUEST.wrapper().msg(error.getField() + " " + error.getDefaultMessage());
     }
 
     @ExceptionHandler(value = ConstraintViolationException.class)