Merge branch 'master' into zhczh_c

src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java

@@ -99,6 +99,8 @@ public class DataProcessServiceImpl implements IDataProcessService {
     private static Logger log= LoggerFactory.getLogger(DataProcessServiceImpl.class);
     private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
 
+    String[] DASHBOARD_SUFFIXES = { "_85", "_85_9003", "_111", "_111_9003", "_S", "_s", "_131_5" };
+
 //    @Autowired
 //    @Qualifier("sysMqttClient")
 //    private MqttClient sysMqttClient;
@@ -725,7 +727,7 @@ public class DataProcessServiceImpl implements IDataProcessService {
                     DeviceAttrCode.MEASURE_HUMIDITY);
         } else {
             String uploadValue = uploadValueList.get(0);//这里只取第一个元素
-            if (baseTransDataEntity.getDeviceId().endsWith("_85")){
+            if (Arrays.stream(DASHBOARD_SUFFIXES).anyMatch(baseTransDataEntity.getDeviceId()::endsWith)){
                 if (categoryIdAccumulate.contains(baseTransDataEntity.getCategoryId())) {
                     storageAccumulate(DeviceAttrCode.COMMON, uploadValue, baseTransDataEntity);
                 }