diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mqtt/EmqxService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mqtt/EmqxService.java index 42d8cd78..f6b2e21a 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mqtt/EmqxService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mqtt/EmqxService.java @@ -33,8 +33,10 @@ public class EmqxService { @Autowired private IDeviceLogService deviceLogService; - /** 订阅的主题 */ - private static final String prefix="/+/+/"; + /** + * 订阅的主题 + */ + private static final String prefix = "/+/+/"; String sInfoTopic = prefix + "info/post"; String sNtpTopic = prefix + "ntp/post"; String sPropertyTopic = prefix + "property/post"; @@ -43,7 +45,9 @@ public class EmqxService { String sShadowPropertyTopic = prefix + "property-offline/post"; String sShadowFunctionTopic = prefix + "function-offline/post"; - /** 发布的主题 */ + /** + * 发布的主题 + */ String pStatusTopic = "/status/post"; String pNtpTopic = "/ntp/get"; String pPropertyTopic = "/property/get"; @@ -55,50 +59,50 @@ public class EmqxService { // 订阅时钟同步 client.subscribe(sNtpTopic, 1); // 订阅设备属性 - client.subscribe(sPropertyTopic,1); + client.subscribe(sPropertyTopic, 1); // 订阅设备功能 - client.subscribe(sFunctionTopic,1); + client.subscribe(sFunctionTopic, 1); // 订阅设备事件 - client.subscribe(sEventTopic,1); + client.subscribe(sEventTopic, 1); // 订阅属性（影子模式） - client.subscribe(sShadowPropertyTopic,1); + client.subscribe(sShadowPropertyTopic, 1); // 订阅功能（影子模式） - client.subscribe(sShadowFunctionTopic,1); + client.subscribe(sShadowFunctionTopic, 1); logger.info("mqtt订阅了设备信息和物模型主题"); } - public void subscribeCallback(String topic, MqttMessage mqttMessage){ + public void subscribeCallback(String topic, MqttMessage mqttMessage) { // subscribe后得到的消息会执行到这里面 - String message=new String(mqttMessage.getPayload()); + String message = new String(mqttMessage.getPayload()); logger.info("接收消息主题 : " + topic); logger.info("接收消息Qos : " + mqttMessage.getQos()); logger.info("接收消息内容 : " + message); - String[] topicItem=topic.substring(1).split("/"); - Long productId= Long.valueOf(topicItem[0]); - String deviceNum=topicItem[1]; - String name=topicItem[2]; - switch (name){ + String[] topicItem = topic.substring(1).split("/"); + Long productId = Long.valueOf(topicItem[0]); + String deviceNum = topicItem[1]; + String name = topicItem[2]; + switch (name) { case "info": - reportDevice(productId,deviceNum,message); + reportDevice(productId, deviceNum, message); break; case "ntp": - publishNtp(productId,deviceNum,message); + publishNtp(productId, deviceNum, message); break; case "property": - reportProperty(productId,deviceNum,message,false); + reportProperty(productId, deviceNum, message, false); break; case "function": - reportFunction(productId,deviceNum,message,false); + reportFunction(productId, deviceNum, message, false); break; case "event": - reportEvent(productId,deviceNum,message); + reportEvent(productId, deviceNum, message); break; case "property-offline": - reportProperty(productId,deviceNum,message,true); + reportProperty(productId, deviceNum, message, true); break; case "function-offline": - reportFunction(productId,deviceNum,message,true); + reportFunction(productId, deviceNum, message, true); break; } } @@ -106,110 +110,123 @@ public class EmqxService { /** * 上报设备信息 */ - private void reportDevice(Long productId,String deviceNum,String message){ - Device device=JSON.parseObject(message,Device.class); - device.setProductId(productId); - device.setSerialNumber(deviceNum); - deviceService.reportDevice(device); + private void reportDevice(Long productId, String deviceNum, String message) { + try { + Device device = JSON.parseObject(message, Device.class); + device.setProductId(productId); + device.setSerialNumber(deviceNum); + deviceService.reportDevice(device); + } catch (Exception e) { + logger.error("接收设备信息，解析数据时异常 message={}", e.getMessage()); + } } /** * 上报属性 + * * @param message */ - private void reportProperty(Long productId,String deviceNum,String message,boolean isShadow){ + private void reportProperty(Long productId, String deviceNum, String message, boolean isShadow) { try { - List thingsModelValueRemarkItems=JSON.parseArray(message, ThingsModelValueRemarkItem.class); - ThingsModelValuesInput input=new ThingsModelValuesInput(); + List thingsModelValueRemarkItems = JSON.parseArray(message, ThingsModelValueRemarkItem.class); + ThingsModelValuesInput input = new ThingsModelValuesInput(); input.setProductId(productId); input.setDeviceNumber(deviceNum); input.setThingsModelValueRemarkItem(thingsModelValueRemarkItems); - deviceService.reportDeviceThingsModelValue(input,1,isShadow); - }catch (Exception e){ - logger.error("接收属性数据，解析数据时异常 message={}",e.getMessage()); + deviceService.reportDeviceThingsModelValue(input, 1, isShadow); + } catch (Exception e) { + logger.error("接收属性数据，解析数据时异常 message={}", e.getMessage()); } } /** * 上报功能 + * * @param message */ - private void reportFunction(Long productId,String deviceNum,String message,boolean isShadow){ - List thingsModelValueRemarkItems=JSON.parseArray(message, ThingsModelValueRemarkItem.class); - ThingsModelValuesInput input=new ThingsModelValuesInput(); - input.setProductId(productId); - input.setDeviceNumber(deviceNum); - input.setThingsModelValueRemarkItem(thingsModelValueRemarkItems); - deviceService.reportDeviceThingsModelValue(input,2,isShadow); + private void reportFunction(Long productId, String deviceNum, String message, boolean isShadow) { + try { + List thingsModelValueRemarkItems = JSON.parseArray(message, ThingsModelValueRemarkItem.class); + ThingsModelValuesInput input = new ThingsModelValuesInput(); + input.setProductId(productId); + input.setDeviceNumber(deviceNum); + input.setThingsModelValueRemarkItem(thingsModelValueRemarkItems); + deviceService.reportDeviceThingsModelValue(input, 2, isShadow); + } catch (Exception e) { + logger.error("接收功能，解析数据时异常 message={}", e.getMessage()); + } } /** * 上报事件 + * * @param message */ - private void reportEvent(Long productId,String deviceNum,String message){ - List thingsModelValueRemarkItems=JSON.parseArray(message, ThingsModelValueRemarkItem.class); - Device device =deviceService.selectDeviceBySerialNumber(deviceNum); - for(int i=0;i thingsModelValueRemarkItems = JSON.parseArray(message, ThingsModelValueRemarkItem.class); + Device device = deviceService.selectDeviceBySerialNumber(deviceNum); + for (int i = 0; i < thingsModelValueRemarkItems.size(); i++) { + // 添加到设备日志 + DeviceLog deviceLog = new DeviceLog(); + deviceLog.setDeviceId(device.getDeviceId()); + deviceLog.setDeviceName(device.getDeviceName()); + deviceLog.setLogValue(thingsModelValueRemarkItems.get(i).getValue()); + deviceLog.setRemark(thingsModelValueRemarkItems.get(i).getRemark()); + deviceLog.setSerialNumber(device.getSerialNumber()); + deviceLog.setIdentity(thingsModelValueRemarkItems.get(i).getId()); + deviceLog.setLogType(3); + deviceLog.setIsMonitor(0); + deviceLogService.insertDeviceLog(deviceLog); + } + } catch (Exception e) { + logger.error("接收事件，解析数据时异常 message={}", e.getMessage()); } } - /** * 1.发布设备状态 */ - public void publishStatus(Long productId,String deviceNum,int deviceStatus,int isShadow){ - String message="{\"status\":"+deviceStatus+",\"isShadow\":"+isShadow+"}"; - emqxClient.publish(1,false,"/"+productId+"/"+deviceNum+pStatusTopic, message); + public void publishStatus(Long productId, String deviceNum, int deviceStatus, int isShadow) { + String message = "{\"status\":" + deviceStatus + ",\"isShadow\":" + isShadow + "}"; + emqxClient.publish(1, false, "/" + productId + "/" + deviceNum + pStatusTopic, message); } /** * 2.发布时钟同步信息 + * * @param message */ - private void publishNtp(Long productId,String deviceNum,String message){ - NtpModel ntpModel=JSON.parseObject(message,NtpModel.class); + private void publishNtp(Long productId, String deviceNum, String message) { + NtpModel ntpModel = JSON.parseObject(message, NtpModel.class); ntpModel.setServerRecvTime(System.currentTimeMillis()); ntpModel.setServerSendTime(System.currentTimeMillis()); - emqxClient.publish(1, false, "/"+productId+"/"+deviceNum+pNtpTopic, JSON.toJSONString(ntpModel)); + emqxClient.publish(1, false, "/" + productId + "/" + deviceNum + pNtpTopic, JSON.toJSONString(ntpModel)); } /** * 3.发布属性 */ - public void publishProperty(Long productId,String deviceNum,List thingsList){ - if(thingsList==null){ - emqxClient.publish(1,true,"/"+productId+"/"+deviceNum+pPropertyTopic, ""); - }else{ - emqxClient.publish(1,true,"/"+productId+"/"+deviceNum+pPropertyTopic, JSON.toJSONString(thingsList)); + public void publishProperty(Long productId, String deviceNum, List thingsList) { + if (thingsList == null) { + emqxClient.publish(1, true, "/" + productId + "/" + deviceNum + pPropertyTopic, ""); + } else { + emqxClient.publish(1, true, "/" + productId + "/" + deviceNum + pPropertyTopic, JSON.toJSONString(thingsList)); } } /** * 4.发布功能 */ - public void publishFunction(Long productId,String deviceNum,List thingsList){ - if(thingsList==null){ - emqxClient.publish(1,true,"/"+productId+"/"+deviceNum+pFunctionTopic, ""); - }else{ - emqxClient.publish(1,true,"/"+productId+"/"+deviceNum+pFunctionTopic, JSON.toJSONString(thingsList)); + public void publishFunction(Long productId, String deviceNum, List thingsList) { + if (thingsList == null) { + emqxClient.publish(1, true, "/" + productId + "/" + deviceNum + pFunctionTopic, ""); + } else { + emqxClient.publish(1, true, "/" + productId + "/" + deviceNum + pFunctionTopic, JSON.toJSONString(thingsList)); } } - - }