From efb0d6f50d446e56949e23f3f8cb230d719a7b2d Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 02 Jul 2024 17:21:12 +0800
Subject: [PATCH] 增加国标直播接口，完成人工图片与图斑绑定，修改图片获取接口，获取前更新人工图片的图斑绑定
---
src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 69593aa..44db0c9 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
@@ -7,7 +7,9 @@
import com.dji.sample.common.model.Pagination;
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.media.dao.IFileMapper;
+import com.dji.sample.media.dao.IMarkMapper;
import com.dji.sample.media.model.MediaFileEntity;
+import com.dji.sample.media.model.MediaFileMarkEntity;
import com.dji.sample.patches.dao.GetPatchesMapper;
import com.dji.sample.patches.model.Param.PatchesParam;
import com.dji.sample.patches.model.entity.LotInfo;
@@ -27,6 +29,8 @@
private GetPatchesMapper mapper;
@Autowired
private IFileMapper fileMapper;
+ @Autowired
+ private IMarkMapper markMapper;
/**
* 分页获取数据的接口实现。
@@ -90,13 +94,24 @@
}
@Override
- public PaginationData<MediaFileEntity> getPhoto(PatchesParam param, String dkbh) {
+ 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));
+ return new PaginationData<MediaFileEntity>(records, new Pagination(page));}
+ else {
+ 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));}
+
}
public List<MediaFileEntity> listPohto(String dkbh, String workspaceId) {
--
Gitblit v1.9.3