Ver código fonte

机构类型

TRX 1 ano atrás
pai
commit
cf7cf0a6ef

+ 2 - 1
src/main/java/com/zswl/dataservice/service/mqtt/DeviceInfoService.java

@@ -74,7 +74,7 @@ public class DeviceInfoService {
             deviceInfo.setProjectInfo(projectInfo);
             deviceInfo.setProjectInfoCode(projectInfo.getCode());
         }
-
+        deviceInfo.setLastOnlineTime(System.currentTimeMillis());
         deviceInfoDao.save(deviceInfo);
         operationLogsService.addLogs(String.format("添加了设备;%s", deviceInfo.getDeviceName()), LogsLevel.Middle, deviceInfo);
         return ResultContent.buildSuccess(deviceInfo);
@@ -140,6 +140,7 @@ public class DeviceInfoService {
         if (ObjectUtils.isEmpty(projectInfo)) {
             return ResultContent.buildFail(String.format("项目不存在:", param.getId()));
         }
+        deviceInfo.setProjectInfoCode(projectInfo.getCode());
         deviceInfo.setProjectInfo(projectInfo);
         deviceInfoDao.save(deviceInfo);
         return ResultContent.buildSuccess();

+ 0 - 2
src/main/java/com/zswl/dataservice/service/mqtt/GateWayInfoService.java

@@ -182,8 +182,6 @@ public class GateWayInfoService extends SuperService {
 
         // 绑定用户设备权限
         bindUserDevicesPermissions(MqttTopicUtils.getUserRoleName(gateWayUserInfo), deviceInfos);
-
-        deviceSyncFullCardService.noticeSyncDevice(deviceInfos);
         return ResultContent.buildSuccess();
     }
 

+ 2 - 2
src/main/java/com/zswl/dataservice/service/sync/DeviceSyncFullCardService.java

@@ -133,8 +133,8 @@ public class DeviceSyncFullCardService extends SuperService {
             }).collect(Collectors.toList());
         }
         param.setList(deviceInfos);
-        APIResponseModel api = apiRequestService.sendFullCardAPI(FullCardAPIConfig.deviceSync, param);
-        log.info("同步设备情况:{} {}", api.isSuccess(), api.getMsg());
+//        APIResponseModel api = apiRequestService.sendFullCardAPI(FullCardAPIConfig.deviceSync, param);
+//        log.info("同步设备情况:{} {}", api.isSuccess(), api.getMsg());
     }
 
     /**