glj-代码提交
This commit is contained in:
parent
eefa6d1330
commit
628ae3a6a7
|
@ -136,6 +136,12 @@ public class EntityData implements Serializable {
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String msName;
|
private String msName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 灾害区域地理字段
|
||||||
|
*/
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String geometry;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
|
|
@ -25,4 +25,6 @@ public class OtherData{
|
||||||
private Long disasterId;
|
private Long disasterId;
|
||||||
|
|
||||||
private Integer visualFlag;
|
private Integer visualFlag;
|
||||||
|
|
||||||
|
private String sourceOrganization;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
||||||
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -31,6 +31,7 @@ public class WordCloudsController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/wordCount")
|
@GetMapping("/wordCount")
|
||||||
public R<Map<String,List<WorldCharts>>> wordCount(@RequestParam Long disasterId){
|
public R<Map<String,List<WorldCharts>>> wordCount(@RequestParam Long disasterId){
|
||||||
|
Map<String, List<WorldCharts>> stringListMap = service.wordCount(disasterId);
|
||||||
return R.data(service.wordCount(disasterId));
|
return R.data(service.wordCount(disasterId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,13 +39,12 @@
|
||||||
<select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
|
<select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
|
||||||
select
|
select
|
||||||
<include refid="Base_Column_List"/>,
|
<include refid="Base_Column_List"/>,
|
||||||
gi.username AS uploaderName,
|
gi.username AS uploaderName,
|
||||||
ms.layer_name,
|
di.vordm_id,
|
||||||
ms.vordm_id,
|
di.geometry
|
||||||
ms.name AS msName
|
|
||||||
from entity_data ed
|
from entity_data ed
|
||||||
left join guest_info gi on gi.id = ed.uploader_id
|
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>
|
<where>
|
||||||
<if test="entityData.disasterId != null and entityData.disasterId != ''">
|
<if test="entityData.disasterId != null and entityData.disasterId != ''">
|
||||||
ed.disaster_id = #{entityData.disasterId}
|
ed.disaster_id = #{entityData.disasterId}
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
</sql>
|
</sql>
|
||||||
<select id="wordCount" resultType="com.kening.vordm.entity.WorldCharts" parameterType="java.lang.Long">
|
<select id="wordCount" resultType="com.kening.vordm.entity.WorldCharts" parameterType="java.lang.Long">
|
||||||
select
|
select
|
||||||
DATE_FORMAT(create_time,'%Y-%m-%d') date,
|
date,
|
||||||
frequency value,
|
frequency value,
|
||||||
word name,
|
word name,
|
||||||
type
|
type
|
||||||
|
@ -35,5 +35,6 @@
|
||||||
and disaster_id = #{disasterId}
|
and disaster_id = #{disasterId}
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
|
ORDER BY date DESC
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
@ -109,6 +109,7 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
|
||||||
entityData.setManagerId(AuthUtil.getUserId());
|
entityData.setManagerId(AuthUtil.getUserId());
|
||||||
entityData.setReviewTime(new Date());
|
entityData.setReviewTime(new Date());
|
||||||
entityData.setVisualFlag(OtherData.getVisualFlag());
|
entityData.setVisualFlag(OtherData.getVisualFlag());
|
||||||
|
entityData.setSourceOrganization(OtherData.getSourceOrganization());
|
||||||
return save(entityData);
|
return save(entityData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue