From 9708a1a1dcd58a9903410edb45a66cf0c74b77bb Mon Sep 17 00:00:00 2001
From: yj <913944315@qq.com>
Date: Wed, 3 Jul 2024 17:36:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B6=8B=E5=8A=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MeterReadController.java       | 25 +++++++++++++++++++
 .../analysis/entity/MeterReadingRecord.java   |  6 +++++
 2 files changed, 31 insertions(+)

diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java
index 75ff989..88b7e42 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java
@@ -3,6 +3,7 @@ package com.xr.device_car.modules.analysis.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xr.device_car.config.common.Result;
 import com.xr.device_car.config.utils.StringFormatterUtil;
 import com.xr.device_car.config.utils.StringUtils;
 import com.xr.device_car.modules.analysis.entity.DataTransferCamera;
@@ -13,6 +14,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("read")
@@ -57,6 +63,25 @@ public class MeterReadController {
         return ipage;
     }
 
+    @RequestMapping("/dayView")
+    public Result<?> dayView(MeterReadingRecord readingRecord){
+        QueryWrapper<MeterReadingRecord> query = new QueryWrapper<>();
+        query.eq("meter_id",readingRecord.getId());
+        if(StringUtils.isNotEmpty(readingRecord.getSelectDate())){
+            query.eq("DATE_FORMAT(reading_time,'%Y-%m-%d')",readingRecord.getSelectDate());
+        }else{
+            query.eq("DATE_FORMAT(reading_time,'%Y-%m')",readingRecord.getSelectMonth());
+        }
+        query.orderByAsc("reading_time");
+        List<MeterReadingRecord> list = meterReadingRecordService.list(query);
+        List<String> values = list.stream().map(n->n.getReadingValue()).collect(Collectors.toList());
+        List<Date> dates = list.stream().map(n->n.getReadingTime()).collect(Collectors.toList());
+        Map<String,List> map=new HashMap<>();
+        map.put("values",values);
+        map.put("dates",dates);
+        return Result.OK(map);
+    }
+
 
 
 }
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java
index d78a135..63f348f 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterReadingRecord.java
@@ -38,6 +38,12 @@ public class MeterReadingRecord implements Serializable {
     @TableField(exist = false)
     private String deviceIp;
 
+    @TableField(exist = false)
+    private String selectDate;
+
+    @TableField(exist = false)
+    private String selectMonth;
+
     private String readingUrl;