yaowang
/
kn-vordm
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glj-代码提交

This commit is contained in:
glj 2023-04-25 09:16:15 +08:00
parent c0206ad1c2
commit 8be32612a5
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java
View File

@ -28,42 +28,47 @@ public class RemoteSensingSourceDataController {
/** /**
* 根据页码和灾害信息查出遥感影像源数据，可多个灾害 * 根据页码和灾害信息查出遥感影像源数据，可多个灾害
*
* @param disasterInfo * @param disasterInfo
* @param query * @param query
* @return * @return
*/ */
@GetMapping("/SourceData") @GetMapping("/SourceData")
public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query){ public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query) {
List<Long> disasterIds = disasterInfoService.getDisasterId(disasterInfo); List<Long> disasterIds = disasterInfoService.getDisasterId(disasterInfo);
if (disasterIds.isEmpty()){ if (disasterIds.isEmpty()) {
return R.data(null); return R.data(null);
} }
return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),new QueryWrapper<RemoteSensingSourceData>().in("disaster_id",disasterIds))); return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), new QueryWrapper<RemoteSensingSourceData>().in("disaster_id", disasterIds)));
} }
/** /**
* 实体数据列表信息 * 实体数据列表信息
*
* @param optionsJson 实体数据条件信息 * @param optionsJson 实体数据条件信息
* @param query current当前页 size 每页数据量 * @param query current当前页 size 每页数据量
* @return * @return
*/ */
@GetMapping("/Condition") @GetMapping("/Condition")
public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceDataByCondition( String optionsJson, Query query) { public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceDataByCondition(String optionsJson, Query query) {
RemoteSensingSourceData remoteSensingSourceData = new RemoteSensingSourceData(); RemoteSensingSourceData remoteSensingSourceData = new RemoteSensingSourceData();
if (optionsJson!=null){ if (optionsJson != null) {
remoteSensingSourceData = (RemoteSensingSourceData)JSON.parseObject(optionsJson, RemoteSensingSourceData.class); remoteSensingSourceData = (RemoteSensingSourceData) JSON.parseObject(optionsJson, RemoteSensingSourceData.class);
} }
return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData)); return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData));
} }
/** /**
* 实体数据列表信息 * 实体数据列表信息
* @param params *
* @param disasterId
* @param query * @param query
* @return * @return
*/ */
@GetMapping("/PagesData") @GetMapping("/PagesData")
public R<IPage<RemoteSensingSourceData>> Pages(@RequestParam Map<String,Object> params, Query query){ public R<IPage<RemoteSensingSourceData>> pages(Query query, String disasterId) {
return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),Condition.getQueryWrapper(params,RemoteSensingSourceData.class))); QueryWrapper<RemoteSensingSourceData> qw = new QueryWrapper<>();
qw.eq("disaster_id", disasterId);
return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), qw));
} }
} }