修复一些小BUG

src/main/java/com/zy/bms/config/mqtt/MqttCallbackHandler.java

@@ -6,10 +6,7 @@ import com.zy.bms.common.exception.ApiRuntimeException;
 import com.zy.bms.model.*;
 import com.zy.bms.redis.DeviceManager;
 import com.zy.bms.service.*;
-import com.zy.bms.utils.CodeGenerator;
-import com.zy.bms.utils.CoordTransformUtil;
-import com.zy.bms.utils.DateTimeUtil;
-import com.zy.bms.utils.GaoDeApiUtil;
+import com.zy.bms.utils.*;
 import com.zy.bms.websocket.WebSocketServer;
 import org.springframework.stereotype.Component;
 
@@ -120,8 +117,12 @@ public class MqttCallbackHandler {
     private Device createDevice(String num) {
         Device device = new Device();
         device.setNum(num);
-        device.setClientId(CodeGenerator.generateUUID());
-        device.setPassword(CodeGenerator.generateShortUuid());
+        String md5 = MD5Util.MD5Encode(num);
+        if (md5 == null) {
+            md5 = CodeGenerator.generateUUID();
+        }
+        device.setClientId(md5);
+        device.setPassword(md5.substring(10));
         device.setGroupId(1);
         deviceService.save(device);
         setBaseService.initSetBase(device.getClientId());

src/main/java/com/zy/bms/service/SetToDeviceService.java

@@ -24,6 +24,7 @@ public class SetToDeviceService {
     /**
      * 设置音量
      * 铃声音量暂时不可用 ringvol 参数暂时没用
+     *
      * @param io 设置参数
      */
     public void setVolume(VolumeSetIO io) {
@@ -31,7 +32,7 @@ public class SetToDeviceService {
         MqttMsgDto msg = new MqttMsgDto(Constant.M_CODE_VOLUME, io.getDeviceId());
         msg.set("msgvol", io.getMsgVol())
                 .set("phonevol", io.getPhoneVol())
-                .set("msgtype", "1");
+                .set("msgtype", 1);
         mqttGateway.sendMsgToMqtt(msg.toJson(), io.getTopic());
     }
 

src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: dev
+    active: prod