diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java index e557c148..1b5e818d 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java @@ -430,7 +430,7 @@ public class SocketDevResponseService { if (successComm.size() == monitorIdListComm.size()) { SourceIssue sourceIssue = SocketManager.getSourceTarget(socketDataMsg.getRequestId()); System.out.println("获取sourceIssue"+sourceIssue); - Map flag = detectionServiceImpl.text(devDataList,devIdMapComm ,sourceIssue, DictDataEnum.AT_WILL_VALUE); + Map flag = detectionServiceImpl.text(devDataList,param.getErrorSysId(),devIdMapComm,sourceIssue, DictDataEnum.AT_WILL_VALUE); System.out.println(flag); WebSocketVO> webSocketVO = new WebSocketVO<>(); diff --git a/detection/src/main/java/com/njcn/gather/detection/pojo/param/PreDetectionParam.java b/detection/src/main/java/com/njcn/gather/detection/pojo/param/PreDetectionParam.java index 4b02698c..8c360df1 100644 --- a/detection/src/main/java/com/njcn/gather/detection/pojo/param/PreDetectionParam.java +++ b/detection/src/main/java/com/njcn/gather/detection/pojo/param/PreDetectionParam.java @@ -17,7 +17,6 @@ public class PreDetectionParam { */ private String operateType = "0"; - /** * 检测计划id */ @@ -42,4 +41,9 @@ public class PreDetectionParam { * 源id */ private String sourceId; + + /** + * 所属误差体系 + */ + private String errorSysId; } diff --git a/detection/src/main/java/com/njcn/gather/detection/pojo/vo/DetectionData.java b/detection/src/main/java/com/njcn/gather/detection/pojo/vo/DetectionData.java index d2e473f0..c489082d 100644 --- a/detection/src/main/java/com/njcn/gather/detection/pojo/vo/DetectionData.java +++ b/detection/src/main/java/com/njcn/gather/detection/pojo/vo/DetectionData.java @@ -11,8 +11,14 @@ import lombok.Data; @Data public class DetectionData { + /** - * 是否是符合数据 + * 第几次谐波 + */ + private Integer num; + + /** + * 原始数据 */ private Integer isData; diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java index a6647ed1..1c2a0276 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java @@ -10,14 +10,17 @@ import com.njcn.gather.device.err.pojo.param.PqErrSysParam; import com.njcn.gather.device.err.pojo.po.PqErrSysDtls; import com.njcn.gather.device.err.service.IPqErrSysDtlsService; import com.njcn.gather.device.script.pojo.po.SourceIssue; +import com.njcn.gather.storage.pojo.po.AdHarmonicResult; import com.njcn.gather.storage.pojo.po.AdNonHarmonicResult; import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.lang.reflect.Field; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -43,11 +46,11 @@ public class DetectionServiceImpl { * 开始处理指标类型 * 一共20组数据，开始处理格式 */ - public Map text(List dev,Map devIdMapComm, SourceIssue issue, DictDataEnum dataRule) { + public Map text(List dev, String errorSysId, Map devIdMapComm, SourceIssue issue, DictDataEnum dataRule) { Map> devDataMap = dev.stream().collect(Collectors.groupingBy(DevData::getId)); Map stringBooleanMap = new LinkedHashMap<>(); devDataMap.forEach(((key, value) -> { - stringBooleanMap.put(key, DetectionIndexProcessing(value,devIdMapComm, dataRule, issue)); + stringBooleanMap.put(key, DetectionIndexProcessing(value, errorSysId, devIdMapComm, dataRule, issue)); })); return stringBooleanMap; } @@ -62,26 +65,29 @@ public class DetectionServiceImpl { * @param sourceIssue 源下发的参数 * @return */ - public Integer DetectionIndexProcessing(List dev,Map devIdMapComm, DictDataEnum dataRule, SourceIssue sourceIssue) { + public Integer DetectionIndexProcessing(List dev, String errorSysId, Map devIdMapComm, DictDataEnum dataRule, SourceIssue sourceIssue) { PqErrSysParam.DetectionParam param = new PqErrSysParam.DetectionParam(); + param.setIndex(sourceIssue.getIndex()); + param.setScriptId(sourceIssue.getScriptId()); + param.setErrorSysId(errorSysId); List pqErrSysDtls = pqErrSysDtlsService.listPqErrSysDtlsByPqErrSysIdAndTypes(param); switch ("V") { /** * 频率 */ case "FREQ": - return isQualified(dev,devIdMapComm, pqErrSysDtls, F, sourceIssue, dataRule, "FREQ").getResultFlag(); + return isQualified(dev, devIdMapComm, pqErrSysDtls, F, sourceIssue, dataRule, "FREQ").getResultFlag(); /** * 电压 */ case "V": - System.out.println(isQualified(dev,devIdMapComm, pqErrSysDtls, F, sourceIssue, dataRule, "FREQ")); - return isQualified(dev,devIdMapComm, pqErrSysDtls, U, sourceIssue, dataRule, "VRMS").getResultFlag(); + System.out.println(isQualified(dev, devIdMapComm, pqErrSysDtls, F, sourceIssue, dataRule, "FREQ")); + return isQualified(dev, devIdMapComm, pqErrSysDtls, U, sourceIssue, dataRule, "VRMS").getResultFlag(); /** * 电流 */ case "I": - return isQualified(dev,devIdMapComm, pqErrSysDtls, I, sourceIssue, dataRule, "IRMS").getResultFlag(); + return isQualified(dev, devIdMapComm, pqErrSysDtls, I, sourceIssue, dataRule, "IRMS").getResultFlag(); /** * 谐波类 */ @@ -98,8 +104,8 @@ public class DetectionServiceImpl { case "F": break; /** - * 暂态 - */ + * 暂态 + */ case "VOLTAGE": break; } @@ -181,9 +187,10 @@ public class DetectionServiceImpl { * @param type (电压还是电流) * @param sourceIssue 源下发所对应的参数 * @param dataRule 数据处理原则 + * @param code 源下发的装置通道code(->desc) * @return */ - public AdNonHarmonicResult isQualified(List dev,Map devIdMapComm, List pqErrSysDtls, String type, SourceIssue sourceIssue, DictDataEnum dataRule, String code) { + public AdNonHarmonicResult isQualified(List dev, Map devIdMapComm, List pqErrSysDtls, String type, SourceIssue sourceIssue, DictDataEnum dataRule, String code) { Map> map = devListMap(dev, dataRule, code); Double fData = 1.0; if (U.equals(type)) { @@ -195,16 +202,16 @@ public class DetectionServiceImpl { if (F.equals(type)) { fData = sourceIssue.getFFreq(); } - AdNonHarmonicResult result=new AdNonHarmonicResult(); + AdNonHarmonicResult result = new AdNonHarmonicResult(); String[] split = dev.get(0).getId().split("_"); - String devID = devIdMapComm.get(split); - result.setMonitorId(devID+"_"+split[1]); + String devID = devIdMapComm.get(split[0]); + result.setMonitorId(devID + "_" + split[1]); result.setScriptId(sourceIssue.getScriptId()); result.setIndex(sourceIssue.getIndex()); result.setDataType("avg"); if (map.containsKey(TYPE_T)) { DetectionData t = rangeComparisonList(map.get(TYPE_T), pqErrSysDtls, fData, 1.0, dataRule); - result.setTValue(t.getData()+"_"+t.getIsData()); + result.setTValue(t.getData() + "_" + t.getIsData()); result.setResultFlag(t.getIsData()); } else { //取出源所对应的相别信息 @@ -212,32 +219,32 @@ public class DetectionServiceImpl { .filter(x -> (type + "a").equals(x.getChannelType())) .collect(Collectors.toList()); DetectionData a = rangeComparisonList(map.get(TYPE_A), pqErrSysDtls, fData, channelTypeAList.get(0).getFAmp(), dataRule); - result.setAValue(a.getData()+"_"+a.getIsData()); + result.setAValue(a.getData() + "_" + a.getIsData()); List channelTypeBList = sourceIssue.getChannelList().stream() .filter(x -> (type + "b").equals(x.getChannelType())) .collect(Collectors.toList()); DetectionData b = rangeComparisonList(map.get(TYPE_B), pqErrSysDtls, fData, channelTypeBList.get(0).getFAmp(), dataRule); - result.setBValue(b.getData()+"_"+b.getIsData()); - + result.setBValue(b.getData() + "_" + b.getIsData()); List channelTypeCList = sourceIssue.getChannelList().stream() .filter(x -> (type + "c").equals(x.getChannelType())) .collect(Collectors.toList()); DetectionData c = rangeComparisonList(map.get(TYPE_C), pqErrSysDtls, fData, channelTypeCList.get(0).getFAmp(), dataRule); - result.setCValue(c.getData()+"_"+c.getIsData()); + result.setCValue(c.getData() + "_" + c.getIsData()); + List numbers = Arrays.asList(a.getIsData(), b.getIsData(), a.getIsData()); - if(numbers.stream().allMatch(n -> n == 1)){ + if (numbers.stream().allMatch(n -> n == 1)) { result.setResultFlag(1); } - if(numbers.stream().allMatch(n -> n == 2)){ - result.setResultFlag(1); + if (numbers.stream().allMatch(n -> n == 2)) { + result.setResultFlag(2); } - if(numbers.stream().allMatch(n -> n == 3)){ - result.setResultFlag(1); + if (numbers.contains(4)) { + result.setResultFlag(4); } } - return result; + return result; } /** @@ -251,7 +258,7 @@ public class DetectionServiceImpl { * @param num 处理数组下标位数 * @return */ - public Boolean isHarmQualified(List dev, List pqErrSysDtls, String type, SourceIssue sourceIssue, DictDataEnum dataRule, Integer num) { + public AdHarmonicResult isHarmQualified(List dev, Map devIdMapComm, List pqErrSysDtls, String type, SourceIssue sourceIssue, DictDataEnum dataRule, Integer num) { Map>> devMap = devHarmListMap(dev, sourceIssue, dataRule, num); Double fData = 1.0; if (U.equals(type)) { @@ -260,25 +267,54 @@ public class DetectionServiceImpl { if (I.equals(type)) { fData = sourceIssue.getFIn(); } - Map integerBooleanMapA = harmRangeComparison(pqErrSysDtls, type, TYPE_A, sourceIssue, dataRule, devMap.get(TYPE_A), fData); - Map integerBooleanMapB = harmRangeComparison(pqErrSysDtls, type, TYPE_B, sourceIssue, dataRule, devMap.get(TYPE_B), fData); - Map integerBooleanMapC = harmRangeComparison(pqErrSysDtls, type, TYPE_C, sourceIssue, dataRule, devMap.get(TYPE_C), fData); - List list = new ArrayList<>(); - list.addAll(integerBooleanMapA.values()); - list.addAll(integerBooleanMapB.values()); - list.addAll(integerBooleanMapC.values()); - if (CollUtil.isNotEmpty(list)) { - List integerList = list.stream().filter(x -> ObjectUtil.isNotNull(x)).collect(Collectors.toList()); - if (integerList.size() == list.size()) { - List booleans = integerList.stream().distinct().collect(Collectors.toList()); - if (booleans.size() > 1) { - return false; - } else { - return booleans.get(0); - } - } + List integerBooleanA = harmRangeComparison(pqErrSysDtls, type, TYPE_A, sourceIssue, dataRule, devMap.get(TYPE_A), fData); + List integerBooleanB = harmRangeComparison(pqErrSysDtls, type, TYPE_B, sourceIssue, dataRule, devMap.get(TYPE_B), fData); + List integerBooleanC = harmRangeComparison(pqErrSysDtls, type, TYPE_C, sourceIssue, dataRule, devMap.get(TYPE_C), fData); + AdHarmonicResult harmonicResult = new AdHarmonicResult(); + String[] split = dev.get(0).getId().split("_"); + String devID = devIdMapComm.get(split[0]); + harmonicResult.setMonitorId(devID + "_" + split[1]); + harmonicResult.setScriptId(sourceIssue.getScriptId()); + harmonicResult.setIndex(sourceIssue.getIndex()); + harmonicResult.setDataType("avg"); + reflectHarmonic("a", integerBooleanA, harmonicResult); + reflectHarmonic("b", integerBooleanA, harmonicResult); + reflectHarmonic("c", integerBooleanA, harmonicResult); + List list = new ArrayList<>(); + list.addAll(integerBooleanA.stream().map(DetectionData::getIsData).distinct().collect(Collectors.toList())); + list.addAll(integerBooleanB.stream().map(DetectionData::getIsData).distinct().collect(Collectors.toList())); + list.addAll(integerBooleanC.stream().map(DetectionData::getIsData).distinct().collect(Collectors.toList())); + if (list.stream().allMatch(n -> n == 1)) { + harmonicResult.setResultFlag(1); } - return null; + if (list.stream().allMatch(n -> n == 2)) { + harmonicResult.setResultFlag(2); + } + if (list.contains(4)) { + harmonicResult.setResultFlag(4); + } + return harmonicResult; + } + + private void reflectHarmonic(String phase, List integerBooleanA, AdHarmonicResult harmonicResult) { + Map dataMap = integerBooleanA.stream().collect(Collectors.toMap(DetectionData::getNum, Function.identity())); + dataMap.forEach((key, value) -> { + try { + // 设置 id 字段 + Field idField = AdHarmonicResult.class.getDeclaredField(phase + "Value" + key); + idField.setAccessible(true); + if (ObjectUtil.isNull(value.getIsData())) { + idField.set(harmonicResult, value.getData()); + } else { + idField.set(harmonicResult, value.getData() + "_" + value.getIsData()); + } + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } catch (NoSuchFieldException e) { + throw new RuntimeException(e); + } + + }); } @@ -330,8 +366,8 @@ public class DetectionServiceImpl { * @param fData * @return */ - public Map harmRangeComparison(List pqErrSysDtls, String type, String phase, SourceIssue sourceIssue, DictDataEnum dataRule, Map> devMap, Double fData) { - Map map = new LinkedHashMap<>(); + public List harmRangeComparison(List pqErrSysDtls, String type, String phase, SourceIssue sourceIssue, DictDataEnum dataRule, Map> devMap, Double fData) { + List info = new ArrayList<>(); //根据谐波几次相值/额定值 Map issueHarmMap = sourceIssue.getChannelList().stream() .filter(x -> (type + phase.toLowerCase()).equals(x.getChannelType())) @@ -352,49 +388,70 @@ public class DetectionServiceImpl { } }); devMap.forEach((harm, harmDataList) -> { - Boolean harmBigNum = getHarmNum(dataRule, harmDataList, errSysDtlMap.get(harm), issueHarmMap.get(harm), fData); - if (ObjectUtil.isNotNull(harmBigNum)) { - map.put(harm, harmBigNum); + PqErrSysDtls errSysDtl = errSysDtlMap.get(harm); + DetectionData data = new DetectionData(); + data.setIsData(4); + data.setNum(harm); + data.setData(harmDataList.get(0)); + if (ObjectUtil.isNotNull(errSysDtl)) { + if (0 == errSysDtl.getErrorValueType()) { + errSysDtl.setMaxErrorValue(multiply(errSysDtl.getMaxErrorValue(), fData, 0)); + } + Double v = issueHarmMap.get(harm); + setDetection(dataRule, harmDataList, errSysDtl, data, v); } - + info.add(data); }); - return map; + return info; } - public Boolean getHarmNum(DictDataEnum dataRule, List harmDataList, PqErrSysDtls errSysDtl, Double channelData, Double fData) { - if (ObjectUtil.isNotNull(errSysDtl)) { - if (0 == errSysDtl.getErrorValueType()) { - errSysDtl.setMaxErrorValue(multiply(errSysDtl.getMaxErrorValue(), fData, 0)); - } - List qualifiedList = harmDataList.stream() - .filter(x -> NumberUtil.isIn(devSubtractChannelData(x, channelData, errSysDtl.getErrorValueType()), - BigDecimal.valueOf(-errSysDtl.getMaxErrorValue()), - BigDecimal.valueOf(errSysDtl.getMaxErrorValue()))).collect(Collectors.toList()); + /** + * @param dataRule 数据处理原则 + * @param harmDataList 原始数据集合 + * @param errSysDtl 误差体系 + * @param data 初始化原始数据 + * @param v 源下发的数据 + * @Description: + * @Author: wr + * @Date: 2024/12/29 18:10 + */ + private void setDetection(DictDataEnum dataRule, List harmDataList, PqErrSysDtls errSysDtl, DetectionData data, Double v) { + List qualifiedList = harmDataList.stream() + .filter(x -> NumberUtil.isIn(devSubtractChannelData(x, v, errSysDtl.getErrorValueType()), + BigDecimal.valueOf(-errSysDtl.getMaxErrorValue()), + BigDecimal.valueOf(errSysDtl.getMaxErrorValue()))).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(qualifiedList)) { + data.setData(qualifiedList.get(0)); switch (dataRule) { case AT_WILL_VALUE: case CP95_VALUE: case AVG_VALUE: if (qualifiedList.size() > 0) { - return true; + data.setIsData(1); + } else { + data.setIsData(2); } break; case SECTION_VALUE: case Own_value: if (qualifiedList.size() == harmDataList.size()) { - return true; + data.setIsData(1); + } else { + data.setIsData(2); } break; } - return false; + } else { + data.setIsData(2); } - return null; } + public Map>> devHarmListMap(List dev, SourceIssue sourceIssue, DictDataEnum dataRule, Integer num) { + Map>> map = new HashMap<>(3); List harmNum = sourceIssue.getChannelList().stream() .flatMap(x -> x.getHarmList().stream().map(f -> f.getHarm())) .sorted().distinct().collect(Collectors.toList()); - Map>> map = new HashMap<>(3); for (DevData devData : dev) { DevData.SqlDataDTO fund = devData.getSqlData().stream().collect(Collectors.toList()).stream().findFirst().get(); DevData.SqlDataHarmDTO harm = devData.getSqlDataHarm().stream().filter(x -> 49 == x.getNum()).collect(Collectors.toList()).stream().findFirst().get(); @@ -441,7 +498,7 @@ public class DetectionServiceImpl { * @returnd */ public DetectionData rangeComparisonList(List listT, List pqErrSysDtls, Double data, Double channelData, DictDataEnum dataRule) { - DetectionData detectionData=new DetectionData(); + DetectionData detectionData = new DetectionData(); detectionData.setIsData(4); detectionData.setData(listT.get(0)); //先根据源所下发的数据，是否在误差体系范围内在则可以进行误差体系判断 @@ -456,33 +513,7 @@ public class DetectionServiceImpl { if (0 == errSysDtl.getErrorValueType()) { errSysDtl.setMaxErrorValue(multiply(errSysDtl.getMaxErrorValue(), data, 0)); } - List qualifiedList = listT.stream().filter(x -> NumberUtil.isIn(devSubtractChannelData(x, channelData, errSysDtl.getErrorValueType()), - BigDecimal.valueOf(-errSysDtl.getMaxErrorValue()), - BigDecimal.valueOf(errSysDtl.getMaxErrorValue()))).collect(Collectors.toList()); - if(CollUtil.isNotEmpty(qualifiedList)){ - detectionData.setData(qualifiedList.get(0)); - switch (dataRule) { - case AT_WILL_VALUE: - case CP95_VALUE: - case AVG_VALUE: - if (qualifiedList.size() > 0) { - detectionData.setIsData(1); - }else{ - detectionData.setIsData(2); - } - break; - case SECTION_VALUE: - case Own_value: - if (qualifiedList.size() == listT.size()) { - detectionData.setIsData(1); - }else{ - detectionData.setIsData(2); - } - break; - } - }else{ - detectionData.setIsData(2); - } + setDetection(dataRule, listT, errSysDtl, detectionData, channelData); } return detectionData; } diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java index ff45daab..893e54d5 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java @@ -109,6 +109,7 @@ public class PreDetectionServiceImpl implements PreDetectionService { AdPlan plan = iAdPlanService.getById(param.getPlanId()); PqSource pqSource = pqSourceService.getById(plan.getDatasourceId()); if (ObjectUtil.isNotNull(plan)) { + plan.setErrorSysId(plan.getId()); String code = dictDataService.getDictDataById(plan.getPattern()).getCode(); DictDataEnum dictDataEnumByCode = DictDataEnum.getDictDataEnumByCode(code); switch (dictDataEnumByCode) { diff --git a/device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysDtlsServiceImpl.java b/device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysDtlsServiceImpl.java index 7c137e36..c79355b6 100644 --- a/device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysDtlsServiceImpl.java +++ b/device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysDtlsServiceImpl.java @@ -8,6 +8,7 @@ import com.njcn.gather.device.err.pojo.param.PqErrSysDtlsParam; import com.njcn.gather.device.err.pojo.param.PqErrSysParam; import com.njcn.gather.device.err.pojo.po.PqErrSysDtls; import com.njcn.gather.device.err.service.IPqErrSysDtlsService; +import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam; import com.njcn.gather.device.script.service.IPqScriptCheckDataService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,7 +35,7 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl listPqErrSysDtlsByPqErrSysId(String pqErrSysId) { - return this.lambdaQuery().eq(PqErrSysDtls::getErrorSysId, pqErrSysId).orderBy(true, true,PqErrSysDtls::getSort).list(); + return this.lambdaQuery().eq(PqErrSysDtls::getErrorSysId, pqErrSysId).orderBy(true, true, PqErrSysDtls::getSort).list(); } @Override @@ -75,13 +76,16 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl() +// PqScriptCheckDataParam script = new PqScriptCheckDataParam(); +// script.setScriptId(param.getScriptId()); +// script.setIndex(param.getIndex()); +// script.setIsValueTypeName(false); +// List valueType = pqScriptCheckDataService.getValueType(script); +// //根据检测脚本id和检测序号，查询出检测子项目 +// return this.list(new LambdaQueryWrapper() // .eq(PqErrSysDtls::getErrorSysId, param.getErrorSysId()) -// .in(PqErrSysDtls::getErrorSysId, param.getType()) +// .in(PqErrSysDtls::getScriptType, valueType) // ); -// return new ArrayList<>(); + } } diff --git a/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptCheckDataParam.java b/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptCheckDataParam.java index b179a2ba..84be2a78 100644 --- a/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptCheckDataParam.java +++ b/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptCheckDataParam.java @@ -14,7 +14,7 @@ public class PqScriptCheckDataParam { @ApiModelProperty("总检测脚本中的测试项序号") private Integer index; - @ApiModelProperty("检测指标类型(true:展示名称 ，false展示id ，默认false)") + @ApiModelProperty("检测指标类型(true:code(I$real) ，false展示id ，默认false)") private Boolean isValueTypeName=false; } \ No newline at end of file diff --git a/storage/src/main/java/com/njcn/gather/storage/controller/DataDealController.java b/storage/src/main/java/com/njcn/gather/storage/controller/DataDealController.java index eef2829a..71279485 100644 --- a/storage/src/main/java/com/njcn/gather/storage/controller/DataDealController.java +++ b/storage/src/main/java/com/njcn/gather/storage/controller/DataDealController.java @@ -39,7 +39,7 @@ public class DataDealController extends BaseController { adHarmonicResult.setAdType("aaaa"); adHarmonicResult.setMonitorId("ss"); - adHarmonicResult.setScriptDtlsId("ddd"); + adHarmonicResult.setScriptId("ddd"); adHarmonicResult.setTimeId(LocalDateTime.now()); list2.add(adHarmonicResult); @@ -48,7 +48,7 @@ public class DataDealController extends BaseController { adHarmonicResult2.setAdType("aaaabb"); adHarmonicResult2.setMonitorId("ssbb"); - adHarmonicResult2.setScriptDtlsId("dddbb"); + adHarmonicResult2.setScriptId("dddbb"); adHarmonicResult2.setTimeId(LocalDateTime.now()); list2.add(adHarmonicResult2); diff --git a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java index 47ec3561..feb76677 100644 --- a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java +++ b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java @@ -36,6 +36,7 @@ public class AdHarmonicResult { */ private String scriptId; + private Integer index; /**