From abded014f0c9735431848aa7925773a67d4acd23 Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Wed, 10 May 2023 18:51:25 +0800
Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kening/vordm/entity/HotspotArea.java    | 4 ++++
 .../src/main/java/com/kening/vordm/entity/Websites.java       | 2 +-
 .../src/main/java/com/kening/vordm/mapper/HotspotMapper.xml   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java
index 7492d2a..ff95e2f 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java
@@ -17,4 +17,8 @@ public class HotspotArea {
 	 * 频次
 	 */
 	private Integer value;
+	/**
+	 * 名称
+	 */
+	private String nameNew;
 }
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java
index c8a3340..f52d2ab 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java
@@ -49,7 +49,7 @@ public class Websites implements Serializable {
     /**
      * 网站灾害对应id
      */
-    private Long websiteId;
+    private String websiteId;
 
     /**
      * 上传的管理人员
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml
index fc9c1fb..8c9e2a4 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml
@@ -25,6 +25,7 @@
     <select id="hotspotCount" resultType="com.kening.vordm.entity.HotspotArea">
         select
                concat(area_cn,"(",area_en,")") as name,
+               area_en  AS nameNew,
                frequency as value
         from hotspot
         <where>