|
|
@@ -81,6 +81,9 @@ public class UserInspectDriverServiceImpl extends BaseServiceImpl<TauvInspectDri |
|
|
|
@Autowired |
|
|
|
private IUserAuthGroupService userAuthGroupService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private ITauvInspectAppService iTauvInspectAppService; |
|
|
|
|
|
|
|
@Override |
|
|
|
public String batchAddData(TauvInspect inspect) { |
|
|
|
List<TauvInspectDriver> inspectDriver = inspect.getInspectDriverList(); |
|
|
@@ -288,13 +291,23 @@ public class UserInspectDriverServiceImpl extends BaseServiceImpl<TauvInspectDri |
|
|
|
// 飞手名称 |
|
|
|
List<String> inspectHandName = iSysAdminService.getAdminNameByIds(inspectDriver.getInspectHand()); |
|
|
|
inspectDriverInfoVo.setInspectHandName(org.apache.commons.lang3.StringUtils.join(inspectHandName.toArray(), ",")); |
|
|
|
|
|
|
|
// 获取巡检任务信息 |
|
|
|
TauvInspect inspect = inspectMapper.selectById(inspectDriver.getInspectId()); |
|
|
|
if (inspect == null) { |
|
|
|
return response.failure("巡检任务不存在"); |
|
|
|
//app巡河 |
|
|
|
if (inspectDriver.getSource() == 5) { |
|
|
|
TauvInspectApp appInfo = iTauvInspectAppService.getInfo(inspectDriver.getInspectId()); |
|
|
|
if (appInfo == null) { |
|
|
|
return response.failure("巡检任务不存在"); |
|
|
|
} |
|
|
|
inspectDriverInfoVo.setInspectTime(appInfo.getBeginTime()); |
|
|
|
} else { |
|
|
|
// 获取巡检任务信息 |
|
|
|
TauvInspect inspect = inspectMapper.selectById(inspectDriver.getInspectId()); |
|
|
|
if (inspect == null) { |
|
|
|
return response.failure("巡检任务不存在"); |
|
|
|
} |
|
|
|
inspectDriverInfoVo.setInspectTime(inspect.getInspectTime()); |
|
|
|
} |
|
|
|
inspectDriverInfoVo.setInspectTime(inspect.getInspectTime()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 获取无人机设备 |
|
|
|
if (!StringUtils.isEmpty(inspectDriver.getEquipmentId())) { |