设备管理时间bug修改

huimv-admin/src/main/java/com/huimv/admin/mapper/EnvDataMapper.java

@@ -1,7 +1,13 @@
 package com.huimv.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.admin.entity.EnvData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author author
  * @since 2023-02-14
  */
+@Repository
 public interface EnvDataMapper extends BaseMapper<EnvData> {
-
+    List<EnvData> listDay(@Param(Constants.WRAPPER) QueryWrapper<EnvData> queryWrapper);
 }

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

@@ -243,8 +243,8 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         if ("4".equals(type)) {
             startTime = startTime + " 00:00:00";
             endTime = endTime + " 23:59:59";
-            queryWrapper.between("create_time", startTime, endTime).orderByAsc("create_time");
-            List<EnvData> envData = dataMapper.selectList(queryWrapper);
+            queryWrapper.between("create_time", startTime, endTime);
+            List<EnvData> envData = dataMapper.listDay(queryWrapper);
             map.put("location", basePigpen.getBuildName());
             map.put("data", envData);
         }
@@ -252,8 +252,8 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         //本月
         else if ("3".equals(type)) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("create_time", timesMonthmorning).orderByAsc("create_time");
-            List<EnvData> envData = dataMapper.selectList(queryWrapper);
+            queryWrapper.ge("create_time", timesMonthmorning);
+            List<EnvData> envData = dataMapper.listDay(queryWrapper);
             map.put("location", basePigpen.getBuildName());
             map.put("data", envData);
 
@@ -261,9 +261,10 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
 
         //本周
         else if ("2".equals(type)) {
-            DateTime dateTime = DateUtil.beginOfWeek(new Date());
-            queryWrapper.ge("create_time",dateTime).orderByAsc("create_time");
-            List<EnvData> envData = dataMapper.selectList(queryWrapper);
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+            queryWrapper.ge("create_time",calendar.getTime());
+            List<EnvData> envData = dataMapper.listDay(queryWrapper);
             map.put("location", basePigpen.getBuildName());
             map.put("data", envData);
         }
@@ -271,7 +272,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         //今日
         else if ("1".equals(type)) {
             Date timesmorning = DataUill.getTimesmorning();
-            queryWrapper.ge("create_time", timesmorning).orderByAsc("create_time");
+            queryWrapper.ge("create_time", timesmorning);
             List<EnvData> envData = dataMapper.selectList(queryWrapper);
             map.put("location", basePigpen.getBuildName());
             map.put("data", envData);

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnvDataMapper.xml

@@ -4,18 +4,23 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.huimv.admin.entity.EnvData">
-        <id column="id" property="id" />
-        <result column="device_id" property="deviceId" />
-        <result column="env_temp" property="envTemp" />
-        <result column="env_hum" property="envHum" />
-        <result column="original_data" property="originalData" />
-        <result column="unit_id" property="unitId" />
-        <result column="farm_id" property="farmId" />
-        <result column="other1" property="other1" />
-        <result column="other2" property="other2" />
-        <result column="other3" property="other3" />
+        <id column="id" property="id"/>
+        <result column="device_id" property="deviceId"/>
+        <result column="env_temp" property="envTemp"/>
+        <result column="env_hum" property="envHum"/>
+        <result column="original_data" property="originalData"/>
+        <result column="unit_id" property="unitId"/>
+        <result column="farm_id" property="farmId"/>
+        <result column="other1" property="other1"/>
+        <result column="other2" property="other2"/>
+        <result column="other3" property="other3"/>
         <result column="create_time" property="createTime"/>
         <result column="receive_date" property="receiveDate"/>
     </resultMap>
-
+    <select id="listDay" resultType="com.huimv.admin.entity.EnvData">
+    SELECT Convert((IFNULL(AVG(env_temp),0)),DECIMAL(10,2)) 'envTemp',Convert((IFNULL(AVG(env_hum),0)),DECIMAL(10,2)) 'envHum',create_time FROM env_data
+    ${ew.customSqlSegment}
+    group BY DATE_FORMAT(create_time,'%Y-%m-%d')
+    ORDER BY create_time ASC
+    </select>
 </mapper>