大图

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/domain/DroDroneBigPicture.java

@@ -73,6 +73,11 @@ public class DroDroneBigPicture extends BaseEntity {
      */
     private String tifFile;
 
+    /**
+     * 来源类型
+     */
+    private String sourceType;
+
     /**
      * 状态
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/domain/bo/DroDroneBigPictureBo.java

@@ -74,6 +74,11 @@ public class DroDroneBigPictureBo extends BaseEntity {
      */
     private String tifFile;
 
+    /**
+     * 来源类型
+     */
+    private String sourceType;
+
     /**
      * 状态
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/domain/vo/DroDroneBigPictureVo.java

@@ -7,12 +7,10 @@ import lombok.Data;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.drone.domain.DroDroneBigPicture;
-import org.dromara.progress.domain.vo.progressplandetail.PgsProgressPlanDetailRecognizerVo;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.List;
 
 
 /**
@@ -104,6 +102,12 @@ public class DroDroneBigPictureVo implements Serializable {
     @ExcelProperty(value = "tif文件")
     private String tifFile;
 
+    /**
+     * 来源类型
+     */
+    @ExcelProperty(value = "来源类型")
+    private String sourceType;
+
     /**
      * 状态
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/drone/service/impl/DroDroneBigPictureServiceImpl.java

@@ -212,6 +212,7 @@ class DroDroneBigPictureServiceImpl extends ServiceImpl<DroDroneBigPictureMapper
         lqw.eq(StringUtils.isNotBlank(bo.getBigPic()), DroDroneBigPicture::getBigPic, bo.getBigPic());
         lqw.eq(bo.getRecognizePic() != null, DroDroneBigPicture::getRecognizePic, bo.getRecognizePic());
         lqw.eq(StringUtils.isNotBlank(bo.getTifFile()), DroDroneBigPicture::getTifFile, bo.getTifFile());
+        lqw.eq(StringUtils.isNotBlank(bo.getSourceType()), DroDroneBigPicture::getSourceType, bo.getSourceType());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), DroDroneBigPicture::getStatus, bo.getStatus());
         return lqw;
     }
@@ -233,6 +234,7 @@ class DroDroneBigPictureServiceImpl extends ServiceImpl<DroDroneBigPictureMapper
             if (StringUtils.isNotBlank(add.getBigPic()) && StringUtils.isNotBlank(add.getTifFile())) {
                 add.setStatus("3");
             }
+            add.setSourceType("1");
             boolean save = this.save(add);
             if (!save) {
                 throw new ServiceException("新增无人机大图信息失败");
@@ -681,6 +683,7 @@ class DroDroneBigPictureServiceImpl extends ServiceImpl<DroDroneBigPictureMapper
         bo.setStatus("9");
         DroDroneBigPicture picture = new DroDroneBigPicture();
         BeanUtils.copyProperties(bo, picture);
+        picture.setSourceType("1");
         boolean save = this.save(picture);
         if (!save) {
             throw new ServiceException("保存数据失败");

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressPlanDetailServiceImpl.java

@@ -1184,6 +1184,7 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
             droDroneBigPicture.setProjectId(projectId);
             droDroneBigPicture.setBigPic(fileUrl);
             droDroneBigPicture.setTifFile(tifUrl);
+            droDroneBigPicture.setSourceType("2");
             droDroneBigPicture.setStatus("5");
             boolean save = droDroneBigPictureService.save(droDroneBigPicture);
             if (!save) {