diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/DevIotDatasController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/DevIotDatasController.java
index 6c48c931..aa3be278 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/DevIotDatasController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/controller/DevIotDatasController.java
@@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.yanzhu.jh.device.domain.DevIotDatas;
 import com.yanzhu.jh.device.service.IDevIotDatasService;
@@ -14,9 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDate;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 配电箱数据Controller
@@ -105,16 +104,15 @@ public class DevIotDatasController extends BaseController
     @GetMapping("/findIotDatasMonitor/{proId}")
     public AjaxResult findProAllConfigPoint(@PathVariable("proId") Long proId, Long pointId, Integer date)
     {
-        // 获取当前日期
-        LocalDate today = LocalDate.now();
-        // 获取最近${X}天的日期
-        LocalDate todayAgo = today.minusDays(date);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());  // 设置为当前时间
+        calendar.add(Calendar.DAY_OF_MONTH, Math.negateExact(date));  // 减去x天
         DevIotDatas datasQuery = new DevIotDatas();
         datasQuery.setPointId(pointId);
         datasQuery.setProjectId(proId);
         Map<String, Object> params = new HashMap<>();
-        params.put("beginCreateTime",today);
-        params.put("endCreateTime",todayAgo);
+        params.put("beginCreateTime", DateUtils.getNowDate());
+        params.put("endCreateTime",calendar.getTime());
         List<DevIotDatas> list = devIotDatasService.selectDevIotDatasList(datasQuery);
         return success(list);
     }