Merge remote-tracking branch 'origin/master'

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -14,9 +14,11 @@ import com.xy.dto.common.MercPlaceDto;
 import com.xy.dto.mini.MiniMercRegionDto;
 import com.xy.entity.DeviceBluetoothAuth;
 import com.xy.entity.DeviceInfo;
+import com.xy.entity.DeviceSysinfo;
 import com.xy.enums.MercStatus;
 import com.xy.service.DeviceBluetoothAuthServiceImpl;
 import com.xy.service.DeviceInfoServiceImpl;
+import com.xy.service.DeviceSysinfoServiceImpl;
 import com.xy.service.be.MercFeignService;
 import com.xy.service.common.MercLineService;
 import com.xy.service.common.MercPlaceService;
@@ -57,6 +59,8 @@ public class MercMiniDeviceController {
     private final MercFeignService mercFeignService;
 
     private final DeviceInfoServiceImpl deviceInfoService;
+
+    private final DeviceSysinfoServiceImpl deviceSysinfoService;
     private final MercPlaceService mercPlaceService;
     private final MercLineService mercLineService;
 
@@ -203,7 +207,12 @@ public class MercMiniDeviceController {
     @PostMapping("genCode")
     @ApiOperation("蓝牙开门-生成授权码")
     public R<Boolean> genCode(@RequestBody @Validated DeviceBluetoothAuthDto.GenCode dto) {
-        Long deviceId = dto.getDeviceId();
+        String deviceSn = dto.getDeviceSn();
+        DeviceSysinfo deviceSysinfo = deviceSysinfoService.getOne(Wrappers.<DeviceSysinfo>lambdaQuery().eq(DeviceSysinfo::getDeviceSn, deviceSn));
+        if (deviceSysinfo == null) {
+            return R.fail("设备不存在！");
+        }
+        Long deviceId = deviceSysinfo.getDeviceId();
         //用户输入的
         String authCode = dto.getAuthCode();
         List<Long> myDevices = getMyDevices();
@@ -241,7 +250,12 @@ public class MercMiniDeviceController {
     @PostMapping("verificationCode")
     @ApiOperation("蓝牙开门-校验并使用授权码")
     public R<Boolean> verificationCode(@RequestBody @Validated DeviceBluetoothAuthDto.VerificationCode dto) {
-        Long deviceId = dto.getDeviceId();
+        String deviceSn = dto.getDeviceSn();
+        DeviceSysinfo deviceSysinfo = deviceSysinfoService.getOne(Wrappers.<DeviceSysinfo>lambdaQuery().eq(DeviceSysinfo::getDeviceSn, deviceSn));
+        if (deviceSysinfo == null) {
+            return R.fail("设备不存在！");
+        }
+        Long deviceId = deviceSysinfo.getDeviceId();
         String authCode = dto.getAuthCode();
         String cacheAuthCode = getCacheAuthCode(deviceId);
         if (!authCode.equals(cacheAuthCode)) {
@@ -266,7 +280,7 @@ public class MercMiniDeviceController {
         return R.ok(deviceBluetoothAuthService.saveOrUpdate(deviceBluetoothAuth));
     }
 
- 
+
     /**
      * auth-code有效期30分钟，单位：s ,
      */

device-api-service/src/main/java/com/xy/service/MqttUserServiceImpl.java

@@ -3,7 +3,6 @@ package com.xy.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xy.config.SpringConfigs;
 import com.xy.dto.MqttUserDto;
 import com.xy.entity.MqttUser;
 import com.xy.entity.SysDictRedis;
@@ -39,8 +38,6 @@ import static com.xy.utils.PlusBeans.toPageBean;
 @Api(tags = "mqtt认证")
 public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> implements MqttUserService {
 
-    private SpringConfigs springConfigs;
-
     @PostMapping("obj")
     @ApiOperation("对象查询")
     public R<MqttUserDto.Vo> obj(@RequestBody MqttUserDto.Obj obj) {
@@ -50,10 +47,9 @@ public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> i
             return R.ok();
         }
         MqttUserDto.Vo mqttUser = list.get(0);
-        String env = !Emptys.check(obj.getEnv()) ? springConfigs.getProfiles().getActive() : obj.getEnv();
         Map<String, SysDictRedis> map = SysDictUtils.get(DictEnum.ENV_PARAMS.getKey());
-        SysDictRedis mqttUrl = map.get(env + "_mqtt_url");
-        SysDictRedis serverUrl = map.get(env + "_server_url");
+        SysDictRedis mqttUrl = map.get("mqtt_url");
+        SysDictRedis serverUrl = map.get("server_url");
         mqttUser.setServerTime(System.currentTimeMillis())
                 .setIpAddress(mqttUrl.getValue())
                 .setServerUrl(serverUrl.getValue());

device-api/src/main/java/com/xy/dto/DeviceBluetoothAuthDto.java

@@ -38,9 +38,10 @@ public class DeviceBluetoothAuthDto {
     @Data
     @Accessors(chain = true)
     public static class GenCode {
-        @NotNull(message = "设备ID不可为空")
-        @ApiModelProperty(value = "设备ID")
-        private Long deviceId;
+
+        @NotNull(message = "设备SN不可为空")
+        @ApiModelProperty(value = "设备SN")
+        private String deviceSn;
 
 
         @NotNull(message = "请输入授权码")
@@ -52,9 +53,10 @@ public class DeviceBluetoothAuthDto {
     @Data
     @Accessors(chain = true)
     public static class VerificationCode {
-        @NotNull(message = "设备ID不可为空")
-        @ApiModelProperty(value = "设备ID")
-        private Long deviceId;
+        
+        @NotNull(message = "设备SN不可为空")
+        @ApiModelProperty(value = "设备SN")
+        private String deviceSn;
 
 
         @NotNull(message = "授权码不可为空")

device-api/src/main/java/com/xy/dto/MqttUserDto.java

@@ -47,9 +47,6 @@ public class MqttUserDto {
         @NotBlank(message = "sn不能为空")
         @ApiModelProperty("sn号")
         private String sn;
-
-        @ApiModelProperty("环境标识")
-        private String env;
     }
 
 

device-start/src/main/resources/bootstrap.yml

@@ -17,7 +17,4 @@ cloud:
   feign:
     head:
       carr-heads:
-        - satoken
-
-mysql:
-  doc: false
+        - satoken