Merge commit 'd30f0e41466f15284b0dfb19c3cbf6e3bdd3a172' into pro

zd-model/src/main/java/com/zd/model/enums/SenseType.java

@@ -18,7 +18,7 @@ public enum SenseType implements BaseEnum<Integer>, HardwareType {
     HUMIDITY(1, "湿度", "湿度", "icon_17", "%"),
     VOC(2, "VOC", "VOC", "icon_23", "ppb"),
 
-    METHANE(3, "甲烷", "甲烷浓度", "icon_19", "ppm"),
+    METHANE(3, "甲烷", "甲烷浓度", "icon_19", "%"),
     CO(4, "一氧化碳", "一氧化碳浓度", "icon_18", "ppm"),
     SMOKE(5, "烟感", "烟感", "icon_22", ""),
     COAL_DUST(6, "煤尘", "煤尘浓度", "icon_22", "%"),

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanAbnormalGroupServiceImpl.java

@@ -76,7 +76,7 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
                 JSONArray sensorList = JSONObject.parseArray(b.getSensorJson());
                 for(int x=0;x<sensorList.size();x++){
                     JSONObject jsonObj=sensorList.getJSONObject(x);
-                    sensorStr.append(jsonObj.get("describe")+":"+jsonObj.get("value")+""+jsonObj.get("unit")+"  ");
+                    sensorStr.append(jsonObj.get("describe")+":"+jsonObj.get("value")+""+jsonObj.get("unit")==null?"":jsonObj.get("unit")+"  ");
                     if(StringUtils.isNotNull(jsonObj.get("funNum")) && (jsonObj.get("funNum")+"").equals("huoyan")){
                         if(!a.getClosePlan()){
                             a.setClosePlan(true);