diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java index 88b5fca..9dde6b9 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java +++ b/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) 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 ff95e2f..2968337 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 @@ -21,4 +21,9 @@ public class HotspotArea { * 名称 */ private String nameNew; + + /** + * 来源 + */ + private String source; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java index 66108f7..66f420d 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java +++ b/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; 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 8c9e2a4..a4e466f 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 @@ -14,19 +14,21 @@ + id,area_cn,area_en, frequency,disaster_id,create_time, - status,manager_id,review_time + status,manager_id,review_time, source