更新定时器

huimv-admin/src/main/java/com/huimv/guowei/admin/AdminApplication.java

@@ -7,7 +7,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @MapperScan("com.huimv.guowei.admin.mapper")
-//@EnableScheduling
+@EnableScheduling
 public class AdminApplication {
 
     public static void main(String[] args) {

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvDataServiceImpl.java

@@ -56,10 +56,9 @@ public class EnvDataServiceImpl extends ServiceImpl<EnvDataMapper, EnvData> impl
             List<BaseBuilding> baseBuildings = baseBuildingMapper.selectList(new QueryWrapper<BaseBuilding>().eq("parent_id", 0));
             if (ObjectUtil.isEmpty(baseBuildings)){
                 return new Result(10001,"请先添加栋舍!",false);
-            }else {
-                unitId = String.valueOf(baseBuildings.get(0).getId());
-                envDataList = envDataMapper.listWeekDetail(farmId,unitId);
             }
+            unitId = String.valueOf(baseBuildings.get(0).getId());
+            envDataList = envDataMapper.listWeekDetail(farmId,unitId);
         }
 
         //今日查询
@@ -67,15 +66,15 @@ public class EnvDataServiceImpl extends ServiceImpl<EnvDataMapper, EnvData> impl
             envDataList = envDataMapper.listDayDetail(farmId,unitId);
         }
         //本周查询
-        else if ("1".equals(type)){
+        if ("1".equals(type)){
             envDataList = envDataMapper.listWeekDetail(farmId,unitId);
         }
         //本月查询
-        else if ("2".equals(type)){
+        if ("2".equals(type)){
             envDataList = envDataMapper.listMonthDetail(farmId,unitId);
         }
         //自定义查询
-        else if ("3".equals(type)){
+        if ("3".equals(type)){
             envDataList = envDataMapper.listCustomDetail(farmId,unitId,startDate,endDate);
         }
         return new Result(ResultCode.SUCCESS,envDataList);

huimv-admin/src/main/java/com/huimv/guowei/admin/timer/DeviceTimer.java

@@ -29,20 +29,22 @@ public class DeviceTimer {
     private void saveOnlineDevice(){
         String farmId = "21";
         double rate = 0.0;
-        Integer deviceOff = envDeviceService.count(new QueryWrapper<EnvDevice>().eq("farm_id", farmId).eq("device_status", 0));
-        Integer deviceOn = envDeviceService.count(new QueryWrapper<EnvDevice>().eq("farm_id", farmId).eq("device_status", 1));
-        Integer total = deviceOff+deviceOn;
+        Double deviceOff = Double.valueOf(envDeviceService.count(new QueryWrapper<EnvDevice>().eq("farm_id", farmId).eq("device_status", 0)));
+        Double deviceOn = Double.valueOf(envDeviceService.count(new QueryWrapper<EnvDevice>().eq("farm_id", farmId).eq("device_status", 1)));
+
+        Double total = deviceOff+deviceOn;
         try {
             rate = (deviceOn/total)*100;
         }catch (ArithmeticException e){
             System.out.println(e);
         }
         EnvDeviceOnline envDeviceOnline = new EnvDeviceOnline();
-        envDeviceOnline.setDeviceOn(deviceOn);
-        envDeviceOnline.setDeviceOff(deviceOff);
+        envDeviceOnline.setDeviceOn(deviceOn.intValue());
+        envDeviceOnline.setDeviceOff(deviceOff.intValue());
         envDeviceOnline.setOnlineRate(new BigDecimal(rate).setScale(2, RoundingMode.UP));
         envDeviceOnline.setFarmId(farmId);
         envDeviceOnline.setCreatTime(new Date());
         envDeviceOnlineService.save(envDeviceOnline);
     }
+
 }