feat:修复bug

saas-module/src/main/java/com/makeit/controller/device/SaasDeviceController.java

@@ -86,7 +86,6 @@ public class SaasDeviceController {
     @ApiOperation("激活设备license")
     @ApiOperation("激活设备license")
     @PostMapping("active")
     @PostMapping("active")
     @AuthIgnore
     @AuthIgnore
-    @TenantIdIgnore
     public ApiResponseEntity active(@RequestBody BaseIdDTO dto) {
     public ApiResponseEntity active(@RequestBody BaseIdDTO dto) {
         platDeviceService.active(dto);
         platDeviceService.active(dto);
         return ApiResponseUtils.success();
         return ApiResponseUtils.success();

saas-module/src/main/java/com/makeit/controller/sys/ElderController.java

-package com.makeit.controller.sys;
-
-public class ElderController {
-}

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -756,7 +756,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
             // 调用设备写入接口
             // 调用设备写入接口
             Map<String, Object> map = new HashMap<>();
             Map<String, Object> map = new HashMap<>();
             map.put("license",platDeviceActiveVO.getLicense());
             map.put("license",platDeviceActiveVO.getLicense());
-            map.put("appId",shengwangProperties.getAppId());
+            map.put("appid",shengwangProperties.getAppId());
 
 
             devicePropertiesOperateService.deviceWriteAttr(platDevice.getOriDeviceId(),map);
             devicePropertiesOperateService.deviceWriteAttr(platDevice.getOriDeviceId(),map);
         }
         }

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java

@@ -476,9 +476,9 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
 
 
         List<PlatElderCoordinateVO> voList = new ArrayList<>(10);
         List<PlatElderCoordinateVO> voList = new ArrayList<>(10);
 
 
-        if (platElderIdDTO == null || StringUtils.isEmpty(platElderIdDTO.getElderId())) {
+    /*    if (platElderIdDTO == null || StringUtils.isEmpty(platElderIdDTO.getElderId())) {
             return voList;
             return voList;
-        }
+        }*/
         List<PlatDevice> deviceListSpace = getSpaceDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         List<PlatDevice> deviceListSpace = getSpaceDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         List<PlatDevice> fallDeviceList = getFallDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         List<PlatDevice> fallDeviceList = getFallDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         deviceListSpace.addAll(fallDeviceList);
         deviceListSpace.addAll(fallDeviceList);

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -909,7 +909,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         addressToDetail(vo);
         addressToDetail(vo);
 
 
         FileUtil.convert(Arrays.asList(vo), PlatElderDTOVO::getAvatar, (e, f) -> {
         FileUtil.convert(Arrays.asList(vo), PlatElderDTOVO::getAvatar, (e, f) -> {
-            e.setAvatar(f.getFullUrl());
+            e.setAvatarPath(f.getFullUrl());
         });
         });
 
 
         List<PlatElderSocialRelation> dbSocialRelationList = platElderSocialRelationService.list(new QueryWrapper<PlatElderSocialRelation>().lambda()
         List<PlatElderSocialRelation> dbSocialRelationList = platElderSocialRelationService.list(new QueryWrapper<PlatElderSocialRelation>().lambda()

server-web/src/main/resources/application-dev.yml

@@ -120,7 +120,7 @@ mqtt:
   defaultTopic: /device/*/*/**
   defaultTopic: /device/*/*/**
   timeout: 10
   timeout: 10
   keepalive: 60
   keepalive: 60
-  msgSwitch: false
+  msgSwitch: true
 
 
 wx:
 wx:
   miniapp:
   miniapp: