Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

gongchunyi

2 天以前 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

 cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java

@@ -155,9 +155,10 @@
     */
    private String getValueByDataStream(Map<String,Object> dataMap, String dataStream) {
        try{
            return dataMap.get(dataStream).toString();
            String val = dataMap.get(dataStream).toString();
            return StringUtils.isNotBlank(val)?val:"0";
        }catch (Exception e){
            return "";
            return "0";
        }
    }