能耗定时器模拟数据

huimv-admin/src/main/java/com/huimv/admin/service/impl/ProtDataServiceImpl.java

@@ -677,34 +677,40 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
         List<ProtWarningInfo> protWarningInfos = protWarningInfoMapper.selectList(queryWrapper);
         //今日
         Date timesmorning = DataUill.getTimesmorning();
-        Integer dayCount = 0;
         //本周
         DateTime dateTime = DateUtil.beginOfWeek(new Date());
-        Integer weekCount = 0;
+
         //本月
         Date timesMonthmorning = DataUill.getTimesMonthmorning();
-        Integer monthCount = 0;
+
         List<ProDataVo> voList = new LinkedList<>();
         for (int i = 0; i < protWarningInfos.size(); i++) {
             ProDataVo proDataVo = new ProDataVo();
             proDataVo.setContent(protWarningInfos.get(i).getWarningContent());
             proDataVo.setTime(protWarningInfos.get(i).getDate());
-            if (protWarningInfos.get(i).getDate().after(timesmorning)) {
-                dayCount++;
-            }
-            if (protWarningInfos.get(i).getDate().after(dateTime)) {
-                weekCount++;
-            }
-            if (protWarningInfos.get(i).getDate().after(timesMonthmorning)) {
-                monthCount++;
-            }
             voList.add(proDataVo);
         }
+        QueryWrapper<ProtWarningInfo> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("farm_id", farmId).ge("date",timesmorning);
+        Integer dayCount = protWarningInfoMapper.selectCount(queryWrapper1);
+
+        QueryWrapper<ProtWarningInfo> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("farm_id", farmId).ge("date",dateTime);
+        Integer weekCount= protWarningInfoMapper.selectCount(queryWrapper2);
+
+        QueryWrapper<ProtWarningInfo> queryWrapper3 = new QueryWrapper<>();
+        queryWrapper3.eq("farm_id", farmId).ge("date",timesMonthmorning);
+        Integer monthCount  = protWarningInfoMapper.selectCount(queryWrapper3);
+
+        QueryWrapper<ProtWarningInfo> queryWrapper4 = new QueryWrapper<>();
+        queryWrapper4.eq("farm_id", farmId);
+        Integer count  = protWarningInfoMapper.selectCount(queryWrapper4);
+
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("dayCount", dayCount);
         jsonObject.put("weekCount", weekCount);
         jsonObject.put("monthCount", monthCount);
-        jsonObject.put("count", protWarningInfos.size());
+        jsonObject.put("count", count);
         jsonObject.put("data", voList);
 
 

huimv-admin/src/main/java/com/huimv/admin/timer/EnergyTimer.java

@@ -1,17 +1,44 @@
 package com.huimv.admin.timer;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.admin.common.utils.NumberUtils;
+import com.huimv.admin.entity.EnergyData;
+import com.huimv.admin.entity.EnergyEnvDevice;
+import com.huimv.admin.mapper.EnergyDataMapper;
+import com.huimv.admin.mapper.EnergyEnvDeviceMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 
+import java.util.Date;
+import java.util.List;
+
 @Configuration
 @EnableScheduling
 public class EnergyTimer {
 
+    @Autowired
+    private EnergyEnvDeviceMapper deviceMapper;
+    @Autowired
+    private EnergyDataMapper dataMapper;
 
 //    能耗数据
-    @Scheduled(cron = "0 0/11 * * * ? ")
+    @Scheduled(cron = "0 0/10 * * * ? ")
     private void getShenChan() throws Exception {
 
+
+        List<EnergyEnvDevice> energyEnvDevices = deviceMapper.selectList(null);
+        for (EnergyEnvDevice energyEnvDevice : energyEnvDevices) {
+            EnergyData energyData = new EnergyData();
+            energyData.setCreateDate(new Date());
+            energyData.setFarmId(energyEnvDevice.getFarmId());
+            energyData.setUnitId(energyEnvDevice.getUnitId());
+            energyData.setFeedValue(NumberUtils.getNum(80, 100, 1));
+            energyData.setWaterValue(NumberUtils.getNum(1, 5, 1));
+            energyData.setGasValue(NumberUtils.getNum(1, 5, 1));
+            energyData.setElectricityValue(NumberUtils.getNum(5, 10, 1));
+            dataMapper.insert(energyData);
+        }
     }
 }