保温灯，保温板单独配置

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/Sheet1Controller.java

@@ -1,8 +1,6 @@
 package com.huimv.env.manage.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.huimv.env.manage.entity.Sheet1;
 import com.huimv.env.manage.service.ISheet1Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/service/impl/LampConfigServiceImpl.java

@@ -138,15 +138,13 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
         String temp = split[split.length-1].split(",")[1];
         for (int i = 0; i < split.length; i++) {
             String  lamp1 = split[i];
-            if (dayAge<=Integer.parseInt(lamp1.split(",")[0])){
+            if (dayAge>=Integer.parseInt(lamp1.split(",")[0])){
                 temp = lamp1.split(",")[1];
                 String tempStr = (Double.parseDouble(temp) * 10) + "";
                 return  tempStr.substring(0,tempStr.lastIndexOf("."));
             }
         }
-
         String tempStr = (Double.parseDouble(temp) * 10) + "";
-
         return  tempStr.substring(0,tempStr.lastIndexOf("."));
     }
 

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/time/Timer.java

@@ -1,6 +1,7 @@
 package com.huimv.env.manage.time;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.env.manage.mapper.LampConfigMapper;
 import com.huimv.env.manage.saas.dao.entity.LampConfig;
 import com.huimv.env.manage.saas.service.ILampConfigService;
@@ -21,7 +22,8 @@ public class Timer {
 //    @Scheduled(cron = "0 * * * * ?")
     private void updateAge(){
         System.out.println("更新日龄");
-        List<LampConfig> lampConfigs = lampConfigService.list(null);
+        List<LampConfig> lampConfigs = lampConfigService.list(new QueryWrapper<>());
+        System.out.println(lampConfigs);
         for (LampConfig lampConfig : lampConfigs) {
             Integer dayAge = lampConfig.getDayAge()+1;
             String temp =   lampConfigService.updateTemp(lampConfig.getAgeList(),dayAge);
@@ -29,11 +31,7 @@ public class Timer {
             lampConfig.setDayAge(dayAge);
             lampConfig.setTempSet(temp);
             lampConfigService.updateById(lampConfig);
-
         }
-
-
     }
 
-
 }