From d4aecf9fb7d3d1dd504693f8d7175235087e4aeb Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 06 Jun 2024 09:34:06 +0800
Subject: [PATCH] 图斑图片调查状态
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 71 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 18 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..e5e90e0 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;
@@ -52,6 +56,8 @@
@Autowired
private IMarkMapper markMapper;
@Autowired
+ private GetPatchesMapper patchesMapper;
+ @Autowired
private IDeviceDictionaryService deviceDictionaryService;
@Autowired
@@ -84,17 +90,30 @@
return mapper.insert(fileEntity);
}
- public Integer saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException, ImageProcessingException {
- File file2 = null;
+ public void saveMarkFile(String workspaceId, FileUploadDTO file) throws IOException, FontFormatException, ImageProcessingException {
+ String name = TimerUtil.getDkbh(file.getName());
+ List<LotInfo> lotInfos = patchesMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getDkbh, name));
+ if (!lotInfos.isEmpty()) {
+ LambdaUpdateWrapper<LotInfo> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(LotInfo::getDkbh, name)
+ .eq(LotInfo::getInvestigate, 0)
+ .set(LotInfo::getInvestigate, 1);
+ patchesMapper.update(null, updateWrapper);
+ }
+
+ boolean endsWith = file.getObjectKey().endsWith(".mp4");
+ if (endsWith) {
+ MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
+ mediaFileMarkEntity.setWorkspaceId(workspaceId);
+ mediaFileMarkEntity.setFileId(UUID.randomUUID().toString());
+ markMapper.insert(mediaFileMarkEntity);
+ }
MediaFileMarkEntity mediaFileMarkEntity = this.fileUploadConvertToMarkEntity(file);
String url = "http://dev.jxpskj.com:9000/cloud-bucket" + file.getObjectKey();
File file1 = TbFjServiceImpl.downloadFile(url);
long timestamp = convertToTimestamp(file.getMetadata().getCreatedTime());
- boolean endsWith = file.getObjectKey().endsWith(".mp4");
- if (!endsWith) {
- file2 = new File(WaterMarkUtil.addWatermark(file1, timestamp, file.getMetadata().getShootPosition().getLat(),
- file.getMetadata().getShootPosition().getLng(), file.getMetadata().getGimbalYawDegree()).toURI());
- }
+ File file2 = new File(WaterMarkUtil.addWatermark(file1, timestamp, file.getMetadata().getShootPosition().getLat(),
+ file.getMetadata().getShootPosition().getLng(), file.getMetadata().getGimbalYawDegree()).toURI());
Object data = ImgUtil.getInfo(file1);
mediaFileMarkEntity.setDronedata(data);
mediaFileMarkEntity.setWorkspaceId(workspaceId);
@@ -108,7 +127,7 @@
String bucketName = "cloud-bucket";
String objectName = mediaFileMarkEntity.getObjectKey(); // 例如 "folder/file.txt"
uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, file2);
- return markMapper.insert(mediaFileMarkEntity);
+ markMapper.insert(mediaFileMarkEntity);
}
@Override
@@ -133,18 +152,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