拉取视频文件加上施工场站名称s

This commit is contained in:
guoshengxiong 2025-10-23 16:21:26 +08:00
parent 44b04db1e9
commit 4dcd0596a2
3 changed files with 26 additions and 0 deletions

View File

@ -25,4 +25,12 @@ public class PoliceCameraItemFileVo extends PoliceCameraItemFile {
private java.lang.String workTicketNumber; private java.lang.String workTicketNumber;
@ApiModelProperty(value = "项目名称") @ApiModelProperty(value = "项目名称")
private String projectName; private String projectName;
/**
* 施工场站s多个,分割
*/
@ApiModelProperty(value = "施工场站s多个,分割)")
private java.lang.String constructionAreas;
/**施工场站名称s多个,分割)*/
@ApiModelProperty(value="施工场站名称s多个,分割)")
private java.lang.String constructionAreaNames ;
} }

View File

@ -8,6 +8,7 @@
,wtt.type_name ,wtt.type_name
,wt.work_ticket_number ,wt.work_ticket_number
,p.project_name ,p.project_name
,wt.construction_areas
from police_camera_item_file t from police_camera_item_file t
left join police_camera_item pci on pci.item_id=t.item_id left join police_camera_item pci on pci.item_id=t.item_id
left join work_ticket_history wth on wth.id = t.history_id left join work_ticket_history wth on wth.id = t.history_id

View File

@ -15,6 +15,8 @@ import com.zhgd.xmgl.modules.policecamera.entity.dto.PoliceCameraItemFileDto;
import com.zhgd.xmgl.modules.policecamera.entity.vo.PoliceCameraItemFileVo; import com.zhgd.xmgl.modules.policecamera.entity.vo.PoliceCameraItemFileVo;
import com.zhgd.xmgl.modules.policecamera.mapper.PoliceCameraItemFileMapper; import com.zhgd.xmgl.modules.policecamera.mapper.PoliceCameraItemFileMapper;
import com.zhgd.xmgl.modules.policecamera.service.IPoliceCameraItemFileService; import com.zhgd.xmgl.modules.policecamera.service.IPoliceCameraItemFileService;
import com.zhgd.xmgl.modules.quality.entity.QualityRegion;
import com.zhgd.xmgl.modules.quality.service.IQualityRegionService;
import com.zhgd.xmgl.util.*; import com.zhgd.xmgl.util.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -24,6 +26,7 @@ import org.springframework.stereotype.Service;
import java.io.InputStream; import java.io.InputStream;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
/** /**
@ -38,6 +41,9 @@ public class PoliceCameraItemFileServiceImpl extends ServiceImpl<PoliceCameraIte
@Lazy @Lazy
@Autowired @Autowired
FileStorageService fileStorageService; FileStorageService fileStorageService;
@Lazy
@Autowired
IQualityRegionService qualityRegionService;
@Autowired @Autowired
private PoliceCameraItemFileMapper policeCameraItemFileMapper; private PoliceCameraItemFileMapper policeCameraItemFileMapper;
@Lazy @Lazy
@ -66,6 +72,17 @@ public class PoliceCameraItemFileServiceImpl extends ServiceImpl<PoliceCameraIte
} }
private List<PoliceCameraItemFileVo> dealList(List<PoliceCameraItemFileVo> list) { private List<PoliceCameraItemFileVo> dealList(List<PoliceCameraItemFileVo> list) {
if (CollUtil.isNotEmpty(list)) {
PoliceCameraItemFileVo vo = list.get(0);
for (PoliceCameraItemFileVo fileVo : list) {
Map<Long, QualityRegion> qualityRegionMap = qualityRegionService.getQualityRegionMapByProjectSn(vo.getProjectSn());
fileVo.setConstructionAreaNames(EntityUtils.convertIdsToNames(
fileVo.getConstructionAreas(),
qualityRegionMap,
QualityRegion::getRegionName
));
}
}
return list; return list;
} }