TRX hai 1 ano
pai
achega
ade6b62c7e

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

@@ -1,8 +1,8 @@
 package com.zhongshu.card.server.core.controller.devices;
 
+import com.github.microservice.models.device.DeviceIdsParam;
 import com.github.microservice.models.device.DevicePermissSendResponseParam;
 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;
@@ -44,7 +44,7 @@ public class DeviceSyncController {
 
     @Operation(summary = "物联网--同步删除设备接口", hidden = true)
     @RequestMapping(value = "deleteDevice", method = {RequestMethod.POST})
-    public ResultContent deleteDevice(@RequestBody DeviceIdParam param) {
+    public ResultContent deleteDevice(@RequestBody DeviceIdsParam param) {
         return deviceSyncFromIotService.deleteDevice(param);
     }
 

+ 1 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/devices/DeviceInfoDao.java

@@ -29,4 +29,5 @@ public interface DeviceInfoDao extends MongoDao<DeviceInfo>, DeviceInfoDaoExtend
 
     long countByProjectOidAndOnLineState(String projectId, OnLineState onLineState);
 
+    void deleteByDeviceIdIn(List<String> deviceIds);
 }

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

@@ -1,10 +1,10 @@
 package com.zhongshu.card.server.core.service.devices;
 
+import com.github.microservice.models.device.DeviceIdsParam;
 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;
@@ -78,9 +78,11 @@ public class DeviceSyncFromIotService {
      * @param param
      * @return
      */
-    public ResultContent deleteDevice(DeviceIdParam param) {
-
-
+    public ResultContent deleteDevice(DeviceIdsParam param) {
+        List<String> deviceIds = param.getDeviceIds();
+        if (ObjectUtils.isNotEmpty(deviceIds)) {
+            deviceInfoDao.deleteByDeviceIdIn(deviceIds);
+        }
         return ResultContent.buildSuccess();
     }