item：稳压泵信息添加今日累计信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SupervisionVideoServiceImpl.java

@@ -8,8 +8,10 @@ import com.yeejoin.equipmanage.common.entity.vo.AlamVideoVO;
 import com.yeejoin.equipmanage.common.enums.PressurePumpRelateEnum;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.vo.IotDataVO;
+import com.yeejoin.equipmanage.common.vo.PressurePumpCountVo;
 import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
 import com.yeejoin.equipmanage.mapper.SupervisionVideoMapper;
+import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
 import com.yeejoin.equipmanage.service.IPressurePumpService;
 import com.yeejoin.equipmanage.service.ISupervisionVideoService;
 import com.yeejoin.equipmanage.service.IVideoService;
@@ -25,6 +27,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 
@@ -41,6 +44,10 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
     private IVideoService videoService;
     @Autowired
     private IPressurePumpService pressurePumpService;
+
+    @Autowired
+    private IEquipmentSpecificSerivce equipmentSpecificSerivce;
+
     @Autowired
     private FireFightingSystemMapper fireFightingSystemMapper;
 
@@ -89,9 +96,12 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
             Map map = infoList.get(0);
             String equipmentCode = map.get("equipmentCode").toString();
             String top = map.get("top").toString();
+            String countRedisKey = map.get("countRedisKey").toString();
+            long countExpire = Long.parseLong(map.get("countExpire").toString());
             Date dateNow = DateUtils.getDateNow();
             String nowStrLong = DateUtils.getNowStrLong();
             //  获取稳压泵数据，redis没有，从iot取
+            List<Map<String, Object>> pumpInfoList = equipmentSpecificSerivce.getFirePumpInfoEQ(equipmentCode, bizOrgCode);
             Map<String, List<IotDataVO>> dataMap = pressurePumpService.getDataList(PressurePumpRelateEnum.PRESSURE_PUMP.getValue(), equipmentCode, top, pressurePumpStart, bizOrgCode, null);
             List<IotDataVO> dataListFilterTrue = dataMap.get("dataListFilterTrue");
             List<IotDataVO> dataListFilterFalse = dataMap.get("dataListFilterFalse");
@@ -101,6 +111,13 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
             int oneHourStartNum = pressurePumpService.getAllPressurePumpStartFrequency(Double.parseDouble(PressurePumpRelateEnum.ONE_HOUR.getValue()), dataListFilterTrue, dateNow);
             int twoHourStartNum = pressurePumpService.getAllPressurePumpStartFrequency(Double.parseDouble(PressurePumpRelateEnum.TWO_HOUR.getValue()), dataListFilterTrue, dateNow);
             int fourHourStartNum = pressurePumpService.getAllPressurePumpStartFrequency(Double.parseDouble(PressurePumpRelateEnum.FOUR_HOUR.getValue()), dataListFilterTrue, dateNow);
+            //  近3天启动平均值，四合五入
+            List<PressurePumpCountVo> dayAvgDataList = pressurePumpService.getDayAvgDataList(pumpInfoList, PressurePumpRelateEnum.PRESSURE_PUMP.getValue(), countRedisKey, equipmentCode, pressurePumpStart, bizOrgCode, countExpire);
+            AtomicInteger dayAvgFrequency = new AtomicInteger();
+            if (!CollectionUtils.isEmpty(dayAvgDataList)) {
+                dayAvgDataList.forEach(x -> dayAvgFrequency.addAndGet(x.getValue()));
+            }
+            int dayAvgStartNum = Math.round(dayAvgFrequency.get() / Math.abs(Integer.parseInt(PressurePumpRelateEnum.DAY_AVG.getValue())));
             pressurePumpInfo = fireFightingSystemMapper.getPressurePumpInfo(page, bizOrgCode, null);
             String prefix = null;
             for (Map<String, Object> item : pressurePumpInfo.getRecords()) {
@@ -127,6 +144,7 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
                 item.put("oneHourStartNum", oneHourStartNum);
                 item.put("twoHourStartNum", twoHourStartNum);
                 item.put("fourHourStartNum", fourHourStartNum);
+                item.put("dayAvgStartNum", dayAvgStartNum);
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 long nowDateTime = new Date().getTime();//当前时间戳
                 boolean time = true;