From 3db92a6fff18c1591b298fa0bf8085dfcbdb6747 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Sat, 06 Jul 2024 15:08:11 +0800
Subject: [PATCH] 修改智能航线规划，修改南昌机场和西安机场人工接管时图片绑定图斑问题
---
src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
index 44db0c9..432a432 100644
--- a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
+++ b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
@@ -1,7 +1,6 @@
package com.dji.sample.patches.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dji.sample.common.model.Pagination;
@@ -20,7 +19,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
import java.util.stream.Collectors;
@Service
@@ -97,20 +95,20 @@
public PaginationData getPhoto(PatchesParam param, String dkbh) {
LotInfo lotInfo=getLotinfoToDb(dkbh);
int statue=lotInfo.getIsPush();
- if (statue==0){
- Page<MediaFileEntity> page = fileMapper.selectPage(new Page<MediaFileEntity>(param.getPage(), param.getPageSize()),
- new LambdaQueryWrapper<MediaFileEntity>().like(MediaFileEntity::getFileName, "%" + dkbh + "~" + "%"));
- List<MediaFileEntity> records = page.getRecords()
- .stream()
- .collect(Collectors.toList());
- return new PaginationData<MediaFileEntity>(records, new Pagination(page));}
- else {
+ if (statue==1){
Page<MediaFileMarkEntity> page = markMapper.selectPage(new Page<MediaFileMarkEntity>(param.getPage(), param.getPageSize()),
new LambdaQueryWrapper<MediaFileMarkEntity>().like(MediaFileMarkEntity::getFileName, "%" + dkbh + "~" + "%"));
List<MediaFileMarkEntity> records = page.getRecords()
.stream()
.collect(Collectors.toList());
return new PaginationData<MediaFileMarkEntity>(records, new Pagination(page));}
+ else {
+ Page<MediaFileEntity> page = fileMapper.selectPage(new Page<MediaFileEntity>(param.getPage(), param.getPageSize()),
+ new LambdaQueryWrapper<MediaFileEntity>().like(MediaFileEntity::getFileName, "%" + dkbh + "~" + "%"));
+ List<MediaFileEntity> records = page.getRecords()
+ .stream()
+ .collect(Collectors.toList());
+ return new PaginationData<MediaFileEntity>(records, new Pagination(page));}
}
--
Gitblit v1.9.3