修复存栏

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/FeedUsageServiceImpl.java

@@ -58,7 +58,7 @@ public class FeedUsageServiceImpl extends ServiceImpl<FeedUsageMapper, FeedUsage
         String unitName = map.get("unitName");
         String type = map.get("type");
         FeedUsedChartVo feedUsedVo;
-        List<FeedVo> feedVos;
+        List<FeedVo> feedVos = new ArrayList<>();
         if ("0".equals(type)){
             feedUsedVo = feedUsageMapper.getTotal(startDate,endDate,unitName);
             feedVos = feedUsageMapper.listFeedGroupByWeek(startDate,endDate,unitName);
@@ -77,6 +77,9 @@ public class FeedUsageServiceImpl extends ServiceImpl<FeedUsageMapper, FeedUsage
             feedUsedVo.setTotalUsed(BigDecimal.ZERO);
             feedUsedVo.setList(new ArrayList<>());
         }
+        if (ObjectUtil.isEmpty(feedUsedVo.getList())){
+            feedUsedVo.setList(new ArrayList<>());
+        }
         return new Result(ResultCode.SUCCESS,feedUsedVo);
     }
 

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/timer/FeedConsumeTimer.java

@@ -47,11 +47,11 @@ public class FeedConsumeTimer {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
         Long start = DateUtil.beginOfDay(new Date()).getTime();
         Long end = System.currentTimeMillis();
-        String stock = "0";
 
         ResponseEntity<BaseResultEntity> forEntity = restTemplate.exchange(BASE_URL + CURRENT_LIST+FARM_CODE+"&position=all", HttpMethod.GET, httpEntity,BaseResultEntity.class );
         List<HousVo> data = forEntity.getBody().getData();
         for (HousVo datum : data) {
+            String stock = "0";
             FeedUsage feedUsage = new FeedUsage();
             ResponseEntity<HistoryEntity> todayForEntity = restTemplate.exchange(BASE_URL + HISTORY_LIST+FARM_CODE+"&i="+datum.getI()+"&start="+start+"&end="+end, HttpMethod.GET, httpEntity,HistoryEntity.class );
             List<HistroyOne> todayData = todayForEntity.getBody().getData();
@@ -97,11 +97,11 @@ public class FeedConsumeTimer {
         Long start = DateUtil.beginOfDay(new Date()).getTime();
         Long end = System.currentTimeMillis();
         Double totalConsume = 0.0;
-        String stock = "0";
 
         ResponseEntity<BaseResultEntity> forEntity = restTemplate.exchange(BASE_URL + CURRENT_LIST+FARM_CODE+"&position=all", HttpMethod.GET, httpEntity,BaseResultEntity.class );
         List<HousVo> data = forEntity.getBody().getData();
         for (HousVo datum : data) {
+            String stock = "0";
             FeedUsage feedUsage = new FeedUsage();
             ResponseEntity<HistoryEntity> todayForEntity = restTemplate.exchange(BASE_URL + HISTORY_LIST+FARM_CODE+"&i="+datum.getI()+"&start="+start+"&end="+end, HttpMethod.GET, httpEntity,HistoryEntity.class );
             List<HistroyOne> todayData = todayForEntity.getBody().getData();

huimv-farm-datacenter-egg/huimv-farm-produce/src/main/java/com/huimv/produce/warning/service/impl/AlarmServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.produce.warning.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -83,21 +84,21 @@ public class AlarmServiceImpl implements IAlarmService {
             String personAlarmTotal = SendMassageGetPagePersonAlarm(startTime, endTime);
             log.info("人员违规事件数量>>" + personAlarmTotal);
             Integer rywgQuantity = 0;
-            if (personAlarmTotal != null) {
+            if (ObjectUtil.isNotEmpty(personAlarmTotal)) {
                 rywgQuantity = Integer.parseInt(personAlarmTotal);
             }
             //车辆闸机事件数量
             String carEventTimes = SendMassageGetPage(startTime, endTime);
             log.info("车辆闸机事件数量>>" + carEventTimes);
             Integer carEventTimesInt = 0;
-            if (carEventTimes != null) {
+            if (ObjectUtil.isNotEmpty(carEventTimes)) {
                 carEventTimesInt = Integer.parseInt(carEventTimes);
             }
             //周界检测事件数量
             String borderEventTimes = getBorderEvent(startTime, endTime);
             log.info("周界检测事件数量>>" + borderEventTimes);
             Integer borderEventTimesInt = 0;
-            if (borderEventTimes != null) {
+            if (ObjectUtil.isNotEmpty(borderEventTimes)) {
                 borderEventTimesInt = Integer.parseInt(borderEventTimes);
             }
             //所有事件累计