修改

src/main/java/com/huimv/admin/entity/EnvHumi.java

@@ -50,6 +50,7 @@ public class EnvHumi implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime askTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     private Integer farmId;

src/main/java/com/huimv/admin/mapper/EnvHumiMapper.java

@@ -3,6 +3,8 @@ package com.huimv.admin.mapper;
 import com.huimv.admin.entity.EnvHumi;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EnvHumiMapper extends BaseMapper<EnvHumi> {
 
+    List<EnvHumi> list(String farmId, String unitId, String startTime, String endTime);
 }

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

@@ -545,11 +545,16 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
                 map.put("name", "temp");
 
             }
+//            if ("2".equals(dataType)) {
+//                QueryWrapper<EnvHumi> humiQueryWrapper = new QueryWrapper<>();
+//                humiQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
+//                        .between("ask_time", startTime, endTime).orderByAsc("update_time");
+//                List<EnvHumi> envHumis = humiMapper.selectList(humiQueryWrapper);
+//                map.put("name", "humi");
+//                map.put("value", envHumis);
+//            }
             if ("2".equals(dataType)) {
-                QueryWrapper<EnvHumi> humiQueryWrapper = new QueryWrapper<>();
-                humiQueryWrapper.eq("farm_id", farmId).eq("unit_id", unitId)
-                        .between("ask_time", startTime, endTime).orderByAsc("update_time");
-                List<EnvHumi> envHumis = humiMapper.selectList(humiQueryWrapper);
+                List<EnvHumi> envHumis = humiMapper.list(farmId,unitId,startTime,endTime);
                 map.put("name", "humi");
                 map.put("value", envHumis);
             }

src/main/resources/mapper/EnvHumiMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.mapper.EnvHumiMapper">
+
+
+    <select id="list" resultType="com.huimv.admin.entity.EnvHumi">
+        SELECT
+            DATE_FORMAT(ask_time, "%Y-%m-%d %H:%i:00") AS 'askTime',
+            ROUND(IFNULL(AVG(handle_value), 0),1) AS 'handleValue'
+        FROM `env_humi`
+        WHERE farm_id = #{farmId} and unit_id = #{unitId} AND update_time BETWEEN '${startTime}' AND '${endTime}'
+        GROUP BY askTime;
+    </select>
+</mapper>

src/main/resources/mapper/EnvTempMapper.xml

@@ -13,7 +13,7 @@
     </select>
 
     <select id="listTempCustomDeatil" resultType="com.huimv.admin.entity.vo.EnvTempVo">
-        SELECT DATE_FORMAT(update_time, "%Y-%m-%d %H:00:00") AS hour_time,
+        SELECT DATE_FORMAT(ask_time, "%Y-%m-%d %H:%i:00") AS hour_time,
         <foreach collection="deviceCodeList" item="code" index="index" separator=",">
             ROUND(IFNULL(AVG(CASE WHEN chip_code = ${code} THEN handle_value END), 0),1) AS 'value${index+1}'
         </foreach>