wulin/qiuguo-iot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化设备注册接口代码结构

Browse Source
This commit is contained in:
wulin 2023-09-18 20:08:23 +08:00
parent 501205c445
commit 36523de816
1 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java
View File

@ -59,12 +59,22 @@ public class DeviceController {
return Mono.error(ex); return Mono.error(ex);
} }
//设备类型是否匹配暂时不做限制 //设备类型是否匹配暂时不做限制
DeviceTypeEnum entryTypeEnum = DeviceTypeEnum.getEnumWithCode(type);
if(entryTypeEnum == null){
BusinessException ex = new BusinessException("不支持的设备类型");
return Mono.error(ex);
}
//验签 //验签
String wifiMd5 = MD5.create().digestHex(wifiMac).toLowerCase(); String wifiMd5 = MD5.create().digestHex(wifiMac);
String btMd5 = MD5.create().digestHex(btMac).toLowerCase(); String btMd5 = MD5.create().digestHex(btMac);
String md5 = MD5.create().digestHex(wifiMd5 + btMd5 + type + time + key).toLowerCase(); String md5 = MD5.create().digestHex(wifiMd5 + btMd5 + type + time + key);
if (md5.equals(signature)) { if (!md5.equals(signature.toLowerCase())) {
// //
//验签失败
BusinessException ex = new BusinessException("验签失败");
return Mono.error(ex);
}
DeviceInfoRequest request = new DeviceInfoRequest(); DeviceInfoRequest request = new DeviceInfoRequest();
request.setWifiMac(wifiMac); request.setWifiMac(wifiMac);
request.setBtMac(btMac); request.setBtMac(btMac);
@ -72,7 +82,7 @@ public class DeviceController {
return mono.defaultIfEmpty(new DeviceInfoEntity()).flatMap(entity -> { return mono.defaultIfEmpty(new DeviceInfoEntity()).flatMap(entity -> {
if(entity.getId() == null){ if(entity.getId() == null){
DeviceTypeEnum entryTypeEnum = DeviceTypeEnum.getEnumWithCode(type);
entity = new DeviceInfoEntity(); entity = new DeviceInfoEntity();
entity.setWifiMac(wifiMac); entity.setWifiMac(wifiMac);
entity.setBtMac(btMac); entity.setBtMac(btMac);
@ -94,10 +104,7 @@ public class DeviceController {
resp.setSn(o.getSn()); resp.setSn(o.getSn());
return resp; return resp;
}); });
}
//验签失败
BusinessException ex = new BusinessException("验签失败");
return Mono.error(ex);
} }
} }