瀏覽代碼

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

tags/v1.0.0^2
wanjing 1 年之前
父節點
當前提交
54aaa72094
共有 2 個檔案被更改,包括 13 行新增9 行删除
  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 查看文件

@@ -218,7 +218,9 @@ public class QueryInspectionPageListService {
for (InspectionVo inspectionVo : inspectionVoList) {
deptName = deptMap.get(inspectionVo.getDeptId());
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);
}
return inspectionVoList;

+ 10
- 8
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/road/query/QueryRoadListByDeptIdService.java 查看文件

@@ -57,14 +57,16 @@ public class QueryRoadListByDeptIdService {
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)) {
log.info("根据部门Id查询公路列表业务:公路信息为空");
return JsonResult.error(QueryRoadListByDeptIdCodeEnum.ROAD_LIST_IS_NULL.getCode(), QueryRoadListByDeptIdCodeEnum.ROAD_LIST_IS_NULL.getMsg());

Loading…
取消
儲存