Merge branch 'dev' into nb-pc-rabbitmq

# Conflicts:
#	nb-service/app-assistant/src/main/java/com/nb/app/assistant/service/LocalAssistantUserBindService.java
#	nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusPatientService.java

nb-service/web-service/src/main/java/com/nb/web/service/bus/listener/DeviceInfoListener.java

@@ -96,6 +96,15 @@ public class DeviceInfoListener implements IIotMsgHandler {
             }
             long startTime = System.currentTimeMillis();
             DeviceOperator deviceOperator = deviceRegistry.getOperator(deviceId);
+            if (DataFromEnum.PC_MQ.equals(device.getFrom())) {
+                Date uploadTime = device.getUploadTime();
+                Date lastUploadTime = deviceOperator.getUploadTime();
+                //存在最后上传时间且当前时间小于最后上传时间，则此数据为旧数据，不再处理
+                if(lastUploadTime!=null&&uploadTime.compareTo(lastUploadTime)<1){
+                    throw new RuntimeException("此数据是旧数据,不再接收处理");
+                }
+            }
+
             //对设备数据的一些参数进行初始化设置
             init(device);