diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DownloadRecord.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DownloadRecord.java index c794d6e..2ee90f5 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DownloadRecord.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DownloadRecord.java @@ -20,10 +20,10 @@ public class DownloadRecord implements Serializable { @TableId private Integer id; - /** - * 灾害id - */ - private Integer diasterId; + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; /** * 大的数据源:1为新闻资讯,2为社交媒体,3实体数据 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 8217ceb..15763b2 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 @@ -54,9 +54,9 @@ public class EntityData implements Serializable { private Date uploadTime; /** - * 灾害id + * vordm-id */ - private Integer disasterId; + private String vordmId; /** * 可视化可视化标志0-不可可视化;1-表示可以可视化 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 71fca78..b42b8c7 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 @@ -36,10 +36,10 @@ public class Hotspot implements Serializable { */ private Integer frequency; - /** - * 灾害id - */ - private Integer disasterId; + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; /** * 数据条目创建时间 diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/MapServer.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/MapServer.java index 2fe24e0..a33908a 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/MapServer.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/MapServer.java @@ -25,10 +25,10 @@ public class MapServer implements Serializable { */ private String name; - /** - * 灾害id - */ - private Integer disasterId; + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; /** * 缩放纬度 diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java index aae83bf..e3f80de 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java @@ -36,10 +36,10 @@ public class PictureInfo implements Serializable { */ private String type; - /** - * 灾害id - */ - private Integer disasterId; + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; /** * 创建时间 diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ResponseInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ResponseInfo.java index 1951780..903a5a9 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ResponseInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/ResponseInfo.java @@ -35,10 +35,10 @@ public class ResponseInfo implements Serializable { */ private Integer managerId; - /** - * 灾害id - */ - private Integer disasterId; + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; @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/Websites.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java index c84805e..6371fc0 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java @@ -37,10 +37,10 @@ public class Websites implements Serializable { */ private String provider; - /** - * 灾害id - */ - private Integer disasterId; + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; /** * 数据条目创建时间 diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/TestController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/TestController.java new file mode 100644 index 0000000..12be816 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/TestController.java @@ -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> getA(Long id) { + + LambdaQueryWrapper qrq = new LambdaQueryWrapper<>(); + qrq.eq(News::getId, id); + + List list = newsService.list(qrq); + return R.data(list); + } + + @PostMapping + public R getB() { + return R.data("seccess"); + } +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.xml index abe1a4f..74f020c 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DownloadRecordMapper.xml @@ -6,7 +6,7 @@ - + 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 1a0689c..f72bfc6 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 @@ -12,7 +12,7 @@ - + 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 bc39a75..05523ef 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 @@ -9,7 +9,7 @@ - + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.java index d9c21ee..60c4af6 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.java @@ -4,6 +4,8 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kening.vordm.entity.MapServer; +import java.util.List; + /** * @author G1393 * @description 针对表【map_server(上传基础地理数据,并发布到geoserver上,记录geoserver的存储信息)】的数据库操作Mapper @@ -13,4 +15,6 @@ import com.kening.vordm.entity.MapServer; public interface MapServerMapper extends BaseMapper { + List getMapService(Long id); + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.xml index 9f6a907..d7624b0 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/MapServerMapper.xml @@ -7,7 +7,7 @@ - + @@ -16,4 +16,7 @@ id,name,disaster_id, lat,lon + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/PictureInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/PictureInfoMapper.xml index 358f06f..d65734f 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/PictureInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/PictureInfoMapper.xml @@ -9,7 +9,7 @@ - + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ResponseInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ResponseInfoMapper.xml index 3299c9a..39befcd 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ResponseInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ResponseInfoMapper.xml @@ -9,7 +9,7 @@ - + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.xml index ed15cba..a4e4cee 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.xml @@ -9,7 +9,7 @@ - + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/NewsService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/NewsService.java index 4b0eb36..3c20fe3 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/NewsService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/NewsService.java @@ -10,4 +10,5 @@ import com.kening.vordm.entity.News; */ public interface NewsService extends IService { + }