From 24fd4e9e3d68ef2c465ae15ea1d4e2853a7bdb25 Mon Sep 17 00:00:00 2001
From: liuchengqian <liuchengqian666@gmail.com>
Date: Thu, 2 Mar 2023 11:55:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xkrs/service/FirePointService.java    |  7 -------
 .../service/impl/FirePointServiceImpl.java    | 19 -------------------
 .../straw/controller/FirePointController.java | 15 ---------------
 3 files changed, 41 deletions(-)

diff --git a/src/main/java/com/xkrs/service/FirePointService.java b/src/main/java/com/xkrs/service/FirePointService.java
index cb28011..d95c14c 100644
--- a/src/main/java/com/xkrs/service/FirePointService.java
+++ b/src/main/java/com/xkrs/service/FirePointService.java
@@ -28,13 +28,6 @@ public interface FirePointService {
      */
     List<FirePointEntity> selectTodayFirePoint(String countyCode);
 
-    /**
-     * 查询近一个月的火点信息
-     *
-     * @return
-     */
-    List<FirePointEntity> selectFirePointByMonth(String countyCode);
-
     /**
      * 查询近一个月的火点数量
      *
diff --git a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
index c5d3e95..58246cb 100644
--- a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
+++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
@@ -306,25 +306,6 @@ public class FirePointServiceImpl implements FirePointService {
         return firePointQueryHelper.queryFirePoint(countyCode, startTimeString, endTimeString, null, null);
     }
 
-    /**
-     * 查询近一个月的火点信息
-     */
-//    @Cacheable(keyGenerator = "keyGenerator", unless = "#result == null")
-    @Override
-    public List<FirePointEntity> selectFirePointByMonth(String countyCode) {
-
-//        LocalDateTime startTime1 = LocalDateTime.now().minusMonths(1);
-//        LocalDateTime startTime2 = LocalDateTime.of(startTime1.getYear(), startTime1.getMonth(), startTime1.getDayOfMonth(), 0, 0, 0, 0);
-//        String startTimeString = DateTimeUtils.localDateTimeToString(startTime2);
-//
-//        LocalDateTime endTime1 = LocalDateTime.now().plusDays(1);
-//        LocalDateTime endTime2 = LocalDateTime.of(endTime1.getYear(), endTime1.getMonth(), endTime1.getDayOfMonth(), 0, 0, 0, 0);
-//        String endTimeString = DateTimeUtils.localDateTimeToString(endTime2);
-//
-//        return firePointQueryHelper.queryFirePoint(countyCode, startTimeString, endTimeString, null, null);
-        return firePointQueryHelper.queryFirePoint(countyCode, null, null, null, null);
-    }
-
     /**
      * 查询近一个月的火点数量
      *
diff --git a/src/main/java/com/xkrs/straw/controller/FirePointController.java b/src/main/java/com/xkrs/straw/controller/FirePointController.java
index 0c98944..93edbac 100644
--- a/src/main/java/com/xkrs/straw/controller/FirePointController.java
+++ b/src/main/java/com/xkrs/straw/controller/FirePointController.java
@@ -150,21 +150,6 @@ public class FirePointController {
         return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointList, locale);
     }
 
-    /**
-     * 查询近一个月的火点信息
-     */
-    @GetMapping("/selectFirePointByMonth")
-    public String selectFirePointByMonth(@RequestHeader(value = "Authorization") String token) {
-        // 验证token
-        String tokenUserName = TokenUtil.obtainUserNameByToken(token);
-        SysUserEntity sysUserEntity = sysUserDao.selectByUserName(tokenUserName);
-        List<FirePointEntity> firePointEntities = firePointService.selectFirePointByMonth(sysUserEntity.getCountyCode());
-        if (firePointEntities == null || firePointEntities.size() == 0) {
-            return outputEncapsulationObject(PromptMessageEnum.DATA_NONE, "暂时没有火点数据", locale);
-        }
-        return outputEncapsulationObject(PromptMessageEnum.SUCCESS, firePointEntities, locale);
-    }
-
     /**
      * 查询火点数量
      */