Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit fb53228a by huangjy
Options

Merge remote-tracking branch 'origin/dev'

parents 29f8fa76 69a9b144
Expand all
Inline Side-by-side
Showing with 1082 additions and 67 deletions
Jenkinsfile
...@@ -74,7 +74,7 @@ node { ...@@ -74,7 +74,7 @@ node {
} }
dir(module) { dir(module) {
sh "/dependencies/apache-maven-3.8.6/bin/mvn -s /dependencies/apache-maven-3.8.6/conf/settings.xml clean install -Dmaven.test.skip=true" sh "/dependencies/apache-maven-3.8.1/bin/mvn -s /dependencies/apache-maven-3.8.1/conf/settings.xml clean install -Dmaven.test.skip=true"
} }
} }
......
db/上线后sql/update.sql
ALTER TABLE `plat_device_other` ALTER TABLE `plat_device_other`
...@@ -20,4 +20,17 @@ ALTER TABLE `plat_elder_report_month` ...@@ -20,4 +20,17 @@ ALTER TABLE `plat_elder_report_month`
ALTER TABLE `sys_api_secret` ALTER TABLE `sys_api_secret`
CHANGE COLUMN `publicKey` `public_key` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '公钥' AFTER `platform`, CHANGE COLUMN `publicKey` `public_key` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '公钥' AFTER `platform`,
CHANGE COLUMN `privateKey` `private_key` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '私钥' AFTER `public_key`, CHANGE COLUMN `privateKey` `private_key` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '私钥' AFTER `public_key`,
CHANGE COLUMN `orgId` `org_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构id' AFTER `private_key`; CHANGE COLUMN `orgId` `org_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构id' AFTER `private_key`;
\ No newline at end of file
ALTER TABLE `dev_iot_yanglao_platform`.`plat_device_other`
ADD COLUMN `uuid` varchar(255) COMMENT '设备uuid' AFTER `secure_key`;
ALTER TABLE `plat_device`
ADD COLUMN `device_license` varchar(64) COMMENT '许可证' AFTER `end_date`,
ADD COLUMN `license_info` varchar(255) COMMENT '许可证信息' AFTER `license`;
ALTER TABLE `plat_device`
ADD COLUMN `expire_time` int8 COMMENT '过期时间' AFTER `license_info`,
ADD COLUMN `activation_time` int8 COMMENT '激活时间' AFTER `expire_time`;
\ No newline at end of file
saas-module/src/main/java/com/makeit/controller/device/SaasDeviceController.java
...@@ -9,7 +9,9 @@ import com.makeit.dto.platform.device.PlatDeviceAttrDTO; ...@@ -9,7 +9,9 @@ import com.makeit.dto.platform.device.PlatDeviceAttrDTO;
import com.makeit.dto.platform.device.PlatDeviceDetailDTO; import com.makeit.dto.platform.device.PlatDeviceDetailDTO;
import com.makeit.dto.saas.device.PlatDeviceEditSaasDTO; import com.makeit.dto.saas.device.PlatDeviceEditSaasDTO;
import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO; import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO;
import com.makeit.dto.wechat.device.PlatDeviceNetAttrWechatDTO;
import com.makeit.entity.platform.device.PlatDevice; import com.makeit.entity.platform.device.PlatDevice;
import com.makeit.global.annotation.AuthIgnore;
import com.makeit.global.aspect.tenant.TenantIdIgnore; import com.makeit.global.aspect.tenant.TenantIdIgnore;
import com.makeit.module.iot.vo.DeviceProperties; import com.makeit.module.iot.vo.DeviceProperties;
import com.makeit.service.platform.device.PlatDeviceService; import com.makeit.service.platform.device.PlatDeviceService;
...@@ -74,6 +76,13 @@ public class SaasDeviceController { ...@@ -74,6 +76,13 @@ public class SaasDeviceController {
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
@ApiOperation("编辑设备网络属性 主要写入usrServerInfo信息")
@PostMapping("editDeviceNetInfo")
public ApiResponseEntity<?> editDeviceNetInfo(@RequestBody PlatDeviceNetAttrWechatDTO dto) {
platDeviceService.editDeviceNetInfo(dto);
return ApiResponseUtils.success();
}
@ApiOperation(value = "批量编辑设备属性",notes = "批量编辑属性，仅相同产品类型的设备可批量编辑属性，点击展示该产品类型的可编辑属性（呼吸心率设备不可编辑设备属性，空间可编辑雷达安装方式和雷达功能模式，跌倒可编辑雷达安装高度") @ApiOperation(value = "批量编辑设备属性",notes = "批量编辑属性，仅相同产品类型的设备可批量编辑属性，点击展示该产品类型的可编辑属性（呼吸心率设备不可编辑设备属性，空间可编辑雷达安装方式和雷达功能模式，跌倒可编辑雷达安装高度")
@PostMapping("batchEditProperties") @PostMapping("batchEditProperties")
@TenantIdIgnore @TenantIdIgnore
...@@ -82,4 +91,12 @@ public class SaasDeviceController { ...@@ -82,4 +91,12 @@ public class SaasDeviceController {
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
@ApiOperation("激活设备license")
@PostMapping("active")
@TenantIdIgnore
public ApiResponseEntity active(@RequestBody BaseIdDTO dto) {
platDeviceService.active(dto);
return ApiResponseUtils.success();
}
} }
saas-module/src/main/java/com/makeit/controller/sys/ElderController.java deleted 100644 → 0
package com.makeit.controller.sys;
public class ElderController {
}
server-common/src/main/java/com/makeit/config/ShengwangProperties.java 0 → 100644
package com.makeit.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@Data
@Configuration
@ConfigurationProperties(prefix = "shengwang")
public class ShengwangProperties {
private String appId;
private String appCertificate;
private String channelName;
private String account;
private String uid;
private String pid;
private String customerKey;
private String customerSecret;
private int tokenExpirationInSeconds;
private int privilegeExpirationInSeconds;
}
server-common/src/main/java/com/makeit/module/iot/service/IotOrgService.java
...@@ -147,8 +147,9 @@ public class IotOrgService extends IotCommonService{ ...@@ -147,8 +147,9 @@ public class IotOrgService extends IotCommonService{
List<DeviceInstanceEntity> deviceInstanceEntityList = JSONArray.parseArray(pagerResult.getData().toString()).toJavaList(DeviceInstanceEntity.class); List<DeviceInstanceEntity> deviceInstanceEntityList = JSONArray.parseArray(pagerResult.getData().toString()).toJavaList(DeviceInstanceEntity.class);
return deviceInstanceEntityList; return deviceInstanceEntityList;
} else {
throw new RuntimeException("获取设备接口失败:{},responseMessage.getMessage()");
} }
log.error("获取设备接口失败:{}",responseMessage.getMessage());
} catch (IOException e) { } catch (IOException e) {
log.error("调用：{}接口异常：{}",url,e.getMessage()); log.error("调用：{}接口异常：{}",url,e.getMessage());
} }
......
server-common/src/main/java/com/makeit/shengwang/agora/dto/PlatCallingDeviceDTO.java 0 → 100644
package com.makeit.shengwang.agora.dto;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@Data
@ApiModel(value="呼叫设备RTM", description="呼叫设备RTM")
public class PlatCallingDeviceDTO {
private String id;
private String userId;
}
server-common/src/main/java/com/makeit/shengwang/agora/http/ShengwangHttpUtil.java 0 → 100644
package com.makeit.shengwang.agora.http;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpUtil;
import com.makeit.config.ShengwangProperties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
@Component
public class ShengwangHttpUtil {
@Autowired
private ShengwangProperties shengwangProperties;
public String active(String licenseKey) {
String plainCredentials = shengwangProperties.getCustomerKey() + ":" + shengwangProperties.getCustomerSecret();
String base64Credentials = new String(Base64.getEncoder().encode(plainCredentials.getBytes()));
// 创建 authorization header
String authorizationHeader = "Basic " + base64Credentials;
Map<String,String> reqMap = new HashMap<>();
reqMap.put("pid",shengwangProperties.getPid());
reqMap.put("licenseKey",licenseKey);
reqMap.put("appid",shengwangProperties.getAppId());
String toParams = HttpUtil.toParams(reqMap);
HttpRequest httpRequest = HttpUtil.createPost("https://api.agora.io/dabiz/license/v2/active?" + toParams);
String result = httpRequest
.header("Authorization", authorizationHeader)
.execute().body();
System.out.println(result);
return result;
}
}
server-common/src/main/java/com/makeit/shengwang/agora/service/ShengwangService.java 0 → 100644
package com.makeit.shengwang.agora.service;
import com.alibaba.fastjson.JSON;
import com.makeit.config.ShengwangProperties;
import com.makeit.shengwang.agora.dto.PlatCallingDeviceDTO;
import com.makeit.shengwang.agora.rtm.RtmTokenBuilder2;
import com.makeit.shengwang.agora.vo.PlatAlarmCallDeviceVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.concurrent.TimeUnit;
@Component
public class ShengwangService {
public static final String REDIS_DEVICE_CALL = "device::call";
@Autowired
private ShengwangProperties shengwangProperties;
@Autowired
private StringRedisTemplate redisTemplate;
public PlatAlarmCallDeviceVO callingDeviceAuthIgnoreRtm(PlatCallingDeviceDTO dto) {
String redisResult = redisTemplate.opsForValue().get(REDIS_DEVICE_CALL + dto.getUserId());
if (StringUtils.isNotBlank(redisResult)) {
return JSON.parseObject(redisResult,PlatAlarmCallDeviceVO.class);
}
PlatAlarmCallDeviceVO platAlarmCallDeviceVO = new PlatAlarmCallDeviceVO();
RtmTokenBuilder2 token = new RtmTokenBuilder2();
String result = token.buildToken(shengwangProperties.getAppId(), shengwangProperties.getAppCertificate(), dto.getUserId(), shengwangProperties.getTokenExpirationInSeconds());
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
String format = String.format("%s:%s","RTM",now.format(dateTimeFormatter));
platAlarmCallDeviceVO.setAccessToken(result);
platAlarmCallDeviceVO.setChannelName(format);
platAlarmCallDeviceVO.setAppId(shengwangProperties.getAppId());
platAlarmCallDeviceVO.setUserId(dto.getUserId());
redisTemplate.opsForValue().set(REDIS_DEVICE_CALL + dto.getUserId(),JSON.toJSONString(platAlarmCallDeviceVO),
shengwangProperties.getTokenExpirationInSeconds(), TimeUnit.SECONDS);
return platAlarmCallDeviceVO;
}
}
server-common/src/main/java/com/makeit/shengwang/agora/vo/PlatAlarmCallDeviceVO.java 0 → 100644
package com.makeit.shengwang.agora.vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@Data
@ApiModel(value="呼叫设备对象", description="呼叫设备")
public class PlatAlarmCallDeviceVO {
private String accessToken;
private String channelName;
private String userId;
private String deviceId;
private String appId;
}
server-common/src/main/java/com/makeit/utils/Base64Encoding.java 0 → 100644
package com.makeit.utils;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpUtil;
import org.apache.http.client.HttpClient;
import java.net.URI;
import java.util.Base64;
public class Base64Encoding {
// 客户 ID
final String customerKey = "b3b5f44e536a4fc191358926c6716b7b";
// 客户密钥
final String customerSecret = "bd81828a133140a58dfb04e9d80eba43";
public static void main(String[] args) {
Base64Encoding base64Encoding = new Base64Encoding();
base64Encoding.test();
}
public void test () {
// 拼接客户 ID 和客户密钥并使用 base64 编码
String plainCredentials = customerKey + ":" + customerSecret;
String base64Credentials = new String(Base64.getEncoder().encode(plainCredentials.getBytes()));
// 创建 authorization header
String authorizationHeader = "Basic " + base64Credentials;
System.out.println(authorizationHeader);
HttpRequest httpRequest = HttpUtil.createGet("https://api.agora.io/dev/v1/projects");
// 创建 HTTP 请求对象
String result = httpRequest
.header("Authorization", authorizationHeader)
.header("Content-Type", "application/json")
.execute().body();
// 发送 HTTP 请求
System.out.println(result);
}
}
server-generator/src/test/java/CodeGenerator.java
...@@ -106,7 +106,7 @@ public class CodeGenerator { ...@@ -106,7 +106,7 @@ public class CodeGenerator {
// 使用重点 下列字段填写表名 运行方法 // 使用重点 下列字段填写表名 运行方法
// strategy.setInclude("edu_teacher","..."); // 多表-逆向工程 // strategy.setInclude("edu_teacher","..."); // 多表-逆向工程
strategy.setInclude("plat_elder_breathe_day_stat"); strategy.setInclude("plat_region_setting_fix","plat_elder_coordinate_record");
strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略 strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略
strategy.setTablePrefix(pc.getModuleName() + "_"); //生成实体属性时去掉表"_"前缀并且第一个字母大写 如：gmt_create -> gmtCreate strategy.setTablePrefix(pc.getModuleName() + "_"); //生成实体属性时去掉表"_"前缀并且第一个字母大写 如：gmt_create -> gmtCreate
......
server-module/src/main/java/com/makeit/module/controller/alarm/PlatAlarmRecordController.java
...@@ -7,7 +7,11 @@ import com.makeit.common.page.PageVO; ...@@ -7,7 +7,11 @@ import com.makeit.common.page.PageVO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO; import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
import com.makeit.global.annotation.AuthIgnore;
import com.makeit.global.aspect.tenant.TenantIdIgnore;
import com.makeit.service.platform.alarm.PlatAlarmRecordService; import com.makeit.service.platform.alarm.PlatAlarmRecordService;
import com.makeit.shengwang.agora.dto.PlatCallingDeviceDTO;
import com.makeit.shengwang.agora.vo.PlatAlarmCallDeviceVO;
import com.makeit.vo.platform.alarm.PlatAlarmRecordVO; import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -62,6 +66,34 @@ public class PlatAlarmRecordController { ...@@ -62,6 +66,34 @@ public class PlatAlarmRecordController {
return ApiResponseUtils.success(count); return ApiResponseUtils.success(count);
} }
@ApiOperation("呼叫设备")
@PostMapping("callingDevice")
public ApiResponseEntity<PlatAlarmCallDeviceVO> callingDevice(@RequestBody PlatCallingDeviceDTO dto) {
return ApiResponseUtils.success(platAlarmRecordService.callingDevice(dto));
}
@ApiOperation("呼叫设备")
@PostMapping("callingDeviceAuthIgnore")
@AuthIgnore
@TenantIdIgnore
public ApiResponseEntity<PlatAlarmCallDeviceVO> callingDeviceAuthIgnore(@RequestBody PlatCallingDeviceDTO dto) {
return ApiResponseUtils.success(platAlarmRecordService.callingDevice(dto));
}
@ApiOperation("呼叫设备rtm")
@PostMapping("callingDeviceAuthRtm")
public ApiResponseEntity<PlatAlarmCallDeviceVO> callingDeviceAuthRtm(@RequestBody PlatCallingDeviceDTO dto) {
return ApiResponseUtils.success(platAlarmRecordService.callingDeviceAuthIgnoreRtm(dto));
}
@ApiOperation("呼叫设备rtm")
@PostMapping("callingDeviceAuthIgnoreRtm")
@AuthIgnore
@TenantIdIgnore
public ApiResponseEntity<PlatAlarmCallDeviceVO> callingDeviceAuthIgnoreRtm(@RequestBody PlatCallingDeviceDTO dto) {
return ApiResponseUtils.success(platAlarmRecordService.callingDeviceAuthIgnoreRtm(dto));
}
// @Autowired // @Autowired
// private MailMsgSender mailMsgSender; // private MailMsgSender mailMsgSender;
// @Autowired // @Autowired
......
server-module/src/main/java/com/makeit/module/controller/children/device/PlatDeviceChildrenController.java 0 → 100644
package com.makeit.module.controller.children.device;
import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO;
import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.wechat.device.PlatChildDeviceDTO;
import com.makeit.dto.wechat.device.PlatDeviceSetupDTO;
import com.makeit.service.platform.device.PlatDeviceService;
import com.makeit.vo.platform.device.PlatChildDeviceListVO;
import com.makeit.vo.platform.device.PlatDeviceViewVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 设备 前端控制器
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Api(tags = "子女段小程序-设备")
@RestController
@RequestMapping("/children/plat/device")
public class PlatDeviceChildrenController {
@Autowired
private PlatDeviceService platDeviceService;
@ApiOperation("分页列表")
@PostMapping("page")
public ApiResponseEntity<PageVO<PlatChildDeviceListVO>> page(@RequestBody PageReqDTO<PlatChildDeviceDTO> pageReqDTO) {
return ApiResponseUtils.success(platDeviceService.pageChild(pageReqDTO));
}
@ApiOperation("详情")
@PostMapping("view")
public ApiResponseEntity<PlatDeviceViewVO> view(@RequestBody BaseIdDTO baseIdDTO) {
return ApiResponseUtils.success(platDeviceService.view(baseIdDTO.getId()));
}
@ApiOperation("修改wifi信息")
@PostMapping("modifyWifiInfo")
public ApiResponseEntity<?> modifyWifiInfo(@Validated @RequestBody PlatDeviceSetupDTO dto) {
platDeviceService.modifyWifiInfo(dto);
return ApiResponseUtils.success();
}
}
server-module/src/main/java/com/makeit/module/controller/device/PlatDeviceController.java
...@@ -7,15 +7,18 @@ import com.makeit.common.page.PageVO; ...@@ -7,15 +7,18 @@ import com.makeit.common.page.PageVO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.platform.device.PlatDeviceAttrDTO; import com.makeit.dto.platform.device.PlatDeviceAttrDTO;
import com.makeit.dto.platform.device.PlatDeviceBindOrgDTO;
import com.makeit.dto.platform.device.PlatDeviceEditDTO; import com.makeit.dto.platform.device.PlatDeviceEditDTO;
import com.makeit.dto.platform.device.PlatDeviceQueryDTO; import com.makeit.dto.platform.device.PlatDeviceQueryDTO;
import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO; import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO;
import com.makeit.dto.wechat.device.PlatDeviceNetAttrWechatDTO;
import com.makeit.entity.platform.device.PlatDevice; import com.makeit.entity.platform.device.PlatDevice;
import com.makeit.global.annotation.AuthIgnore; import com.makeit.global.annotation.AuthIgnore;
import com.makeit.global.aspect.tenant.TenantIdIgnore; import com.makeit.global.aspect.tenant.TenantIdIgnore;
import com.makeit.module.iot.vo.DeviceProperties; import com.makeit.module.iot.vo.DeviceProperties;
import com.makeit.service.platform.device.PlatDeviceService; import com.makeit.service.platform.device.PlatDeviceService;
import com.makeit.task.IotSyncTask; import com.makeit.shengwang.agora.dto.PlatCallingDeviceDTO;
import com.makeit.shengwang.agora.vo.PlatAlarmCallDeviceVO;
import com.makeit.vo.platform.device.PlatDeviceListVO; import com.makeit.vo.platform.device.PlatDeviceListVO;
import com.makeit.vo.platform.device.PlatDeviceViewVO; import com.makeit.vo.platform.device.PlatDeviceViewVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -64,19 +67,13 @@ public class PlatDeviceController { ...@@ -64,19 +67,13 @@ public class PlatDeviceController {
return ApiResponseUtils.success(platDeviceService.view(baseIdDTO.getId())); return ApiResponseUtils.success(platDeviceService.view(baseIdDTO.getId()));
} }
@Autowired @ApiOperation("划拨组织")
private IotSyncTask iotSyncTask; @PostMapping("bindOrg")
public ApiResponseEntity<PlatDeviceViewVO> bindOrg(@RequestBody PlatDeviceBindOrgDTO platDeviceBindOrgDTO) {
@ApiOperation("手动同步") platDeviceService.bindOrg(platDeviceBindOrgDTO);
@PostMapping("iotSyncTask")
@AuthIgnore
@TenantIdIgnore
public ApiResponseEntity<Void> iotSyncTask(@RequestBody BaseIdDTO baseIdDTO) {
//iotSyncTask.savePlatDevice();
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
@ApiOperation("产品下拉") @ApiOperation("产品下拉")
@PostMapping("productList") @PostMapping("productList")
public ApiResponseEntity<List<PlatDevice>> productList(@RequestBody PlatDeviceQueryDTO dto) { public ApiResponseEntity<List<PlatDevice>> productList(@RequestBody PlatDeviceQueryDTO dto) {
...@@ -89,13 +86,20 @@ public class PlatDeviceController { ...@@ -89,13 +86,20 @@ public class PlatDeviceController {
return ApiResponseUtils.success(platDeviceService.readDeviceProperties(dto)); return ApiResponseUtils.success(platDeviceService.readDeviceProperties(dto));
} }
@ApiOperation("编辑设备属性 主要写入usrServerInfo信息") @ApiOperation("编辑设备属性 ")
@PostMapping("editDeviceProperties") @PostMapping("editDeviceProperties")
public ApiResponseEntity<?> editDeviceProperties(@RequestBody PlatDeviceAttrWechatDTO dto) { public ApiResponseEntity<?> editDeviceProperties(@RequestBody PlatDeviceAttrWechatDTO dto) {
platDeviceService.editDeviceProperties(dto); platDeviceService.editDeviceProperties(dto);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
@ApiOperation("编辑设备网络属性 主要写入usrServerInfo信息")
@PostMapping("editDeviceNetInfo")
public ApiResponseEntity<?> editDeviceNetInfo(@RequestBody PlatDeviceNetAttrWechatDTO dto) {
platDeviceService.editDeviceNetInfo(dto);
return ApiResponseUtils.success();
}
@ApiOperation(value = "批量编辑设备属性",notes = "批量编辑属性，仅相同产品类型的设备可批量编辑属性，点击展示该产品类型的可编辑属性（呼吸心率设备不可编辑设备属性，空间可编辑雷达安装方式和雷达功能模式，跌倒可编辑雷达安装高度") @ApiOperation(value = "批量编辑设备属性",notes = "批量编辑属性，仅相同产品类型的设备可批量编辑属性，点击展示该产品类型的可编辑属性（呼吸心率设备不可编辑设备属性，空间可编辑雷达安装方式和雷达功能模式，跌倒可编辑雷达安装高度")
@PostMapping("batchEditProperties") @PostMapping("batchEditProperties")
...@@ -103,5 +107,20 @@ public class PlatDeviceController { ...@@ -103,5 +107,20 @@ public class PlatDeviceController {
platDeviceService.batchEditProperties(dto); platDeviceService.batchEditProperties(dto);
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
@ApiOperation("设备呼叫设备")
@PostMapping("callingDevice")
public ApiResponseEntity<PlatAlarmCallDeviceVO> callingDevice(@RequestBody PlatCallingDeviceDTO dto) {
return ApiResponseUtils.success(platDeviceService.callingDevice(dto));
}
@ApiOperation("设备获取登录RTMtoken")
@PostMapping("getDeviceRtmToken")
@AuthIgnore
@TenantIdIgnore
public ApiResponseEntity<PlatAlarmCallDeviceVO> getDeviceRtmToken(@RequestBody PlatCallingDeviceDTO dto) {
return ApiResponseUtils.success(platDeviceService.getDeviceRtmToken(dto));
}
} }
server-module/src/main/java/com/makeit/module/controller/elder/PlatElderSleepController.java
...@@ -75,6 +75,14 @@ public class PlatElderSleepController { ...@@ -75,6 +75,14 @@ public class PlatElderSleepController {
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
@ApiOperation("测试")
@PostMapping("test5")
@AuthIgnore
public ApiResponseEntity<Void> coordinateRecordTask() {
platElderReportTask.coordinateRecordTask();
return ApiResponseUtils.success();
}
@ApiOperation("编辑设备属性") @ApiOperation("编辑设备属性")
@PostMapping("editDeviceProperties") @PostMapping("editDeviceProperties")
@AuthIgnore @AuthIgnore
......
server-service/src/main/java/com/makeit/dto/platform/device/PlatDeviceBindOrgDTO.java 0 → 100644
package com.makeit.dto.platform.device;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.List;
/**
* <p>
* 设备
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Data
@ApiModel(value = "设备划拨组织对象", description = "设备划拨组织")
public class PlatDeviceBindOrgDTO {
@ApiModelProperty(value = "设备id集合")
private List<String> idList;
@ApiModelProperty(value = "组织id")
@NotBlank(message = "组织id不能为空")
private String orgId;
}
server-service/src/main/java/com/makeit/dto/platform/device/PlatDeviceQueryDTO.java
...@@ -43,6 +43,7 @@ public class PlatDeviceQueryDTO extends BaseTenantDTO { ...@@ -43,6 +43,7 @@ public class PlatDeviceQueryDTO extends BaseTenantDTO {
private List<String> orgIds; private List<String> orgIds;
private String spaceId; private String spaceId;
private String elderId;
} }
server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderImportDTO.java
...@@ -41,7 +41,7 @@ public class PlatElderImportDTO extends BaseTenantDTO { ...@@ -41,7 +41,7 @@ public class PlatElderImportDTO extends BaseTenantDTO {
@ApiModelProperty(value = "小区/社区/街道空间id") @ApiModelProperty(value = "小区/社区/街道空间id")
private String streetSpaceId; private String streetSpaceId;
@ExcelProperty({BIG_TITLE, "小区"}) @ExcelProperty({BIG_TITLE, "一级空间"})
@ApiModelProperty(value = "小区/社区/街道空间名称") @ApiModelProperty(value = "小区/社区/街道空间名称")
private String streetSpaceName; private String streetSpaceName;
...@@ -49,7 +49,7 @@ public class PlatElderImportDTO extends BaseTenantDTO { ...@@ -49,7 +49,7 @@ public class PlatElderImportDTO extends BaseTenantDTO {
@ApiModelProperty(value = "楼栋空间id") @ApiModelProperty(value = "楼栋空间id")
private String buildingSpaceId; private String buildingSpaceId;
@ExcelProperty({BIG_TITLE, "楼栋"}) @ExcelProperty({BIG_TITLE, "二级空间"})
@ApiModelProperty(value = "楼栋空间名称") @ApiModelProperty(value = "楼栋空间名称")
private String buildingSpaceName; private String buildingSpaceName;
...@@ -57,7 +57,7 @@ public class PlatElderImportDTO extends BaseTenantDTO { ...@@ -57,7 +57,7 @@ public class PlatElderImportDTO extends BaseTenantDTO {
@ApiModelProperty(value = "单元空间id") @ApiModelProperty(value = "单元空间id")
private String unitSpaceId; private String unitSpaceId;
@ExcelProperty({BIG_TITLE, "单元"}) @ExcelProperty({BIG_TITLE, "三级空间"})
@ApiModelProperty(value = "单元空间名称") @ApiModelProperty(value = "单元空间名称")
private String unitSpaceName; private String unitSpaceName;
...@@ -65,7 +65,7 @@ public class PlatElderImportDTO extends BaseTenantDTO { ...@@ -65,7 +65,7 @@ public class PlatElderImportDTO extends BaseTenantDTO {
@ApiModelProperty(value = "楼层id") @ApiModelProperty(value = "楼层id")
private String floorSpaceId; private String floorSpaceId;
@ExcelProperty({BIG_TITLE, "楼层"}) @ExcelProperty({BIG_TITLE, "四级空间"})
@ApiModelProperty(value = "楼层id") @ApiModelProperty(value = "楼层id")
private String floorSpaceName; private String floorSpaceName;
......
server-service/src/main/java/com/makeit/dto/wechat/device/PlatChildDeviceDTO.java 0 → 100644
package com.makeit.dto.wechat.device;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* 设备
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Data
@ApiModel(value = "子女端设备列表", description = "子女端设备列表DTO")
public class PlatChildDeviceDTO {
@ApiModelProperty(value = "长者id")
private String elderId;
}
server-service/src/main/java/com/makeit/dto/wechat/device/PlatDeviceSetupDTO.java
...@@ -46,6 +46,8 @@ public class PlatDeviceSetupDTO extends BaseTenantDTO { ...@@ -46,6 +46,8 @@ public class PlatDeviceSetupDTO extends BaseTenantDTO {
private String secureId; private String secureId;
@ApiModelProperty(value = "密钥Key") @ApiModelProperty(value = "密钥Key")
private String secureKey; private String secureKey;
@ApiModelProperty(value = "设备uuid")
private String uuid;
@ApiModelProperty(value = "组织id") @ApiModelProperty(value = "组织id")
private String orgId; private String orgId;
......
server-service/src/main/java/com/makeit/entity/platform/device/PlatDevice.java
...@@ -73,6 +73,14 @@ public class PlatDevice extends BaseBusEntity { ...@@ -73,6 +73,14 @@ public class PlatDevice extends BaseBusEntity {
@ApiModelProperty(value = "组织路径") @ApiModelProperty(value = "组织路径")
private String orgPath; private String orgPath;
@ApiModelProperty(value = "许可证")
private String deviceLicense;
@ApiModelProperty(value = "许可证信息")
private String licenseInfo;
@ApiModelProperty(value = "过期时间")
private Long expireTime;
@ApiModelProperty(value = "激活时间")
private Long activationTime;
@ApiModelProperty(value = "设备类型 0-呼吸心率雷达 1-空间人体雷达 2-跌倒检测雷达") @ApiModelProperty(value = "设备类型 0-呼吸心率雷达 1-空间人体雷达 2-跌倒检测雷达")
private String category; private String category;
......
server-service/src/main/java/com/makeit/entity/platform/device/PlatDeviceOther.java
...@@ -59,5 +59,7 @@ public class PlatDeviceOther extends BaseBusEntity { ...@@ -59,5 +59,7 @@ public class PlatDeviceOther extends BaseBusEntity {
private String secureId; private String secureId;
@ApiModelProperty(value = "密钥Key") @ApiModelProperty(value = "密钥Key")
private String secureKey; private String secureKey;
@ApiModelProperty(value = "设备uuid")
private String uuid;
} }
server-service/src/main/java/com/makeit/entity/platform/elder/PlatElderCoordinateRecord.java 0 → 100644
package com.makeit.entity.platform.elder;
import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 长者坐标记录
* </p>
*
* @author eugene young
* @since 2023-11-15
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="PlatElderCoordinateRecord对象", description="长者坐标记录")
public class PlatElderCoordinateRecord extends BaseBusEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "设备Id")
private String deviceId;
@ApiModelProperty(value = "设备Id")
private String iotDeviceId;
@ApiModelProperty(value = "设备Id")
private String elderId;
@ApiModelProperty(value = "人体目标距离雷达位置")
private Integer distance;
@ApiModelProperty(value = "空间人感：0表示无人，1表示活动， 2表示微动 ，3表示静止 ，跌倒设备：0无人，1跌倒")
private Integer personState;
@ApiModelProperty(value = "1 表示空间， 2 表示跌倒")
private Integer type;
@ApiModelProperty(value = "人体目标偏离雷达法线角度范围：±60，单位°")
private Integer angle;
@ApiModelProperty(value = "安装方式")
private Integer mount;
@ApiModelProperty(value = "跌倒设备轨迹")
private String track;
@ApiModelProperty(value = "上报时间")
private Long reportTime;
}
server-service/src/main/java/com/makeit/entity/platform/space/PlatRegionSettingFix.java 0 → 100644
package com.makeit.entity.platform.space;
import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 区域设置固化
* </p>
*
* @author eugene young
* @since 2023-11-15
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="PlatRegionSettingFix对象", description="区域设置固化")
public class PlatRegionSettingFix extends BaseBusEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "安装方式 1-顶装 0-侧装")
private String installType;
@ApiModelProperty(value = "设备朝向 0-上 1-下 2-左 3-右")
private String toward;
@ApiModelProperty(value = "区域名称")
private String regionName;
@ApiModelProperty(value = "区域定位")
private String regionRange;
@ApiModelProperty(value = "房间门定位")
private String roomRange;
@ApiModelProperty(value = "设备定位")
private String equipmentRange;
@ApiModelProperty(value = "设备Id")
private String deviceId;
@ApiModelProperty(value = "长者id")
private String elderId;
@ApiModelProperty(value = "当前日期 yyyy-mm-dd")
private String happenDate;
@ApiModelProperty(value = "房间id")
private String roomId;
@ApiModelProperty(value = "背景色")
private String background;
}
server-service/src/main/java/com/makeit/mapper/platform/elder/PlatElderCoordinateRecordMapper.java 0 → 100644
package com.makeit.mapper.platform.elder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.platform.elder.PlatElderCoordinateRecord;
/**
* <p>
* 长者坐标记录 Mapper 接口
* </p>
*
* @author eugene young
* @since 2023-11-15
*/
public interface PlatElderCoordinateRecordMapper extends BaseMapper<PlatElderCoordinateRecord> {
}
server-service/src/main/java/com/makeit/mapper/platform/space/PlatRegionSettingFixMapper.java 0 → 100644
package com.makeit.mapper.platform.space;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.platform.space.PlatRegionSettingFix;
/**
* <p>
* 区域设置固化 Mapper 接口
* </p>
*
* @author eugene young
* @since 2023-11-15
*/
public interface PlatRegionSettingFixMapper extends BaseMapper<PlatRegionSettingFix> {
}
server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmRecordService.java
...@@ -9,6 +9,8 @@ import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO; ...@@ -9,6 +9,8 @@ import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
import com.makeit.entity.platform.alarm.PlatAlarmConfig; import com.makeit.entity.platform.alarm.PlatAlarmConfig;
import com.makeit.entity.platform.alarm.PlatAlarmRecord; import com.makeit.entity.platform.alarm.PlatAlarmRecord;
import com.makeit.entity.platform.elder.PlatElder; import com.makeit.entity.platform.elder.PlatElder;
import com.makeit.shengwang.agora.dto.PlatCallingDeviceDTO;
import com.makeit.shengwang.agora.vo.PlatAlarmCallDeviceVO;
import com.makeit.vo.platform.alarm.PlatAlarmRecordVO; import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
/** /**
...@@ -67,4 +69,8 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> { ...@@ -67,4 +69,8 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
Integer unreadCount(PlatAlarmRecordQueryDTO dto); Integer unreadCount(PlatAlarmRecordQueryDTO dto);
void misinformation(String id); void misinformation(String id);
PlatAlarmCallDeviceVO callingDevice(PlatCallingDeviceDTO dto);
PlatAlarmCallDeviceVO callingDeviceAuthIgnoreRtm(PlatCallingDeviceDTO id);
} }
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
...@@ -8,12 +8,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; ...@@ -8,12 +8,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.makeit.common.dto.BaseIdDTO; import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.entity.BaseBusEntity; import com.makeit.common.entity.BaseBusEntity;
import com.makeit.common.entity.BaseEntity; import com.makeit.common.entity.BaseEntity;
import com.makeit.common.page.PageReqDTO; import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO; import com.makeit.common.page.PageVO;
import com.makeit.config.ShengwangProperties;
import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO; import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO;
import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO; import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
import com.makeit.entity.platform.alarm.PlatAlarmConfig; import com.makeit.entity.platform.alarm.PlatAlarmConfig;
...@@ -35,12 +35,18 @@ import com.makeit.service.platform.alarm.PlatAlarmConfigService; ...@@ -35,12 +35,18 @@ import com.makeit.service.platform.alarm.PlatAlarmConfigService;
import com.makeit.service.platform.alarm.PlatAlarmRecordService; import com.makeit.service.platform.alarm.PlatAlarmRecordService;
import com.makeit.service.platform.auth.PlatOrgService; import com.makeit.service.platform.auth.PlatOrgService;
import com.makeit.service.platform.auth.PlatUserService; import com.makeit.service.platform.auth.PlatUserService;
import com.makeit.service.platform.device.PlatDeviceService;
import com.makeit.service.platform.elder.PlatElderChildrenInfoService; import com.makeit.service.platform.elder.PlatElderChildrenInfoService;
import com.makeit.service.platform.elder.PlatElderService; import com.makeit.service.platform.elder.PlatElderService;
import com.makeit.service.platform.space.PlatRegionSettingService; import com.makeit.service.platform.space.PlatRegionSettingService;
import com.makeit.service.platform.space.PlatRoomBedDeviceService; import com.makeit.service.platform.space.PlatRoomBedDeviceService;
import com.makeit.service.platform.space.PlatRoomService; import com.makeit.service.platform.space.PlatRoomService;
import com.makeit.service.saas.PlatTenantService; import com.makeit.service.saas.PlatTenantService;
import com.makeit.shengwang.agora.dto.PlatCallingDeviceDTO;
import com.makeit.shengwang.agora.media.RtcTokenBuilder2;
import com.makeit.shengwang.agora.rtm.RtmTokenBuilder2;
import com.makeit.shengwang.agora.service.ShengwangService;
import com.makeit.shengwang.agora.vo.PlatAlarmCallDeviceVO;
import com.makeit.utils.data.convert.BeanDtoVoUtils; import com.makeit.utils.data.convert.BeanDtoVoUtils;
import com.makeit.utils.data.convert.PageUtil; import com.makeit.utils.data.convert.PageUtil;
import com.makeit.utils.data.convert.StreamUtil; import com.makeit.utils.data.convert.StreamUtil;
...@@ -56,11 +62,14 @@ import lombok.extern.slf4j.Slf4j; ...@@ -56,11 +62,14 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -74,6 +83,7 @@ import java.util.stream.Collectors; ...@@ -74,6 +83,7 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMapper, PlatAlarmRecord> public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMapper, PlatAlarmRecord>
implements PlatAlarmRecordService { implements PlatAlarmRecordService {
@Autowired @Autowired
private PlatAlarmConfigService platAlarmConfigService; private PlatAlarmConfigService platAlarmConfigService;
...@@ -98,6 +108,12 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe ...@@ -98,6 +108,12 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
private PlatTenantService platTenantService; private PlatTenantService platTenantService;
@Autowired @Autowired
private PlatOrgService platOrgService; private PlatOrgService platOrgService;
@Autowired
private PlatDeviceService platDeviceService;
@Autowired
private ShengwangProperties shengwangProperties;
@Autowired
private ShengwangService shengwangService;
@Override @Override
...@@ -567,4 +583,34 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe ...@@ -567,4 +583,34 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
// todo 误报结果写入设备 // todo 误报结果写入设备
} }
@Override
public PlatAlarmCallDeviceVO callingDevice(PlatCallingDeviceDTO dto) {
PlatAlarmCallDeviceVO platAlarmCallDeviceVO = new PlatAlarmCallDeviceVO();
PlatAlarmRecord platAlarmRecord = getById(dto.getId());
if (platAlarmRecord == null) {
throw new RuntimeException("告警记录为空:" + dto.getId());
}
String deviceId = platAlarmRecord.getDeviceId();
PlatDevice platDevice = platDeviceService.getById(deviceId);
if (platDevice == null) {
throw new RuntimeException("找不到告警关联的设备,设备已解绑" + deviceId);
}
platAlarmCallDeviceVO.setDeviceId(platDevice.getOriDeviceId());
platAlarmCallDeviceVO.setAppId(shengwangProperties.getAppId());
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
String channelName = String.format("%s:%s","RTC",now.format(dateTimeFormatter));
RtcTokenBuilder2 token = new RtcTokenBuilder2();
String result = token.buildTokenWithUid(shengwangProperties.getAppId(), shengwangProperties.getAppCertificate(), channelName, 0, RtcTokenBuilder2.Role.ROLE_SUBSCRIBER,
shengwangProperties.getTokenExpirationInSeconds(), shengwangProperties.getPrivilegeExpirationInSeconds());
platAlarmCallDeviceVO.setAccessToken(result);
platAlarmCallDeviceVO.setChannelName(channelName);
return platAlarmCallDeviceVO;
}
@Override
public PlatAlarmCallDeviceVO callingDeviceAuthIgnoreRtm(PlatCallingDeviceDTO dto) {
return shengwangService.callingDeviceAuthIgnoreRtm(dto);
}
} }
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatOrgServiceImpl.java
...@@ -403,10 +403,23 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg> ...@@ -403,10 +403,23 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
String isTenant = userVOCanNull.getIsTenant(); String isTenant = userVOCanNull.getIsTenant();
//如果是租户账号 则有所有权限 返回最顶级 //如果是租户账号 则有所有权限 返回最顶级
if (StringUtils.equals(isTenant, CommonEnum.YES.getValue())) { if (StringUtils.equals(isTenant, CommonEnum.YES.getValue())) {
boolean typeFlag = StringUtils.isNotEmpty(param.getType());
boolean nameFlag = StringUtils.isNotEmpty(param.getName());
boolean statusFlag = StringUtils.isNotEmpty(param.getStatus());
List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>() List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>()
.eq(StringUtils.isNotEmpty(param.getType()), PlatOrg::getType, param.getType()) .eq(typeFlag, PlatOrg::getType, param.getType())
.like(nameFlag, PlatOrg::getName, param.getName())
.eq(statusFlag, PlatOrg::getStatus, param.getStatus())
.eq(PlatOrg::getStatus, CommonEnum.YES.getValue()) .eq(PlatOrg::getStatus, CommonEnum.YES.getValue())
); );
if (typeFlag || nameFlag) {
Map<String, List<PlatOrg>> parentIdMap = orgList.stream().collect(Collectors.groupingBy(PlatOrg::getParentId));
orgList.forEach(vo -> {
List<PlatOrg> childList = parentIdMap.get(vo.getId());
vo.setChildren(childList);
});
return orgList;
}
return getOrgTree(orgList, Collections.singletonList(TenantIdUtil.getTenantId())); return getOrgTree(orgList, Collections.singletonList(TenantIdUtil.getTenantId()));
} }
...@@ -414,6 +427,8 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg> ...@@ -414,6 +427,8 @@ public class PlatOrgServiceImpl extends ServiceImpl<PlatOrgMapper, PlatOrg>
Set<String> orgIdList = getOrgIdListByUserId(userVOCanNull.getId()); Set<String> orgIdList = getOrgIdListByUserId(userVOCanNull.getId());
List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>() List<PlatOrg> orgList = this.list(new LambdaQueryWrapper<PlatOrg>()
.eq(StringUtils.isNotEmpty(param.getType()), PlatOrg::getType, param.getType()) .eq(StringUtils.isNotEmpty(param.getType()), PlatOrg::getType, param.getType())
.like(StringUtils.isNotEmpty(param.getName()), PlatOrg::getName, param.getName())
.eq(StringUtils.isNotEmpty(param.getStatus()), PlatOrg::getStatus, param.getStatus())
.in(BaseEntity::getId, orgIdList).eq(PlatOrg::getStatus, CommonEnum.YES.getValue())); .in(BaseEntity::getId, orgIdList).eq(PlatOrg::getStatus, CommonEnum.YES.getValue()));
if (CollectionUtils.isEmpty(orgList)) { if (CollectionUtils.isEmpty(orgList)) {
return new ArrayList<>(); return new ArrayList<>();
......
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatRoleServiceImpl.java
...@@ -91,9 +91,12 @@ implements PlatRoleService { ...@@ -91,9 +91,12 @@ implements PlatRoleService {
List<PlatRole> tntRoleList = list(listWrapper(dto)); List<PlatRole> tntRoleList = list(listWrapper(dto));
List<PlatRoleDTOVO> rolVOList = BeanDtoVoUtils.listVo(tntRoleList, PlatRoleDTOVO.class); List<PlatRoleDTOVO> rolVOList = BeanDtoVoUtils.listVo(tntRoleList, PlatRoleDTOVO.class);
JoinUtil.join(rolVOList, platOrgService, PlatRoleDTOVO::getOrgId, PlatOrg::getId, (r, e) -> r.setDeptName(e.getName())); JoinUtil.join(rolVOList, platOrgService, PlatRoleDTOVO::getOrgId, PlatOrg::getId, (r, e) -> {
r.setDeptName(e.getName());
r.setOrgPath(e.getPath()+","+e.getId());
});
return BeanDtoVoUtils.listVo(tntRoleList, PlatRoleDTOVO.class); return rolVOList;
} }
@Override @Override
...@@ -106,8 +109,10 @@ implements PlatRoleService { ...@@ -106,8 +109,10 @@ implements PlatRoleService {
List<PlatRoleDTOVO> tntUserVOList = BeanDtoVoUtils.listVo(pageList.getRecords(), PlatRoleDTOVO.class); List<PlatRoleDTOVO> tntUserVOList = BeanDtoVoUtils.listVo(pageList.getRecords(), PlatRoleDTOVO.class);
JoinUtil.join(tntUserVOList, platOrgService, PlatRoleDTOVO::getOrgId, PlatOrg::getId, (r, e) -> r.setDeptName(e.getName())); JoinUtil.join(tntUserVOList, platOrgService, PlatRoleDTOVO::getOrgId, PlatOrg::getId, (r, e) -> {
r.setDeptName(e.getName());
r.setOrgPath(e.getPath()+","+e.getId());
});
return PageUtil.toPageVO(tntUserVOList, pageList); return PageUtil.toPageVO(tntUserVOList, pageList);
} }
......
server-service/src/main/java/com/makeit/service/platform/device/PlatDeviceService.java
...@@ -2,20 +2,18 @@ package com.makeit.service.platform.device; ...@@ -2,20 +2,18 @@ package com.makeit.service.platform.device;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.page.PageReqDTO; import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO; import com.makeit.common.page.PageVO;
import com.makeit.dto.platform.dataScreen.PlatDataScreenQueryDTO; import com.makeit.dto.platform.dataScreen.PlatDataScreenQueryDTO;
import com.makeit.dto.platform.device.PlatDeviceAttrDTO; import com.makeit.dto.platform.device.*;
import com.makeit.dto.platform.device.PlatDeviceDetailDTO;
import com.makeit.dto.platform.device.PlatDeviceEditDTO;
import com.makeit.dto.platform.device.PlatDeviceQueryDTO;
import com.makeit.dto.saas.device.PlatDeviceEditSaasDTO; import com.makeit.dto.saas.device.PlatDeviceEditSaasDTO;
import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO; import com.makeit.dto.wechat.device.*;
import com.makeit.dto.wechat.device.PlatDeviceEditWechatDTO;
import com.makeit.dto.wechat.device.PlatDeviceNetAttrWechatDTO;
import com.makeit.dto.wechat.device.PlatDeviceSetupDTO;
import com.makeit.entity.platform.device.PlatDevice; import com.makeit.entity.platform.device.PlatDevice;
import com.makeit.module.iot.vo.DeviceProperties; import com.makeit.module.iot.vo.DeviceProperties;
import com.makeit.shengwang.agora.dto.PlatCallingDeviceDTO;
import com.makeit.shengwang.agora.vo.PlatAlarmCallDeviceVO;
import com.makeit.vo.platform.device.PlatChildDeviceListVO;
import com.makeit.vo.platform.device.PlatDeviceListVO; import com.makeit.vo.platform.device.PlatDeviceListVO;
import com.makeit.vo.platform.device.PlatDeviceViewVO; import com.makeit.vo.platform.device.PlatDeviceViewVO;
...@@ -78,4 +76,16 @@ public interface PlatDeviceService extends IService<PlatDevice> { ...@@ -78,4 +76,16 @@ public interface PlatDeviceService extends IService<PlatDevice> {
boolean updateDeviceStatus(String messageType, String deviceId, String iot_tenantId); boolean updateDeviceStatus(String messageType, String deviceId, String iot_tenantId);
void editDeviceNetInfo(PlatDeviceNetAttrWechatDTO dto); void editDeviceNetInfo(PlatDeviceNetAttrWechatDTO dto);
PageVO<PlatChildDeviceListVO> pageChild(PageReqDTO<PlatChildDeviceDTO> pageReqDTO);
void modifyWifiInfo(PlatDeviceSetupDTO dto);
void bindOrg(PlatDeviceBindOrgDTO platDeviceBindOrgDTO);
void active(BaseIdDTO dto);
PlatAlarmCallDeviceVO getDeviceRtmToken(PlatCallingDeviceDTO dto);
PlatAlarmCallDeviceVO callingDevice(PlatCallingDeviceDTO dto);
} }
server-service/src/main/java/com/makeit/service/platform/elder/PlatElderCoordinateRecordService.java 0 → 100644
package com.makeit.service.platform.elder;
import com.baomidou.mybatisplus.extension.service.IService;
import com.makeit.entity.platform.elder.PlatElderCoordinateRecord;
/**
* <p>
* 长者坐标记录 服务类
* </p>
*
* @author eugene young
* @since 2023-11-15
*/
public interface PlatElderCoordinateRecordService extends IService<PlatElderCoordinateRecord> {
void coordinateRecordTask();
}
server-service/src/main/java/com/makeit/service/platform/elder/PlatElderService.java
...@@ -70,6 +70,8 @@ public interface PlatElderService extends IService<PlatElder> { ...@@ -70,6 +70,8 @@ public interface PlatElderService extends IService<PlatElder> {
void batchEdit(PlatElderBatchEditDTOVO dto); void batchEdit(PlatElderBatchEditDTOVO dto);
List<PlatElderListVO> listByElder(PlatElderQueryDTO dto); List<PlatElderListVO> listByElder(PlatElderQueryDTO dto);
PlatElder getByDeviceId(String deviceId);
/*小程序*/ /*小程序*/
} }
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
...@@ -11,6 +11,7 @@ import com.makeit.common.entity.BaseEntity; ...@@ -11,6 +11,7 @@ import com.makeit.common.entity.BaseEntity;
import com.makeit.common.page.PageReqDTO; import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO; import com.makeit.common.page.PageVO;
import com.makeit.dto.platform.auth.PlatOrgSplitDTO; import com.makeit.dto.platform.auth.PlatOrgSplitDTO;
import com.makeit.dto.platform.elder.add.PlatElderDTOVO;
import com.makeit.dto.platform.elder.children.PlatElderChildrenInfoDTOVO; import com.makeit.dto.platform.elder.children.PlatElderChildrenInfoDTOVO;
import com.makeit.dto.platform.elder.children.PlatElderChildrenInfoQueryDTO; import com.makeit.dto.platform.elder.children.PlatElderChildrenInfoQueryDTO;
import com.makeit.dto.platform.elder.children.PlatElderChildrenInfoWechatDTOVO; import com.makeit.dto.platform.elder.children.PlatElderChildrenInfoWechatDTOVO;
...@@ -30,6 +31,7 @@ import com.makeit.utils.data.convert.StreamUtil; ...@@ -30,6 +31,7 @@ import com.makeit.utils.data.convert.StreamUtil;
import com.makeit.utils.old.StringUtils; import com.makeit.utils.old.StringUtils;
import com.makeit.utils.request.RequestUtil; import com.makeit.utils.request.RequestUtil;
import com.makeit.utils.sql.join.JoinUtil; import com.makeit.utils.sql.join.JoinUtil;
import com.makeit.utils.sys.FileUtil;
import com.makeit.utils.user.common.CommonUserUtil; import com.makeit.utils.user.common.CommonUserUtil;
import com.makeit.utils.user.common.CommonUserVO; import com.makeit.utils.user.common.CommonUserVO;
import com.makeit.utils.user.wechat.WechatUserUtil; import com.makeit.utils.user.wechat.WechatUserUtil;
...@@ -70,6 +72,7 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild ...@@ -70,6 +72,7 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
.like(StringUtils.isNotBlank(dto.getPhone()), PlatElderChildrenInfo::getPhone, dto.getPhone()) .like(StringUtils.isNotBlank(dto.getPhone()), PlatElderChildrenInfo::getPhone, dto.getPhone())
.eq(StringUtils.isNotBlank(dto.getElderId()), PlatElderChildrenInfo::getElderId, dto.getElderId()) .eq(StringUtils.isNotBlank(dto.getElderId()), PlatElderChildrenInfo::getElderId, dto.getElderId())
.eq(StringUtils.isNotBlank(dto.getTenantId()), PlatElderChildrenInfo::getTenantId, dto.getTenantId()) .eq(StringUtils.isNotBlank(dto.getTenantId()), PlatElderChildrenInfo::getTenantId, dto.getTenantId())
.in(CollectionUtils.isNotEmpty(dto.getOrgIdList()),PlatElderChildrenInfo::getOrgId,dto.getOrgIdList())
.apply(StringUtils.isNotBlank(dto.getOrgId()), "find_in_set('" + dto.getOrgId() + "',org_path)"); .apply(StringUtils.isNotBlank(dto.getOrgId()), "find_in_set('" + dto.getOrgId() + "',org_path)");
} }
...@@ -271,6 +274,10 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild ...@@ -271,6 +274,10 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
List<PlatElderListVO> list = BeanDtoVoUtils.listVo(platElders, PlatElderListVO.class); List<PlatElderListVO> list = BeanDtoVoUtils.listVo(platElders, PlatElderListVO.class);
platElderService.fill(list); platElderService.fill(list);
FileUtil.convert(list, PlatElderListVO::getAvatar, (e, f) -> {
e.setAvatar(f.getFullUrl());
});
Map<String, PlatElderListVO> elderListVOMap = StreamUtil.toMap(list, BaseIdDTO::getId); Map<String, PlatElderListVO> elderListVOMap = StreamUtil.toMap(list, BaseIdDTO::getId);
List<PlatElderChildrenInfoWechatVO> voList = Lists.newArrayList(); List<PlatElderChildrenInfoWechatVO> voList = Lists.newArrayList();
for (PlatElderChildrenInfo platElderChildrenInfo : platElderChildrenInfoList) { for (PlatElderChildrenInfo platElderChildrenInfo : platElderChildrenInfoList) {
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderCoordinateRecordServiceImpl.java 0 → 100644
package com.makeit.service.platform.elder.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.makeit.entity.platform.elder.PlatElder;
import com.makeit.entity.platform.elder.PlatElderCoordinateRecord;
import com.makeit.entity.platform.space.PlatRegionSetting;
import com.makeit.entity.platform.space.PlatRegionSettingFix;
import com.makeit.mapper.platform.elder.PlatElderCoordinateRecordMapper;
import com.makeit.service.platform.elder.PlatElderCoordinateRecordService;
import com.makeit.service.platform.elder.PlatElderDayReportDayService;
import com.makeit.service.platform.elder.PlatElderRealTimeService;
import com.makeit.service.platform.elder.PlatElderService;
import com.makeit.service.platform.space.PlatRegionSettingFixService;
import com.makeit.service.platform.space.PlatRegionSettingService;
import com.makeit.utils.data.convert.StreamUtil;
import com.makeit.utils.time.LocalDateTimeUtils;
import com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
/**
* <p>
* 长者坐标记录 服务实现类
* </p>
*
* @author eugene young
* @since 2023-11-15
*/
@Service
public class PlatElderCoordinateRecordServiceImpl extends ServiceImpl<PlatElderCoordinateRecordMapper, PlatElderCoordinateRecord> implements PlatElderCoordinateRecordService {
@Autowired
private PlatElderService platElderService;
@Autowired
private PlatElderDayReportDayService platElderDayReportDayService;
@Autowired
private PlatRegionSettingFixService platRegionSettingFixService;
@Autowired
private PlatRegionSettingService platRegionSettingService;
@Autowired
private PlatElderRealTimeService platElderRealTimeService;
@Override
public void coordinateRecordTask() {
LocalDate nowDate = LocalDate.now();
LocalDate yesDate = nowDate.minusDays(1);
LocalDateTime datStart = LocalDateTimeUtils.getDayStart(yesDate);
LocalDateTime dayEnd = LocalDateTimeUtils.getDayEnd(yesDate);
List<PlatElder> elderList = platElderService.list(new QueryWrapper<PlatElder>().lambda()
.isNotNull(PlatElder::getRoomId));
if (CollectionUtils.isEmpty(elderList)) {
return;
}
PlatElderCoordinateRecord platElderCoordinateRecord;
PlatRegionSettingFix platRegionSettingFix;
List<PlatRegionSetting> platRegionSettingList = platRegionSettingService.list(new QueryWrapper<>());
Function<PlatRegionSetting,String> function = entity -> entity.getRoomId() + "-" + entity.getDeviceId();
Map<String, PlatRegionSetting> platRegionSettingMap = StreamUtil.toMap(platRegionSettingList,
function);
for (PlatElder platElder : elderList) {
List<PlatElderCoordinateVO> elderCoordinateVOList = platElderDayReportDayService.coordinateList(platElder.getId(), null, datStart, dayEnd);
Set<String> deviceIdSet = Sets.newHashSet();
List<PlatElderCoordinateRecord> list = Lists.newArrayList();
for (PlatElderCoordinateVO vo : elderCoordinateVOList) {
platElderCoordinateRecord = new PlatElderCoordinateRecord();
BeanUtils.copyProperties(vo,platElderCoordinateRecord);
if (CollectionUtils.isNotEmpty(vo.getTrack())) {
platElderCoordinateRecord.setTrack(JSON.toJSONString(vo.getTrack()));
}
platElderCoordinateRecord.setReportTime(vo.getTimestamp());
platElderCoordinateRecord.setIotDeviceId(vo.getOriDeviceId());
platElderCoordinateRecord.setDeviceId(vo.getDeviceId());
platElderCoordinateRecord.setPersonState(vo.getPersonState());
platElderCoordinateRecord.setElderId(platElder.getId());
platElderCoordinateRecord.setTenantId(platElder.getTenantId());
list.add(platElderCoordinateRecord);
deviceIdSet.add(vo.getDeviceId());
}
saveBatch(list);
for (String deviceId : deviceIdSet) {
PlatRegionSetting platRegionSetting = platRegionSettingMap.get(platElder.getRoomId() + "-" + deviceId);
if (platRegionSetting != null) {
platRegionSettingFix = new PlatRegionSettingFix();
BeanUtils.copyProperties(platRegionSetting,platRegionSettingFix,"id");
platRegionSettingFix.setElderId(platElder.getId());
platRegionSettingFix.setHappenDate(yesDate.toString());
platRegionSettingFixService.save(platRegionSettingFix);
}
}
}
}
}
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportWeekServiceImpl.java
...@@ -75,6 +75,8 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -75,6 +75,8 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
@Autowired @Autowired
private PlatElderSleepAnalysisService platElderSleepAnalysisService; private PlatElderSleepAnalysisService platElderSleepAnalysisService;
@Autowired
private PlatElderService platElderService;
private LocalDateTime weekStartDateTime(LocalDateTime defaultTime) { private LocalDateTime weekStartDateTime(LocalDateTime defaultTime) {
return weekStartDateTime(LocalDate.now().minusDays(1), defaultTime); return weekStartDateTime(LocalDate.now().minusDays(1), defaultTime);
...@@ -174,9 +176,15 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -174,9 +176,15 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
public PlatElderSleepEvaluationVO sleepEvaluationInternal(PlatElderReportDTO platElderIdDTO, LocalDate weekStartDate, LocalDate weekEndDate) { public PlatElderSleepEvaluationVO sleepEvaluationInternal(PlatElderReportDTO platElderIdDTO, LocalDate weekStartDate, LocalDate weekEndDate) {
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String elderId = platElderIdDTO.getElderId();
if (StringUtils.isNotEmpty(platElderIdDTO.getDeviceId())) {
PlatElder platElder = platElderService.getByDeviceId(platElderIdDTO.getDeviceId());
if (platElder != null) {
elderId = platElder.getId();
}
}
List<PlatElderSleepAnalysis> sleepAnalysisList = platElderSleepAnalysisService.list(new QueryWrapper<PlatElderSleepAnalysis>().lambda() List<PlatElderSleepAnalysis> sleepAnalysisList = platElderSleepAnalysisService.list(new QueryWrapper<PlatElderSleepAnalysis>().lambda()
.eq(PlatElderSleepAnalysis::getElderId, platElderIdDTO.getElderId()) .eq(PlatElderSleepAnalysis::getElderId, elderId)
.ge(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate)) .ge(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate))
.le(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate)) .le(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate))
); );
...@@ -239,15 +247,21 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -239,15 +247,21 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
LocalDate weekEndDate = weekEndDate(platElderIdDTO.getEndTime()); LocalDate weekEndDate = weekEndDate(platElderIdDTO.getEndTime());
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String elderId = platElderIdDTO.getElderId();
if (StringUtils.isNotEmpty(platElderIdDTO.getDeviceId())) {
PlatElder platElder = platElderService.getByDeviceId(platElderIdDTO.getDeviceId());
if (platElder != null) {
elderId = platElder.getId();
}
}
List<PlatElderSleep> sleepList = platElderSleepService.list(new QueryWrapper<PlatElderSleep>().lambda() List<PlatElderSleep> sleepList = platElderSleepService.list(new QueryWrapper<PlatElderSleep>().lambda()
.eq(PlatElderSleep::getElderId, platElderIdDTO.getElderId()) .eq(PlatElderSleep::getElderId, elderId)
.ge(PlatElderSleep::getHappenDate, dateTimeFormatter.format(weekStartDate)) .ge(PlatElderSleep::getHappenDate, dateTimeFormatter.format(weekStartDate))
.le(PlatElderSleep::getHappenDate, dateTimeFormatter.format(weekEndDate)) .le(PlatElderSleep::getHappenDate, dateTimeFormatter.format(weekEndDate))
); );
List<PlatElderSleepAnalysis> sleepAnalysisList = platElderSleepAnalysisService.list(new QueryWrapper<PlatElderSleepAnalysis>().lambda() List<PlatElderSleepAnalysis> sleepAnalysisList = platElderSleepAnalysisService.list(new QueryWrapper<PlatElderSleepAnalysis>().lambda()
.eq(PlatElderSleepAnalysis::getElderId, platElderIdDTO.getElderId()) .eq(PlatElderSleepAnalysis::getElderId, elderId)
.ge(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate)) .ge(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate))
.le(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate)) .le(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate))
); );
...@@ -317,9 +331,15 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -317,9 +331,15 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
public PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluationInternal(PlatElderReportDTO platElderIdDTO, LocalDate weekStartDate, LocalDate weekEndDate) { public PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluationInternal(PlatElderReportDTO platElderIdDTO, LocalDate weekStartDate, LocalDate weekEndDate) {
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String elderId = platElderIdDTO.getElderId();
if (StringUtils.isNotEmpty(platElderIdDTO.getDeviceId())) {
PlatElder platElder = platElderService.getByDeviceId(platElderIdDTO.getDeviceId());
if (platElder != null) {
elderId = platElder.getId();
}
}
List<PlatElderBreatheAnalysis> breatheAnalyses = platElderBreatheAnalysisService.list(new QueryWrapper<PlatElderBreatheAnalysis>().lambda() List<PlatElderBreatheAnalysis> breatheAnalyses = platElderBreatheAnalysisService.list(new QueryWrapper<PlatElderBreatheAnalysis>().lambda()
.eq(PlatElderBreatheAnalysis::getElderId, platElderIdDTO.getElderId()) .eq(PlatElderBreatheAnalysis::getElderId, elderId)
.ge(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate)) .ge(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate))
.le(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate)) .le(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate))
); );
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java
...@@ -112,7 +112,15 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -112,7 +112,15 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
} }
if (StringUtils.isNotBlank(deviceId)) { if (StringUtils.isNotBlank(deviceId)) {
deviceList = Arrays.asList(platDeviceService.getById(deviceId)); PlatDevice platDevice = platDeviceService.getById(deviceId);
if (platDevice != null) {
deviceList.add(platDevice);
}
PlatDevice device = platDeviceService.getOne(new QueryWrapper<PlatDevice>().lambda()
.eq(PlatDevice::getOriDeviceId, deviceId).last("limit 1"));
if (device != null) {
deviceList.add(device);
}
} }
return deviceList; return deviceList;
...@@ -127,7 +135,15 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -127,7 +135,15 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
} }
if (StringUtils.isNotBlank(deviceId)) { if (StringUtils.isNotBlank(deviceId)) {
deviceList = Arrays.asList(platDeviceService.getById(deviceId)); PlatDevice platDevice = platDeviceService.getById(deviceId);
if (platDevice != null) {
deviceList.add(platDevice);
}
PlatDevice device = platDeviceService.getOne(new QueryWrapper<PlatDevice>().lambda()
.eq(PlatDevice::getOriDeviceId, deviceId).last("limit 1"));
if (device != null) {
deviceList.add(device);
}
} }
return deviceList; return deviceList;
...@@ -476,11 +492,22 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -476,11 +492,22 @@ 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 = Lists.newArrayList();
List<PlatDevice> fallDeviceList = Lists.newArrayList();
if (StringUtils.isNotBlank(platElderIdDTO.getDeviceId())) {
PlatDevice device = platDeviceService.getOne(new QueryWrapper<PlatDevice>().lambda()
.eq(PlatDevice::getOriDeviceId, platElderIdDTO.getDeviceId()).last("limit 1"));
if (device != null) {
deviceListSpace.add(device);
}
} else {
deviceListSpace = getSpaceDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
fallDeviceList = getFallDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
} }
List<PlatDevice> deviceListSpace = getSpaceDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
List<PlatDevice> fallDeviceList = getFallDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
deviceListSpace.addAll(fallDeviceList); deviceListSpace.addAll(fallDeviceList);
for (PlatDevice platDevice : deviceListSpace) { for (PlatDevice platDevice : deviceListSpace) {
String spaceResult = redisTemplate.opsForValue().get(DEVICE_SPACE_DATA + platDevice.getOriDeviceId()); String spaceResult = redisTemplate.opsForValue().get(DEVICE_SPACE_DATA + platDevice.getOriDeviceId());
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
...@@ -25,6 +25,7 @@ import com.makeit.entity.platform.elder.PlatElderOtherInfo; ...@@ -25,6 +25,7 @@ import com.makeit.entity.platform.elder.PlatElderOtherInfo;
import com.makeit.entity.platform.elder.PlatElderSocialRelation; import com.makeit.entity.platform.elder.PlatElderSocialRelation;
import com.makeit.entity.platform.space.PlatBed; import com.makeit.entity.platform.space.PlatBed;
import com.makeit.entity.platform.space.PlatRoom; import com.makeit.entity.platform.space.PlatRoom;
import com.makeit.entity.platform.space.PlatRoomBedDevice;
import com.makeit.entity.platform.space.PlatSpace; import com.makeit.entity.platform.space.PlatSpace;
import com.makeit.enums.CodeMessageEnum; import com.makeit.enums.CodeMessageEnum;
import com.makeit.enums.CommonEnum; import com.makeit.enums.CommonEnum;
...@@ -908,7 +909,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -908,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()
...@@ -1191,6 +1192,19 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -1191,6 +1192,19 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
return voList; return voList;
} }
@Override
public PlatElder getByDeviceId(String deviceId) {
PlatRoomBedDevice platRoomBedDevice = platRoomBedDeviceService.getOne(new QueryWrapper<PlatRoomBedDevice>().lambda()
.eq(PlatRoomBedDevice::getDeviceId, deviceId)
.last("limit 1"));
if (platRoomBedDevice != null && StringUtils.isNotEmpty(platRoomBedDevice.getBedId())) {
PlatElder platElder = getOne(new QueryWrapper<PlatElder>().lambda()
.eq(PlatElder::getBedId, platRoomBedDevice.getBedId()));
return platElder;
}
return null;
}
} }
//TODO ywc 数据字典 //TODO ywc 数据字典
//还有空间相关的没有 列表 详情 导入 导出 //还有空间相关的没有 列表 详情 导入 导出
......
server-service/src/main/java/com/makeit/service/platform/space/PlatRegionSettingFixService.java 0 → 100644
package com.makeit.service.platform.space;
import com.baomidou.mybatisplus.extension.service.IService;
import com.makeit.entity.platform.space.PlatRegionSettingFix;
/**
* <p>
* 区域设置固化 服务类
* </p>
*
* @author eugene young
* @since 2023-11-15
*/
public interface PlatRegionSettingFixService extends IService<PlatRegionSettingFix> {
}
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRegionSettingFixServiceImpl.java 0 → 100644
package com.makeit.service.platform.space.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.entity.platform.space.PlatRegionSettingFix;
import com.makeit.mapper.platform.space.PlatRegionSettingFixMapper;
import com.makeit.service.platform.space.PlatRegionSettingFixService;
import org.springframework.stereotype.Service;
/**
* <p>
* 区域设置固化 服务实现类
* </p>
*
* @author eugene young
* @since 2023-11-15
*/
@Service
public class PlatRegionSettingFixServiceImpl extends ServiceImpl<PlatRegionSettingFixMapper, PlatRegionSettingFix> implements PlatRegionSettingFixService {
}
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRegionSettingServiceImpl.java
...@@ -71,18 +71,20 @@ public class PlatRegionSettingServiceImpl extends ServiceImpl<PlatRegionSettingM ...@@ -71,18 +71,20 @@ public class PlatRegionSettingServiceImpl extends ServiceImpl<PlatRegionSettingM
platDeviceOthers = platDeviceOthers.stream().filter(platDeviceOther -> StringUtils.isNotEmpty(platDeviceOther.getAttribute())).collect(Collectors.toList()); platDeviceOthers = platDeviceOthers.stream().filter(platDeviceOther -> StringUtils.isNotEmpty(platDeviceOther.getAttribute())).collect(Collectors.toList());
Map<String,String> map = platDeviceOthers.stream().collect(Collectors.toMap(PlatDeviceOther::getDeviceId,PlatDeviceOther::getAttribute)); Map<String,String> map = platDeviceOthers.stream().collect(Collectors.toMap(PlatDeviceOther::getDeviceId,PlatDeviceOther::getAttribute));
List<PlatRegionSetting> list = new ArrayList<>(); List<PlatRegionSetting> list = new ArrayList<>();
listDeviceId.forEach(item->{ for (String item : listDeviceId) {
PlatRegionSetting platRegionSetting = new PlatRegionSetting(); PlatRegionSetting platRegionSetting = new PlatRegionSetting();
platRegionSetting.setDeviceId(item); platRegionSetting.setDeviceId(item);
platRegionSetting.setRoomId(roomId); platRegionSetting.setRoomId(roomId);
if(map.get(item)!=null){ if(map.get(item)!=null){
String attribute = map.get(item); String attribute = map.get(item);
PlatDeviceAttrWechatDTO deviceAttrWechatDTO = JsonUtil.toObj(attribute,PlatDeviceAttrWechatDTO.class); PlatDeviceAttrWechatDTO deviceAttrWechatDTO = JsonUtil.toObj(attribute,PlatDeviceAttrWechatDTO.class);
platRegionSetting.setInstallType(deviceAttrWechatDTO.getRadarMount()+""); if (deviceAttrWechatDTO == null || deviceAttrWechatDTO.getRadarMount() == null) {
continue;
}
platRegionSetting.setInstallType(deviceAttrWechatDTO.getRadarMount().toString());
} }
list.add(platRegionSetting); list.add(platRegionSetting);
}); }
if(!list.isEmpty()){ if(!list.isEmpty()){
saveBatch(list); saveBatch(list);
......
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomDynamicServiceImpl.java
...@@ -68,6 +68,15 @@ public class PlatRoomDynamicServiceImpl implements PlatRoomDynamicService { ...@@ -68,6 +68,15 @@ public class PlatRoomDynamicServiceImpl implements PlatRoomDynamicService {
//空间下的房间 //空间下的房间
List<PlatRoom> rooms = platRoomService.list(new QueryWrapper<PlatRoom>().lambda() List<PlatRoom> rooms = platRoomService.list(new QueryWrapper<PlatRoom>().lambda()
.in(PlatRoom::getSpaceId,spaceIds)); .in(PlatRoom::getSpaceId,spaceIds));
if (CollectionUtils.isEmpty(rooms)) {
spaces = platSpaceService.list(new QueryWrapper<PlatSpace>().lambda()
.in(PlatSpace::getParentId,spaceIds));
if (CollectionUtils.isNotEmpty(spaces)) {
spaceIds = spaces.stream().map(PlatSpace::getId).collect(Collectors.toList());
rooms = platRoomService.list(new QueryWrapper<PlatRoom>().lambda()
.in(PlatRoom::getSpaceId,spaceIds));
}
}
Map<String,List<PlatRoom>> spaceRoomMap = rooms.stream().collect(Collectors.groupingBy(PlatRoom::getSpaceId)); Map<String,List<PlatRoom>> spaceRoomMap = rooms.stream().collect(Collectors.groupingBy(PlatRoom::getSpaceId));
List<String> roomIds = rooms.stream().map(PlatRoom::getId).collect(Collectors.toList()); List<String> roomIds = rooms.stream().map(PlatRoom::getId).collect(Collectors.toList());
List<PlatBed> beds = platBedService.list(new QueryWrapper<PlatBed>().lambda() List<PlatBed> beds = platBedService.list(new QueryWrapper<PlatBed>().lambda()
......
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomServiceImpl.java
...@@ -9,6 +9,7 @@ import com.makeit.common.page.PageVO; ...@@ -9,6 +9,7 @@ import com.makeit.common.page.PageVO;
import com.makeit.dto.platform.space.PlatRoomDTO; import com.makeit.dto.platform.space.PlatRoomDTO;
import com.makeit.dto.platform.space.PlatRoomQueryDTO; import com.makeit.dto.platform.space.PlatRoomQueryDTO;
import com.makeit.dto.platform.workstation.WorkStationQueryDTO; import com.makeit.dto.platform.workstation.WorkStationQueryDTO;
import com.makeit.entity.platform.elder.PlatElder;
import com.makeit.entity.platform.space.PlatBed; import com.makeit.entity.platform.space.PlatBed;
import com.makeit.entity.platform.space.PlatRoom; import com.makeit.entity.platform.space.PlatRoom;
import com.makeit.entity.platform.space.PlatRoomBedDevice; import com.makeit.entity.platform.space.PlatRoomBedDevice;
...@@ -17,6 +18,7 @@ import com.makeit.enums.CodeMessageEnum; ...@@ -17,6 +18,7 @@ import com.makeit.enums.CodeMessageEnum;
import com.makeit.enums.CommonEnum; import com.makeit.enums.CommonEnum;
import com.makeit.exception.BusinessException; import com.makeit.exception.BusinessException;
import com.makeit.mapper.platform.space.PlatRoomMapper; import com.makeit.mapper.platform.space.PlatRoomMapper;
import com.makeit.service.platform.elder.PlatElderService;
import com.makeit.service.platform.space.PlatBedService; import com.makeit.service.platform.space.PlatBedService;
import com.makeit.service.platform.space.PlatRoomBedDeviceService; import com.makeit.service.platform.space.PlatRoomBedDeviceService;
import com.makeit.service.platform.space.PlatRoomService; import com.makeit.service.platform.space.PlatRoomService;
...@@ -49,6 +51,8 @@ public class PlatRoomServiceImpl extends ServiceImpl<PlatRoomMapper, PlatRoom> i ...@@ -49,6 +51,8 @@ public class PlatRoomServiceImpl extends ServiceImpl<PlatRoomMapper, PlatRoom> i
@Autowired @Autowired
private PlatSpaceService platSpaceService; private PlatSpaceService platSpaceService;
@Autowired @Autowired
private PlatElderService platElderService;
@Autowired
private PlatRoomBedDeviceService platRoomBedDeviceService; private PlatRoomBedDeviceService platRoomBedDeviceService;
private void checkName(PlatRoom platRoom){ private void checkName(PlatRoom platRoom){
...@@ -95,6 +99,16 @@ public class PlatRoomServiceImpl extends ServiceImpl<PlatRoomMapper, PlatRoom> i ...@@ -95,6 +99,16 @@ public class PlatRoomServiceImpl extends ServiceImpl<PlatRoomMapper, PlatRoom> i
updateById(platRoom); updateById(platRoom);
platBedService.add(platRoom); platBedService.add(platRoom);
// 同步更新长者房间
List<PlatElder> platElderList = platElderService.list(new QueryWrapper<PlatElder>().lambda()
.eq(PlatElder::getRoomId, platRoom.getId()));
for (PlatElder platElder : platElderList) {
platElder.setSpaceId(dto.getSpaceId());
platElder.setSpacePath(dto.getSpacePath() + "," + platElder.getRoomId() + "," + platElder.getBedId());
platElderService.updateById(platElder);
}
} }
@Override @Override
......
server-service/src/main/java/com/makeit/task/PlatElderReportTask.java
...@@ -3,6 +3,7 @@ package com.makeit.task; ...@@ -3,6 +3,7 @@ package com.makeit.task;
import com.makeit.global.aspect.tenant.TenantIdIgnore; import com.makeit.global.aspect.tenant.TenantIdIgnore;
import com.makeit.service.platform.elder.PlatElderBreatheAnalysisService; import com.makeit.service.platform.elder.PlatElderBreatheAnalysisService;
import com.makeit.service.platform.elder.PlatElderBreatheDayStatService; import com.makeit.service.platform.elder.PlatElderBreatheDayStatService;
import com.makeit.service.platform.elder.PlatElderCoordinateRecordService;
import com.makeit.service.platform.elder.PlatElderSleepService; import com.makeit.service.platform.elder.PlatElderSleepService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -19,6 +20,8 @@ public class PlatElderReportTask { ...@@ -19,6 +20,8 @@ public class PlatElderReportTask {
private PlatElderBreatheDayStatService platElderBreatheDayStatService; private PlatElderBreatheDayStatService platElderBreatheDayStatService;
@Autowired @Autowired
private PlatElderBreatheAnalysisService platElderBreatheAnalysisService; private PlatElderBreatheAnalysisService platElderBreatheAnalysisService;
@Autowired
private PlatElderCoordinateRecordService platElderCoordinateRecordService;
...@@ -30,6 +33,14 @@ public class PlatElderReportTask { ...@@ -30,6 +33,14 @@ public class PlatElderReportTask {
log.info("生成长者每日呼吸，异常情况结束"); log.info("生成长者每日呼吸，异常情况结束");
} }
@Scheduled(cron = "0 30 1 * * ?")
@TenantIdIgnore
public void coordinateRecordTask() {
log.info("开始生成长者每日实时定位");
platElderCoordinateRecordService.coordinateRecordTask();
log.info("生成长者每日实时定位结束");
}
/** /**
* 长者呼吸心率分析 * 长者呼吸心率分析
......
server-service/src/main/java/com/makeit/vo/platform/device/PlatChildDeviceListVO.java 0 → 100644
package com.makeit.vo.platform.device;
import com.makeit.entity.platform.device.PlatDeviceOther;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* 设备
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Data
@ApiModel(value = "子女端设备对象", description = "子女端设备")
public class PlatChildDeviceListVO {
@ApiModelProperty(value = "id")
private String id;
@ApiModelProperty(value = "原始设备ID")
private String oriDeviceId;
@ApiModelProperty(value = "设备名称")
private String name;
@ApiModelProperty(value = "产品名称")
private String productName;
@ApiModelProperty(value = "产品id")
private String productId;
@ApiModelProperty(value = "说明")
private String description;
@ApiModelProperty(value = "状态 数据字典 1 在线 0离线")
private String status;
@ApiModelProperty(value = "设备类型 0-呼吸心率雷达 1-空间人体雷达 2-跌倒检测雷达")
private String category;
@ApiModelProperty(value = "组织id")
private String orgId;
@ApiModelProperty(value = "组织名称")
private String orgName;
private PlatDeviceOther platDeviceOther;
}
server-service/src/main/java/com/makeit/vo/platform/device/PlatDeviceActiveVO.java 0 → 100644
package com.makeit.vo.platform.device;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* <p>
* 设备
* </p>
*
* @author eugene young
* @since 2023-09-05
*/
@Data
@ApiModel(value = "设备激活许可", description = "设备激活许可")
public class PlatDeviceActiveVO {
private String license;
private SkuView skuView;
private Long expireTime;
private Long activationTime;
@Data
public static class SkuView {
private Integer product;
private Integer minutes;
private Integer mediaType;
private String name;
private String period;
}
}
server-service/src/main/java/com/makeit/vo/platform/device/PlatDeviceListVO.java
...@@ -2,6 +2,7 @@ package com.makeit.vo.platform.device; ...@@ -2,6 +2,7 @@ package com.makeit.vo.platform.device;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.makeit.common.dto.BaseTenantDTO; import com.makeit.common.dto.BaseTenantDTO;
import com.makeit.entity.platform.device.PlatDeviceOther;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
server-service/src/main/java/com/makeit/vo/platform/elder/PlatElderExportVO.java
...@@ -31,7 +31,7 @@ public class PlatElderExportVO extends BaseTenantDTO { ...@@ -31,7 +31,7 @@ public class PlatElderExportVO extends BaseTenantDTO {
@ApiModelProperty(value = "小区/社区/街道空间id") @ApiModelProperty(value = "小区/社区/街道空间id")
private String streetSpaceId; private String streetSpaceId;
@ExcelProperty("小区") @ExcelProperty("一级空间")
@ApiModelProperty(value = "小区/社区/街道空间名称") @ApiModelProperty(value = "小区/社区/街道空间名称")
private String streetSpaceName; private String streetSpaceName;
...@@ -39,7 +39,7 @@ public class PlatElderExportVO extends BaseTenantDTO { ...@@ -39,7 +39,7 @@ public class PlatElderExportVO extends BaseTenantDTO {
@ApiModelProperty(value = "楼栋空间id") @ApiModelProperty(value = "楼栋空间id")
private String buildingSpaceId; private String buildingSpaceId;
@ExcelProperty("楼栋") @ExcelProperty("二级空间")
@ApiModelProperty(value = "楼栋空间名称") @ApiModelProperty(value = "楼栋空间名称")
private String buildingSpaceName; private String buildingSpaceName;
...@@ -47,7 +47,7 @@ public class PlatElderExportVO extends BaseTenantDTO { ...@@ -47,7 +47,7 @@ public class PlatElderExportVO extends BaseTenantDTO {
@ApiModelProperty(value = "单元空间id") @ApiModelProperty(value = "单元空间id")
private String unitSpaceId; private String unitSpaceId;
@ExcelProperty("单元") @ExcelProperty("三级空间")
@ApiModelProperty(value = "单元空间名称") @ApiModelProperty(value = "单元空间名称")
private String unitSpaceName; private String unitSpaceName;
...@@ -55,7 +55,7 @@ public class PlatElderExportVO extends BaseTenantDTO { ...@@ -55,7 +55,7 @@ public class PlatElderExportVO extends BaseTenantDTO {
@ApiModelProperty(value = "楼层id") @ApiModelProperty(value = "楼层id")
private String floorSpaceId; private String floorSpaceId;
@ExcelProperty("楼层") @ExcelProperty("四级空间")
@ApiModelProperty(value = "楼层id") @ApiModelProperty(value = "楼层id")
private String floorSpaceName; private String floorSpaceName;
......
server-service/src/main/java/com/makeit/vo/platform/elder/PlatElderListVO.java
...@@ -135,6 +135,7 @@ public class PlatElderListVO extends BaseTenantDTO { ...@@ -135,6 +135,7 @@ public class PlatElderListVO extends BaseTenantDTO {
@ApiModelProperty(value = "更新人名称") @ApiModelProperty(value = "更新人名称")
private String updateBy; private String updateBy;
@ApiModelProperty(value = "头像文件id")
private String avatar;
} }
server-service/src/main/java/com/makeit/vo/platform/elder/realtime/PlatElderCoordinateVO.java
...@@ -25,6 +25,8 @@ public class PlatElderCoordinateVO { ...@@ -25,6 +25,8 @@ public class PlatElderCoordinateVO {
private Integer angle; private Integer angle;
@ApiModelProperty("安装方式") @ApiModelProperty("安装方式")
private Integer mount; private Integer mount;
@ApiModelProperty("上报时间")
private Long timestamp;
@ApiModelProperty("跌倒设备轨迹") @ApiModelProperty("跌倒设备轨迹")
private List<Integer> track; private List<Integer> track;
......
server-service/src/main/java/com/makeit/vo/platform/elder/report/day/PlatElderSleepDiagramVO.java
...@@ -21,5 +21,9 @@ public class PlatElderSleepDiagramVO { ...@@ -21,5 +21,9 @@ public class PlatElderSleepDiagramVO {
@ApiModelProperty("图表集合") @ApiModelProperty("图表集合")
private List<PlatElderSleepDiagramContentVO> contentList; private List<PlatElderSleepDiagramContentVO> contentList;
@ApiModelProperty(value = "睡眠类型 1 睡眠 2 小憩")
private Integer elderSleepType;
} }
server-service/src/main/resources/mappers/PlatDeviceMapper.xml
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</if> </if>
</where> </where>
order by pd.update_date desc,prbd.update_date desc order by pd.update_date desc,pd.id desc
</select> </select>
<select id="getDevices" resultType="com.makeit.vo.platform.device.PlatDeviceListVO"> <select id="getDevices" resultType="com.makeit.vo.platform.device.PlatDeviceListVO">
......
server-web/src/main/resources/application-dev.yml
...@@ -70,7 +70,7 @@ file: ...@@ -70,7 +70,7 @@ file:
storage: storage:
location: ${file.file} location: ${file.file}
type: local type: local
url: http://localhost:8888/${file.filePath} url: https://localhost:8888/${file.filePath}
# aliBaseDir: point # aliBaseDir: point
...@@ -108,7 +108,7 @@ redis: ...@@ -108,7 +108,7 @@ redis:
libreOffice: C:\\Program Files\\LibreOffice\\program\\soffice libreOffice: C:\\Program Files\\LibreOffice\\program\\soffice
iot: iot:
url: http://iot.qa.insightica.cn/api/ url: https://iot.qa.insightica.cn/api/
clientId: fyxmb5h52iKwE2Hi clientId: fyxmb5h52iKwE2Hi
secureKey: 22fZbnH36wdHn7ZTyKKHraFw233npcez secureKey: 22fZbnH36wdHn7ZTyKKHraFw233npcez
...@@ -149,6 +149,17 @@ voice-sms: ...@@ -149,6 +149,17 @@ voice-sms:
uid: 362 uid: 362
pwd: xmksyy123456 pwd: xmksyy123456
shengwang:
appId: 883078934ecd4193aa7a62a3cdacd810
appCertificate: b29be69c9c034120a68f1d5c199d2e74
channelName: 1
uid: 0
tokenExpirationInSeconds: 3600
privilegeExpirationInSeconds: 3600
customerKey: b3b5f44e536a4fc191358926c6716b7b
customerSecret: bd81828a133140a58dfb04e9d80eba43
pid: 9851781E9E31453DA3C572A4A4AF9402
......
server-web/src/main/resources/application-test.yml
...@@ -67,7 +67,7 @@ file: ...@@ -67,7 +67,7 @@ file:
storage: storage:
location: ${file.file} location: ${file.file}
type: local type: local
url: http://saas.qa.insightica.cn/api/${file.filePath} url: https://saas.qa.insightica.cn/api/${file.filePath}
# aliBaseDir: point # aliBaseDir: point
# aliEndpoint: obs.cn-south-1.myhuaweicloud.com # aliEndpoint: obs.cn-south-1.myhuaweicloud.com
...@@ -104,7 +104,7 @@ redis: ...@@ -104,7 +104,7 @@ redis:
libreOffice: /home/group1_lzy/iot-server/LibreOffice/program/soffice libreOffice: /home/group1_lzy/iot-server/LibreOffice/program/soffice
iot: iot:
url: http://iot.qa.insightica.cn/api/ url: https://iot.qa.insightica.cn/api/
clientId: fyxmb5h52iKwE2Hi clientId: fyxmb5h52iKwE2Hi
secureKey: 22fZbnH36wdHn7ZTyKKHraFw233npcez secureKey: 22fZbnH36wdHn7ZTyKKHraFw233npcez
...@@ -146,3 +146,14 @@ voice-sms: ...@@ -146,3 +146,14 @@ voice-sms:
uid: 362 uid: 362
pwd: xmksyy123456 pwd: xmksyy123456
shengwang:
appId: 883078934ecd4193aa7a62a3cdacd810
appCertificate: b29be69c9c034120a68f1d5c199d2e74
channelName: 1
uid: 0
tokenExpirationInSeconds: 3600
privilegeExpirationInSeconds: 3600
customerKey: b3b5f44e536a4fc191358926c6716b7b
customerSecret: bd81828a133140a58dfb04e9d80eba43
pid: 9851781E9E31453DA3C572A4A4AF9402
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