修改disaster_id为vordm_id
This commit is contained in:
parent
7cb7144184
commit
706b65b340
|
@ -21,9 +21,9 @@ public class DownloadRecord implements Serializable {
|
||||||
private Integer id;
|
private Integer id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 灾害id
|
* 灾害id,审批通过后生成
|
||||||
*/
|
*/
|
||||||
private Integer diasterId;
|
private String vordmId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 大的数据源:1为新闻资讯,2为社交媒体,3实体数据
|
* 大的数据源:1为新闻资讯,2为社交媒体,3实体数据
|
||||||
|
|
|
@ -54,9 +54,9 @@ public class EntityData implements Serializable {
|
||||||
private Date uploadTime;
|
private Date uploadTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 灾害id
|
* vordm-id
|
||||||
*/
|
*/
|
||||||
private Integer disasterId;
|
private String vordmId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 可视化可视化标志0-不可可视化;1-表示可以可视化
|
* 可视化可视化标志0-不可可视化;1-表示可以可视化
|
||||||
|
|
|
@ -37,9 +37,9 @@ public class Hotspot implements Serializable {
|
||||||
private Integer frequency;
|
private Integer frequency;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 灾害id
|
* 灾害id,审批通过后生成
|
||||||
*/
|
*/
|
||||||
private Integer disasterId;
|
private String vordmId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 数据条目创建时间
|
* 数据条目创建时间
|
||||||
|
|
|
@ -26,9 +26,9 @@ public class MapServer implements Serializable {
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 灾害id
|
* 灾害id,审批通过后生成
|
||||||
*/
|
*/
|
||||||
private Integer disasterId;
|
private String vordmId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 缩放纬度
|
* 缩放纬度
|
||||||
|
|
|
@ -37,9 +37,9 @@ public class PictureInfo implements Serializable {
|
||||||
private String type;
|
private String type;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 灾害id
|
* 灾害id,审批通过后生成
|
||||||
*/
|
*/
|
||||||
private Integer disasterId;
|
private String vordmId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建时间
|
* 创建时间
|
||||||
|
|
|
@ -36,9 +36,9 @@ public class ResponseInfo implements Serializable {
|
||||||
private Integer managerId;
|
private Integer managerId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 灾害id
|
* 灾害id,审批通过后生成
|
||||||
*/
|
*/
|
||||||
private Integer disasterId;
|
private String vordmId;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
|
@ -38,9 +38,9 @@ public class Websites implements Serializable {
|
||||||
private String provider;
|
private String provider;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 灾害id
|
* 灾害id,审批通过后生成
|
||||||
*/
|
*/
|
||||||
private Integer disasterId;
|
private String vordmId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 数据条目创建时间
|
* 数据条目创建时间
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
package com.kening.vordm.controller;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
|
import com.kening.vordm.entity.News;
|
||||||
|
import com.kening.vordm.service.NewsService;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springblade.core.tool.api.R;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class TestController {
|
||||||
|
private final NewsService newsService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@GetMapping
|
||||||
|
public R<List<News>> getA(Long id) {
|
||||||
|
|
||||||
|
LambdaQueryWrapper<News> qrq = new LambdaQueryWrapper<>();
|
||||||
|
qrq.eq(News::getId, id);
|
||||||
|
|
||||||
|
List<News> list = newsService.list(qrq);
|
||||||
|
return R.data(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping
|
||||||
|
public R<String> getB() {
|
||||||
|
return R.data("seccess");
|
||||||
|
}
|
||||||
|
}
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
<resultMap id="BaseResultMap" type="com.kening.vordm.entity.DownloadRecord">
|
<resultMap id="BaseResultMap" type="com.kening.vordm.entity.DownloadRecord">
|
||||||
<id property="id" column="id" jdbcType="INTEGER"/>
|
<id property="id" column="id" jdbcType="INTEGER"/>
|
||||||
<result property="diasterId" column="diaster_id" jdbcType="INTEGER"/>
|
<result property="vordmId" column="vordmId" jdbcType="INTEGER"/>
|
||||||
<result property="bigType" column="big_type" jdbcType="INTEGER"/>
|
<result property="bigType" column="big_type" jdbcType="INTEGER"/>
|
||||||
<result property="smallType" column="small_type" jdbcType="VARCHAR"/>
|
<result property="smallType" column="small_type" jdbcType="VARCHAR"/>
|
||||||
<result property="count" column="count" jdbcType="INTEGER"/>
|
<result property="count" column="count" jdbcType="INTEGER"/>
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
<result property="link" column="link" jdbcType="VARCHAR"/>
|
<result property="link" column="link" jdbcType="VARCHAR"/>
|
||||||
<result property="remark" column="remark" jdbcType="VARCHAR"/>
|
<result property="remark" column="remark" jdbcType="VARCHAR"/>
|
||||||
<result property="uploadTime" column="upload_time" jdbcType="TIMESTAMP"/>
|
<result property="uploadTime" column="upload_time" jdbcType="TIMESTAMP"/>
|
||||||
<result property="disasterId" column="disaster_id" jdbcType="INTEGER"/>
|
<result property="vordmId" column="disaster_id" jdbcType="INTEGER"/>
|
||||||
<result property="visualFlag" column="visual_flag" jdbcType="INTEGER"/>
|
<result property="visualFlag" column="visual_flag" jdbcType="INTEGER"/>
|
||||||
<result property="visualLon" column="visual_lon" jdbcType="DOUBLE"/>
|
<result property="visualLon" column="visual_lon" jdbcType="DOUBLE"/>
|
||||||
<result property="visualLat" column="visual_lat" jdbcType="DOUBLE"/>
|
<result property="visualLat" column="visual_lat" jdbcType="DOUBLE"/>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<result property="areaCn" column="area_cn" jdbcType="VARCHAR"/>
|
<result property="areaCn" column="area_cn" jdbcType="VARCHAR"/>
|
||||||
<result property="areaEn" column="area_en" jdbcType="VARCHAR"/>
|
<result property="areaEn" column="area_en" jdbcType="VARCHAR"/>
|
||||||
<result property="frequency" column="frequency" jdbcType="INTEGER"/>
|
<result property="frequency" column="frequency" jdbcType="INTEGER"/>
|
||||||
<result property="disasterId" column="disaster_id" jdbcType="INTEGER"/>
|
<result property="vordmId" column="vordmId" jdbcType="INTEGER"/>
|
||||||
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
||||||
<result property="status" column="status" jdbcType="SMALLINT"/>
|
<result property="status" column="status" jdbcType="SMALLINT"/>
|
||||||
<result property="managerId" column="manager_id" jdbcType="INTEGER"/>
|
<result property="managerId" column="manager_id" jdbcType="INTEGER"/>
|
||||||
|
|
|
@ -4,6 +4,8 @@ package com.kening.vordm.mapper;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.kening.vordm.entity.MapServer;
|
import com.kening.vordm.entity.MapServer;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author G1393
|
* @author G1393
|
||||||
* @description 针对表【map_server(上传基础地理数据,并发布到geoserver上,记录geoserver的存储信息)】的数据库操作Mapper
|
* @description 针对表【map_server(上传基础地理数据,并发布到geoserver上,记录geoserver的存储信息)】的数据库操作Mapper
|
||||||
|
@ -13,4 +15,6 @@ import com.kening.vordm.entity.MapServer;
|
||||||
public interface MapServerMapper extends BaseMapper<MapServer> {
|
public interface MapServerMapper extends BaseMapper<MapServer> {
|
||||||
|
|
||||||
|
|
||||||
|
List<MapServer> getMapService(Long id);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<resultMap id="BaseResultMap" type="com.kening.vordm.entity.MapServer">
|
<resultMap id="BaseResultMap" type="com.kening.vordm.entity.MapServer">
|
||||||
<id property="id" column="id" jdbcType="BIGINT"/>
|
<id property="id" column="id" jdbcType="BIGINT"/>
|
||||||
<result property="name" column="name" jdbcType="VARCHAR"/>
|
<result property="name" column="name" jdbcType="VARCHAR"/>
|
||||||
<result property="disasterId" column="disaster_id" jdbcType="INTEGER"/>
|
<result property="vordmId" column="vordmId" jdbcType="INTEGER"/>
|
||||||
<result property="lat" column="lat" jdbcType="DOUBLE"/>
|
<result property="lat" column="lat" jdbcType="DOUBLE"/>
|
||||||
<result property="lon" column="lon" jdbcType="DOUBLE"/>
|
<result property="lon" column="lon" jdbcType="DOUBLE"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
@ -16,4 +16,7 @@
|
||||||
id,name,disaster_id,
|
id,name,disaster_id,
|
||||||
lat,lon
|
lat,lon
|
||||||
</sql>
|
</sql>
|
||||||
|
<select id="getMapService" resultType="com.kening.vordm.entity.MapServer">
|
||||||
|
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<result property="link" column="link" jdbcType="VARCHAR"/>
|
<result property="link" column="link" jdbcType="VARCHAR"/>
|
||||||
<result property="size" column="size" jdbcType="INTEGER"/>
|
<result property="size" column="size" jdbcType="INTEGER"/>
|
||||||
<result property="type" column="type" jdbcType="VARCHAR"/>
|
<result property="type" column="type" jdbcType="VARCHAR"/>
|
||||||
<result property="disasterId" column="disaster_id" jdbcType="INTEGER"/>
|
<result property="vordmId" column="vordmId" jdbcType="INTEGER"/>
|
||||||
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
||||||
<result property="isMain" column="is_main" jdbcType="SMALLINT"/>
|
<result property="isMain" column="is_main" jdbcType="SMALLINT"/>
|
||||||
<result property="uploader" column="uploader" jdbcType="INTEGER"/>
|
<result property="uploader" column="uploader" jdbcType="INTEGER"/>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<result property="promoteId" column="promote_id" jdbcType="INTEGER"/>
|
<result property="promoteId" column="promote_id" jdbcType="INTEGER"/>
|
||||||
<result property="uploaderId" column="uploader_id" jdbcType="INTEGER"/>
|
<result property="uploaderId" column="uploader_id" jdbcType="INTEGER"/>
|
||||||
<result property="managerId" column="manager_id" jdbcType="INTEGER"/>
|
<result property="managerId" column="manager_id" jdbcType="INTEGER"/>
|
||||||
<result property="disasterId" column="disaster_id" jdbcType="INTEGER"/>
|
<result property="vordmId" column="vordmId" jdbcType="INTEGER"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<result property="title" column="title" jdbcType="VARCHAR"/>
|
<result property="title" column="title" jdbcType="VARCHAR"/>
|
||||||
<result property="link" column="link" jdbcType="VARCHAR"/>
|
<result property="link" column="link" jdbcType="VARCHAR"/>
|
||||||
<result property="provider" column="provider" jdbcType="VARCHAR"/>
|
<result property="provider" column="provider" jdbcType="VARCHAR"/>
|
||||||
<result property="disasterId" column="disaster_id" jdbcType="INTEGER"/>
|
<result property="vordmId" column="vordmId" jdbcType="INTEGER"/>
|
||||||
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
|
||||||
<result property="websiteId" column="website_id" jdbcType="VARCHAR"/>
|
<result property="websiteId" column="website_id" jdbcType="VARCHAR"/>
|
||||||
<result property="uploader" column="uploader" jdbcType="INTEGER"/>
|
<result property="uploader" column="uploader" jdbcType="INTEGER"/>
|
||||||
|
|
|
@ -10,4 +10,5 @@ import com.kening.vordm.entity.News;
|
||||||
*/
|
*/
|
||||||
public interface NewsService extends IService<News> {
|
public interface NewsService extends IService<News> {
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue