Merge remote-tracking branch 'origin/master'

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskEntity.java

@@ -48,6 +48,14 @@ public class TaskEntity extends TenantEntity {
 	@ApiModelProperty(value = "计划名称")
 	@QueryField(condition = SqlCondition.LIKE)
 	private String planName;
+
+	/**
+	 * 路线名称
+	 */
+	@ApiModelProperty(value = "路线名称")
+	@QueryField(condition = SqlCondition.LIKE)
+	private String routeName;
+
 	/**
 	 * 任务批次号
 	 */

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java

@@ -236,6 +236,7 @@ public class RobotTaskServiceImpl extends BaseServiceImpl<RobotTaskMapper, Robot
 				RobotTaskTransParam transParam = new RobotTaskTransParam();
 				transParam.setTaskId(taskvo.getId());
 				transParam.setName(taskvo.getPlanName());
+				transParam.setRouteName(taskvo.getRouteName());
 				transParam.setStatus(taskvo.getStatus());
 				transParam.setStartTime(taskvo.getPlanStartTime());
 				transParam.setEndTime(taskvo.getPlanEndTime());

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/vo/robot/RobotTaskTransParam.java

@@ -28,6 +28,10 @@ public class RobotTaskTransParam {
 	@ApiModelProperty(value = "任务名称")
 	private String name;
 
+
+	@ApiModelProperty(value = "巡检路线")
+	private String routeName;
+
 	/**
 	 * 任务状态
 	 * 0未开始 1进行中 2暂停 3已完成 4未完成,  程序只会返回以下状态任务： 0未开始 1进行中 2暂停

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskJobService.java

@@ -400,6 +400,7 @@ public class TaskJobService {
         task.setDutyId(plan.getDutyId());
         task.setPlanId(plan.getId());
         task.setPlanName(plan.getName());
+        task.setRouteName(plan.getRouteName());
         task.setType(plan.getType());
         task.setCycle(plan.getCycle());
 		if(PlanCycleEnum.NEVER_CYCLE.getCycle().equals(plan.getCycle())) {