From 044f0e325e88b23a671f0b020d81cbd30b3c1a11 Mon Sep 17 00:00:00 2001
From: blankk <2649084208@qq.com>
Date: Mon, 4 Jul 2022 16:55:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../code/camera/service/impl/WaterPhotoInfoServiceImpl.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/impl/WaterPhotoInfoServiceImpl.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/impl/WaterPhotoInfoServiceImpl.java
index 4550b19..5ac1a31 100644
--- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/impl/WaterPhotoInfoServiceImpl.java
+++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/impl/WaterPhotoInfoServiceImpl.java
@@ -58,12 +58,6 @@ public class WaterPhotoInfoServiceImpl extends ServiceImpl<WaterPhotoInfoMapper,
         List<String> legend = new ArrayList<>();
         List<ChartData> series = new ArrayList<>();
 
-        String startTime = (String)params.get("startTime");
-        String endTime = (String)params.get("endTime");
-        if(!startTime.contains("-")){
-            params.put("startTime",formatDate(new Long(startTime)));
-            params.put("endTime",formatDate(new Long(endTime)));
-        }
         // 获取表名
         Integer dataType = Integer.parseInt((String) params.get("dataType"));
         String dataTableName = getDataTableName(dataType);

From 339afcc91fa8c18850d685058fa0d6367be91107 Mon Sep 17 00:00:00 2001
From: blankk <2649084208@qq.com>
Date: Mon, 4 Jul 2022 16:58:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WaterPhotoInfoServiceImpl.java       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/impl/WaterPhotoInfoServiceImpl.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/impl/WaterPhotoInfoServiceImpl.java
index 5ac1a31..0f241bc 100644
--- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/impl/WaterPhotoInfoServiceImpl.java
+++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/impl/WaterPhotoInfoServiceImpl.java
@@ -15,8 +15,10 @@ import com.ruoyi.common.utils.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Service业务层处理
@@ -111,11 +113,6 @@ public class WaterPhotoInfoServiceImpl extends ServiceImpl<WaterPhotoInfoMapper,
         }
         return "";
     }
-    public String formatDate(Long d){
-        Date date = new Date(d);
-        SimpleDateFormat sm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        return sm.format(date);
-    }
     public ChartData getChartOptionData(Map<String, Object> params){
         ChartData data = null;
         List<YcData>  dataList = baseMapper.selectWaterData(params);