吉安感知网项目-后端
linwei
2026-01-19 fd3536cec7d55ef45afc92c07e211f665c69adc5
附件新增和修改
3 files modified
19 ■■■■ changed files
drone-ops-api/drone-resource-api/src/main/java/org/sxkj/resource/entity/Attach.java 5 ●●●●● patch | view | raw | blame | history
drone-ops/drone-resource/src/main/java/org/sxkj/resource/controller/AttachController.java 4 ●●●● patch | view | raw | blame | history
drone-ops/drone-resource/src/main/java/org/sxkj/resource/service/impl/AttachServiceImpl.java 10 ●●●● patch | view | raw | blame | history
drone-ops-api/drone-resource-api/src/main/java/org/sxkj/resource/entity/Attach.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -27,7 +28,7 @@
@Data
@TableName(value = "blade_attach")
@EqualsAndHashCode(callSuper = true)
//@ApiModel(value = "Attach对象", description = "附件表")
@ApiModel(value = "Attach对象", description = "附件表")
public class Attach extends TenantEntity {
    /**
     * ai类型
@@ -84,7 +85,7 @@
    @TableField(value = "wayline_job_id")
    private String wayLineJobId;
    @ApiModelProperty(value = "成果类型:0图片,1=视频,2=ai,3=三维,4=正射,5=全景, 6=图片压缩小(后缀small),7=图片压缩中(后缀show),8视频一帧图,9视频压缩,10ai压缩小,11ai压缩中,12水印,13 倾斜,14 工单上传,15精准复拍")
    @ApiModelProperty(value = "附件类型: 1=巡查类文档,2=巡检类文档,3=安保类文档,4=文旅类文档,5=采集数据类文档")
    private Integer resultType;
    @ApiModelProperty(value = "设备SN")
drone-ops/drone-resource/src/main/java/org/sxkj/resource/controller/AttachController.java
@@ -87,8 +87,8 @@
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "附件分页", notes = "传入attach")
    public R<IPage<AttachVO>> page(AttachVO attach, Query query) {
        String areaCode = HeaderUtils.getAreaCode();
        attach.setAreaCode(areaCode);
        // String areaCode = HeaderUtils.getAreaCode();
        // attach.setAreaCode(areaCode);
        IPage<AttachVO> pages = attachService.selectAttachPage(Condition.getPage(query), attach);
        AttachVO.settingNickName(pages.getRecords());
        return R.data(pages);
drone-ops/drone-resource/src/main/java/org/sxkj/resource/service/impl/AttachServiceImpl.java
@@ -105,13 +105,13 @@
    @Override
    public IPage<AttachVO> selectAttachPage(IPage<AttachVO> page, AttachVO attach) {
        Integer resultType = attach.getResultType();
        // Integer resultType = attach.getResultType();
        List<AttachVO> attachVOS = Collections.emptyList();
        if (Objects.nonNull(resultType) && Attach.RESULT_TYPE_AI.equals(resultType)) {
            attachVOS = baseMapper.selectEventAttachPage(page, attach);
        } else {
        // if (Objects.nonNull(resultType) && Attach.RESULT_TYPE_AI.equals(resultType)) {
        //     attachVOS = baseMapper.selectEventAttachPage(page, attach);
        // } else {
            attachVOS = baseMapper.selectAttachPage(page, attach);
        }
        // }
        return page.setRecords(attachVOS);
    }