TRX 1 год назад
Родитель
Сommit
b9723481df

+ 10 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/devices/DeviceSyncController.java

@@ -5,6 +5,8 @@ import com.github.microservice.models.device.DeviceSyncListParam;
 import com.github.microservice.models.device.GateWaySyncParam;
 import com.github.microservice.models.hxz.DevicePingInfoParam;
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.staticVariable.OpenApiMark;
+import com.zhongshu.card.client.openApi.params.DeviceIdParam;
 import com.zhongshu.card.server.core.service.devices.DeviceSyncFromIotService;
 import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissSendLogService;
 import io.swagger.v3.oas.annotations.Hidden;
@@ -20,7 +22,8 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  *
  */
-@RequestMapping("/deviceSync")
+//@RequestMapping("/deviceSync")
+@RequestMapping("/" + OpenApiMark.fullCardOpenAPI + "/v1/deviceSync")
 @RestController
 @Validated
 @Tag(name = "物联网平台 设备同步")
@@ -39,6 +42,12 @@ public class DeviceSyncController {
         return deviceSyncFromIotService.syncFromIotDevices(param);
     }
 
+    @Operation(summary = "物联网--同步删除设备接口", hidden = true)
+    @RequestMapping(value = "deleteDevice", method = {RequestMethod.POST})
+    public ResultContent deleteDevice(@RequestBody DeviceIdParam param) {
+        return deviceSyncFromIotService.deleteDevice(param);
+    }
+
     @Operation(summary = "物联网--同步设备最近上线时间", hidden = true)
     @RequestMapping(value = "lastDeviceOnLineTime", method = {RequestMethod.POST})
     public ResultContent lastDeviceOnLineTime(@RequestBody DevicePingInfoParam param) {

+ 12 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DeviceSyncFromIotService.java

@@ -4,6 +4,7 @@ import com.github.microservice.models.device.DeviceInfoSyncParam;
 import com.github.microservice.models.device.DeviceSyncListParam;
 import com.github.microservice.models.hxz.DevicePingInfoParam;
 import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.openApi.params.DeviceIdParam;
 import com.zhongshu.card.client.service.school.DeviceInfoService;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.client.utils.DateUtils;
@@ -72,6 +73,17 @@ public class DeviceSyncFromIotService {
         return ResultContent.buildSuccess();
     }
 
+    /**
+     * 删除设备
+     * @param param
+     * @return
+     */
+    public ResultContent deleteDevice(DeviceIdParam param) {
+
+
+        return ResultContent.buildSuccess();
+    }
+
     /**
      * 在线状态
      *