From 6de7f1ffdf157d64688839a55e112ec62692a672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=AE=9D=E9=BE=99?= <mabaolong@anjugs.com>
Date: Fri, 3 Jul 2026 19:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ModelUnemploymentWarningDiffusionServiceImpl.java | 11 ++---------
 .../java/com/ruoyi/cms/util/ModelIndicatorUtil.java   |  7 +------
 2 files changed, 3 insertions(+), 15 deletions(-)

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<BigDecimal> unemploymentRateList = new ArrayList<>();
-        for (ModelResultDataVo dataVo : unemploymentRateData.getDataList()) {
+        for (ModelResultDataVo dataVo : dataList) {
             unemploymentRateList.add(dataVo.getValue());
         }
         vo.setUnemploymentRateList(unemploymentRateList);
 
-        List<BigDecimal> diffusionList = ModelIndicatorUtil.calculateDiffusion(result, null);
+        List<BigDecimal> 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<BigDecimal> calculateDiffusion(Tuple2<List<String>, List<ModelResultIndicatorDataVo>> resultList,
-                                                      ModelResultIndicatorDataVo unemploymentRateData) {
+    public static List<BigDecimal> calculateDiffusion(Tuple2<List<String>, List<ModelResultIndicatorDataVo>> resultList) {
 
         List<ModelResultIndicatorDataVo> indicatorDataList = resultList.getT2();
-        if (Objects.nonNull(unemploymentRateData)) {
-            indicatorDataList.add(unemploymentRateData);
-        }
 
         int maxLeadPeriod = 0;
         // 计算各个警兆指标的景气值