glj-代码提交

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java

@@ -76,6 +76,12 @@ public class Hotspot implements Serializable {
 	@ExcelIgnore
     private Date reviewTime;
 
+	/**
+	 * news或gdacs 来源
+	 */
+	private String source;
+
+
 
 	@ExcelIgnore
     @TableField(exist = false)

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java

@@ -21,4 +21,9 @@ public class HotspotArea {
 	 * 名称
 	 */
 	private String nameNew;
+
+	/**
+	 * 来源
+	 */
+	private String source;
 }

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java

@@ -1,7 +1,5 @@
 package com.kening.vordm.entity;
 
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml

@@ -14,19 +14,21 @@
             <result property="status" column="status" jdbcType="SMALLINT"/>
             <result property="managerId" column="manager_id" jdbcType="BIGINT"/>
             <result property="reviewTime" column="review_time" jdbcType="TIMESTAMP"/>
+            <result property="source" column="source" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id,area_cn,area_en,
         frequency,disaster_id,create_time,
-        status,manager_id,review_time
+        status,manager_id,review_time, source
     </sql>
 
     <select id="hotspotCount" resultType="com.kening.vordm.entity.HotspotArea">
         select
                concat(area_cn,"(",area_en,")") as name,
                area_en  AS nameNew,
-               frequency as value
+               frequency as value,
+               source as source
         from hotspot
         <where>
             and `status` = 1