小问题调整

appapi/src/main/java/tech/glinfo/enbao/modules/mq/MqConsumer.java

@@ -108,7 +108,7 @@ public class MqConsumer {
 
         try {
             Map<String, String> datas = (Map<String, String>) JSON.parse(message);
-            if ("08".equals(datas.get("cmd"))) {
+//            if ("08".equals(datas.get("cmd"))) {
                 //新增设备
                 if (redisUtils.hasKey("device:save:" + datas.get("mac"))) {
                     String[] userId = redisUtils.get("device:save:" + datas.get("mac")).split("-");
@@ -125,7 +125,7 @@ public class MqConsumer {
                     redisUtils.delete("device:save:" + datas.get("mac"));
                     jmsTemplate.convertAndSend(socketioTopic, JSON.toJSONString(new MapUtils().put("deviceId", datas.get("mac"))));
                 }
-            }
+//            }
             ShDeviceEntity device = otherShDeviceService.deviceInfo(new MapUtils().put("numbering", datas.get("receiveId")));
             if (device == null) {
                 logger.error("设备不存在 : {}", datas.get("receiveId"));

appapi/src/main/java/tech/glinfo/enbao/modules/sh/controller/ShDeviceController.java

@@ -115,15 +115,18 @@ public class ShDeviceController {
     @ApiLog("添加关联房间")
     public R addRelation(@RequestBody Map<String, Object> params) {
         Integer roomId = (Integer) params.get("roomId");
-        Integer deviceId = (Integer) params.get("deviceId");
+        String deviceIds = (String) params.get("deviceIds");//允许多选择设备
 
-        if (StringUtils.isBlank(roomId, deviceId)) {
+        if (StringUtils.isBlank(roomId, deviceIds)) {
             return R.error("缺少参数");
         }
+        String[] ds = deviceIds.split(",");
+        for (String d : ds) {
             ShDeviceEntity device = new ShDeviceEntity();
             device.setRoomId(roomId);
-        device.setId(deviceId);
+            device.setId(Integer.valueOf(d));
             otherShDeviceService.updateById(device);
+        }
         return R.ok();
     }
 

appapi/src/main/java/tech/glinfo/enbao/modules/sh/service/impl/OtherShDeviceServiceImpl.java

@@ -49,11 +49,11 @@ public class OtherShDeviceServiceImpl extends ServiceImpl<OtherShDeviceDao, ShDe
         String mac = (String) params.get("mac");
         Integer familyId = (Integer) params.get("familyId");
         if (StringUtils.isBlank(mac, familyId)) {
-            return R.error();
+            return R.error("缺少参数");
         }
         int count = this.count(new QueryWrapper<ShDeviceEntity>().eq("mac", mac));
         if (count > 0) {
-            return R.error();
+            return R.error("该设备已添加");
         }
         //保存MAC地址
         redisUtils.set("device:save:" + mac, user.getId() + "-" + familyId);