bug修改

src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/service/impl/ExteriorScaffoldingCurrentDataServiceImpl.java

@@ -18,7 +18,6 @@ import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.async.AsyncDevExcavation;
 import com.zhgd.xmgl.modules.discharging.service.impl.DischargingPlatformAlarmServiceImpl;
-import com.zhgd.xmgl.modules.highformwork.entity.vo.NumberDifferentTypesAlarmsRadarChartOneMonthVo;
 import com.zhgd.xmgl.modules.exteriorscaffolding.entity.ExteriorScaffoldingCurrentData;
 import com.zhgd.xmgl.modules.exteriorscaffolding.entity.ExteriorScaffoldingMeasurePoint;
 import com.zhgd.xmgl.modules.exteriorscaffolding.entity.ExteriorScaffoldingMonitorType;
@@ -33,6 +32,7 @@ import com.zhgd.xmgl.modules.exteriorscaffolding.service.ExteriorScaffoldingSens
 import com.zhgd.xmgl.modules.exteriorscaffolding.service.IExteriorScaffoldingCurrentDataService;
 import com.zhgd.xmgl.modules.exteriorscaffolding.service.IExteriorScaffoldingMeasurePointService;
 import com.zhgd.xmgl.modules.exteriorscaffolding.service.IExteriorScaffoldingMonitorTypeService;
+import com.zhgd.xmgl.modules.highformwork.entity.vo.NumberDifferentTypesAlarmsRadarChartOneMonthVo;
 import com.zhgd.xmgl.util.JxlExcelUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -279,9 +279,8 @@ public class ExteriorScaffoldingCurrentDataServiceImpl extends ServiceImpl<Exter
             exteriorScaffoldingCurrentData.setReceiveTime(DateUtil.format(receiveTime, "yyyy-MM-dd HH:mm:ss"));
             JSONObject current = currentData.getJSONObject("current");
             log.info("currentData.current：{}", current);
-            int alarmState = Optional.ofNullable(current.getJSONObject("pointAlarmStatus")).map(e -> e.getInteger("alarmState")).orElse(1);
+            int alarmState = Optional.ofNullable(current.getInteger("alarmStatus")).map(a -> getAlarmState(a)).orElse(1);
             if (current != null) {
-
                 if (currentData.getJSONObject("metadata") != null) {
                     exteriorScaffoldingCurrentData.setProjectCode(currentData.getJSONObject("metadata").getString("projectCode"));
                 }
@@ -344,6 +343,21 @@ public class ExteriorScaffoldingCurrentDataServiceImpl extends ServiceImpl<Exter
         return exteriorScaffoldingCurrentDataList;
     }
 
+    private Integer getAlarmState(Integer a) {
+        if (a == null) {
+            return null;
+        }
+        switch (a) {
+            case 0:
+                return 1;
+            case 1:
+                return 2;
+            case 2:
+                return 3;
+        }
+        return null;
+    }
+
 
     @Override
     public void saveBatchExteriorScaffoldingCurrentData(JSONArray jsonArray) {

src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevCurrentDataServiceImpl.java

@@ -229,10 +229,11 @@ public class PoisonousGasDevCurrentDataServiceImpl extends ServiceImpl<Poisonous
         insertCurrentData(devSn, 4, iDataArr, 3, poisonousGasDev, 0, dateTime);
         insertCurrentData(devSn, 3, iDataArr, 4, poisonousGasDev, 0, dateTime);
 
-        insertAlarmIf(devSn, "甲烷", dateTime, poisonousGasDev, iDataArr, 1, 1, 2);
+        //取消报警
-        insertAlarmIf(devSn, "氧气", dateTime, poisonousGasDev, iDataArr, 2, 2, 1);
+        //insertAlarmIf(devSn, "甲烷", dateTime, poisonousGasDev, iDataArr, 1, 1, 2);
-        insertAlarmIf(devSn, "硫化氢", dateTime, poisonousGasDev, iDataArr, 3, 0, 4);
+        //insertAlarmIf(devSn, "氧气", dateTime, poisonousGasDev, iDataArr, 2, 2, 1);
-        insertAlarmIf(devSn, "一氧化碳", dateTime, poisonousGasDev, iDataArr, 4, 0, 3);
+        //insertAlarmIf(devSn, "硫化氢", dateTime, poisonousGasDev, iDataArr, 3, 0, 4);
+        //insertAlarmIf(devSn, "一氧化碳", dateTime, poisonousGasDev, iDataArr, 4, 0, 3);
     }
 
     @Override