diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/InstantController.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/InstantController.java index 553aaea..3d03702 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/InstantController.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/InstantController.java @@ -99,7 +99,7 @@ public class InstantController { @Operation(summary = "创建模型实例") @PreAuthorize("@ss.hasPermission('run:instant:create')") public CommonResult> createInstant(@RequestBody InstantSaveReqVO createReqVO) throws IOException { - return success(instantService.createInstant(createReqVO, null)); + return success(instantService.createInstant(createReqVO)); } @DeleteMapping("/delete") diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java index c61c480..ee12c87 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java @@ -26,6 +26,11 @@ public class InstantSaveReqVO extends InstantInfoVO { @DiffLogField(name = "模型编号") private Long modelId; + + @Schema(description = "算法编号(1-PCA;2-ANN)", requiredMode = Schema.RequiredMode.REQUIRED,example = "1") + @DiffLogField(name = "算法编号") + private Long algorithmId; + @Schema(description = "模型实例信息", requiredMode = Schema.RequiredMode.REQUIRED,example = "1") @DiffLogField(name = "模型实例信息") @JsonIgnore diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/pointInfo.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/pointInfo.java index 5429e73..4632675 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/pointInfo.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/pointInfo.java @@ -19,6 +19,6 @@ public class pointInfo { private String unit; @JsonProperty(value="type") - @Schema(description = "类型(输入-false;输出-true;ANN-空)", example = "yudao") + @Schema(description = "ANN才有的字段---类型(输入-false;输出-true)", example = "yudao") private Object type; } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelRespVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelRespVO.java index 5ae42fe..a5874f4 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelRespVO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelRespVO.java @@ -32,6 +32,13 @@ public class ModelRespVO { private String unitName; + /** + * 算法id + */ + + @Schema(description = "算法id", example = "yudao") + + private String algorithmId; /** * 算法名称 */ diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantService.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantService.java index e7e88cc..1a97116 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantService.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantService.java @@ -49,10 +49,9 @@ public interface InstantService { * 创建实例 * * @param createReqVO 创建实例信息 - * @param type 实例类型--目前用不到 * @return 实例编号 */ - List createInstant(@Valid InstantSaveReqVO createReqVO, Integer type) throws IOException; + List createInstant(@Valid InstantSaveReqVO createReqVO) throws IOException; /** * 删除实例 * diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java index 0fadd5f..87fd040 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java @@ -76,7 +76,7 @@ public class InstantServiceImpl implements InstantService { @Transactional(rollbackFor = Exception.class) @LogRecord(type = SYSTEM_INSTANT_TYPE, subType = SYSTEM_INSTANT_CREATE_SUB_TYPE, bizNo = "{{#role.id}}", success = SYSTEM_INSTANT_CREATE_SUCCESS) - public List createInstant(InstantSaveReqVO createReqVO, Integer type) throws IOException { + public List createInstant(InstantSaveReqVO createReqVO) throws IOException { try { // 1. 校验角色 @@ -118,7 +118,9 @@ public class InstantServiceImpl implements InstantService { inputInfoList.add(pointInfoList.get(i).getPointId()); inputNameList.add(pointInfoList.get(i).getDescription()); unitList.add(pointInfoList.get(i).getUnit()); - if (Objects.isNull(pointInfoList.get(i).getType()) || pointInfoList.get(i).getType().equals("1")) { +// 如果pointInfoList.get(i)有type字段,或者createReqVO对象中的算法是PCA就加一些重构值、时间值、偏差值 + if (pointInfoList.get(i).getType() != null || Objects.equals(createReqVO.getAlgorithmId(), "1") + || createReqVO.getAlgorithmId().equals(1L)) { //构建重构值对象 outpoint = HEAD + "M" + String.format("%04d", insertId) + String.format("%04d", i + 1) + "R"; point = new Point(); @@ -162,12 +164,6 @@ public class InstantServiceImpl implements InstantService { point.setEngUnits(pointInfoList.get(i).getUnit()); point.setItemType(5); InstantPointList.add(point); - } else { - outpoint = ""; - outPointInfoList.add(outpoint); - timePointInfoList.add(outpoint); - biasPointInfoList.add(outpoint); - faultVariablePointList.add(outpoint); } } @@ -226,6 +222,7 @@ public class InstantServiceImpl implements InstantService { String ss = exaUtils.setPoint(EXA_IP, item); resultList.add(ss); } + //插入预警表 createWarn1(instant, createReqVO); log.info("模型实例创建成功,实例ID: {}", instant.getMpId()); return resultList;