iailab-cloud/iailab-gateway/src/main/resources/application.yaml
@@ -115,6 +115,13 @@ - Path=/admin-api/model/** filters: - RewritePath=/admin-api/model/v3/api-docs, /v3/api-docs ## ai-server 服务 - id: ai-admin-api # 路由的编号 uri: grayLb://ai-server predicates: # 断言，作为路由的匹配条件，对应 RouteDefinition 数组 - Path=/admin-api/ai/** filters: - RewritePath=/admin-api/ai/v3/api-docs, /v3/api-docs # 配置，保证转发到 /v3/api-docs ## fast 服务 - id: fast-admin-api # 路由的编号 uri: grayLb://fast-server iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/PointCollector.java
@@ -76,7 +76,7 @@ public static final String PV = "point_value:"; public static final long offset = 60 * 2L; public static final long offset = 3L; /** * 采集 @@ -100,17 +100,17 @@ List<DaPointDTO> pointMeasureList = daPointService.getMeasurePoint(minfreq); pointValues.addAll(measureHandle.handle(collectTime, pointMeasureList, dataMap, listGood, listBad)); log.info("读取计算点"); List<DaPointDTO> pointCalculateList = daPointService.getMathPoint(minfreq); pointValues.addAll(calculateHandle.handle(collectTime, pointCalculateList, dataMap, listGood, listBad)); log.info("读取累计点"); List<DaPointDTO> pointCumulateList = daPointService.getCumulatePoint(minfreq); pointValues.addAll(cumulateHandle.handle(collectTime, pointCumulateList, listGood, listBad)); pointValues.addAll(cumulateHandle.handle(collectTime, pointCumulateList, dataMap, listGood, listBad)); log.info("读取极值点"); List<DaPointDTO> pointExtremalList = daPointService.getExtremalPoint(minfreq); pointValues.addAll(extremalHandle.handle(collectTime, pointExtremalList, listGood, listBad)); pointValues.addAll(extremalHandle.handle(collectTime, pointExtremalList, dataMap, listGood, listBad)); log.info("读取计算点"); List<DaPointDTO> pointCalculateList = daPointService.getMathPoint(minfreq); pointValues.addAll(calculateHandle.handle(collectTime, pointCalculateList, dataMap, listGood, listBad)); log.info("存入时序库"); log.info("pointValueTimestamp=" + (pointValues.get(0) == null ? 0 : pointValues.get(0).getTimestamp().getNano())); iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CalculateHandle.java
@@ -47,6 +47,12 @@ private ConstantHandle constantHandle; @Resource private CumulateHandle cumulateHandle; @Resource private ExtremalHandle extremalHandle; @Resource private JavaScriptHandler javaScriptHandler; @Autowired @@ -171,6 +177,8 @@ pointNos.add(s); dataMap.putAll(measureHandle.getCurrent(pointNos)); dataMap.putAll(constantHandle.getCurrent(pointNos)); dataMap.putAll(cumulateHandle.getCurrent(pointNos)); dataMap.putAll(extremalHandle.getCurrent(pointNos)); if (dataMap.get(s) == null) { log.info("计算点数据异常"); log.info("pointNo=" + dto.getPointNo() + ";dataMap.key=" + s); iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/ConstantHandle.java
@@ -10,6 +10,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.util.*; /** @@ -33,9 +34,13 @@ return result; } dtos.forEach(dto -> { InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto); BigDecimal defaultValue = dto.getDefaultValue(); BigDecimal coefficient = dto.getUnittransfactor() == null ? BigDecimal.ONE : dto.getUnittransfactor(); defaultValue = defaultValue.multiply(coefficient); InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto,defaultValue); pojo.setTimestamp(GenInfluxPointValueUtils.getByMin(collectTime, DataPointFreqEnum.getEumByCode(dto.getMinfreqid()))); dataMap.put(dto.getPointNo(), dto.getDefaultValue()); dataMap.put(dto.getPointNo(), defaultValue); result.add(pojo); listGood.add(dto.getPointNo()); }); @@ -49,7 +54,8 @@ List<DaPointDTO> pointConstantList = daPointService.getConstantPoint(pointNos); if (!CollectionUtils.isEmpty(pointConstantList)) { pointConstantList.forEach(item -> { data.put(item.getPointNo(), item.getDefaultValue()); BigDecimal coefficient = item.getUnittransfactor() == null ? BigDecimal.ONE : item.getUnittransfactor(); data.put(item.getPointNo(), item.getDefaultValue().multiply(coefficient)); }); } return data; iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/CumulateHandle.java
@@ -45,7 +45,7 @@ @Autowired private RedisTemplate<String, Object> redisTemplate; public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, List<String> listGood, List<String> listBad) { public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, Map<String, Object> dataMap, List<String> listGood, List<String> listBad) { List<InfluxPointValuePOJO> result = new ArrayList<>(); try { log.info("累计点处理开始"); @@ -59,6 +59,7 @@ BigDecimal calValue = new BigDecimal(rawValue.toString()).multiply(coefficient); InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, calValue); pojo.setTimestamp(GenInfluxPointValueUtils.getByMin(collectTime, DataPointFreqEnum.getEumByCode(dto.getMinfreqid()))); dataMap.put(dto.getPointNo(), calValue); result.add(pojo); } catch (Exception ex) { ex.printStackTrace(); @@ -163,7 +164,7 @@ long start = startTime.getTime(); long end = endTime.getTime(); long oneMin = 1000L * DataPointFreqEnum.getEumByCode(minfreqid).getValue(); long mins = (end - start) / oneMin; long mins = ((end - start) / oneMin) + 1; //找出缺少项 Map<Long, Double> sourceDataMap = new HashMap<>(dataList.size()); iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/ExtremalHandle.java
@@ -20,6 +20,7 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; /** @@ -43,7 +44,7 @@ @Autowired private RedisTemplate<String, Object> redisTemplate; public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, List<String> listGood, List<String> listBad) { public List<InfluxPointValuePOJO> handle(Date collectTime, List<DaPointDTO> dtos, Map<String, Object> dataMap, List<String> listGood, List<String> listBad) { List<InfluxPointValuePOJO> result = new ArrayList<>(); try { log.info("极值点处理开始"); @@ -52,9 +53,12 @@ } dtos.forEach(dto -> { try { Object value = singleCompute(dto, collectTime, listGood, listBad); InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, value); Object rawValue = singleCompute(dto, collectTime, listGood, listBad); BigDecimal coefficient = dto.getUnittransfactor() == null ? BigDecimal.ONE : dto.getUnittransfactor(); BigDecimal calValue = new BigDecimal(rawValue.toString()).multiply(coefficient); InfluxPointValuePOJO pojo = GenInfluxPointValueUtils.getByPoint(dto, calValue); pojo.setTimestamp(GenInfluxPointValueUtils.getByMin(collectTime, DataPointFreqEnum.getEumByCode(dto.getMinfreqid()))); dataMap.put(dto.getPointNo(), calValue); result.add(pojo); } catch (Exception ex) { ex.printStackTrace(); @@ -83,6 +87,8 @@ value = redisTemplate.opsForValue().get(PointCollector.PV + item.getPointNo()); } else { value = singleCompute(item, calendar.getTime(), new ArrayList<>(), new ArrayList<>()); BigDecimal coefficient = item.getUnittransfactor() == null ? BigDecimal.ONE : item.getUnittransfactor(); value = new BigDecimal(value.toString()).multiply(coefficient); } data.put(item.getPointNo(), value); }); iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/MeasureHandle.java
@@ -224,17 +224,18 @@ public Map<String, Object> getCurrent(List<String> pointNos) { Map<String, Object> data = new HashMap<>(); List<DaPointDTO> pointMeasureList = daPointService.getMeasurePoint(pointNos); pointMeasureList.forEach( item -> { for (DaPointDTO item : pointMeasureList) { try { Object value = CommonConstant.BAD_VALUE; boolean hasKey = redisTemplate.hasKey(PointCollector.PV + item.getPointNo()); if (hasKey) { if (hasKey && !StrUtils.isNumeric(value.toString())) { value = redisTemplate.opsForValue().get(PointCollector.PV + item.getPointNo()); } if(hasKey && StrUtils.isNumeric(value.toString()) && new BigDecimal(value.toString()).compareTo(CommonConstant.BAD_VALUE) != 0 ) { data.put(item.getPointNo(), value); continue; } else if(hasKey && StrUtils.isNumeric(value.toString()) && new BigDecimal(value.toString()).compareTo(CommonConstant.BAD_VALUE) != 0 ) { value = redisTemplate.opsForValue().get(PointCollector.PV + item.getPointNo()); data.put(item.getPointNo(), value); continue; } else if (DataSourceType.OPCUA.getCode().equals(item.getSourceType())) { value = opcUaCollector.getTagValue(item.getSourceId(), item.getTagNo()); } else if (DataSourceType.ModBus.getCode().equals(item.getSourceType())) { @@ -258,7 +259,8 @@ } log.info("TagNo=" + item.getTagNo() + ",value=" + value.toString()); if (!PointDataTypeEnum.BOOLEAN.getCode().equals(item.getDataType())) { BigDecimal decValue = new BigDecimal(value.toString()); BigDecimal coefficient = item.getUnittransfactor() == null ? BigDecimal.ONE : item.getUnittransfactor(); BigDecimal decValue = new BigDecimal(value.toString()).multiply(coefficient); if (PointDataTypeEnum.FLOAT.getCode().equals(item.getDataType())) { decValue = decValue.setScale(2, BigDecimal.ROUND_HALF_UP); } else if (PointDataTypeEnum.INT.getCode().equals(item.getDataType())) { @@ -276,9 +278,7 @@ } catch (Exception ex) { ex.printStackTrace(); } } ); return data; }
@@ -67,7 +67,7 @@ } } Calendar startCal = unit.calculate(endTime, length); Calendar startCal = unit.calculate(endTime, length-1); return startCal.getTime(); } } iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml
@@ -161,6 +161,7 @@ t1.point_type, t1.store_type, t1.data_type, t1.unittransfactor, t1.minfreqid FROM t_da_point t1 <where> iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictAutoAdjustConfigService.java
@@ -20,7 +20,7 @@ MmPredictAutoAdjustConfigEntity getInfo(String id); MmPredictAutoAdjustConfigEntity getByCode(String code); List<MmPredictAutoAdjustConfigEntity> getByCode(String code); void create(MmPredictAutoAdjustConfigEntity entity);
@@ -60,8 +60,8 @@ } @Override public MmPredictAutoAdjustConfigEntity getByCode(String code) { return baseDao.selectOne("config_code",code,"is_enable",1); public List<MmPredictAutoAdjustConfigEntity> getByCode(String code) { return baseDao.selectList(MmPredictAutoAdjustConfigEntity::getConfigCode,code,MmPredictAutoAdjustConfigEntity::getIsEnable,1); } @Override @@ -85,24 +85,43 @@ public boolean autoAdjustByCode(String configCode,long adjustStartTime) { log.info("开始自动调整：configCode：" + configCode + ",adjustStartTime:" + new Date(adjustStartTime)); // 查询调整配置 MmPredictAutoAdjustConfigEntity configEntity = getByCode(configCode); if (configEntity == null) { log.info("自动调整失败原因：configEntity为null"); List<MmPredictAutoAdjustConfigEntity> configEntityList = getByCode(configCode); if (CollectionUtils.isEmpty(configEntityList)) { log.info("自动调整失败原因：configEntityList为空"); return false; } // 根据outputId分组 Map<String, List<MmPredictAutoAdjustConfigEntity>> outputIdMap = configEntityList.stream().collect(Collectors.groupingBy(MmPredictAutoAdjustConfigEntity::getOutputId)); for (Map.Entry<String, List<MmPredictAutoAdjustConfigEntity>> entry : outputIdMap.entrySet()) { String outputId = entry.getKey(); // 查询调整用户adjustStartTime 至 adjustStartTime - 预测长度 * 预测粒度 范围的值 Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(adjustStartTime); Date endTime = calendar.getTime(); ItemVO item = mmPredictItemService.getItemByOutPutId(configEntity.getOutputId()); ItemVO item = mmPredictItemService.getItemByOutPutId(outputId); if (item == null) { log.info("自动调整失败原因：getItemByOutPutId为null，outputId：" + configEntity.getOutputId()); return false; log.info("自动调整失败原因：getItemByOutPutId为null，outputId：" + outputId); continue; } calendar.add(Calendar.SECOND,item.getPredictLength() * item.getGranularity() * -1); Date startTime = calendar.getTime(); // 获取预测历史结果 InfluxModelResultPOJO pojo = new InfluxModelResultPOJO(); pojo.setType(DataTypeEnum.FLOAT_LAST_BAK.getCode()); pojo.setOutPutId(outputId); List<InfluxModelResultVO> influxModelResult = influxDBService.queryModelResults(pojo, new Date(adjustStartTime), new Date(adjustStartTime)); if (CollectionUtils.isEmpty(influxModelResult)) { log.info("自动调整失败原因：预测历史结果为空。itemNo：" + item.getItemNo() + "，itemName:" + item.getItemName() + "，outputId:" + outputId + "，time:" + adjustStartTime); continue; } // 计算所有影响用户的最终调整值 Double finalAdjustValue = 0.0; for (MmPredictAutoAdjustConfigEntity configEntity : entry.getValue()) { Double adjustValue = null; // 查询影响用户历史值 ApiPointValueQueryDTO queryDTO = new ApiPointValueQueryDTO(); ApiPointDTO pointInfo = dataPointApi.getInfoById(configEntity.getPointId()); queryDTO.setPointNo(pointInfo.getPointNo()); @@ -110,29 +129,18 @@ queryDTO.setStart(startTime); List<ApiPointValueDTO> apiPointValueDTOS = dataPointApi.queryPointHistoryValue(queryDTO); if (CollectionUtils.isEmpty(apiPointValueDTOS)) { log.info("自动调整失败原因：测点数据长度为0。queryDTO：" + queryDTO); return false; log.info("影响用户[" + pointInfo.getPointName() + "]调整失败原因：测点数据长度为0。queryDTO：" + queryDTO); continue; } // 过滤掉-2 apiPointValueDTOS = apiPointValueDTOS.stream().filter(e -> !Double.valueOf(e.getV()).equals(-2.0)).collect(Collectors.toList()); if (CollectionUtils.isEmpty(apiPointValueDTOS)) { log.info("自动调整失败原因：过滤掉-2之后测点数据长度为0。queryDTO：" + queryDTO); return false; } // 获取预测历史结果 InfluxModelResultPOJO pojo = new InfluxModelResultPOJO(); pojo.setType(DataTypeEnum.FLOAT_LAST.getCode()); pojo.setOutPutId(configEntity.getOutputId()); List<InfluxModelResultVO> influxModelResult = influxDBService.queryModelResults(pojo, new Date(adjustStartTime), new Date(adjustStartTime)); if (CollectionUtils.isEmpty(influxModelResult)) { log.info("自动调整失败原因：预测历史结果为空。itemNo：" + item.getItemNo() + "，itemName" + item.getItemName() + "，outputId" + configEntity.getOutputId() + "，time" + adjustStartTime); return false; log.info("影响用户调整失败原因：过滤掉-2之后测点数据长度为0。queryDTO：" + queryDTO); continue; } // 触发规则 AutoAdjustTriggerRuleEnum triggerRuleEnum = AutoAdjustTriggerRuleEnum.fromCode(configEntity.getTriggerRule()); Double adjustValue = null; // 判断是否符合触发条件 并计算调整值 switch (triggerRuleEnum) { case SLOPE: @@ -143,8 +151,8 @@ slopeCalendar.add(Calendar.MINUTE,configEntity.getT()); Date slopeEndTime = slopeCalendar.getTime(); if (slopeEndTime.after(endTime)) { log.info("自动调整失败原因：△t设置过大，大于模型预测长度 * 预测粒度。△t：" + configEntity.getT()); return false; log.info("影响用户[" + pointInfo.getPointName() + "]调整失败原因：△t设置过大，大于模型预测长度 * 预测粒度。△t：" + configEntity.getT()); continue; } while (!slopeEndTime.after(endTime)) { //计算斜率 @@ -185,8 +193,8 @@ Date averageEndTime = averageCalendar.getTime(); if (averageEndTime.after(endTime)) { log.info("自动调整失败原因：△t设置过大，△t*2大于模型预测长度 * 预测粒度。△t：" + configEntity.getT()); return false; log.info("影响用户[" + pointInfo.getPointName() + "]调整失败原因：△t设置过大，△t*2大于模型预测长度 * 预测粒度。△t：" + configEntity.getT()); continue; } while (!averageEndTime.after(endTime)) { //计算均值差 @@ -217,32 +225,40 @@ } break; default: log.info("自动调整失败原因：未知触发规则,triggerRule" + configEntity.getTriggerRule()); return false; log.info("影响用户[" + pointInfo.getPointName() + "]调整失败原因：未知触发规则,triggerRule" + configEntity.getTriggerRule()); continue; } if (adjustValue == null) { log.info("自动调整失败原因：未达到触发条件"); return false; log.info("影响用户[" + pointInfo.getPointName() + "]调整失败原因：未达到触发条件"); continue; } // 调整系数 adjustValue = adjustValue * configEntity.getAdjustCoefficient(); // 调整方向 adjustValue = adjustValue * configEntity.getAdjustDirection(); // 累加到最终调整值 finalAdjustValue += adjustValue; } // 执行调整 if (finalAdjustValue.equals(0.0)) { log.info("自动调整失败原因：finalAdjustValue为0，outputId：" + outputId + "，configCode:" + configCode); continue; } List<InfluxModelResultPOJO> lastList = new ArrayList<>(); for (InfluxModelResultVO resultVO : influxModelResult) { InfluxModelResultLastSimPOJO adjustPojo = new InfluxModelResultLastSimPOJO(); // 设置新的调整值 adjustPojo.setValue(Double.parseDouble(resultVO.getValue().toString()) + adjustValue); adjustPojo.setValue(Double.parseDouble(resultVO.getValue().toString()) + finalAdjustValue); adjustPojo.setTimestamp(resultVO.getTimestamp()); adjustPojo.setOutPutId(configEntity.getOutputId()); adjustPojo.setOutPutId(outputId); lastList.add(adjustPojo); } // 相同时间直接覆盖旧值 influxDBService.asyncWriteModelResults(lastList); log.info("t+l自动调整。configCode:" + configCode + ",adjustValue:" + adjustValue + "，itemNo：" + item.getItemNo() + "，itemName" + item.getItemName() + "，outputId" + configEntity.getOutputId() + ",adjustTime：" + adjustStartTime); log.info("t+l自动调整。configCode:" + configCode + ",adjustValue:" + finalAdjustValue + "，itemNo：" + item.getItemNo() + "，itemName：" + item.getItemName() + "，outputId：" + outputId + ",adjustTime：" + adjustStartTime); } return true; } } iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/StSuggestSnapshotConfDetService.java
@@ -7,6 +7,8 @@ import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetRespVO; import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetSaveReqVO; import java.util.List; /** * @author Jay @@ -20,5 +22,5 @@ void delete(String id); StSuggestSnapshotConfDetRespVO getByConfId(String confId); List<StSuggestSnapshotConfDetRespVO> getByConfId(String confId); } iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestOperationRecordServiceImpl.java
@@ -16,6 +16,7 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.util.Date; import java.util.List; import java.util.UUID; @@ -52,7 +53,8 @@ if (confMain != null){ StSuggestSnapshotRecordSaveReqVO snapshotRecordSaveReqVO = new StSuggestSnapshotRecordSaveReqVO(); snapshotRecordSaveReqVO.setModelId(entity.getModelId()); StSuggestSnapshotConfDetRespVO confDet = stSuggestSnapshotConfDetService.getByConfId(confMain.getId()); List<StSuggestSnapshotConfDetRespVO> confDetList = stSuggestSnapshotConfDetService.getByConfId(confMain.getId()); confDetList.forEach(confDet -> { snapshotRecordSaveReqVO.setDataNo(confDet.getDataNo()); snapshotRecordSaveReqVO.setDataType(confDet.getDataType()); snapshotRecordSaveReqVO.setScheduleTime(entity.getScheduleTime()); @@ -65,6 +67,7 @@ Date endTime = Date.from(localEndDateTime.atZone(ZoneId.systemDefault()).toInstant()); snapshotRecordSaveReqVO.setEndTime(endTime); stSuggestSnapshotRecordService.create(snapshotRecordSaveReqVO); }); } }
@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.UUID; @@ -55,7 +56,7 @@ } @Override public StSuggestSnapshotConfDetRespVO getByConfId(String confId) { return ConvertUtils.sourceToTarget(baseDao.selectOne("conf_id", confId), StSuggestSnapshotConfDetRespVO.class); public List<StSuggestSnapshotConfDetRespVO> getByConfId(String confId) { return ConvertUtils.sourceToTarget(baseDao.selectList("conf_id", confId), StSuggestSnapshotConfDetRespVO.class); } } iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/permission/MenuServiceImpl.java
@@ -331,7 +331,10 @@ if (CollUtil.isEmpty(ids)) { return Lists.newArrayList(); } return menuMapper.selectBatchIds(ids); return menuMapper.selectList( new LambdaQueryWrapper<MenuDO>() .in(MenuDO::getId, ids) .eq(MenuDO::getStatus, CommonStatusEnum.ENABLE)); } @Override iailab-plat-sdk/src/main/java/com/iailab/sdk/util/http/IailabHttpUtils.java
@@ -90,7 +90,7 @@ httpPost.addHeader("Content-Type", "application/json;charset=UTF-8"); httpPost.addHeader("Authorization", "Bearer " + IailabClient.accessToken); httpPost.addHeader("Tenant-Id", SdkAutoConfiguration.TENANT_ID.toString()); StringEntity stringEntity = new StringEntity(json); StringEntity stringEntity = new StringEntity(json,"UTF-8"); stringEntity.setContentEncoding("UTF-8"); stringEntity.setContentType("application/json"); httpPost.setEntity(stringEntity);
