diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelPageReqVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelPageReqVO.java index d2aac03..a92889d 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelPageReqVO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelPageReqVO.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.alert.controller.admin.model.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.models.security.SecurityScheme; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,5 +15,7 @@ public class ModelPageReqVO extends PageParam { @Schema(description = "模型名称", example = "yudao") private String modelName; + @Schema(description = "状态", example = "1") + private int status; } 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 1f659bb..97060ef 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 @@ -44,4 +44,11 @@ public class ModelRespVO { @Schema(description = "模型信息-长字符串", example = "yudao") private String modelInfo; + + /** + * 模型信息 + */ + @Schema(description = "模型状态", example = "yudao") + + private int status; } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java index c4fbe45..7738d10 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java @@ -45,6 +45,9 @@ public class ModelDO extends BaseDO { */ private String modelInfo; - + /** + * 模型信息 + */ + private int status; } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java index cad9a1d..f65d686 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java @@ -13,6 +13,7 @@ public interface ModelMapper extends BaseMapperX { default PageResult selectPage(ModelPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(ModelDO::getModelName, reqVO.getModelName()) + .eqIfPresent(ModelDO::getStatus, reqVO.getStatus()) .orderByAsc(ModelDO::getId)); } 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 f0c87e6..2a01971 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 @@ -73,157 +73,155 @@ public class InstantServiceImpl implements InstantService { @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 { - // 1. 校验角色 + // 1. 校验角色 // validateRoleDuplicate(createReqVO.getName(), createReqVO.getCode(), null); + //根据modelversionid查询modelversion，录入instantcfg表的modelversion字段 + String modelVersion = versionMapper.selectById(createReqVO.getModelVersionId()).getVersion(); + createReqVO.setModelVersion(modelVersion); + //插入除instantInfo外的所有数据，获取到id + // 2. 插入到数据库-status、visible默认值 + InstantTableDO instant = BeanUtils.toBean(createReqVO, InstantTableDO.class) + .setInstantStatus(ObjUtil.defaultIfNull(createReqVO.getInstantStatus(), 1L)) + .setVisible(ObjUtil.defaultIfNull(createReqVO.getVisible(), 1L)); + instantTableMapper.insert(instant); - //根据modelversionid查询modelversion，录入instantcfg表的modelversion字段 - String modelVersion = versionMapper.selectById(createReqVO.getModelVersionId()).getVersion(); - createReqVO.setModelVersion(modelVersion); + // 3. 记录操作日志上下文 + LogRecordContext.putVariable("instant", instant); - //插入除instantInfo外的所有数据，获取到id - // 2. 插入到数据库-status、visible默认值 - InstantTableDO instant = BeanUtils.toBean(createReqVO, InstantTableDO.class) - .setInstantStatus(ObjUtil.defaultIfNull(createReqVO.getInstantStatus(), 1L)) - .setVisible(ObjUtil.defaultIfNull(createReqVO.getVisible(), 1L)); + Long insertId = instant.getMpId(); - instantTableMapper.insert(instant); - - // 3. 记录操作日志上下文 - LogRecordContext.putVariable("instant", instant); - - Long insertId = instant.getMpId(); - - //处理数据 + //处理数据 // inputInfo 各种转换 - List pointInfoList = createReqVO.getPointInfo(); - System.out.println(pointInfoList); - - List inputInfoList = new ArrayList<>(); - List inputNameList = new ArrayList<>(); - List unitList = new ArrayList<>(); - List outPointInfoList = new ArrayList<>(); - List timePointInfoList = new ArrayList<>(); - List biasPointInfoList = new ArrayList<>(); - List faultVariablePointList = new ArrayList<>(); - - List InstantPointList = new ArrayList<>(); - Point point = new Point(); - String outpoint = ""; - for (Integer i = 0; i < pointInfoList.size(); i++) { - 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")) { - //构建重构值对象 - outpoint = HEAD + "M" + String.format("%04d", insertId) + String.format("%04d", i + 1) + "R"; - point = new Point(); - point.setGroupName("WARN"); - outPointInfoList.add(outpoint); - point.setItemName(outpoint); - point.setDescriptor(pointInfoList.get(i).getDescription() + "_重构值"); - point.setEngUnits(pointInfoList.get(i).getUnit()); - point.setItemType(5); - InstantPointList.add(point); - - //构建时间值对象 - outpoint = HEAD + "M" + String.format("%04d", insertId) + String.format("%04d", i + 1) + "T"; - point = new Point(); - point.setGroupName("WARN"); - timePointInfoList.add(outpoint); - point.setItemName(outpoint); - point.setDescriptor(pointInfoList.get(i).getDescription() + "_时间值"); - point.setEngUnits(pointInfoList.get(i).getUnit()); - point.setItemType(5); - InstantPointList.add(point); - - //构建偏差值对象 - outpoint = HEAD + "M" + String.format("%04d", insertId) + String.format("%04d", i + 1) + "B"; - point = new Point(); - point.setGroupName("WARN"); - biasPointInfoList.add(outpoint); - point.setItemName(outpoint); - point.setDescriptor(pointInfoList.get(i).getDescription() + "_偏差值"); - point.setEngUnits(pointInfoList.get(i).getUnit()); - point.setItemType(5); - InstantPointList.add(point); - - //构建状态值对象 - outpoint = HEAD + "M" + String.format("%04d", insertId) + String.format("%04d", i + 1) + "F"; - point = new Point(); - point.setGroupName("WARN"); - faultVariablePointList.add(outpoint); - point.setItemName(outpoint); - point.setDescriptor(pointInfoList.get(i).getDescription() + "_状态值"); - 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); - } - } - - - createReqVO.setMpId(insertId); - createReqVO.setInstantStatus(instant.getInstantStatus()); - createReqVO.setVisible(instant.getVisible()); - createReqVO.setInputInfo(inputInfoList); - createReqVO.setInputName(inputNameList); - createReqVO.setUnit(unitList); - createReqVO.setOutPointInfo(outPointInfoList); - createReqVO.setTimePointInfo(timePointInfoList); - createReqVO.setBiasPointInfo(biasPointInfoList); - createReqVO.setFaultVariablePointInfo(faultVariablePointList); - - - //构建模型实例ste值-没有unit参数 - outpoint = HEAD + "M" + String.format("%04d", insertId) + "_ste"; - //赋值-createReqVO - createReqVO.setModel_state(outpoint); - point = new Point(); - point.setGroupName("WARN"); - point.setItemName(outpoint); - point.setDescriptor(instant.getMpName() + "_残差值"); - point.setItemType(5); - InstantPointList.add(point); - - //构建模型实例状态值-没有unit参数 - outpoint = HEAD + "M" + String.format("%04d", insertId) + "_status"; - //赋值-createReqVO - createReqVO.setModel_status(outpoint); - point = new Point(); - point.setGroupName("WARN"); - point.setItemName(outpoint); - point.setDescriptor(instant.getMpName() + "_状态值"); - point.setItemType(5); - InstantPointList.add(point); + List pointInfoList = createReqVO.getPointInfo(); + System.out.println(pointInfoList); + + List inputInfoList = new ArrayList<>(); + List inputNameList = new ArrayList<>(); + List unitList = new ArrayList<>(); + List outPointInfoList = new ArrayList<>(); + List timePointInfoList = new ArrayList<>(); + List biasPointInfoList = new ArrayList<>(); + List faultVariablePointList = new ArrayList<>(); + + List InstantPointList = new ArrayList<>(); + Point point = new Point(); + String outpoint = ""; + for (Integer i = 0; i < pointInfoList.size(); i++) { + 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")) { + //构建重构值对象 + outpoint = HEAD + "M" + String.format("%04d", insertId) + String.format("%04d", i + 1) + "R"; + point = new Point(); + point.setGroupName("WARN"); + outPointInfoList.add(outpoint); + point.setItemName(outpoint); + point.setDescriptor(pointInfoList.get(i).getDescription() + "_重构值"); + point.setEngUnits(pointInfoList.get(i).getUnit()); + point.setItemType(5); + InstantPointList.add(point); + + //构建时间值对象 + outpoint = HEAD + "M" + String.format("%04d", insertId) + String.format("%04d", i + 1) + "T"; + point = new Point(); + point.setGroupName("WARN"); + timePointInfoList.add(outpoint); + point.setItemName(outpoint); + point.setDescriptor(pointInfoList.get(i).getDescription() + "_时间值"); + point.setEngUnits(pointInfoList.get(i).getUnit()); + point.setItemType(5); + InstantPointList.add(point); + + //构建偏差值对象 + outpoint = HEAD + "M" + String.format("%04d", insertId) + String.format("%04d", i + 1) + "B"; + point = new Point(); + point.setGroupName("WARN"); + biasPointInfoList.add(outpoint); + point.setItemName(outpoint); + point.setDescriptor(pointInfoList.get(i).getDescription() + "_偏差值"); + point.setEngUnits(pointInfoList.get(i).getUnit()); + point.setItemType(5); + InstantPointList.add(point); + + //构建状态值对象 + outpoint = HEAD + "M" + String.format("%04d", insertId) + String.format("%04d", i + 1) + "F"; + point = new Point(); + point.setGroupName("WARN"); + faultVariablePointList.add(outpoint); + point.setItemName(outpoint); + point.setDescriptor(pointInfoList.get(i).getDescription() + "_状态值"); + 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); + } + } + + + createReqVO.setMpId(insertId); + createReqVO.setInstantStatus(instant.getInstantStatus()); + createReqVO.setVisible(instant.getVisible()); + createReqVO.setInputInfo(inputInfoList); + createReqVO.setInputName(inputNameList); + createReqVO.setUnit(unitList); + createReqVO.setOutPointInfo(outPointInfoList); + createReqVO.setTimePointInfo(timePointInfoList); + createReqVO.setBiasPointInfo(biasPointInfoList); + createReqVO.setFaultVariablePointInfo(faultVariablePointList); + + + //构建模型实例ste值-没有unit参数 + outpoint = HEAD + "M" + String.format("%04d", insertId) + "_ste"; + //赋值-createReqVO + createReqVO.setModel_state(outpoint); + point = new Point(); + point.setGroupName("WARN"); + point.setItemName(outpoint); + point.setDescriptor(instant.getMpName() + "_残差值"); + point.setItemType(5); + InstantPointList.add(point); + + //构建模型实例状态值-没有unit参数 + outpoint = HEAD + "M" + String.format("%04d", insertId) + "_status"; + //赋值-createReqVO + createReqVO.setModel_status(outpoint); + point = new Point(); + point.setGroupName("WARN"); + point.setItemName(outpoint); + point.setDescriptor(instant.getMpName() + "_状态值"); + point.setItemType(5); + InstantPointList.add(point); //更新instantInfo字段 - InstantSaveReqVO updateReqVO = new InstantSaveReqVO(); - updateReqVO.setMpId(instant.getMpId()); - updateReqVO.setInstantInfo(JsonUtils.toJsonString(createReqVO)); + InstantSaveReqVO updateReqVO = new InstantSaveReqVO(); + updateReqVO.setMpId(instant.getMpId()); + updateReqVO.setInstantInfo(JsonUtils.toJsonString(createReqVO)); - updateInstant(updateReqVO); - List resultList = new ArrayList(); + updateInstant(updateReqVO); + List resultList = new ArrayList(); - resultList.add(instant.getMpId().toString()); + resultList.add(instant.getMpId().toString()); - for (Point item : InstantPointList) { - // 每次循环输出list中的元素 - System.out.println(item.toString()); - //循环加点 - String ss = exaUtils.setPoint(EXA_IP, item); - resultList.add(ss); - } - createWarn1(instant, createReqVO); - return resultList; + for (Point item : InstantPointList) { + // 每次循环输出list中的元素 + System.out.println(item.toString()); + //循环加点 + String ss = exaUtils.setPoint(EXA_IP, item); + resultList.add(ss); + } + createWarn1(instant, createReqVO); + return resultList; + }