拉取视频文件加上施工场站名称s
This commit is contained in:
parent
44b04db1e9
commit
4dcd0596a2
@ -25,4 +25,12 @@ public class PoliceCameraItemFileVo extends PoliceCameraItemFile {
|
||||
private java.lang.String workTicketNumber;
|
||||
@ApiModelProperty(value = "项目名称")
|
||||
private String projectName;
|
||||
/**
|
||||
* 施工场站s(多个,分割)
|
||||
*/
|
||||
@ApiModelProperty(value = "施工场站s(多个,分割)")
|
||||
private java.lang.String constructionAreas;
|
||||
/**施工场站名称s(多个,分割)*/
|
||||
@ApiModelProperty(value="施工场站名称s(多个,分割)")
|
||||
private java.lang.String constructionAreaNames ;
|
||||
}
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
,wtt.type_name
|
||||
,wt.work_ticket_number
|
||||
,p.project_name
|
||||
,wt.construction_areas
|
||||
from police_camera_item_file t
|
||||
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
|
||||
|
||||
@ -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.mapper.PoliceCameraItemFileMapper;
|
||||
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 lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@ -24,6 +26,7 @@ import org.springframework.stereotype.Service;
|
||||
import java.io.InputStream;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
@ -38,6 +41,9 @@ public class PoliceCameraItemFileServiceImpl extends ServiceImpl<PoliceCameraIte
|
||||
@Lazy
|
||||
@Autowired
|
||||
FileStorageService fileStorageService;
|
||||
@Lazy
|
||||
@Autowired
|
||||
IQualityRegionService qualityRegionService;
|
||||
@Autowired
|
||||
private PoliceCameraItemFileMapper policeCameraItemFileMapper;
|
||||
@Lazy
|
||||
@ -66,6 +72,17 @@ public class PoliceCameraItemFileServiceImpl extends ServiceImpl<PoliceCameraIte
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user