气体监测分析时间修改

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

@@ -22,7 +22,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author author
@@ -33,16 +33,26 @@ public class GasDataServiceImpl extends ServiceImpl<GasDataMapper, GasData> impl
 
     @Autowired
     private GasDataMapper dataMapper;
+
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
+        String date = paramsMap.get("time");
+
         QueryWrapper<GasData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
-        DateTime dateTime = DateUtil.beginOfDay(new Date());
-        queryWrapper.ge("create_time", dateTime).orderByAsc("create_time");
+        if (date == null || date == "") {
+            DateTime dateTime = DateUtil.beginOfDay(new Date());
+            date = dateTime.toString();
+            queryWrapper.ge("create_time", date).orderByAsc("create_time");
+        } else {
+            String startTime = date + " 00:00:00";
+            String endTime = date + " 23:59:59";
+            queryWrapper.between("create_time", startTime, endTime).orderByAsc("create_time");
+        }
+
         List<GasData> gasData = dataMapper.selectList(queryWrapper);
         JSONArray jsonArray = new JSONArray();
-
         for (GasData gasDatum : gasData) {
             JSONObject jsonObject = new JSONObject();
             if (gasDatum.getLoctionType() == 1) {
@@ -65,29 +75,29 @@ public class GasDataServiceImpl extends ServiceImpl<GasDataMapper, GasData> impl
         JSONObject jsonObject = new JSONObject();
 
         QueryWrapper<GasData> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("loction_type",1).orderByDesc("create_time")
+        queryWrapper.eq("farm_id", farmId).eq("loction_type", 1).orderByDesc("create_time")
                 .last(" limit 1");
         GasData gasData = dataMapper.selectOne(queryWrapper);
         jsonObject.put("pigpen", gasData);
 
         QueryWrapper<GasData> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("farm_id", farmId).eq("loction_type",2).orderByDesc("create_time")
+        queryWrapper2.eq("farm_id", farmId).eq("loction_type", 2).orderByDesc("create_time")
                 .last(" limit 1");
         GasData gasData2 = dataMapper.selectOne(queryWrapper2);
         jsonObject.put("above", gasData2);
 
         QueryWrapper<GasData> queryWrapper3 = new QueryWrapper<>();
-        queryWrapper3.eq("farm_id", farmId).eq("loction_type",3).orderByDesc("create_time")
+        queryWrapper3.eq("farm_id", farmId).eq("loction_type", 3).orderByDesc("create_time")
                 .last(" limit 1");
         GasData gasData3 = dataMapper.selectOne(queryWrapper3);
         jsonObject.put("under", gasData3);
 
         QueryWrapper<GasData> queryWrapper4 = new QueryWrapper<>();
-        queryWrapper4.eq("farm_id", farmId).eq("loction_type",4).orderByDesc("create_time")
+        queryWrapper4.eq("farm_id", farmId).eq("loction_type", 4).orderByDesc("create_time")
                 .last(" limit 1");
         GasData gasData4 = dataMapper.selectOne(queryWrapper4);
         jsonObject.put("people", gasData4);
 
-        return new Result(ResultCode.SUCCESS,jsonObject);
+        return new Result(ResultCode.SUCCESS, jsonObject);
     }
 }