diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelUnemploymentWarningDiffusionServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelUnemploymentWarningDiffusionServiceImpl.java index 4f09de0..7ca5b6b 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelUnemploymentWarningDiffusionServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ModelUnemploymentWarningDiffusionServiceImpl.java @@ -189,21 +189,14 @@ public class ModelUnemploymentWarningDiffusionServiceImpl implements ModelUnempl .map(ModelWarningIndicatorData::getDataValue).orElse(null)) .build()); } - ModelResultIndicatorDataVo unemploymentRateData = ModelResultIndicatorDataVo.builder() - .indicatorName("城镇调查失业率") - .indicatorCode("syzb000") - .indicatorType(1) - .leadPeriod(1) - .dataList(dataList) - .build(); List unemploymentRateList = new ArrayList<>(); - for (ModelResultDataVo dataVo : unemploymentRateData.getDataList()) { + for (ModelResultDataVo dataVo : dataList) { unemploymentRateList.add(dataVo.getValue()); } vo.setUnemploymentRateList(unemploymentRateList); - List diffusionList = ModelIndicatorUtil.calculateDiffusion(result, null); + List diffusionList = ModelIndicatorUtil.calculateDiffusion(result); vo.setDiffusionValueList(diffusionList); vo.setCurrentValue(diffusionList.get(diffusionList.size() - 1)); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/ModelIndicatorUtil.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/ModelIndicatorUtil.java index f64ee7f..1de1735 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/ModelIndicatorUtil.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/ModelIndicatorUtil.java @@ -171,16 +171,11 @@ public class ModelIndicatorUtil { * 失业预警扩散指数 * * @param resultList 指标结果数据 - * @param unemploymentRateData 失业率数据 * @return 计算结果 */ - public static List calculateDiffusion(Tuple2, List> resultList, - ModelResultIndicatorDataVo unemploymentRateData) { + public static List calculateDiffusion(Tuple2, List> resultList) { List indicatorDataList = resultList.getT2(); - if (Objects.nonNull(unemploymentRateData)) { - indicatorDataList.add(unemploymentRateData); - } int maxLeadPeriod = 0; // 计算各个警兆指标的景气值