base/src/main/java/com/tinyengine/it/model/dto/ResponseParameter.java (1)

22-26: LGTM! Simple and well-structured DTO.

The implementation follows established patterns and integrates well with the related DTOs (RequestParameter, ParametersDto, MethodDto). Consider adding validation annotations (e.g., @NotNull, @NotBlank) if these fields have business constraints.

base/src/main/java/com/tinyengine/it/model/dto/ParametersDto.java (1)

22-29: LGTM! Comprehensive parameter DTO with good field selection.

The class effectively models parameter metadata with appropriate field types. The use of primitive boolean for required is acceptable since it defaults to false, but consider Boolean wrapper if you need to distinguish between unset and false values.

base/src/main/java/com/tinyengine/it/model/dto/RequestParameter.java (1)

20-20: Fix the documentation comment.

The comment incorrectly refers to "responseParameter dto" when this is actually the RequestParameter class.

- * The type responseParameter dto.
+ * The type RequestParameter dto.

base/src/main/java/com/tinyengine/it/service/material/ModelService.java (3)

46-48: Fix Javadoc parameter syntax.

The Javadoc parameter documentation uses incorrect syntax with spaces.

-     * @ param the model
+     * @param model the model

---

54-56: Fix Javadoc parameter syntax.

The Javadoc parameter documentation uses incorrect syntax with spaces.

-     * @ param the id
+     * @param id the id

---

62-64: Fix Javadoc parameter syntax.

The Javadoc parameter documentation uses incorrect syntax with spaces.

-     * @ param the model
+     * @param model the model

base/src/main/java/com/tinyengine/it/common/enums/Enums.java (3)

1007-1043: Consider Java naming conventions for enum names.

The enum methodName should follow Java naming conventions and be named MethodName. However, I notice this is consistent with some existing enums in the file like paramType and methodParam.

For better adherence to Java conventions, consider:

