git-svn-id: https://192.168.57.71/svn/qt@79 12fe181a-e57f-b044-8676-16dc139aa63e

jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/web/command/ctl/LjghCtl.java

@@ -79,7 +79,7 @@ public class LjghCtl {
 		JSONObject jsonObject = ljghService.getWayResources(
 				origin, destination,
 				strategy, waypoints,
-				avoidroad, false);
+				avoidroad, false, "");
 		return jsonObject;
     }
     
@@ -98,7 +98,7 @@ public class LjghCtl {
     		jsonObject = ljghService.getWayResources(
     				ljghEntity.getStartPoint(), ljghEntity.getEndPoint(),
     				ljghEntity.getStrategy(), ljghEntity.getTjPoints(),
-    				ljghEntity.getAvoidRoad(), true);
+    				ljghEntity.getAvoidRoad(), true, comandTaskVo.getResType());
         }
 		return jsonObject;
     }

jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/web/command/service/LjghService.java

@@ -19,5 +19,6 @@ public interface LjghService {
 	 */
     public JSONObject getWayResources(String origin, 
     		String destination, String strategy, 
-    		String waypoints, String avoidroad, boolean isShowResource);
+    		String waypoints, String avoidroad, boolean isShowResource
+    		,String resType);
 }

jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/web/command/service/impl/LjghServiceImpl.java

@@ -38,7 +38,8 @@ public class LjghServiceImpl implements LjghService {
     @Override
     public JSONObject getWayResources(String origin, 
     		String destination, String strategy, 
-    		String waypoints, String avoidroad, boolean isShowResource) {
+    		String waypoints, String avoidroad, boolean isShowResource
+    		,String resType) {
     	JSONObject jsonObject = null;
 		String url = Constants.LJGH_ADDRESS + Constants.USERKEY 
 				+ "&origin=" + origin
@@ -65,7 +66,7 @@ public class LjghServiceImpl implements LjghService {
 					gpsPoints += obj.getString("polyline") + ";";
 				}
 				if(gpsPoints.length() > 0) {
-					List<Resource> listRes = pathService.findResources2(gpsPoints, "");
+					List<Resource> listRes = pathService.findResources2(gpsPoints, resType);
 					jsonObject.put("resources", listRes);
 				} else {
 					jsonObject.put("resources", new ArrayList<Resource>());

jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/web/command/task/service/impl/ComandTaskServiceImpl.java

@@ -631,7 +631,7 @@ public class ComandTaskServiceImpl implements ComandTaskService {
     	JSONObject jsonObject = ljghService.getWayResources(
     			getMapValue(map, "START_POINT"), getMapValue(map, "END_POINT"),
     			getMapValue(map, "STRATEGY"), getMapValue(map, "TJ_POINTS"),
-    			getMapValue(map, "AVOID_ROAD"), true);
+    			getMapValue(map, "AVOID_ROAD"), true, "");
     	if(jsonObject.containsKey("status") && "1".equals(jsonObject.getString("status"))) {
     		// 拼接路段信息
     		desc += newline + "路段行驶提示：" + newline;

jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/web/command/task/vo/ComandTaskVo.java

@@ -31,6 +31,8 @@ public class ComandTaskVo extends CommonVo  {
     private String remark;
     /** 操作标识 */
     private String operFlg;
+    /*资源类型*/
+    private String resType;
     
     public String getId() {
         return id;
@@ -92,5 +94,11 @@ public class ComandTaskVo extends CommonVo  {
     public void setTaskSummary(String taskSummary) {
         this.taskSummary = taskSummary;
     }
+	public String getResType() {
+		return resType;
+	}
+	public void setResType(String resType) {
+		this.resType = resType;
+	}
 
 }