From 628ae3a6a7cda1873363a6652f172750c3f543c9 Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Wed, 26 Apr 2023 18:06:30 +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

---
 .../com/kening/vordm/entity/EntityData.java   |  6 ++++
 .../com/kening/vordm/entity/OtherData.java    |  2 ++
 .../vordm/controller/MapServerController.java | 35 +++++++++++++++++++
 .../controller/WordCloudsController.java      |  1 +
 .../kening/vordm/mapper/EntityDataMapper.xml  |  9 +++--
 .../kening/vordm/mapper/WordCloudsMapper.xml  |  3 +-
 .../service/impl/OtherDataServiceImpl.java    |  1 +
 7 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/MapServerController.java

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
index f60627d..1719c3e 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
@@ -136,6 +136,12 @@ public class EntityData implements Serializable {
 	@TableField(exist = false)
 	private String msName;
 
+	/**
+	 * 灾害区域地理字段
+	 */
+	@TableField(exist = false)
+	private String geometry;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
index 2bb7457..889ce2b 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
@@ -25,4 +25,6 @@ public class OtherData{
 	private Long disasterId;
 
 	private Integer visualFlag;
+
+	private String sourceOrganization;
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/MapServerController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/MapServerController.java
new file mode 100644
index 0000000..bd0d057
--- /dev/null
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/MapServerController.java
@@ -0,0 +1,35 @@
+package com.kening.vordm.controller;
+
+import com.kening.vordm.entity.MapServer;
+import com.kening.vordm.service.MapServerService;
+import com.kening.vordm.vo.UserVo;
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/ui/mapServer")
+public class MapServerController {
+
+
+	//邮箱发送服务
+	private final MapServerService mapServerService;
+
+	/**
+	 * 新增基础地理数据
+	 *
+	 * @param mapServer
+	 * @return
+	 */
+//	@PostMapping("/saveMapServer")
+//	public R saveMapServer(@RequestBody MapServer mapServer) {
+//		return mapServerService.saveMapServer(mapServer);
+//	}
+
+
+}
+
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordCloudsController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordCloudsController.java
index 9984257..50243fa 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordCloudsController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WordCloudsController.java
@@ -31,6 +31,7 @@ public class WordCloudsController {
 	 */
 	@GetMapping("/wordCount")
 	public R<Map<String,List<WorldCharts>>> wordCount(@RequestParam Long disasterId){
+		Map<String, List<WorldCharts>> stringListMap = service.wordCount(disasterId);
 		return R.data(service.wordCount(disasterId));
 	}
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
index bc6f8f8..dd1fbb6 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
@@ -39,13 +39,12 @@
     <select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
         select
         <include refid="Base_Column_List"/>,
-               gi.username AS uploaderName,
-               ms.layer_name,
-               ms.vordm_id,
-               ms.name AS msName
+                gi.username AS uploaderName,
+                di.vordm_id,
+                di.geometry
         from entity_data ed
         left join guest_info gi on gi.id = ed.uploader_id
-        left join map_server ms on ms.disaster_id = ed.disaster_id
+        LEFT JOIN disaster_info di on di.id = ed.disaster_id
         <where>
             <if test="entityData.disasterId != null and entityData.disasterId != ''">
                 ed.disaster_id = #{entityData.disasterId}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml
index 81708aa..62075b2 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml
@@ -24,7 +24,7 @@
     </sql>
     <select id="wordCount" resultType="com.kening.vordm.entity.WorldCharts" parameterType="java.lang.Long">
         select
-               DATE_FORMAT(create_time,'%Y-%m-%d') date,
+                date,
                frequency value,
                word name,
                 type
@@ -35,5 +35,6 @@
                 and disaster_id = #{disasterId}
             </if>
         </where>
+        ORDER BY date DESC
     </select>
 </mapper>
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
index d28ecc9..ab44c48 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
@@ -109,6 +109,7 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
 		entityData.setManagerId(AuthUtil.getUserId());
 		entityData.setReviewTime(new Date());
 		entityData.setVisualFlag(OtherData.getVisualFlag());
+		entityData.setSourceOrganization(OtherData.getSourceOrganization());
 		return save(entityData);
 	}
 }