```

feat(device): 添加 OTA 升级相关接口与依赖- 在 DeviceController 和 WebDeviceController 中新增 OTA 固件查询和升级接口
-从 PubController 中移除重复的 OTA 接口实现- 引入 PubGateway依赖以支持 OTA 相关操作
- 调整日志记录代码格式，增强可读性```

portal-service-application/src/main/java/com/hfln/portal/application/controller/pub/PubController.java

@@ -5,15 +5,16 @@ package com.hfln.portal.application.controller.pub;
 import cn.hfln.framework.catchlog.CatchAndLog;
 import cn.hfln.framework.dto.ApiResult;
 import com.hfln.portal.common.dto.data.device.DevInfoDTO;
-import com.hfln.portal.common.dto.data.oss.OtaFileDTO;
 import com.hfln.portal.common.dto.data.pub.DicItemDto;
-import com.hfln.portal.common.request.web.UpdateOTAParams;
 import com.hfln.portal.domain.gateway.PubGateway;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -34,18 +35,6 @@ public class PubController {
         return ApiResult.success(pubGateway.query(dicType));
     }
 
-    @GetMapping("/OTA/query")
-    @Operation(summary = "OTA升级固件列表查询")
-    public ApiResult<List<OtaFileDTO>> queryOtaFiles() {
-        return ApiResult.success(pubGateway.queryOtaFiles());
-    }
-
-    @PostMapping("/OTA/update")
-    @Operation(summary = "设备OTA升级")
-    public ApiResult<Void> updateOTA(@RequestBody @Valid UpdateOTAParams params) {
-        pubGateway.updateOTA(params);
-        return ApiResult.success();
-    }
 
     @GetMapping("/queryClientIdByDevId")
     @Operation(summary = "根据设备主键ID查询设备相关信息")

portal-service-application/src/main/java/com/hfln/portal/application/controller/wap/DeviceController.java

@@ -3,8 +3,11 @@ package com.hfln.portal.application.controller.wap;
 import cn.hfln.framework.catchlog.CatchAndLog;
 import cn.hfln.framework.dto.ApiResult;
 import com.hfln.portal.common.dto.data.device.DeviceDTO;
+import com.hfln.portal.common.dto.data.oss.OtaFileDTO;
 import com.hfln.portal.common.request.device.*;
+import com.hfln.portal.common.request.web.UpdateOTAParams;
 import com.hfln.portal.domain.gateway.DeviceGateway;
+import com.hfln.portal.domain.gateway.PubGateway;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -23,6 +26,9 @@ public class DeviceController {
     @Autowired
     private DeviceGateway deviceGateway;
 
+    @Autowired
+    private PubGateway pubGateway;
+
     @PostMapping("/deviceList")
     @Operation(summary = "查询设备列表")
     public ApiResult<List<DeviceDTO>> deviceList(@RequestBody @Valid DeviceListParams request) {
@@ -76,4 +82,17 @@ public class DeviceController {
     public ApiResult<Boolean> statusLight(@RequestBody @Valid StatusLightParams params) {
         return ApiResult.success(deviceGateway.statusLight(params));
     }
+
+    @GetMapping("/OTA/query")
+    @Operation(summary = "OTA升级固件列表查询")
+    public ApiResult<List<OtaFileDTO>> queryOtaFiles() {
+        return ApiResult.success(pubGateway.queryOtaFiles());
+    }
+
+    @PostMapping("/OTA/update")
+    @Operation(summary = "设备OTA升级")
+    public ApiResult<Void> updateOTA(@RequestBody @Valid UpdateOTAParams params) {
+        pubGateway.updateOTA(params);
+        return ApiResult.success();
+    }
 }

portal-service-application/src/main/java/com/hfln/portal/application/controller/web/WebDeviceController.java

@@ -3,12 +3,15 @@ package com.hfln.portal.application.controller.web;
 import cn.hfln.framework.catchlog.CatchAndLog;
 import cn.hfln.framework.dto.ApiResult;
 import com.hfln.portal.common.dto.data.device.DeviceDTO;
+import com.hfln.portal.common.dto.data.oss.OtaFileDTO;
 import com.hfln.portal.common.request.device.DeviceListQueryReq;
 import com.hfln.portal.common.request.device.WebUpdateDeviceParams;
 import com.hfln.portal.common.request.web.DeviceAddParam;
+import com.hfln.portal.common.request.web.UpdateOTAParams;
 import com.hfln.portal.common.vo.PageRecord;
 import com.hfln.portal.common.vo.UploadRes;
 import com.hfln.portal.domain.gateway.DeviceGateway;
+import com.hfln.portal.domain.gateway.PubGateway;
 import com.hfln.portal.domain.gateway.WebGateway;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -19,6 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.List;
 
 @RestController
 @CatchAndLog
@@ -33,6 +37,9 @@ public class WebDeviceController {
     @Autowired
     private DeviceGateway DeviceGateway;
 
+    @Autowired
+    private PubGateway pubGateway;
+
     @PostMapping("/uploadDev")
     @Operation(summary = "excel上传设备信息")
     public ApiResult<UploadRes> uploadDev(@Valid @RequestParam MultipartFile file) throws IOException {
@@ -63,4 +70,17 @@ public class WebDeviceController {
     public ApiResult<Boolean> webUpdateDevice(@Valid @RequestBody WebUpdateDeviceParams Params) {
         return ApiResult.success(DeviceGateway.webUpdateDevice(Params));
     }
+
+    @GetMapping("/OTA/query")
+    @Operation(summary = "OTA升级固件列表查询")
+    public ApiResult<List<OtaFileDTO>> queryOtaFiles() {
+        return ApiResult.success(pubGateway.queryOtaFiles());
+    }
+
+    @PostMapping("/OTA/update")
+    @Operation(summary = "设备OTA升级")
+    public ApiResult<Void> updateOTA(@RequestBody @Valid UpdateOTAParams params) {
+        pubGateway.updateOTA(params);
+        return ApiResult.success();
+    }
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/AlarmGatewayImpl.java

@@ -125,8 +125,8 @@ public class AlarmGatewayImpl implements AlarmGateway {
         }
 
         AlarmTimePlan alarmTimePlan = alarmTimePlanService.getById(alarmPlan.getAlarmTimePlanId());
-        logService.saveLog((long) req.getId(),OprLogType.DEL_ALARM_PLAN.getCode(), alarmPlan);
-        logService.saveLog((long)alarmTimePlan.getId(),OprLogType.DEL_TIME_PLAN.getCode(), alarmTimePlan);
+        logService.saveLog((long) req.getId(), OprLogType.DEL_ALARM_PLAN.getCode(), alarmPlan);
+        logService.saveLog((long) alarmTimePlan.getId(), OprLogType.DEL_TIME_PLAN.getCode(), alarmTimePlan);
         alarmPlanService.delById(req.getId());
         alarmTimePlanService.delById(alarmTimePlan.getId());