Browse Source

1、修改获取部门公路列表;2、修改任务视频字段;

tags/v1.0.0^2
wanjing 1 year ago
parent
commit
54aaa72094
2 changed files with 13 additions and 9 deletions
  1. +3
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/QueryInspectionPageListService.java
  2. +10
    -8
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/road/query/QueryRoadListByDeptIdService.java

+ 3
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/QueryInspectionPageListService.java View File

for (InspectionVo inspectionVo : inspectionVoList) { for (InspectionVo inspectionVo : inspectionVoList) {
deptName = deptMap.get(inspectionVo.getDeptId()); deptName = deptMap.get(inspectionVo.getDeptId());
inspectionVo.setDeptName(deptName); inspectionVo.setDeptName(deptName);
inspectionVo.setAiVideoUrl(CommonConfig.videoURL + inspectionVo.getAiVideoUrl());
if (StringUtils.isNotEmpty(inspectionVo.getAiVideoUrl())) {
inspectionVo.setAiVideoUrl(CommonConfig.videoURL + inspectionVo.getAiVideoUrl());
}
executeHandle.handler(user, dept, inspectionVo); executeHandle.handler(user, dept, inspectionVo);
} }
return inspectionVoList; return inspectionVoList;

+ 10
- 8
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/road/query/QueryRoadListByDeptIdService.java View File

Dept dept = (Dept) result.getData(); Dept dept = (Dept) result.getData();


// 获取公路列表 // 获取公路列表
List<RoadInformation> roadInformationList;
if (SystemConstant.ROOT_DEPT_PID.equals(dept.getPid())) {
// 顶级部门获取所有的公路列表
roadInformationList = this.getAllRoadInformationList(tenantId);
} else {
// 非顶级部门获取该部门下公路列表
roadInformationList = this.getRoadInformationListByDeptId(tenantId, deptId);
}
// List<RoadInformation> roadInformationList;
// if (SystemConstant.ROOT_DEPT_PID.equals(dept.getPid())) {
// // 顶级部门获取所有的公路列表
// roadInformationList = this.getAllRoadInformationList(tenantId);
// } else {
// // 非顶级部门获取该部门下公路列表
// roadInformationList = this.getRoadInformationListByDeptId(tenantId, deptId);
// }
// 获取公路列表
List<RoadInformation> roadInformationList = this.getRoadInformationListByDeptId(tenantId, deptId);
if (CollectionUtil.isEmpty(roadInformationList)) { if (CollectionUtil.isEmpty(roadInformationList)) {
log.info("根据部门Id查询公路列表业务:公路信息为空"); log.info("根据部门Id查询公路列表业务:公路信息为空");
return JsonResult.error(QueryRoadListByDeptIdCodeEnum.ROAD_LIST_IS_NULL.getCode(), QueryRoadListByDeptIdCodeEnum.ROAD_LIST_IS_NULL.getMsg()); return JsonResult.error(QueryRoadListByDeptIdCodeEnum.ROAD_LIST_IS_NULL.getCode(), QueryRoadListByDeptIdCodeEnum.ROAD_LIST_IS_NULL.getMsg());

Loading…
Cancel
Save