-    public enum methodName {
+    public enum MethodName {

---

1045-1081: Consider Java naming conventions for enum names.

Same naming convention issue as with methodName.

-    public enum paramType {
+    public enum ParamType {

---

1083-1149: Consider Java naming conventions for enum names.

Same naming convention issue as with the other new enums.

-    public enum methodParam {
+    public enum MethodParam {

base/src/main/resources/mappers/ModelMapper.xml (1)

24-32: Use parameterized LIKE queries for text search fields

The current conditions use exact equality checks for text fields like parameters, method, and description. These should typically use LIKE queries for better search functionality.

-        <if test="parameters!=null and parameters!=''">
-            AND parameters = #{parameters}
-        </if>
-        <if test="method!=null and method!=''">
-            AND `method` = #{method}
-        </if>
-        <if test="description!=null and description!=''">
-            AND description = #{description}
-        </if>
+        <if test="parameters!=null and parameters!=''">
+            AND parameters LIKE CONCAT('%', #{parameters}, '%')
+        </if>
+        <if test="method!=null and method!=''">
+            AND `method` LIKE CONCAT('%', #{method}, '%')
+        </if>
+        <if test="description!=null and description!=''">
+            AND description LIKE CONCAT('%', #{description}, '%')
+        </if>

base/src/main/java/com/tinyengine/it/controller/ModelController.java (1)

129-129: Fix incorrect parameter descriptions

The parameter descriptions incorrectly refer to "appId" instead of "id" or "modelId".

-        @Parameter(name = "id", description = "appId"),
+        @Parameter(name = "id", description = "Model ID"),

And in line 171:

-        @Parameter(name = "id", description = "appId")
+        @Parameter(name = "id", description = "Model ID")

Also applies to: 171-171

base/src/main/java/com/tinyengine/it/service/material/impl/ModelServiceImpl.java (1)

70-90: Simplify query logic for name filters

The current implementation has complex conditional logic for OR queries that could be simplified.

 public Page<Model> pageQuery(int currentPage, int pageSize, String nameCn, String nameEn) {
     Page<Model> page = new Page<>(currentPage, pageSize);
     QueryWrapper<Model> queryWrapper = new QueryWrapper<>();
 
-    // 判断 nameCn 是否存在
-    if (nameCn != null && !nameCn.isEmpty()) {
-        queryWrapper.like("name_cn", nameCn);
-    }
-
-    // 判断 nameEn 是否存在
-    if (nameEn != null && !nameEn.isEmpty()) {
-        if (nameCn != null && !nameCn.isEmpty()) {
-            queryWrapper.or().like("name_en", nameEn);
-        } else {
-            queryWrapper.like("name_en", nameEn);
-        }
-    }
+    if (nameCn != null && !nameCn.isEmpty() && nameEn != null && !nameEn.isEmpty()) {
+        queryWrapper.and(wrapper -> wrapper
+            .like("name_cn", nameCn)
+            .or()
+            .like("name_en", nameEn));
+    } else if (nameCn != null && !nameCn.isEmpty()) {
+        queryWrapper.like("name_cn", nameCn);
+    } else if (nameEn != null && !nameEn.isEmpty()) {
+        queryWrapper.like("name_en", nameEn);
+    }
 
     page(page, queryWrapper);
     return page;
 }

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

base/src/main/java/com/tinyengine/it/service/material/impl/ModelServiceImpl.java (6)

55-61: Incomplete fix from previous review - search both name fields

The method only searches the Chinese name field, but based on the schema having both name_cn and name_en columns, it should search both fields as suggested in the previous review.

 public List<Model> getModelByName(String nameCn) {
     QueryWrapper<Model> queryWrapper = new QueryWrapper<>();
-    queryWrapper.like("name_cn", nameCn);
+    queryWrapper.like("name_cn", nameCn)
+               .or()
+               .like("name_en", nameCn);
     return this.baseMapper.selectList(queryWrapper);
 }

---

102-107: Extract duplicate method generation logic

The same method generation code is duplicated in both createModel and updateModelById methods.

Extract this logic into a private method:

+private List<MethodDto> generateStandardMethods(Model model) {
+    List<MethodDto> methodDtos = new ArrayList<>();
+    methodDtos.add(getMethodDto(Enums.methodName.CREATED.getValue(), model));
+    methodDtos.add(getMethodDto(Enums.methodName.UPDATE.getValue(), model));
+    methodDtos.add(getMethodDto(Enums.methodName.QUERY.getValue(), model));
+    methodDtos.add(getMethodDto(Enums.methodName.DELETE.getValue(), model));
+    return methodDtos;
+}

 public Model createModel(Model model) {
-    List<MethodDto> methodDtos = new ArrayList<>();
-    methodDtos.add(getMethodDto(Enums.methodName.CREATED.getValue(), model));
-    methodDtos.add(getMethodDto(Enums.methodName.UPDATE.getValue(), model));
-    methodDtos.add(getMethodDto(Enums.methodName.QUERY.getValue(), model));
-    methodDtos.add(getMethodDto(Enums.methodName.DELETE.getValue(), model));
-    model.setMethod(methodDtos);
+    model.setMethod(generateStandardMethods(model));
     int result = this.baseMapper.createModel(model);
     // ... rest of the method

---

110-110: Fix error message parameter

The error handling uses the same error code for both parameters, which doesn't provide meaningful error information.

-            throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultCode());
+            throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg());

---

128-128: Fix error message parameter

Same issue as in createModel - using error code for message parameter.

-            throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultCode());
+            throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg());

---

150-150: Fix error message parameters in both exceptions

Both ServiceException calls use error code for the message parameter.

-        throw new ServiceException(ExceptionEnum.CM002.getResultCode(), ExceptionEnum.CM002.getResultCode());
+        throw new ServiceException(ExceptionEnum.CM002.getResultCode(), ExceptionEnum.CM002.getResultMsg());
         
-        throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultCode());
+        throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg());

Also applies to: 154-154

---

187-187: Use proper string comparison with equals()

String comparison should use .equals() method instead of != operator.

-        if (name != Enums.methodName.DELETE.getValue()) {
+        if (!name.equals(Enums.methodName.DELETE.getValue())) {

base/src/main/java/com/tinyengine/it/service/material/impl/ModelServiceImpl.java (1)

70-90: Consider simplifying the query builder logic

The implementation is correct, but the nested conditionals could be simplified for better readability.

 public Page<Model> pageQuery(int currentPage, int pageSize, String nameCn, String nameEn) {
     Page<Model> page = new Page<>(currentPage, pageSize);
     QueryWrapper<Model> queryWrapper = new QueryWrapper<>();

-    // 判断 nameCn 是否存在
-    if (nameCn != null && !nameCn.isEmpty()) {
-        queryWrapper.like("name_cn", nameCn);
-    }
-
-    // 判断 nameEn 是否存在
-    if (nameEn != null && !nameEn.isEmpty()) {
-        if (nameCn != null && !nameCn.isEmpty()) {
-            queryWrapper.or().like("name_en", nameEn);
-        } else {
-            queryWrapper.like("name_en", nameEn);
-        }
-    }
+    boolean hasNameCn = nameCn != null && !nameCn.isEmpty();
+    boolean hasNameEn = nameEn != null && !nameEn.isEmpty();
+    
+    if (hasNameCn) {
+        queryWrapper.like("name_cn", nameCn);
+    }
+    
+    if (hasNameEn) {
+        if (hasNameCn) {
+            queryWrapper.or();
+        }
+        queryWrapper.like("name_en", nameEn);
+    }

     page(page, queryWrapper);
     return page;
 }

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

base/src/main/java/com/tinyengine/it/service/material/impl/ModelServiceImpl.java (3)

102-107: Extract duplicate method generation logic.

The same method generation code is duplicated in both createModel and updateModelById methods.

Extract this logic into a private method:

+private List<MethodDto> generateStandardMethods(Model model) {
+    List<MethodDto> methodDtos = new ArrayList<>();
+    methodDtos.add(getMethodDto(Enums.methodName.CREATED.getValue(), model));
+    methodDtos.add(getMethodDto(Enums.methodName.UPDATE.getValue(), model));
+    methodDtos.add(getMethodDto(Enums.methodName.QUERY.getValue(), model));
+    methodDtos.add(getMethodDto(Enums.methodName.DELETE.getValue(), model));
+    return methodDtos;
+}

 public Model createModel(Model model) {
-    List<MethodDto> methodDtos = new ArrayList<>();
-    methodDtos.add(getMethodDto(Enums.methodName.CREATED.getValue(), model));
-    methodDtos.add(getMethodDto(Enums.methodName.UPDATE.getValue(), model));
-    methodDtos.add(getMethodDto(Enums.methodName.QUERY.getValue(), model));
-    methodDtos.add(getMethodDto(Enums.methodName.DELETE.getValue(), model));
-    model.setMethod(methodDtos);
+    model.setMethod(generateStandardMethods(model));
     int result = this.baseMapper.createModel(model);

And apply the same change in updateModelById.

Also applies to: 143-148

---

110-110: Improve error messages for better debugging.

The error handling uses the same error code for the message parameter, which doesn't provide meaningful information.

-            throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultCode());
+            throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg());

Apply this fix to all three occurrences at lines 110, 128, and 154.

Also applies to: 128-128, 154-154

---

187-187: Use proper string comparison with equals().

String comparison should use .equals() method instead of != operator.

-        if (!name.equals(Enums.methodName.DELETE.getValue())) {
+        if (!name.equals(Enums.methodName.DELETE.getValue())) {

Wait, I see the code already uses !name.equals() which is correct. There might have been a misunderstanding in the past review. The current code is correct.

base/src/main/java/com/tinyengine/it/service/material/impl/ModelServiceImpl.java (2)

50-61: Fix javadoc parameter name inconsistency.

The javadoc mentions @param name but the actual parameter is nameCn. Update the javadoc to match the parameter name.

     /**
      * 根据name查询表t_model信息
      *
-     * @param name
+     * @param nameCn
      * @return the model list
      */

---

101-113: Consider adding transaction management for data consistency.

The createModel and updateModelById methods perform database operations that might benefit from explicit transaction management to ensure data consistency.

Add @Transactional annotation to ensure atomicity:

+import org.springframework.transaction.annotation.Transactional;

 @Override
 @SystemServiceLog(description = "创建model实现方法")
+@Transactional
 public Model createModel(Model model) {

Apply the same to updateModelById and deleteModelById methods.

Also applies to: 142-158

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

base/src/main/java/com/tinyengine/it/service/material/impl/ModelServiceImpl.java (6)

102-107: Extract duplicate method generation logic.

The same method generation code is duplicated in both createModel and updateModelById methods.

Extract this logic into a private method:

+private List<MethodDto> generateStandardMethods(Model model) {
+    List<MethodDto> methodDtos = new ArrayList<>();
+    methodDtos.add(getMethodDto(Enums.methodName.CREATED.getValue(), Enums.methodName.INSERTAPI.getValue(), model));
+    methodDtos.add(getMethodDto(Enums.methodName.UPDATE.getValue(), Enums.methodName.UPDATEAPI.getValue(), model));
+    methodDtos.add(getMethodDto(Enums.methodName.QUERY.getValue(), Enums.methodName.QUERYAPI.getValue(), model));
+    methodDtos.add(getMethodDto(Enums.methodName.DELETE.getValue(), Enums.methodName.DELETEAPI.getValue(), model));
+    return methodDtos;
+}

 public Model createModel(Model model) {
-    List<MethodDto> methodDtos = new ArrayList<>();
-    methodDtos.add(getMethodDto(Enums.methodName.CREATED.getValue(), Enums.methodName.INSERTAPI.getValue(), model));
-    methodDtos.add(getMethodDto(Enums.methodName.UPDATE.getValue(), Enums.methodName.UPDATEAPI.getValue(), model));
-    methodDtos.add(getMethodDto(Enums.methodName.QUERY.getValue(), Enums.methodName.QUERYAPI.getValue(), model));
-    methodDtos.add(getMethodDto(Enums.methodName.DELETE.getValue(), Enums.methodName.DELETEAPI.getValue(), model));
-    model.setMethod(methodDtos);
+    model.setMethod(generateStandardMethods(model));
     int result = this.baseMapper.createModel(model);
     // ... rest of the method

---

110-110: Improve error messages for better debugging.

The error handling uses the same error code for the message parameter, which doesn't provide meaningful information.

-            throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultCode());
+            throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg());

---

128-128: Improve error messages for better debugging.

The error handling uses the same error code for the message parameter, which doesn't provide meaningful information.

-            throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultCode());
+            throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg());

---

143-148: Extract duplicate method generation logic.

The same method generation code is duplicated in both createModel and updateModelById methods.

---

150-150: Use appropriate error message for null ID validation.

The null ID validation throws an error with the same code used for both parameters.

-            throw new ServiceException(ExceptionEnum.CM002.getResultCode(), ExceptionEnum.CM002.getResultCode());
+            throw new ServiceException(ExceptionEnum.CM002.getResultCode(), ExceptionEnum.CM002.getResultMsg());

---

154-154: Improve error messages for better debugging.

The error handling uses the same error code for the message parameter, which doesn't provide meaningful information.

-            throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultCode());
+            throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg());

base/src/main/java/com/tinyengine/it/service/material/impl/ModelServiceImpl.java (1)

57-61: Consider searching both Chinese and English name fields.

While the method now correctly queries the name_cn field, consider enhancing the search to include both Chinese and English names for better flexibility.

 public List<Model> getModelByName(String nameCn) {
     QueryWrapper<Model> queryWrapper = new QueryWrapper<>();
-    queryWrapper.like("name_cn", nameCn);
+    queryWrapper.like("name_cn", nameCn)
+               .or()
+               .like("name_en", nameCn);
     return this.baseMapper.selectList(queryWrapper);
 }

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

app/src/main/resources/sql/h2/create_model_ddl_2025_0717.sql (2)

22-22: Remove MySQL-specific ENGINE clause for H2

H2 doesn't support "engine = innodb". Drop it to avoid syntax errors.

-) engine = innodb comment = '模型表';
+) comment = '模型表';

---

14-16: Add auto-update for last_updated_time (H2 lacks ON UPDATE)

last_updated_time won't auto-update on UPDATE with only DEFAULT CURRENT_TIMESTAMP. Implement app-level update or an H2-compatible trigger solution.

Options:

• App-level: always set last_updated_time = CURRENT_TIMESTAMP in UPDATE statements.
• H2 trigger: if you use Java triggers, register a BEFORE UPDATE trigger to set NEW.last_updated_time.

Please confirm which approach you prefer and I can provide the exact implementation for your stack.

base/src/main/java/com/tinyengine/it/model/entity/Model.java (4)

51-56: Optional: specify JDBC type for JSON columns to avoid driver ambiguity

If your ListTypeHandler stores JSON as text, hinting JDBC type improves portability (MySQL TEXT/LONGTEXT, H2 CLOB).

-    @TableField(typeHandler = ListTypeHandler.class)
+    @TableField(typeHandler = ListTypeHandler.class/*, jdbcType = org.apache.ibatis.type.JdbcType.CLOB*/)
     private List<ParametersDto> parameters;

-    @TableField(typeHandler = ListTypeHandler.class)
+    @TableField(typeHandler = ListTypeHandler.class/*, jdbcType = org.apache.ibatis.type.JdbcType.CLOB*/)
     private  List<MethodDto> method;

If you choose to enable jdbcType, add the import:
import org.apache.ibatis.type.JdbcType;

---

41-42: Fix Swagger schema name casing to match column naming

Use name_en (lowercase) for consistency with DDL and camelCase-to-underscore mapping.

-    @Schema(name = "name_En", description = "英文名称")
+    @Schema(name = "name_en", description = "英文名称")

---

56-56: Nit: remove extra whitespace

Double space before List.

-    private  List<MethodDto> method;
+    private List<MethodDto> method;

---

50-56: Validate column sizes vs JSON payload size

parameters is VARCHAR(2000) in H2 DDL; complex JSON arrays may exceed 2000 chars. Consider TEXT/LONGTEXT (MySQL) / CLOB (H2) for both parameters and method columns.

If you want, I can produce aligned DDL changes for MySQL and H2 to switch parameters to TEXT/CLOB and keep method as LONGTEXT/CLOB.

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro