From 98612bc0c81de6bd6160c820234f694e8b1129ff Mon Sep 17 00:00:00 2001
From: nihaotian <q756741434@163.com>
Date: Mon, 12 Aug 2024 16:18:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index 0f5d957..7b0e23b 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -1723,6 +1723,6 @@
 
     <select id="getAffectedCountryCount" resultType="java.lang.Integer">
         SELECT count(*) FROM
-                (SELECT disaster_country FROM `disaster_info` GROUP BY disaster_country) disaster
+            (SELECT disaster_country FROM `disaster_info` where respond_status = 2 GROUP BY disaster_country) disaster
     </select>
 </mapper>

From 8f25db4ef223f722d6054ff7fc58b1e314d9561d Mon Sep 17 00:00:00 2001
From: nihaotian <q756741434@163.com>
Date: Tue, 13 Aug 2024 12:46:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DisasterInfoController.java    | 68 ++++++++++++++++++-
 .../vordm/mapper/DisasterInfoMapper.java      |  4 +-
 .../vordm/mapper/DisasterInfoMapper.xml       | 42 +++++++++++-
 .../vordm/service/DisasterInfoService.java    |  4 +-
 .../service/impl/DisasterInfoServiceImpl.java |  9 ++-
 5 files changed, 120 insertions(+), 7 deletions(-)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
index fb4d047..b472a9f 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
@@ -857,8 +857,72 @@ public class DisasterInfoController {
 
 	//home页面 受影响国家统计
 	@GetMapping("/getAffectedCountryCount")
-	public R<Integer> getAffectedCountryCount() {
-		return R.data(disasterInfoService.getAffectedCountryCount());
+	public R<Integer> getAffectedCountryCount(@RequestParam Map<String, String> params) {
+		String dateType = String.valueOf(params.get("dateType"));
+		if (StringUtils.isNotBlank(dateType) && !"4".equals(dateType) && !"null".equals(dateType)) {
+			LocalDate date = LocalDate.now();
+			//如果有时间类型
+			switch (dateType) {
+				case "1":
+					//Latest week 上一周
+					date = LocalDate.now().minusWeeks(1);
+					params.put("startTime",date.toString());
+					break;
+				case "2":
+					//Latest month 上一个月
+					date = LocalDate.now().minusMonths(1);
+					params.put("startTime",date.toString());
+					break;
+				case "3":
+					//Latest six month 上3个月
+					date = LocalDate.now().minusMonths(3);
+					params.put("startTime",date.toString());
+					break;
+				case "5":
+					//Latest six month 上6个月
+					date = LocalDate.now().minusMonths(6);
+					params.put("startTime",date.toString());
+					break;
+				default:
+					break;
+			}
+		}
+		return R.data(disasterInfoService.getAffectedCountryCount(params));
+	}
+
+	//home页面 灾害类型数量统计
+	@GetMapping("/getDisasterCountryCount")
+	public R<Integer> getDisasterCountryCount(@RequestParam Map<String, String> params) {
+		String dateType = String.valueOf(params.get("dateType"));
+		if (StringUtils.isNotBlank(dateType) && !"4".equals(dateType) && !"null".equals(dateType)) {
+			LocalDate date = LocalDate.now();
+			//如果有时间类型
+			switch (dateType) {
+				case "1":
+					//Latest week 上一周
+					date = LocalDate.now().minusWeeks(1);
+					params.put("startTime",date.toString());
+					break;
+				case "2":
+					//Latest month 上一个月
+					date = LocalDate.now().minusMonths(1);
+					params.put("startTime",date.toString());
+					break;
+				case "3":
+					//Latest six month 上3个月
+					date = LocalDate.now().minusMonths(3);
+					params.put("startTime",date.toString());
+					break;
+				case "5":
+					//Latest six month 上6个月
+					date = LocalDate.now().minusMonths(6);
+					params.put("startTime",date.toString());
+					break;
+				default:
+					break;
+			}
+		}
+		return R.data(disasterInfoService.getDisasterCountryCount(params));
 	}
 
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java
index a574f65..41897a8 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java
@@ -118,5 +118,7 @@ public interface DisasterInfoMapper extends BaseMapper<DisasterInfo> {
 
 	void updateApplyForCount(@Param("id") Long id);
 
-    Integer getAffectedCountryCount();
+    Integer getAffectedCountryCount(@Param("params")Map<String, String> params);
+
+	Integer getDisasterCountryCount(@Param("params")Map<String, String> params);
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index 7b0e23b..09ae13b 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -1723,6 +1723,46 @@
 
     <select id="getAffectedCountryCount" resultType="java.lang.Integer">
         SELECT count(*) FROM
-            (SELECT disaster_country FROM `disaster_info` where respond_status = 2 GROUP BY disaster_country) disaster
+            (SELECT disaster_country FROM `disaster_info`
+        <where>
+        <if test="params.respondStatus!=null and params.respondStatus!=''">
+            and respond_status = #{params.respondStatus}
+        </if>
+        <if test="params.affectedArea!=null and params.affectedArea!=''">
+            and disaster_country = #{params.affectedArea}
+        </if>
+        <if test="params.disasterType!=null and params.disasterType!=''">
+            and disaster_type = #{params.disasterType}
+        </if>
+        <if test="params.startTime!=null and params.startTime!=''">
+            and disaster_time &gt;= #{params.startTime}
+        </if>
+        <if test="params.endTime!=null and params.endTime!=''">
+            and disaster_time &lt;= #{params.endTime}
+        </if>
+        </where>
+            GROUP BY disaster_country) disaster
+    </select>
+    <select id="getDisasterCountryCount" resultType="java.lang.Integer">
+        SELECT count(*) FROM
+            (SELECT disaster_type FROM `disaster_info`
+        <where>
+        <if test="params.respondStatus!=null and params.respondStatus!=''">
+            and respond_status = #{params.respondStatus}
+        </if>
+        <if test="params.affectedArea!=null and params.affectedArea!=''">
+            and disaster_country = #{params.affectedArea}
+        </if>
+        <if test="params.disasterType!=null and params.disasterType!=''">
+            and disaster_type = #{params.disasterType}
+        </if>
+        <if test="params.startTime!=null and params.startTime!=''">
+            and disaster_time &gt;= #{params.startTime}
+        </if>
+        <if test="params.endTime!=null and params.endTime!=''">
+            and disaster_time &lt;= #{params.endTime}
+        </if>
+        </where>
+            GROUP BY disaster_type) disaster
     </select>
 </mapper>
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java
index ac0c502..895f346 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java
@@ -99,5 +99,7 @@ public interface DisasterInfoService extends IService<DisasterInfo> {
 
 	void updateApplyForCount(Long disasterId);
 
-	Integer getAffectedCountryCount();
+	Integer getAffectedCountryCount(Map<String, String> params);
+
+	Integer getDisasterCountryCount(Map<String, String> params);
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java
index fd45700..1eba645 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java
@@ -628,7 +628,12 @@ public class DisasterInfoServiceImpl extends ServiceImpl<DisasterInfoMapper, Dis
 	}
 
 	@Override
-	public Integer getAffectedCountryCount() {
-		return baseMapper.getAffectedCountryCount();
+	public Integer getAffectedCountryCount(Map<String, String> params) {
+		return baseMapper.getAffectedCountryCount(params);
+	}
+
+	@Override
+	public Integer getDisasterCountryCount(Map<String, String> params) {
+		return baseMapper.getDisasterCountryCount(params);
 	}
 }