修改bug

src/main/java/com/huimv/admin/service/impl/BasePigpenServiceImpl.java

@@ -338,8 +338,8 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             Date timesmorning = DataUill.getTimesmorning();
             if ("1".equals(dataType)) {
                 QueryWrapper<EnvTemp> tempQueryWrapper = new QueryWrapper<>();
-                tempQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
-                        .ge("update_time", timesmorning).orderByAsc("ask_time");
+                tempQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId).eq("chip_code",10011411)
+                        .ge("ask_time", timesmorning).orderByAsc("ask_time");
                 List<EnvTemp> envTemps = tempMapper.selectList(tempQueryWrapper);
                 map.put("name", "temp");
                 map.put("value", envTemps);
@@ -347,7 +347,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             if ("2".equals(dataType)) {
                 QueryWrapper<EnvHumi> humiQueryWrapper = new QueryWrapper<>();
                 humiQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
-                        .ge("update_time", timesmorning).orderByAsc("ask_time");
+                        .ge("ask_time", timesmorning).orderByAsc("ask_time");
                 List<EnvHumi> envHumis = humiMapper.selectList(humiQueryWrapper);
                 map.put("name", "humi");
                 map.put("value", envHumis);
@@ -355,7 +355,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             if ("3".equals(dataType)) {
                 QueryWrapper<EnvAmmonia> ammoniaQueryWrapper = new QueryWrapper<>();
                 ammoniaQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
-                        .ge("update_time", timesmorning).orderByAsc("ask_time");
+                        .ge("ask_time", timesmorning).orderByAsc("ask_time");
                 List<EnvAmmonia> ammonias = ammoniaMapper.selectList(ammoniaQueryWrapper);
                 map.put("name", "ammonias");
                 map.put("value", ammonias);
@@ -363,7 +363,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             if ("4".equals(dataType)) {
                 QueryWrapper<EnvCo2> co2QueryWrapper = new QueryWrapper<>();
                 co2QueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
-                        .ge("update_time", timesmorning).orderByAsc("ask_time");
+                        .ge("ask_time", timesmorning).orderByAsc("ask_time");
                 List<EnvCo2> co2s = co2Mapper.selectList(co2QueryWrapper);
                 map.put("name", "CO2");
                 map.put("value", co2s);
@@ -371,7 +371,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             if ("5".equals(dataType)) {
                 QueryWrapper<EnvStive> stiveQueryWrapper = new QueryWrapper<>();
                 stiveQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
-                        .ge("update_time", timesmorning).orderByAsc("ask_time");
+                        .ge("ask_time", timesmorning).orderByAsc("ask_time");
                 List<EnvStive> stives = stiveMapper.selectList(stiveQueryWrapper);
                 map.put("name", "stive");
                 map.put("value", stives);
@@ -379,7 +379,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             if ("6".equals(dataType)) {
                 QueryWrapper<EnvPressure> pressureQueryWrapper = new QueryWrapper<>();
                 pressureQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
-                        .ge("update_time", timesmorning).orderByAsc("ask_time");
+                        .ge("ask_time", timesmorning).orderByAsc("ask_time");
                 List<EnvPressure> pressures = pressureMapper.selectList(pressureQueryWrapper);
                 map.put("name", "pressure");
                 map.put("value", pressures);
@@ -392,7 +392,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             if ("1".equals(dataType)) {
                 QueryWrapper<EnvTemp> tempQueryWrapper = new QueryWrapper<>();
                 tempQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
-                        .between("update_time", startTime, endTime).orderByAsc("update_time");
+                        .between("ask_time", startTime, endTime).orderByAsc("update_time");
                 List<EnvTemp> envTemps = tempMapper.selectList(tempQueryWrapper);
                 map.put("name", "temp");
                 map.put("value", envTemps);
@@ -400,7 +400,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             if ("2".equals(dataType)) {
                 QueryWrapper<EnvHumi> humiQueryWrapper = new QueryWrapper<>();
                 humiQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
-                        .between("update_time", startTime, endTime).orderByAsc("update_time");
+                        .between("ask_time", startTime, endTime).orderByAsc("update_time");
                 List<EnvHumi> envHumis = humiMapper.selectList(humiQueryWrapper);
                 map.put("name", "humi");
                 map.put("value", envHumis);
@@ -408,7 +408,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             if ("3".equals(dataType)) {
                 QueryWrapper<EnvAmmonia> ammoniaQueryWrapper = new QueryWrapper<>();
                 ammoniaQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
-                        .between("update_time", startTime, endTime).orderByAsc("update_time");
+                        .between("ask_time", startTime, endTime).orderByAsc("update_time");
                 List<EnvAmmonia> ammonias = ammoniaMapper.selectList(ammoniaQueryWrapper);
                 map.put("name", "ammonias");
                 map.put("value", ammonias);
@@ -416,7 +416,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             if ("4".equals(dataType)) {
                 QueryWrapper<EnvCo2> co2QueryWrapper = new QueryWrapper<>();
                 co2QueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
-                        .between("update_time", startTime, endTime).orderByAsc("update_time");
+                        .between("ask_time", startTime, endTime).orderByAsc("update_time");
                 List<EnvCo2> co2s = co2Mapper.selectList(co2QueryWrapper);
                 map.put("name", "CO2");
                 map.put("value", co2s);
@@ -424,7 +424,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             if ("5".equals(dataType)) {
                 QueryWrapper<EnvStive> stiveQueryWrapper = new QueryWrapper<>();
                 stiveQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
-                        .between("update_time", startTime, endTime).orderByAsc("update_time");
+                        .between("ask_time", startTime, endTime).orderByAsc("update_time");
                 List<EnvStive> stives = stiveMapper.selectList(stiveQueryWrapper);
                 map.put("name", "stive");
                 map.put("value", stives);
@@ -432,7 +432,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             if ("6".equals(dataType)) {
                 QueryWrapper<EnvPressure> pressureQueryWrapper = new QueryWrapper<>();
                 pressureQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
-                        .between("update_time", startTime, endTime).orderByAsc("update_time");
+                        .between("ask_time", startTime, endTime).orderByAsc("update_time");
                 List<EnvPressure> pressures = pressureMapper.selectList(pressureQueryWrapper);
                 map.put("name", "pressure");
                 map.put("value", pressures);