修复一些小BUG

src/main/java/com/zy/bms/common/vo/DeviceVo.java

@@ -11,6 +11,7 @@ import lombok.Data;
 @Data
 public class DeviceVo {
     private String num;//设备随机码
-    private Integer isDefault;//是否是默认设备 0:不是 1:是
     private String name;//设备名称
+    private String deviceId;//设备ID
+    private Integer isDefault;//是否是默认设备 0:不是 1:是
 }

src/main/java/com/zy/bms/controller/RelationController.java

@@ -45,7 +45,7 @@ public class RelationController {
     /**
      * 解除绑定关系
      */
-    @PostMapping("unbind￿.do")
+    @PostMapping("unbind.do")
     public ServerResponse unbind(String deviceNum) {
         relationService.delByDeviceNum(deviceNum);
         return ServerResponse.createBySuccess();

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

@@ -33,7 +33,7 @@ public class SetBaseService extends ServiceImpl<SetBaseMapper, SetBase> {
      */
     public SetBase getVolumeSet(String deviceId) {
         QueryWrapper<SetBase> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("msgVol", "phoneVol", "ringVol");
+        queryWrapper.select("deviceId", "msgVol", "phoneVol", "ringVol");
         queryWrapper.eq("deviceId", deviceId);
         return baseMapper.selectOne(queryWrapper);
     }
@@ -43,7 +43,7 @@ public class SetBaseService extends ServiceImpl<SetBaseMapper, SetBase> {
      */
     public SetBase getSosSet(String deviceId) {
         QueryWrapper<SetBase> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("key0Name", "key0Phone", "key1Name", "key1Phone", "key2Name", "key2Phone");
+        queryWrapper.select("deviceId", "key0Name", "key0Phone", "key1Name", "key1Phone", "key2Name", "key2Phone");
         queryWrapper.eq("deviceId", deviceId);
         return baseMapper.selectOne(queryWrapper);
     }
@@ -53,7 +53,7 @@ public class SetBaseService extends ServiceImpl<SetBaseMapper, SetBase> {
      */
     public SetBase getOtherSet(String deviceId) {
         QueryWrapper<SetBase> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("autoAnswer", "gpsRate", "highFreq");
+        queryWrapper.select("deviceId", "autoAnswer", "gpsRate", "highFreq");
         queryWrapper.eq("deviceId", deviceId);
         return baseMapper.selectOne(queryWrapper);
     }

src/main/resources/mapper/UserDeviceRelationMapping.xml

@@ -5,13 +5,13 @@
 <mapper namespace="com.zy.bms.mapper.UserDeviceRelationMapper">
 
     <select id="getListByUserId" resultType="com.zy.bms.common.vo.DeviceVo">
-        SELECT
-            t1.isDefault,
-            t1.num,
-            t1.name
-        FROM
-            db_user_device_relation t1
-        INNER JOIN zy_device t2 ON t1.deviceNum = t2.num
+        SELECT t1.isDefault,
+               t2.num,
+               t2.name,
+               t2.clientId AS deviceId
+        FROM user_device_relation t1
+                 INNER JOIN zy_device t2 ON t1.deviceNum = t2.num
         WHERE t1.userId = #{userId}
+        ORDER BY t1.isDefault
     </select>
 </mapper>