Explorar o código

修改sn号重复注册问题

李进 %!s(int64=2) %!d(string=hai) anos
pai
achega
44e3e14a87

+ 1 - 0
device-api-service/src/main/java/com/xy/service/DeviceRegisterServiceImpl.java

@@ -113,6 +113,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
         mqttUserInfo.setPasswordHash(deviceId);
         mqttUserInfo.setPasswordHash(deviceId);
         mqttUserInfo.setCreated(LocalDateTime.now());
         mqttUserInfo.setCreated(LocalDateTime.now());
         mqttUserInfo.setTopic(CommConsts.DEVICE_MQTT_TOPIC_SUFFIX);
         mqttUserInfo.setTopic(CommConsts.DEVICE_MQTT_TOPIC_SUFFIX);
+        mqttUserInfo.setSn(deviceRegister.getDeviceSn());
         mqttUserService.save(mqttUserInfo);
         mqttUserService.save(mqttUserInfo);
         return R.ok();
         return R.ok();
     }
     }

+ 1 - 1
device-api-service/src/main/java/com/xy/service/MqttServiceImpl.java

@@ -103,7 +103,7 @@ public class MqttServiceImpl extends ServiceImpl<MqttCommandMapper, MqttCommand>
     public void sysnAtoms() {
     public void sysnAtoms() {
         String sn = LambdaUtils.getProperty(MqttCommand::getSn);
         String sn = LambdaUtils.getProperty(MqttCommand::getSn);
         QueryWrapper<MqttCommand> wrapper = new QueryWrapper<MqttCommand>()
         QueryWrapper<MqttCommand> wrapper = new QueryWrapper<MqttCommand>()
-                .select("max(%s) as %s", sn, sn);
+                .select(String.format("max(%s) as %s", sn, sn));
         MqttCommand mqttCommand = getOne(wrapper);
         MqttCommand mqttCommand = getOne(wrapper);
         if (mqttCommand == null) {
         if (mqttCommand == null) {
             return;
             return;