重构

ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsStatisticalReportController.java

@@ -12,7 +12,9 @@ import com.xzzn.ems.domain.vo.ClusterStatisListVo;
 import com.xzzn.ems.domain.vo.DateSearchRequest;
 import com.xzzn.ems.domain.vo.StatisAmmeterDateRequest;
 import com.xzzn.ems.domain.vo.StatisClusterDateRequest;
+import com.xzzn.ems.domain.vo.WeatherSyncResultVo;
 import com.xzzn.ems.service.IEmsStatsReportService;
+import com.xzzn.ems.service.IEmsWeatherSyncService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,6 +40,8 @@ public class EmsStatisticalReportController extends BaseController
 
     @Autowired
     private IEmsStatsReportService ieEmsStatsReportService;
+    @Autowired
+    private IEmsWeatherSyncService iEmsWeatherSyncService;
 
     /**
      * 概率统计-收益指标查询
@@ -176,4 +180,19 @@ public class EmsStatisticalReportController extends BaseController
         }
     }
 
+    /**
+     * 手动触发天气同步
+     */
+    @PostMapping("/syncWeatherByDateRange")
+    public AjaxResult syncWeatherByDateRange(StatisAmmeterDateRequest requestVo)
+    {
+        if (StringUtils.isEmpty(requestVo.getSiteId())
+                || StringUtils.isEmpty(requestVo.getStartTime())
+                || StringUtils.isEmpty(requestVo.getEndTime())) {
+            return error("缺少必传项: siteId/startTime/endTime");
+        }
+        WeatherSyncResultVo resultVo = iEmsWeatherSyncService.syncWeatherByDateRange(requestVo);
+        return success(resultVo);
+    }
+
 }

ems-admin/src/main/java/com/xzzn/web/controller/ems/MqttMessageController.java

@@ -6,11 +6,7 @@ import com.xzzn.common.enums.TopicHandleType;
 import com.xzzn.common.utils.StringUtils;
 import com.xzzn.ems.domain.EmsMqttTopicConfig;
 import com.xzzn.ems.mapper.EmsMqttTopicConfigMapper;
-import com.xzzn.ems.service.IDDSDataProcessService;
 import com.xzzn.ems.service.IDeviceDataProcessService;
-import com.xzzn.ems.service.IEmsStrategyService;
-import com.xzzn.ems.service.IFXXAlarmDataProcessService;
-import com.xzzn.ems.service.IFXXDataProcessService;
 import com.xzzn.ems.service.IMqttSyncLogService;
 import com.xzzn.framework.manager.MqttLifecycleManager;
 import com.xzzn.framework.web.service.MqttPublisher;
@@ -38,22 +34,13 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
 
     private final MqttLifecycleManager mqttLifecycleManager;
 
-    @Autowired
-    private IFXXDataProcessService fXXDataProcessService;
-
-    @Autowired
-    private IDDSDataProcessService dDSDataProcessService;
 
     @Autowired
     private IDeviceDataProcessService deviceDataProcessService;
 
-    @Autowired
-    private IFXXAlarmDataProcessService fXXAlarmDataProcessService;
     @Autowired
     private EmsMqttTopicConfigMapper emsMqttTopicConfigMapper;
     @Autowired
-    private IEmsStrategyService emsStrategyService;
-    @Autowired
     private IMqttSyncLogService iMqttSyncLogService;
 
     @Autowired

ems-admin/src/main/resources/application-local.yml

@@ -205,3 +205,10 @@ modbus:
   poll:
     interval: "0 */5 * * * *"  # 5分钟间隔
     timeout: 30000             # 30秒超时
+
+weather:
+  api:
+    enabled: true
+    base-url: https://archive-api.open-meteo.com/v1/archive
+    api-key:
+    timezone: Asia/Shanghai

ems-admin/src/main/resources/application-prod.yml

@@ -205,3 +205,10 @@ modbus:
   poll:
     interval: "0 */5 * * * *"  # 5分钟间隔
     timeout: 30000             # 30秒超时
+
+weather:
+  api:
+    enabled: true
+    base-url: https://archive-api.open-meteo.com/v1/archive
+    api-key:
+    timezone: Asia/Shanghai

ems-admin/src/main/resources/application.yml

@@ -221,3 +221,10 @@ modbus:
   poll:
     interval: "0 */5 * * * *"  # 5分钟间隔
     timeout: 30000             # 30秒超时
+
+weather:
+  api:
+    enabled: true
+    base-url: https://archive-api.open-meteo.com/v1/archive
+    api-key:
+    timezone: Asia/Shanghai