From a46e7ad0f67c78d3b6379bff2605c50a115a2bf1 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 05 Jun 2024 14:32:37 +0800
Subject: [PATCH] 修改图斑图片审查，行政区转换，航线生成bug
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java b/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
index 3cc5222..9a54851 100644
--- a/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
+++ b/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dji.sample.common.model.Pagination;
import com.dji.sample.common.model.PaginationData;
+import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.oss.model.OssConfiguration;
import com.dji.sample.component.oss.service.impl.OssServiceContext;
import com.dji.sample.manage.model.dto.DeviceDictionaryDTO;
@@ -16,8 +18,10 @@
import com.dji.sample.media.model.*;
import com.dji.sample.media.service.IFileService;
import com.dji.sample.media.util.ImgUtil;
+import com.dji.sample.patches.dao.GetPatchesMapper;
+import com.dji.sample.patches.model.entity.LotInfo;
+import com.dji.sample.patches.utils.TimerUtil;
import com.dji.sample.territory.service.impl.TbFjServiceImpl;
-import com.dji.sample.territory.utils.VideoZipUtil;
import com.dji.sample.territory.utils.WaterMarkUtil;
import com.drew.imaging.ImageProcessingException;
import io.minio.MinioClient;
@@ -51,6 +55,8 @@
private IFileMapper mapper;
@Autowired
private IMarkMapper markMapper;
+ @Autowired
+ private GetPatchesMapper patchesMapper;
@Autowired
private IDeviceDictionaryService deviceDictionaryService;
@@ -133,18 +139,34 @@
.eq(MediaFileEntity::getWorkspaceId, workspaceId).eq(MediaFileEntity::getJobId, jobId));
}
- public List<MediaFileEntity> listByIsadd() {
+ public List<MediaFileEntity> listByIsadd(String dkbh, String workspaceId) {
return mapper.selectList(new LambdaQueryWrapper<MediaFileEntity>().eq(MediaFileEntity::getIsadd, 0)
- .like(MediaFileEntity::getFileName, "~"));
+ .eq(MediaFileEntity::getWorkspaceId, workspaceId)
+ .like(MediaFileEntity::getFileName, dkbh + "~"));
}
- public int updateExamByFileId(String fileId) {
- // 创建并配置 LambdaUpdateWrapper
- LambdaUpdateWrapper<MediaFileEntity> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(MediaFileEntity::getFileId, fileId)
- .set(MediaFileEntity::getExamine, 0);
- // 执行更新操作并返回更新的行数
- return mapper.update(null, updateWrapper);
+ public ResponseResult updateExamByFileId(String fileId) {
+ int examineStatus = getExamByFileId(fileId);
+ if (examineStatus == 1) {
+ LambdaUpdateWrapper<MediaFileEntity> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(MediaFileEntity::getFileId, fileId)
+ .set(MediaFileEntity::getExamine, 0);
+ mapper.update(null, updateWrapper);
+ return ResponseResult.success("审核未通过");
+ } else if (examineStatus == 0) {
+ LambdaUpdateWrapper<MediaFileEntity> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(MediaFileEntity::getFileId, fileId)
+ .set(MediaFileEntity::getExamine, 1);
+ mapper.update(null, updateWrapper);
+ return ResponseResult.success("审核通过");
+ }
+ return ResponseResult.error("媒体文件不存在");
+ }
+
+ public int getExamByFileId(String fileId) {
+ MediaFileEntity entity = mapper.selectOne(new LambdaQueryWrapper<MediaFileEntity>()
+ .eq(MediaFileEntity::getFileId, fileId));
+ return entity.getExamine();
}
@Override
--
Gitblit v1.9.3