算法读取批次部分合并

project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Location.java

@@ -67,15 +67,15 @@ public class Location {
     }
     }
 
 
     
     
-    /**
-     * time to the given location in minutes.
-     * FIXME 这里简化处理没有用时间矩阵 时间=距离/100
-     * @param location other location
-     * @return time in minutes
-     */
-    public int getPathTimeTo(Location location) {
-    	return (int)(distanceMap.get(location)/100);
-    }
+	/**
+	 * time to the given location in minutes.
+	 *
+	 * @param location other location
+	 * @return time in minutes
+	 */
+	public int getPathTimeTo(Location location) {
+		return distanceTimeMap.get(location).intValue();
+	}
 
 
     // ************************************************************************
     // ************************************************************************
     // Complex methods
     // Complex methods
@@ -97,4 +97,5 @@ public class Location {
         return this.id == ((Location) obj).getId();
         return this.id == ((Location) obj).getId();
     }
     }
 
 
+
 }
 }

project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Technician.java

@@ -195,5 +195,18 @@ public class Technician {
         return this.id == ((Technician) obj).getId();
         return this.id == ((Technician) obj).getId();
     }
     }
 
 
-
+    @Override
+    public String toString() {
+        return "Technician{" +
+                "id=" + id +
+                ", code='" + code + '\'' +
+                ", depot=" + depot +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", skills=" + skills +
+                ", maxCount=" + maxCount +
+                ", maxMinute=" + maxMinute +
+                ", maxDistanceMeter=" + maxDistanceMeter +
+                '}';
+    }
 }
 }