diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentDefinitionEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentDefinitionEntity.java index e5b8a4e..f2754c7 100644 --- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentDefinitionEntity.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentDefinitionEntity.java @@ -49,6 +49,12 @@ public class ContentDefinitionEntity extends TenantEntity implements Serializabl @ApiModelProperty(value = "检测类型子类") private String checkTypeSon; + /** + * 检测类型子类(多组) + */ + @ApiModelProperty(value = "检测类型子类(多组)") + private String multiCheckTypeSon; + // @JsonSerialize(nullsUsing = NullSerializer.class) // @ApiModelProperty(value = "表针识别,表盘ID") // private Long clockId; diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentEntity.java index 6752254..64620fb 100644 --- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentEntity.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ContentEntity.java @@ -63,6 +63,12 @@ public class ContentEntity extends TenantEntity { private String checkTypeSon; /** + * 检测类型子类(多组) + */ + @ApiModelProperty(value = "检测类型子类(多组)") + private String multiCheckTypeSon; + + /** * 表针识别,表盘ID */ @JsonSerialize(nullsUsing = NullSerializer.class) diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/controller/ZhipuAnalysisInfoController.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/controller/ZhipuAnalysisInfoController.java index 3c6eef8..905710f 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/controller/ZhipuAnalysisInfoController.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/controller/ZhipuAnalysisInfoController.java @@ -16,6 +16,8 @@ import org.springblade.core.tool.utils.Func; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @Author: ypj * @Date: 2024/8/12 20:22 @@ -34,7 +36,7 @@ public class ZhipuAnalysisInfoController { return R.status(analysisInfoService.save(request.toEntity())); } - @GetMapping("/remove") + @DeleteMapping("/remove") @ApiOperation("批量删除智谱分析信息") @ApiOperationSupport(order = 2) public R remove(@RequestParam @ApiParam("主键ID,按逗号分隔") String ids) { @@ -54,4 +56,11 @@ public class ZhipuAnalysisInfoController { public R update(@RequestBody @Validated ZhipuAnalysisInfoEntity requestData) { return R.status(analysisInfoService.updateById(requestData)); } + + @GetMapping("/list") + @ApiOperation("列出智谱分析配置信息") + @ApiOperationSupport(order = 5) + public R> list(ZhipuAnalysisInfoEntity requestData) { + return R.data(analysisInfoService.list(Condition.getQueryWrapper(requestData))); + } } diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/entity/ZhipuAnalysisInfoEntity.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/entity/ZhipuAnalysisInfoEntity.java index acc89a7..4712811 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/entity/ZhipuAnalysisInfoEntity.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/entity/ZhipuAnalysisInfoEntity.java @@ -38,6 +38,14 @@ public class ZhipuAnalysisInfoEntity extends TenantEntity { @TableField("REQUEST_CONTENT") private String requestContent; + @ApiModelProperty(value = "模型交互约束") + @TableField("REQUEST_CONSTRAINS") + private String requestConstrains; + + @ApiModelProperty(value = "模型交互返回格式定义") + @TableField("REQUEST_OUTPUT_FORMAT") + private String requestOutputFormat; + @ApiModelProperty(value = "结果解析策略") @TableField("RESULT_STRATEGY") private String resultStrategy; diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/vo/ZhipuAnalysisInfoVO.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/vo/ZhipuAnalysisInfoVO.java index 9f4ad23..cb0fcca 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/vo/ZhipuAnalysisInfoVO.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/zhipuai/vo/ZhipuAnalysisInfoVO.java @@ -21,40 +21,7 @@ import javax.validation.constraints.NotNull; @ApiModel(value = "大模型分析信息") @Data @EqualsAndHashCode(callSuper = false) -public class ZhipuAnalysisInfoVO extends TenantEntity { - @JsonSerialize(using = ToStringSerializer.class) - @ApiModelProperty(value = "主键id") - @TableId(value = "id", type = IdType.ASSIGN_ID) - private Long id; - - @ApiModelProperty(value = "策略编码") - @NotNull - private String code; - - @ApiModelProperty(value = "策略名称") - private String name; - - @ApiModelProperty(value = "调用模型名称") - @NotNull - private String model; - - @ApiModelProperty(value = "模型交互内容") - private String requestContent; - - @ApiModelProperty(value = "结果解析策略") - private String resultStrategy; - - @ApiModelProperty(value = "结果类型") - private String resultType; - - @ApiModelProperty(value = "结果查询key值") - private String resultKey; - - @ApiModelProperty(value = "结果对比内容") - private String resultCondition; - - @ApiModelProperty(value = "对比方式") - private String resultJudgeModel; +public class ZhipuAnalysisInfoVO extends ZhipuAnalysisInfoEntity { public ZhipuAnalysisInfoEntity toEntity() { return BeanUtil.copy(this, ZhipuAnalysisInfoEntity.class);