Commit 66557fef by huangjy

feat:修复bug

parent 8c9a95ac
......@@ -86,7 +86,6 @@ public class SaasDeviceController {
@ApiOperation("激活设备license")
@PostMapping("active")
@AuthIgnore
@TenantIdIgnore
public ApiResponseEntity active(@RequestBody BaseIdDTO dto) {
platDeviceService.active(dto);
return ApiResponseUtils.success();
......
package com.makeit.controller.sys;
public class ElderController {
}
......@@ -756,7 +756,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
// 调用设备写入接口
Map<String, Object> map = new HashMap<>();
map.put("license",platDeviceActiveVO.getLicense());
map.put("appId",shengwangProperties.getAppId());
map.put("appid",shengwangProperties.getAppId());
devicePropertiesOperateService.deviceWriteAttr(platDevice.getOriDeviceId(),map);
}
......
......@@ -476,9 +476,9 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
List<PlatElderCoordinateVO> voList = new ArrayList<>(10);
if (platElderIdDTO == null || StringUtils.isEmpty(platElderIdDTO.getElderId())) {
/* if (platElderIdDTO == null || StringUtils.isEmpty(platElderIdDTO.getElderId())) {
return voList;
}
}*/
List<PlatDevice> deviceListSpace = getSpaceDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
List<PlatDevice> fallDeviceList = getFallDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
deviceListSpace.addAll(fallDeviceList);
......
......@@ -909,7 +909,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
addressToDetail(vo);
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()
......
......@@ -120,7 +120,7 @@ mqtt:
defaultTopic: /device/*/*/**
timeout: 10
keepalive: 60
msgSwitch: false
msgSwitch: true
wx:
miniapp:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment