From fecc3ea609157b2fe2a7f738e41e1fa470ebf9c4 Mon Sep 17 00:00:00 2001 From: luyie Date: Fri, 16 Aug 2024 13:52:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?add:=E5=B7=A1=E6=A3=80=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0=E5=A4=A7=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E8=AF=86=E5=88=AB=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=A4=9A?= =?UTF-8?q?=E9=80=89=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../obj/entity/ContentDefinitionEntity.java | 6 ++++ .../hzinfo/inspect/obj/entity/ContentEntity.java | 6 ++++ .../controller/ZhipuAnalysisInfoController.java | 11 ++++++- .../zhipuai/entity/ZhipuAnalysisInfoEntity.java | 8 +++++ .../bigmodel/zhipuai/vo/ZhipuAnalysisInfoVO.java | 35 +--------------------- 5 files changed, 31 insertions(+), 35 deletions(-) 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); From ecbc2bb039a21c1473624619f60e6b28d411aedc Mon Sep 17 00:00:00 2001 From: luyie Date: Fri, 16 Aug 2024 14:49:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?add:=E5=B7=A1=E6=A3=80=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0ai=E8=AF=86=E5=88=AB=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzinfo/inspect/obj/entity/ContentDefinitionEntity.java | 6 ++++++ .../main/java/com/hnac/hzinfo/inspect/obj/entity/ContentEntity.java | 6 ++++++ 2 files changed, 12 insertions(+) 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 f2754c7..c0b525c 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 @@ -55,6 +55,12 @@ public class ContentDefinitionEntity extends TenantEntity implements Serializabl @ApiModelProperty(value = "检测类型子类(多组)") private String multiCheckTypeSon; + /** + * ai识别分析方式，设备或大模型 + */ + @ApiModelProperty(value = "ai识别分析方式，设备或大模型") + private String analyserType; + // @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 64620fb..cc2a083 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 @@ -69,6 +69,12 @@ public class ContentEntity extends TenantEntity { private String multiCheckTypeSon; /** + * ai识别分析方式，设备或大模型 + */ + @ApiModelProperty(value = "ai识别分析方式，设备或大模型") + private String analyserType; + + /** * 表针识别，表盘ID */ @JsonSerialize(nullsUsing = NullSerializer.class)