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

jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/web/sys/terminal/ctl/TerminalCtl.java

@@ -178,6 +178,56 @@ public class TerminalCtl extends BaseWebCtl {
     }
 
     /**
+     * 根据终端设备ID获取轨迹
+     * 
+     * @param mmsi
+     */
+    @RequestMapping("/tracknew")
+    @ResponseBody
+    public List<TerminalVo> findTerminalTracknew(String deviceId) {
+        // 查询当天轨迹记录
+        List<Map<String, Object>> mapList = terminalService.findTerminalTrack(deviceId);
+        List<TerminalVo> voList = new ArrayList<TerminalVo>();
+        if(mapList.size() > 0) {
+            // 返回vo
+            TerminalVo terminalVo = new TerminalVo();
+            terminalVo.setDeviceId(deviceId);
+            List<TerminalPosition> routeList = new ArrayList<TerminalPosition>();
+            TerminalPosition routeVo = null;
+            for(int i=0; i<mapList.size(); i++) {
+                Map<String, Object> mapObj = mapList.get(i);
+                routeVo = new TerminalPosition();
+                routeVo.setSort(i+1);
+                routeVo.setLon(mapObj.get("lon").toString());
+                routeVo.setLat(mapObj.get("lat").toString());
+                String time = mapObj.get("time").toString();
+                routeVo.setTime(time);
+                if(mapList.size() == 1) {
+                    routeList.add(routeVo);
+                } else if((i+1) < mapList.size()) {
+                	String nextTime = mapList.get(i+1).get("time").toString();
+                	Double plusNum = Double.parseDouble(nextTime) - Double.parseDouble(time);
+                	if(plusNum > 600) {
+                        routeList.add(routeVo);
+                        terminalVo.setRoute(routeList);
+                        voList.add(terminalVo);
+                        terminalVo = new TerminalVo();
+                        routeList = new ArrayList<TerminalPosition>();
+                        continue;
+                	} else {
+                		routeList.add(routeVo);
+                	}
+                } else if((i+1) == mapList.size()) {
+                	routeList.add(routeVo);
+                }
+            }
+            terminalVo.setRoute(routeList);
+            voList.add(terminalVo);
+        }
+        return voList;
+    }
+
+    /**
      * 根据任务ID,设备ID获取终端设备轨迹
      * 
      * @param mmsi

jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/web/sys/terminal/service/impl/TerminalServiceImpl.java

@@ -76,7 +76,7 @@ public class TerminalServiceImpl implements TerminalService {
                 + " from t_jdc_terminal_trail a "
                 + " where a.device_id = '"+deviceId+"'"
                 + " and a.recvdate >= curdate()"
-                + " order by a.updtime desc";
+                + " order by a.updtime asc";
         List<Map<String, Object>> mapList = template.queryForList(strSql, params);
         return mapList;
     }

jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/common_command.js

@@ -1126,6 +1126,15 @@ function getDeviceInfo(marker) {
  */
 function queryTerminalRoute(deviceId,lon,lat) {
     $.get(basePath + "/terminal/track", {'deviceId': deviceId}, function (result) {
+    	/*if(result && result.length > 0) {
+            // 缩放地图比例
+            setMapCenter(lat, lon, 11);
+    		for(var i = 0; i < result.length; i++) {
+    			var t = result[i];
+    			// 绘制轨迹
+                addTerminalPath(t);
+    		}
+    	}*/
         if(result && result.route) {
             // 缩放地图比例
             setMapCenter(lat, lon, 11);

jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/common_railway.js

@@ -11,12 +11,7 @@ var basicType;
 /** 页面初始化 */
 $(function () {
     initRailMap();
-    // 图层
-    basicType = [
-        {"id": tc_jtsn, "type": "railway", label: "交通枢纽", layer: jtsnMarkerlayer},
-        {"id": tc_ptzd, "type": "railway", label: "普通站点", layer: ptzdMarkerlayer}
-    ];
-    // 查询题录列表
+    // 查询铁路列表
     showRailList();
     // 调整左边栏显示高度和宽度
     var height = $(document).height() - headerHeight;
@@ -149,7 +144,12 @@ function initRail() {
 //    queryUTFGrid(params,base_features_url, railProcessCompleted);
     // 获取铁路列表
     //getTLXList();
-    
+
+    // 图层
+    basicType = [
+        {"id": tc_jtsn, "type": "railway", label: "交通枢纽", layer: jtsnMarkerlayer},
+        {"id": tc_ptzd, "type": "railway", label: "普通站点", layer: ptzdMarkerlayer}
+    ];
     // 设置图层选中事件
     getRailLayerItems();
 }

jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/common_road.js

@@ -420,6 +420,9 @@ function showRoadList() {
             vectorLayer.removeFeatures(selectFeature);
             layer.close(infoDetailWin);
             setRoadRel();
+            if($("#"+tc_camera).prop("checked")==false) {
+            	cameraMarkerlayer.clearMarkers();
+            }
         }
     });
 }