1.

王通
1 parent a9728e40
Showing 26 changed files with 1714 additions and 132 deletions
src/main/java/com/bsth/common/SystemParamKeys.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/controller/realcontrol/PageForwardingController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/data/SystemParamCache.java
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/entity/Detour.java
src/main/java/com/bsth/entity/LsStationRoute.java
src/main/java/com/bsth/entity/StationRoute.java
src/main/java/com/bsth/entity/transport_capability/TransportCapability.java
src/main/java/com/bsth/repository/DetourRepository.java
src/main/java/com/bsth/service/DetourService.java
src/main/java/com/bsth/service/gps/GpsService.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/impl/DetourServiceImpl.java
src/main/java/com/bsth/service/impl/LsStationRouteServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/resources/static/pages/base/stationroute/add_stationroute_step2.html
@@ -7,6 +7,8 @@ public class SystemParamKeys {
     public static final String SPECIAL_ROLES = "special.roles";
+    public static final String SPECIAL_DAYS = "special.days";
+
     public static final String URL_HTTP_GPS_REAL_CACHE = "url.http.gps.real.cache";
     public static final String URL_HTTP_GPS_REAL = "url.http.gps.real";
@@ -40,4 +42,30 @@ public class SystemParamKeys {
     public static final String URL_HTTP_SSO_LOGOUT = "url.http.sso.logout";
     public static final String URL_HTTP_SSO_AUTH = "url.http.sso.auth";
-}
+
+    public static final String URL_HTTP_MAINTENANCE = "url.http.maintenance";
+
+    public static final String ENABLED_WHITE_IP = "enabled.white.ip";
+
+    public static final String ENABLED_FILTER_AUTHORITY = "enabled.filter.authority";
+
+    public static final String URL_HTTP_DVR = "url.http.dvr";
+
+    public static final String URL_HTTP_DVR_PWD = "url.http.dvr.pwd";
+
+    public static final String DR_SYS_CITY_INTERFACE_URL = "dr.sys.city.interface.url";
+
+    public static final String DR_SYS_CITY_INTERFACE_URL1 = "dr.sys.city.interface.url1";
+
+    public static final String DR_SYS_CITY_INTERFACE_USER = "dr.sys.city.interface.user";
+
+    public static final String DR_SYS_CITY_INTERFACE_PASSWORD = "dr.sys.city.interface.password";
+
+    public static final String DR_SYS_CITY_INTERFACE_BAK_URL = "dr.sys.city.interface.bak.url";
+
+    public static final String DR_SYS_CITY_INTERFACE_BAK_URL1 = "dr.sys.city.interface.bak.url1";
+
+    public static final String DR_SYS_CITY_INTERFACE_BAK_USER = "dr.sys.city.interface.bak.user";
+
+    public static final String DR_SYS_CITY_INTERFACE_BAK_PASSWORD = "dr.sys.city.interface.bak.password";
+}
 \ No newline at end of file
@@ -233,5 +233,9 @@ public class GpsController {
 	public Map<String, Object> allCarsByLine(String lineCode){
         return gpsService.allCarsByLine(lineCode);
     }
-    
+
+    @RequestMapping(value = "/all/fuzzy")
+    public Map<String, Object> fuzzy(@RequestParam Map<String, Object> map) {
+        return gpsService.fuzzy(map);
+    }
 }
@@ -33,6 +33,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -403,4 +404,18 @@ public class AdminUtilsController {
         return "error";
     }
+
+    public static void main(String[] args) {
+        String line = "730088,#131597Aa";
+        String[] arr = line.split(",");
+        if (arr.length == 2) {
+            String uname = arr[0], password = arr[1];
+            StringBuilder sb = new StringBuilder("update bsth_c_sys_user set password='");
+            sb.append(new BCryptPasswordEncoder(4).encode(password));
+            sb.append("' where user_name='");
+            sb.append(uname);
+            sb.append("';");
+            System.out.println(sb.toString());
+        }
+    }
 }
 \ No newline at end of file
-package com.bsth.controller.realcontrol;
-
-import com.bsth.data.zndd.voice.UploadVideoServlet;
-import com.bsth.entity.sys.Role;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * 线调登入页面转发
- * Created by panzhao on 2017/1/21.
- */
-@Controller
-@RequestMapping("real_control")
-public class PageForwardingController {
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    UploadVideoServlet UploadVideoServlet;
-    @RequestMapping("/v2")
-    public ModelAndView v2(HttpServletResponse response){
-        ModelAndView mv = new ModelAndView();
-        SysUser user = SecurityUtils.getCurrentUser();
-
-        //班次管理员
-        if(user.getUserName().equals("bcgly")){
-            mv.setViewName("/real_control_v2/sch_manage/sch_imitate.html");
-            return mv;
-        }
-
-        try{
-            //闵行运管所，直接打开地图页面
-            if(user.getRoles().size() == 1){
-                for(Role role : user.getRoles()){
-                    if(role.getCodeName().equals("MH_YGS")){
-                        // 直接重定向
-                        response.sendRedirect("/pages/mapmonitor/alone/wrap.html");
-                        return null;
-                    }
-                }
-            }
-        }catch (Exception e){
-            logger.error("", e);
-        }
-
-        //正常线调主页
-        mv.setViewName("/real_control_v2/main.html");
-        return mv;
-    }
-
-    @RequestMapping(value = "zndd/do/{line}")
-    public void doPost(@PathVariable("line") String line, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        UploadVideoServlet.doPost(line,request,response);
-    }
-}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.zndd.voice.UploadVideoServlet;
+import com.bsth.entity.sys.Role;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 线调登入页面转发
+ * Created by panzhao on 2017/1/21.
+ */
+@Controller
+@RequestMapping("real_control")
+public class PageForwardingController {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    UploadVideoServlet UploadVideoServlet;
+    @RequestMapping("/v2")
+    public ModelAndView v2(HttpServletResponse response){
+        ModelAndView mv = new ModelAndView();
+        SysUser user = SecurityUtils.getCurrentUser();
+
+        //班次管理员
+        if(user.getUserName().equals("bcgly")){
+            mv.setViewName("/real_control_v2/sch_manage/sch_imitate.html");
+            return mv;
+        }
+
+        try{
+            //闵行运管所，直接打开地图页面
+            if(user.getRoles().size() == 1){
+                for(Role role : user.getRoles()){
+                    if(role.getCodeName().equals("MH_YGS")){
+                        // 直接重定向
+                        response.sendRedirect("/pages/mapmonitor/alone/wrap.html");
+                        return null;
+                    }
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+
+        //正常线调主页
+        mv.setViewName("/real_control_v2/main.html");
+        return mv;
+    }
+
+    @RequestMapping("/demo")
+    public ModelAndView demo(HttpServletResponse response){
+        ModelAndView mv = new ModelAndView();
+        mv.setViewName("/pages/demo.html");
+        return mv;
+    }
+
+    @RequestMapping(value = "zndd/do/{line}")
+    public void doPost(@PathVariable("line") String line, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        UploadVideoServlet.doPost(line,request,response);
+    }
+}
@@ -108,6 +108,7 @@ public class ServiceDataInterface {
             map.put("remarks", sch.getRemark());
             map.put("status", sch.getStatus());
             map.put("realExecDate", sch.getRealExecDate());
+            map.put("lineRegion", sch.getLineRegion());
             //放站班次，放到的站点
             map.put("majorStationName", sch.getMajorStationName());
@@ -21,6 +21,10 @@ public class SystemParamCache implements InitializingBean {
         return systemParamService1.getValue(SystemParamKeys.SPECIAL_ROLES);
     }
+    public static String getSpecialDays() {
+        return systemParamService1.getValue(SystemParamKeys.SPECIAL_DAYS);
+    }
+
     public static String getUrlHttpGpsRealCache() {
         return systemParamService1.getValue(SystemParamKeys.URL_HTTP_GPS_REAL_CACHE);
     }
@@ -85,11 +89,62 @@ public class SystemParamCache implements InitializingBean {
         return systemParamService1.getValue(SystemParamKeys.URL_HTTP_SSO_LOGOUT);
     }
-    public static final String URL_HTTP_SSO_AUTH = "url.http.sso.auth";
     public static String getUrlHttpSsoAuth() {
         return systemParamService1.getValue(SystemParamKeys.URL_HTTP_SSO_AUTH);
     }
+    public static String getUrlHttpMaintenance() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_MAINTENANCE);
+    }
+
+    public static boolean getEnabledWhiteIp() {
+        return Boolean.parseBoolean(systemParamService1.getValue(SystemParamKeys.ENABLED_WHITE_IP));
+    }
+
+    public static boolean getEnableFilterAuthority() {
+        return Boolean.parseBoolean(systemParamService1.getValue(SystemParamKeys.ENABLED_FILTER_AUTHORITY));
+    }
+
+    public static String getUrlHttpDvr() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_DVR);
+    }
+
+    public static String getUrlHttpDvrPwd() {
+        return systemParamService1.getValue(SystemParamKeys.URL_HTTP_DVR_PWD);
+    }
+
+    public static String getDrSysCityInterfaceUrl() {
+        return systemParamService1.getValue(SystemParamKeys.DR_SYS_CITY_INTERFACE_URL);
+    }
+
+    public static String getDrSysCityInterfaceUrl1() {
+        return systemParamService1.getValue(SystemParamKeys.DR_SYS_CITY_INTERFACE_URL1);
+    }
+
+    public static String getDrSysCityInterfaceUser() {
+        return systemParamService1.getValue(SystemParamKeys.DR_SYS_CITY_INTERFACE_USER);
+    }
+
+    public static String getDrSysCityInterfacePassword() {
+        return systemParamService1.getValue(SystemParamKeys.DR_SYS_CITY_INTERFACE_PASSWORD);
+    }
+
+    public static String getDrSysCityInterfaceBakUrl() {
+        return systemParamService1.getValue(SystemParamKeys.DR_SYS_CITY_INTERFACE_BAK_URL);
+    }
+
+    public static String getDrSysCityInterfaceBakUrl1() {
+        return systemParamService1.getValue(SystemParamKeys.DR_SYS_CITY_INTERFACE_BAK_URL1);
+    }
+
+    public static String getDrSysCityInterfaceBakUser() {
+        return systemParamService1.getValue(SystemParamKeys.DR_SYS_CITY_INTERFACE_BAK_USER);
+    }
+
+    public static String getDrSysCityInterfaceBakPassword() {
+        return systemParamService1.getValue(SystemParamKeys.DR_SYS_CITY_INTERFACE_BAK_PASSWORD);
+    }
+
     @Override
     public void afterPropertiesSet() throws Exception {
         systemParamService1 = systemParamService;
@@ -117,8 +117,8 @@ public class CarOutInfoHandler {
                     //删除
                     jdbcTemplate.update("delete from bsth_t_clfcxxb");
                     //重新写入
-                    jdbcTemplate.batchUpdate("insert into bsth_t_clfcxxb(rq, line_code, line_name, lp_name, lp_sn, dfsj, nbbm, cph, bc_type, end_station_name, updown, jGh, jName, remarks, sn, sch)" +
-                            " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                    jdbcTemplate.batchUpdate("insert into bsth_t_clfcxxb(rq, line_code, line_name, lp_name, lp_sn, dfsj, nbbm, cph, bc_type, end_station_name, updown, jGh, jName, remarks, sn, sch, line_region)" +
+                            " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
                         @Override
                         public void setValues(PreparedStatement ps, int i) throws SQLException {
                             ScheduleRealInfo sch = pstList.get(i);
@@ -138,6 +138,7 @@ public class CarOutInfoHandler {
                             ps.setString(14, sch.getRemarks());
                             ps.setInt(15, sch.getFcpSn());
                             ps.setLong(16, sch.getId());
+                            ps.setString(17, sch.getLineRegion());
                         }
                         @Override
+package com.bsth.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * 绕改道实体类
+ * 对应数据库表 bsth_c_detour
+ */
+@Entity
+@Table(name = "bsth_c_detour")
+@DynamicInsert
+@DynamicUpdate
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Detour {
+
+    // 主键
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    // 线路
+    private Integer line;
+
+    // 版本号
+    @JsonIgnore
+    private Integer versions;
+
+    // 上下行
+    private Integer direction;
+
+    // 起点编码
+    @JsonIgnore
+    private String startStationCode;
+
+    @Transient
+    private int startIdx;
+
+    // 终点编码
+    @JsonIgnore
+    private String terminalStationCode;
+
+    @Transient
+    private int terminalIdx;
+
+    // 路段wgs84点位
+    private String points;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getLine() {
+        return line;
+    }
+
+    public void setLine(Integer line) {
+        this.line = line;
+    }
+
+    public Integer getVersions() {
+        return versions;
+    }
+
+    public void setVersions(Integer versions) {
+        this.versions = versions;
+    }
+
+    public Integer getDirection() {
+        return direction;
+    }
+
+    public void setDirection(Integer direction) {
+        this.direction = direction;
+    }
+
+    public String getStartStationCode() {
+        return startStationCode;
+    }
+
+    public void setStartStationCode(String startStationCode) {
+        this.startStationCode = startStationCode;
+    }
+
+    public int getStartIdx() {
+        return startIdx;
+    }
+
+    public void setStartIdx(int startIdx) {
+        this.startIdx = startIdx;
+    }
+
+    public String getTerminalStationCode() {
+        return terminalStationCode;
+    }
+
+    public void setTerminalStationCode(String terminalStationCode) {
+        this.terminalStationCode = terminalStationCode;
+    }
+
+    public int getTerminalIdx() {
+        return terminalIdx;
+    }
+
+    public void setTerminalIdx(int terminalIdx) {
+        this.terminalIdx = terminalIdx;
+    }
+
+    public String getPoints() {
+        return points;
+    }
+
+    public void setPoints(String points) {
+        this.points = points;
+    }
+}
 \ No newline at end of file
@@ -165,6 +165,11 @@ public class LsStationRoute {
 	@Transient
 	private String centerPointWgsWkt;
+	/**
+	 * 绕改道当前站点对应的后一站点
+	 */
+	private Integer detourStationRoute;
+
 	public Integer getId() {
 		return id;
 	}
@@ -440,4 +445,12 @@ public class LsStationRoute {
 		return centerPointWgsWkt;
 	}
+
+	public Integer getDetourStationRoute() {
+		return detourStationRoute;
+	}
+
+	public void setDetourStationRoute(Integer detourStationRoute) {
+		this.detourStationRoute = detourStationRoute;
+	}
 }
 \ No newline at end of file
@@ -198,6 +198,11 @@ public class StationRoute {
 	@Transient
 	private String centerPointWgsWkt;
+	/**
+	 * 绕改道当前站点对应的后一站点
+	 */
+	private Integer detourStationRoute;
+
 	public Integer getId() {
 		return id;
 	}
@@ -473,4 +478,12 @@ public class StationRoute {
 		return centerPointWgsWkt;
 	}
+
+	public Integer getDetourStationRoute() {
+		return detourStationRoute;
+	}
+
+	public void setDetourStationRoute(Integer detourStationRoute) {
+		this.detourStationRoute = detourStationRoute;
+	}
 }
 \ No newline at end of file
+package com.bsth.entity.transport_capability;
+
+/**
+ * 运能运力
+ */
+public class TransportCapability {
+
+    private String nbbm;
+
+    private String lineCode;
+
+    private String lineName;
+
+    private int upDown;
+
+    private String qdzArrDatejh;
+
+    private long dfsjT;
+
+    private String dfsj;
+
+    private float lon;
+
+    private float lat;
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getQdzArrDatejh() {
+        return qdzArrDatejh;
+    }
+
+    public void setQdzArrDatejh(String qdzArrDatejh) {
+        this.qdzArrDatejh = qdzArrDatejh;
+    }
+
+    public long getDfsjT() {
+        return dfsjT;
+    }
+
+    public void setDfsjT(long dfsjT) {
+        this.dfsjT = dfsjT;
+    }
+
+    public String getDfsj() {
+        return dfsj;
+    }
+
+    public void setDfsj(String dfsj) {
+        this.dfsj = dfsj;
+    }
+
+    public float getLon() {
+        return lon;
+    }
+
+    public void setLon(float lon) {
+        this.lon = lon;
+    }
+
+    public float getLat() {
+        return lat;
+    }
+
+    public void setLat(float lat) {
+        this.lat = lat;
+    }
+}
+package com.bsth.repository;
+
+import com.bsth.entity.Detour;
+
+/**
+ * 绕改道 Repository 接口
+ */
+public interface DetourRepository extends BaseRepository<Detour, Integer> {
+
+}
 \ No newline at end of file
+package com.bsth.service;
+
+import com.bsth.entity.Detour;
+
+/**
+ * 绕改道 Service 接口
+ */
+public interface DetourService extends BaseService<Detour, Integer> {
+
+}
 \ No newline at end of file
@@ -47,4 +47,6 @@ public interface GpsService {
 	Map<String, Object> Pagequery(Map<String, Object> map);
     Map<String,Object> allCarsByLine(String lineCode);
+
+	Map<String, Object> fuzzy(Map<String, Object> map);
 }
@@ -1576,6 +1576,16 @@ public class GpsServiceImpl implements GpsService {
         return map;
     }
+    @Override
+    public Map<String, Object> fuzzy(Map<String, Object> map) {
+        List<String> nbbs = BasicData.getServiceNbbms();
+
+
+        dayOfSchedule.executeCurr("").getQdzArrDatejh();
+        dayOfSchedule.next(null);
+        return Collections.emptyMap();
+    }
+
     static List<GpsSpeed> findAll(Map<String, Object> map) {
         Connection conn = null;
         PreparedStatement ps = null;
+package com.bsth.service.impl;
+
+import com.bsth.entity.Detour;
+import com.bsth.repository.DetourRepository;
+import com.bsth.service.DetourService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 绕改道 Service 实现类
+ */
+@Service
+public class DetourServiceImpl extends BaseServiceImpl<Detour, Integer> implements DetourService {
+
+    @Autowired
+    private DetourRepository detourRepository;
+
+}
 \ No newline at end of file
 package com.bsth.service.impl;
 import com.bsth.annotation.BusinessDescription;
+import com.bsth.data.gpsdata_v2.utils.GeoUtils;
 import com.bsth.entity.*;
 import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.*;
 import com.bsth.service.LsStationRouteService;
-import com.bsth.util.CoordinateConverter;
 import com.bsth.util.CustomBeanUtils;
 import com.bsth.util.GeoConverter;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.geolatte.geom.LineString;
-import org.geolatte.geom.Point;
 import org.geolatte.geom.Polygon;
 import org.geolatte.geom.codec.Wkt;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
@@ -32,6 +31,8 @@ import java.util.*;
 @Service
 public class LsStationRouteServiceImpl extends BaseServiceImpl<LsStationRoute, Integer> implements LsStationRouteService {
+    private final static Logger log = LoggerFactory.getLogger(LsStationRouteServiceImpl.class);
+
     @Autowired
     private LsStationRouteRepository lsStationRouteRepository;
@@ -59,6 +60,9 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
     @Autowired
     private JdbcTemplate jdbcTemplate;
+    @Autowired
+    private DetourRepository detourRepository;
+
     @Override
     public Iterable<LsStationRoute> findAllByParams(Map<String, Object> map) {
         List<Sort.Order> orders = new ArrayList<>();
@@ -318,9 +322,201 @@ public class LsStationRouteServiceImpl extends BaseServiceImpl&lt;LsStationRoute, I
             refreshCurrent(stationRoute1.getLine().getId(), currentVersion);
         }
+        // 处理绕改道逻辑
+        handleDetour(stationRoute1);
+
         return new HashMap<>();
     }
+    private void handleDetour(LsStationRoute stationRoute) {
+        Integer detourStationRouteId = stationRoute.getDetourStationRoute();
+        if (detourStationRouteId == null) {
+            return;
+        }
+
+        // 获取终点站点路由
+        LsStationRoute endStationRoute = lsStationRouteRepository.findById(detourStationRouteId)
+                .orElseThrow(() -> new IllegalArgumentException("未找到对应的终点站点路由，ID：" + detourStationRouteId));
+
+        // 获取起点和终点的WGS坐标
+        org.geolatte.geom.Point startPoint = stationRoute.getCenterPointWgs();
+        org.geolatte.geom.Point endPoint = endStationRoute.getCenterPointWgs();
+        if (startPoint == null || endPoint == null) {
+            throw new IllegalArgumentException("起点或终点站点坐标信息不完整");
+        }
+
+        // 转换为内部Geo.Point
+        com.bsth.util.Geo.Point startGeoPoint = toGeoPoint(startPoint);
+        com.bsth.util.Geo.Point endGeoPoint = toGeoPoint(endPoint);
+
+        // 获取线路、版本号、上下行信息
+        Integer lineId = Optional.ofNullable(stationRoute.getLine())
+                .map(Line::getId)
+                .orElseThrow(() -> new IllegalArgumentException("站点路由关联的线路信息缺失"));
+        Integer versions = stationRoute.getVersions();
+        Integer directions = stationRoute.getDirections();
+
+        // 查询所有路段路由（按路段编码升序）
+        Map<String, Object> params = new HashMap<>();
+        params.put("line.id_eq", lineId);
+        params.put("versions_eq", versions);
+        params.put("directions_eq", directions);
+        params.put("destroy_eq", 0);
+        List<LsSectionRoute> sectionRoutes = lsSectionRouteRepository.findAll(
+                new CustomerSpecs<>(params),
+                Sort.by(Sort.Direction.ASC, "sectionrouteCode")
+        );
+
+        // 第一步：找到起点和终点所在的路段及索引
+        LsSectionRoute startSection = null;
+        LsSectionRoute endSection = null;
+        int startIndex = -1;
+        int endIndex = -1;
+        double minStartDistance = Double.MAX_VALUE;
+        double minEndDistance = Double.MAX_VALUE;
+
+        for (int i = 0; i < sectionRoutes.size(); i++) {
+            LsSectionRoute sectionRoute = sectionRoutes.get(i);
+            Section section = sectionRoute.getSection();
+            if (section == null || section.getGsectionVector() == null) {
+                continue;
+            }
+            LineString lineString = section.getGsectionVector();
+
+            // 计算起点到当前路段的最小距离
+            double startDist = calcMinDistanceToLine(lineString, startGeoPoint);
+            if (startDist < minStartDistance) {
+                minStartDistance = startDist;
+                startSection = sectionRoute;
+                startIndex = i;
+            }
+
+            // 计算终点到当前路段的最小距离
+            double endDist = calcMinDistanceToLine(lineString, endGeoPoint);
+            if (endDist < minEndDistance) {
+                minEndDistance = endDist;
+                endSection = sectionRoute;
+                endIndex = i;
+            }
+        }
+
+        if (startSection == null || endSection == null) {
+            log.warn("未能找到起点或终点所在的路段，起点ID：{}，终点ID：{}",
+                     stationRoute.getId(), endStationRoute.getId());
+            return;
+        }
+
+        // 第二步：确定中间经过的路段（排除起点和终点路段）
+        List<LsSectionRoute> passingSections = new ArrayList<>();
+        if (startIndex >= 0 && endIndex >= 0) {
+            int low = Math.min(startIndex, endIndex);
+            int high = Math.max(startIndex, endIndex);
+            // 只添加严格介于两者之间的路段
+            for (int i = low + 1; i < high; i++) {
+                passingSections.add(sectionRoutes.get(i));
+            }
+        }
+
+        // 检查路段数（超过15视为异常）
+        if (passingSections.size() > 13) {
+            log.error("绕改道路径过长，起点路段：{}，终点路段：{}，中间路段数：{}",
+                      startSection.getId(), endSection.getId(), passingSections.size());
+            throw new RuntimeException("过长的绕改道路径（超过13个中间路段）");
+        }
+
+        // 构建绕改道路径
+        Detour detour = new Detour();
+        detour.setLine(lineId);
+        detour.setVersions(versions);
+        detour.setDirection(directions);
+        detour.setStartStationCode(stationRoute.getStationCode());
+        detour.setTerminalStationCode(endStationRoute.getStationCode());
+
+        String points = buildPoints(startPoint, passingSections, endPoint);
+        try {
+            detour.setPoints(points);
+            detourRepository.save(detour);
+            log.info("绕改道路径保存成功，线路：{}，版本：{}，方向：{}", lineId, versions, directions);
+        } catch (Exception e) {
+            log.error("保存绕改道失败，points：{}", points, e);
+            throw new RuntimeException("保存绕改道路径失败", e);
+        }
+    }
+
+    /**
+     * 将org.geolatte.geom.Point转换为内部Geo.Point
+     */
+    private com.bsth.util.Geo.Point toGeoPoint(org.geolatte.geom.Point point) {
+        return new com.bsth.util.Geo.Point(
+                point.getPosition().getCoordinate(0),
+                point.getPosition().getCoordinate(1)
+        );
+    }
+
+    /**
+     * 将org.geolatte.geom.Position转换为内部Geo.Point
+     */
+    private com.bsth.util.Geo.Point toGeoPoint(org.geolatte.geom.Position position) {
+        return new com.bsth.util.Geo.Point(
+                position.getCoordinate(0),
+                position.getCoordinate(1)
+        );
+    }
+
+    /**
+     * 计算点到LineString的最小距离（遍历每个线段）
+     * 注意：使用getPositionN获取位置，LineString无getPointN方法
+     */
+    private double calcMinDistanceToLine(LineString lineString,
+                                          com.bsth.util.Geo.Point geoPoint) {
+        double minDist = Double.MAX_VALUE;
+        int numPoints = lineString.getNumPositions(); // 获取点数
+        for (int i = 0; i < numPoints - 1; i++) {
+            org.geolatte.geom.Position p1 = lineString.getPositionN(i);
+            org.geolatte.geom.Position p2 = lineString.getPositionN(i + 1);
+            com.bsth.util.Geo.Point geoP1 = toGeoPoint(p1);
+            com.bsth.util.Geo.Point geoP2 = toGeoPoint(p2);
+            double dist = GeoUtils.getDistanceFromLine(geoP1, geoP2, geoPoint);
+            minDist = Math.min(minDist, dist);
+        }
+        return minDist;
+    }
+
+    /**
+     * 构建坐标点 包含起点、中间路段中点、终点
+     */
+    private String buildPoints(org.geolatte.geom.Point startPoint,
+                                       List<LsSectionRoute> passingSections,
+                                       org.geolatte.geom.Point endPoint) {
+        StringBuilder wktBuilder = new StringBuilder();
+        // 添加起点
+        wktBuilder.append(startPoint.getPosition().getCoordinate(0))
+                  .append(" ")
+                  .append(startPoint.getPosition().getCoordinate(1));
+
+        // 添加中间路段的中点
+        for (LsSectionRoute sectionRoute : passingSections) {
+            Section section = sectionRoute.getSection();
+            if (section != null && section.getGsectionVector() != null) {
+                LineString lineString = section.getGsectionVector();
+                int numPoints = lineString.getNumPositions();
+                int midIndex = numPoints / 2; // 取中间索引点
+                org.geolatte.geom.Position midPos = lineString.getPositionN(midIndex);
+                wktBuilder.append(",")
+                          .append(midPos.getCoordinate(0))
+                          .append(" ")
+                          .append(midPos.getCoordinate(1));
+            }
+        }
+
+        // 添加终点
+        wktBuilder.append(",")
+                  .append(endPoint.getPosition().getCoordinate(0))
+                  .append(" ")
+                  .append(endPoint.getPosition().getCoordinate(1));
+        return wktBuilder.toString();
+    }
+
     @Transactional
     @Override
     public Map<String, Object> exchangeDirection(int lineId, int version) {
@@ -509,8 +509,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				clientUtils.uploadFile(url, port, username, password, remotePath + "/voice/", textFileName, input);
 				String linePath = String.format(linePathPattern, lineId), voicePath = String.format("%s%s.zip", linePath, lineId);
 				// 报站文件上传(全程)
-				clientUtils.deleteFtpFile(url, port, username, password, remotePath + "/voice/", String.format("%s.zip", line.getLineCode()));
-				clientUtils.FTPUpLoadFromDisk(new File(voicePath), String.format("%s.zip", line.getLineCode()), url, port, username, password, remotePath + "/voice/");
+//				clientUtils.deleteFtpFile(url, port, username, password, remotePath + "/voice/", String.format("%s.zip", line.getLineCode()));
+//				clientUtils.FTPUpLoadFromDisk(new File(voicePath), String.format("%s.zip", line.getLineCode()), url, port, username, password, remotePath + "/voice/");
 				// 线路区间
 				if (lineRegions.size() > 0) {
@@ -1305,7 +1305,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		// 子线路路径
 		String linePath = String.format(linePathPattern, lineId);
 		String subLinePath = String.format("%s%s/", linePath, subLineId);
-		List<String> arr = Arrays.asList(commonPath + "cn_origin_1.mp3", linePath + String.format("cn/%03d.mp3", 0), commonPath + "cn_origin_2.mp3", linePath + String.format("cn/%03d.mp3", terminal.getStationLevel()), commonPath + "sh_origin_1.mp3", linePath + String.format("sh/%03d.mp3", 0), commonPath + "sh_origin_2.mp3", linePath + String.format("cn/%03d.mp3", terminal.getStationLevel()), commonPath + "cn_start_1.mp3", linePath + String.format("cn/%03d.mp3", current.getStationLevel()), commonPath + "cn_start_2.mp3", commonPath + "sh_start_1.mp3", linePath + String.format("sh/%03d.mp3", current.getStationLevel()), commonPath + "sh_start_2.mp3", commonPath + "en_1.mp3", linePath + String.format("en/%03d.mp3", current.getStationLevel()), commonPath + "cn_start_3.mp3", commonPath + "sh_start_3.mp3");
+		List<String> arr = Arrays.asList(commonPath + "cn_origin_1.mp3", linePath + String.format("cn/%03d.mp3", 0), commonPath + "cn_origin_2.mp3", linePath + String.format("cn/%03d.mp3", terminal.getStationLevel()), commonPath + "sh_origin_1.mp3", linePath + String.format("sh/%03d.mp3", 0), commonPath + "sh_origin_2.mp3", linePath + String.format("sh/%03d.mp3", terminal.getStationLevel()), commonPath + "cn_start_1.mp3", linePath + String.format("cn/%03d.mp3", current.getStationLevel()), commonPath + "cn_start_2.mp3", commonPath + "sh_start_1.mp3", linePath + String.format("sh/%03d.mp3", current.getStationLevel()), commonPath + "sh_start_2.mp3", commonPath + "en_1.mp3", linePath + String.format("en/%03d.mp3", current.getStationLevel()), commonPath + "cn_start_3.mp3", commonPath + "sh_start_3.mp3");
 		List<String> inputPaths = new ArrayList<>();
 		for (String path : arr) {
 			for (String lang : languages) {
 package com.bsth.service.impl;
 import com.bsth.data.BasicData;
+import com.bsth.data.SystemParamCache;
 import com.bsth.email.SendEmailController;
 import com.bsth.email.entity.EmailBean;
 import com.bsth.entity.*;
@@ -23,9 +24,9 @@ import com.bsth.util.CoordinateConverter;
 import com.bsth.util.IpUtils;
 import com.bsth.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
-import com.bsth.webService.trafficManage.org.tempuri.Results;
-import com.bsth.webService.trafficManage.org.tempuri.WebServiceLocator;
-import com.bsth.webService.trafficManage.org.tempuri.WebServiceSoap;
+import com.bsth.webService.trafficManage.up.org.tempuri.Results;
+import com.bsth.webService.trafficManage.up.org.tempuri.WebServiceLocator;
+import com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
@@ -33,6 +34,7 @@ import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -135,11 +137,31 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	private LineVersionsRepository lineVersionsRepository;
 	// 运管处上传接口
-	private com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap webServiceSoapUp;
-	private WebServiceSoap ssop ;
+	private WebServiceSoap ssop,ssop1;
+	private WebServiceSoap ssopBak,ssopBak1;
 	{
 		try {
-			ssop = new WebServiceLocator().getWebServiceSoap();
+			WebServiceLocator locator = new WebServiceLocator();
+			String url = SystemParamCache.getDrSysCityInterfaceUrl();
+			if (StringUtils.isNotEmpty(url)) {
+				locator.setWebServiceSoapEndpointAddress(url);
+				ssop = locator.getWebServiceSoap();
+			}
+			url = SystemParamCache.getDrSysCityInterfaceUrl1();
+			if (StringUtils.isNotEmpty(url)) {
+				locator.setWebServiceSoapEndpointAddress(url);
+				ssop1 = locator.getWebServiceSoap();
+			}
+			url = SystemParamCache.getDrSysCityInterfaceBakUrl();
+			if (StringUtils.isNotEmpty(url)) {
+				locator.setWebServiceSoapEndpointAddress(url);
+				ssopBak = locator.getWebServiceSoap();
+			}
+			url = SystemParamCache.getDrSysCityInterfaceBakUrl1();
+			if (StringUtils.isNotEmpty(url)) {
+				locator.setWebServiceSoapEndpointAddress(url);
+				ssopBak1 = locator.getWebServiceSoap();
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -153,31 +175,20 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	// 数字格式化
 	DecimalFormat format = new DecimalFormat("0.00");
-	// 用户名
-	private final String userNameOther = "user";
-	// 密码
-	private final String passwordOther = "user";
+	private final String userNameOther = SystemParamCache.getDrSysCityInterfaceUser();
+
+	private final String passwordOther = SystemParamCache.getDrSysCityInterfacePassword();
+
+	private final String userNameUp = SystemParamCache.getDrSysCityInterfaceBakUser();
+
+	private final String passwordUp = SystemParamCache.getDrSysCityInterfaceBakPassword();
-	// 用户名
-	private final String userNameUp = "user";
-	// 密码
-	private final String passwordUp = "user";
 	// 接收邮件人
-	private final String emailSendToAddress = "113252620@qq.com";
+	private String[] emails = SystemParamCache.getMailWaybill().split(",");
+
 	// 记录路单上线的成功、失败线路数
 	private Integer countSuccess,countFailure;
-	private synchronized com.bsth.webService.trafficManage.up.org.tempuri.WebServiceSoap  getWebServiceSoapUp(){
-		try {
-			if(webServiceSoapUp == null){
-				webServiceSoapUp = new com.bsth.webService.trafficManage.up.org.tempuri.WebServiceLocator().getWebServiceSoap();
-			}
-		}catch (Exception e){
-			e.printStackTrace();
-		}finally {
-			return webServiceSoapUp;
-		}
-	}
 	/**
 	 * 上传线路信息
 	 */
@@ -218,13 +229,18 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				}
 				String state;// 是否上传成功
 				// 调用上传方法
-				if(getWebServiceSoapUp().setXL(userNameUp,passwordUp,xml).isSuccess()){
+				if(ssop1.setXL(userNameOther,passwordOther,xml).isSuccess()){
 					result = "success";
 					state = "1";
 				}else{
 					result = "failure";
 					state = "0";
 				}
+				if (ssopBak1.setXL(userNameOther,passwordOther,xml).isSuccess()) {
+					result += ",success";
+				} else {
+					result += ",failure";
+				}
 				logger.info("setXL:"+xml);
 				logger.info("setXL:"+result);
 				// 保存运管处上传记录
@@ -319,6 +335,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			if(ssop.setCL(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
 				result = "success";
 			}
+			if (ssopBak != null && ssopBak.setCL(userNameOther, passwordOther, sBuffer.toString()).isSuccess()) {
+				result += ",success";
+			}
 		} catch (Exception e) {
 			logger.error("setCL:",e);
 			e.printStackTrace();
@@ -356,7 +375,10 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			sBuffer.append("</SJs>");
 			if(ssop.setSJ(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
 				result = "success";
-			};
+			}
+			if (ssopBak != null && ssopBak.setSJ(userNameOther, passwordOther, sBuffer.toString()).isSuccess()) {
+				result += ",success";
+			}
 		} catch (Exception e) {
 			logger.error("setSJ:",e);
 			e.printStackTrace();
@@ -395,6 +417,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		String str = "", xlbm = null, oldXlbm = null;
 		List<Map<String,Object>> listGroup = null;
 		int scount = 0, ccount = 0;
+		int scount1 = 0, ccount1 = 0;
 		long start = System.currentTimeMillis();
 		try {
 			// 计数器
@@ -436,6 +459,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					Line line = code2line.get(lineCode);
 					if(line == null || line.getInUse() == null || line.getInUse() == 0){
 						ccount++;
+						ccount1++;
 						continue;
 					}
 					if(counter % per == 0){
@@ -512,7 +536,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sf.append("</DLDS>");
 					// 去掉'号
 					str = sf.toString().replace("'","");
-					scount += invokeSetLD(str, counter);
+					scount += invokeSetLD(ssop, str, counter, "master");
+					scount1 += invokeSetLD(ssopBak, str, counter, "slave");
 					counter = 0;
 				}
 			}
@@ -521,18 +546,23 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				sf.append("</DLDS>");
 				// 去掉'号
 				str = sf.toString().replace("'","");
-				scount += invokeSetLD(str, counter);
+				scount += invokeSetLD(ssop, str, counter, "master");
+				if (ssopBak != null) {
+					scount1 += invokeSetLD(ssopBak, str, counter, "slave");
+				}
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("setLD:", e);
 		} finally {
 			try {
-				//发送邮件
-				EmailBean mail = new EmailBean();
-				mail.setSubject(IpUtils.getLocalIpAddress() +":路单日志数据"+date);
-				mail.setContent("总数：" + (listGroup == null ? 0 : listGroup.size()) + "<br/>成功数：" + scount + "<br/>跳过数：" + ccount + "<br/>耗时：" + (System.currentTimeMillis() - start));
-				sendEmailController.sendMail(emailSendToAddress, mail);
+				for (String email : emails) {
+					//发送邮件
+					EmailBean mail = new EmailBean();
+					mail.setSubject(IpUtils.getLocalIpAddress() +":路单日志数据"+date);
+					mail.setContent("总数：" + (listGroup == null ? 0 : listGroup.size()) + "<br/>成功数：" + scount + "," + scount1 + "<br/>跳过数：" + ccount + "," + ccount1 + "<br/>耗时：" + (System.currentTimeMillis() - start));
+					sendEmailController.sendMail(email, mail);
+				}
 				logger.info("setLD-sendMail:邮件发送成功！");
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -548,21 +578,21 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 * @param counter 分组数
 	 * @return 成功返回counter 失败返回0
 	 */
-	private int invokeSetLD(String xml, int counter) {
+	private int invokeSetLD(WebServiceSoap ssop, String xml, int counter, String flag) {
 		for (int i = 0;i < 10;i++) {
 			try {
 				Results results = ssop.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(xml));
 				if (results.isSuccess()) {
-					logger.info("setLD: " + xml);
+					logger.info("{} setLD: {}", flag, xml);
 					logger.info("setLD: 成功");
 					return counter;
 				} else if (i == 9) {
-					logger.error("setLD: " + xml);
+					logger.error("{} setLD: {}", flag, xml);
 					logger.error("setLD: 失败，" + results.getMessage());
 				}
 				Thread.sleep(2000);
 			} catch (Exception e) {
-				logger.error("运管处接口调用异常", e);
+				logger.error("{} 运管处接口调用异常", flag, e);
 				try {
 					Thread.sleep(2000);
 				} catch (InterruptedException ex) {
@@ -586,6 +616,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			if(rss.isSuccess()){
 				result = "success";
 			}
+			if (ssopBak != null && ssopBak.setLD(userNameOther, passwordOther, StringEscapeUtils.unescapeHtml(tmp)).isSuccess()) {
+				result += ",success";
+			}
 		} catch (Exception e) {
 			logger.error("setLD:",e);
 			e.printStackTrace();
@@ -688,6 +721,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			if(ssop.setLCYH(userNameOther, passwordOther, sf.toString()).isSuccess()){
 				result = "success";
 			}
+			if (ssopBak != null && ssopBak.setLCYH(userNameOther, passwordOther, sf.toString()).isSuccess()) {
+				result += ",success";
+			}
 		} catch (Exception e) {
 			logger.error("setLCYH:",e);
 			e.printStackTrace();
@@ -792,6 +828,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			if(ssop.setDDRB(userNameOther, passwordOther, sf.toString()).isSuccess()){
 				result = "success";
 			}
+			if (ssopBak != null && ssopBak.setDDRB(userNameOther, passwordOther, sf.toString()).isSuccess()) {
+				result += ",success";
+			}
 		} catch (Exception e) {
 			logger.error("setDDRB:",e);
 			e.printStackTrace();
@@ -910,6 +949,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			if(ssop.setJHBC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
 				result = "success";
 			}
+			if (ssopBak != null && ssopBak.setJHBC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()) {
+				result += ",success";
+			}
 		} catch (Exception e) {
 			logger.error("setJHBC:",e);
 			e.printStackTrace();
@@ -1103,14 +1145,20 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				result = "上传失败";
 				state = "0";
 			}
+			if (ssopBak != null) {
+				if (ssopBak.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()) {
+					result += ",上传成功";
+				} else {
+					result += ",上传失败";
+				}
+			}
+			logger.info("xml:" + sBuffer.toString());
+			logger.info("上传结果:" + result);
 			// 保存运管处上传记录
 			saveYgcUploadLog(ttinfoList,sBuffer.toString(),TrafficManageServiceImpl.UPLOAD_TYPE_SKB,state);
 		} catch (Exception e) {
 			logger.error("setSKB:", e);
 			e.printStackTrace();
-		}finally{
-			logger.info("setSKB:"+sBuffer.toString());
-			logger.info("setSKB:"+result);
 		}
 		return result;
 	}
@@ -1191,6 +1239,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			}
 		}
 	}
+
 	/**
 	 * 上传线路人员车辆配置信息
 	 */
@@ -1243,6 +1292,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			if(ssop.setXLPC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
 				result = "success";
 			}
+			if (ssopBak != null && ssopBak.setXLPC(userNameOther, passwordOther, sBuffer.toString()).isSuccess()) {
+				result += ",success";
+			}
 		} catch (Exception e) {
 			logger.error("setXLPC:",e);
 			e.printStackTrace();
@@ -1303,6 +1355,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			if(ssop.setCS(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
 				result = "success";
 			}
+			if (ssopBak != null && ssopBak.setCS(userNameOther, passwordOther, sBuffer.toString()).isSuccess()) {
+				result += ",success";
+			}
 		} catch (Exception e) {
 			logger.error("setCS:",e);
 			e.printStackTrace();
@@ -311,7 +311,7 @@ $(&#39;#add_stationroute_step2_modal&#39;).on(&#39;modal.show&#39;, function(event){
 			params.bufferPolygonWkt = params.bufferPolygonWkt ? 'POLYGON((' + params.bufferPolygonWkt + '))' : '';
 			params.shapedType = params.shapedType == '圆形' ? 'r' : 'd';
 			if (params.stationRouteCode == '请选择...' && params.stationMark == 'B') {
-				params.stationRouteCode = '100';
+				params.stationRouteCode = 1;
 			} else {
 				params.stationRouteCode = parseInt(params.stationRouteCode) + 1;
 			}
@@ -201,7 +201,7 @@ $(&#39;#add_station_template_modal&#39;).on(&#39;modal.show&#39;, function(event) {
 	}
 	function formatRoutes(params) {
-		var stationRoutes = [], sectionRoutes = [], sectionRouteCode = 100;
+		var stationRoutes = [], sectionRoutes = [], sectionRouteCode = 1;
 		params.stationJSON.forEach(function(item) {
 			stationRoutes.push({stationName: item.name, shapedType: 'r', radius: 80, destroy: 0, distances: 0, toTime: 0, station: {stationName: item.name, centerPointWkt: 'POINT(' + item.potion.lng + ' ' + item.potion.lat + ')'}});
 		})
@@ -138,7 +138,7 @@ $(&#39;#edit_sectionroute_modal&#39;).on(&#39;modal.show&#39;, function(e, polyline){
             params.sectionTime = 0;
 			if(params.sectionrouteCode == '请选择...') {
-				params.sectionrouteCode = 100;
+				params.sectionrouteCode = 1;
 			} else {
 				params.sectionrouteCode = parseInt(params.sectionrouteCode) + 1;
 			}
@@ -174,6 +174,18 @@
 							</div>
 						</div>
 					</div>
+					<!-- 绕改道 -->
+					<div class="form-body">
+						<div class="form-group">
+							<label class="control-label col-md-3">
+								绕改道&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+							</label>
+							<div class="col-md-6">
+								<select name="detourStationRoute" class="form-control" id="detourStationRouteSelect" style="width:100%"></select>
+								<span class="help-block"> *说明:绕改道指当前站点至指定站点中间发生了临时走向调整(站点不调整)，超过15个路段需要分开配置。 </span>
+							</div>
+						</div>
+					</div>
 				</form>
 			</div>
 			<div class="modal-footer">
@@ -257,7 +269,7 @@ $(&#39;#edit_stationroute_step2_modal&#39;).on(&#39;modal.show&#39;, function(event){
 			else if(params.shapedType=='多边形')
 				params.shapedType='d';
 			if(params.stationRouteCode == '' || params.stationMark === 'B')
-				params.stationRouteCode = 100;
+				params.stationRouteCode = 1;
 			if (params.stationMark !== 'B') {
 				params.stationRouteCode = parseInt(stationRouteCode.split('-')[0]) + 1;
 			}
@@ -295,14 +307,20 @@ $(&#39;#edit_stationroute_step2_modal&#39;).on(&#39;modal.show&#39;, function(event){
 		var obj = {'id':'-1','text':'请选择...'};
 		RoutesService.getzdlyInfo(p, function(array) {
+			debugger
 			// 定义路段路由长度、渲染拼音检索下拉框格式数据.
-			var len_ = array.length, paramsD = new Array();
+			var len_ = array.length, paramsD = new Array(), stationRoutes = new Array();
+			const choose = {'id':'-1','text':'请选择...'};
 			if(len_>0) {
-				paramsD.push({'id':'-1','text':'请选择...'});
+				paramsD.push(choose);
+				stationRoutes.push(choose)
 				// 遍历.
 				$.each(array, function(i, g){
 					if(g.stationName) {
 						if (g.stationRouteCode != editStationRoute.stationRouteCode) {
+							if (stationRoutes.length == 1 && g.stationRouteCode > editStationRoute.stationRouteCode) {
+								stationRoutes.push({'id': g.id, 'text': g.stationName + '(' + g.stationRouteCode + ')'});
+							}
 							if (editStationRoute.stationMark == 'E' && i == (len_ - 2)){
 								obj = {'id':g.stationRouteCode + '_' + 'E' + '_' + g.directions, 'text':g.stationName + ' (' + g.stationRouteCode + ')' + '  --' + RoutesOperation.dirdmToName(g.directions)};
 								paramsD.push(obj);
@@ -316,12 +334,15 @@ $(&#39;#edit_stationroute_step2_modal&#39;).on(&#39;modal.show&#39;, function(event){
 					}
 				});
 				$('#stationrouteSelect').empty();
+				$('#detourStationRouteSelect').empty();
 				// 初始化上一个路段拼音检索下拉框.
 				initPinYinSelect2($('#stationrouteSelect'),paramsD,function(selector) {
-					$('#stationrouteSelect').val(prevObj.id).select2();
+					$('#stationrouteSelect').val(prevObj.id).trigger('change');
 					$('#stationMarkSelect').val(editStationRoute.stationMark);
 				});
-				
+				initPinYinSelect2($('#detourStationRouteSelect'), stationRoutes, function(selector) {
+					$('#detourStationRouteSelect').val(editStationRoute.detourStationRoute).trigger('change');
+				});
 			}
 		});
 	}
@@ -144,7 +144,7 @@ $(&#39;#edit_section_modal&#39;).on(&#39;modal.show&#39;, function(e, currentSection){
             params.sectionTime = 0;
 			error.hide();
 			if(params.sectionrouteCode == '请选择...') {
-				params.sectionrouteCode = 100;
+				params.sectionrouteCode = 1;
 			} else {
 				params.sectionrouteCode = parseInt(params.sectionrouteCode) + 1;
 			}
@@ -1325,7 +1325,7 @@ var RoutesOperation = (function () {
                         sectionRoute['line.id'] = lineId;
                         sectionRoute.sectionCode = sectionCode;
                         sectionRoute.roadCoding = '';
-                        sectionRoute.sectionrouteCode = 100;
+                        sectionRoute.sectionrouteCode = 1;
                         sectionRoute.sectionTime = 0;
                         sectionRoute.sectionDistance = 0;
                         sectionRoute.speedLimit = 60;
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>运能运力一盘棋</title>
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script src="//api.map.baidu.com/api?v=2.0&ak=1TgEKvYqohJyeGXnN6yHSSTb4psOarQw"></script>
+    <style>
+        .BMap_cpyCtrl {
+            display: none;
+        }
+        
+        .anchorBL {
+            display: none;
+        }
+        
+        ::-webkit-scrollbar {
+            width: 6px;
+            height: 6px;
+        }
+        
+        ::-webkit-scrollbar-track {
+            background: #f1f1f1;
+            border-radius: 3px;
+        }
+        
+        ::-webkit-scrollbar-thumb {
+            background: #c1c1c1;
+            border-radius: 3px;
+        }
+        
+        ::-webkit-scrollbar-thumb:hover {
+            background: #a8a8a8;
+        }
+        
+        * {
+            -ms-overflow-style: -ms-autohiding-scrollbar;
+            scrollbar-width: thin;
+            scrollbar-color: #c1c1c1 #f1f1f1;
+        }
+        
+        .condition-panel {
+            max-height: 0;
+            overflow: hidden;
+            transition: max-height 0.3s ease-out;
+        }
+        
+        .condition-panel.open {
+            max-height: 500px;
+        }
+        
+        .search-tag {
+            display: inline-flex;
+            align-items: center;
+            gap: 4px;
+            padding: 2px 8px;
+            background: #1e6bb8;
+            color: white;
+            border-radius: 4px;
+            font-size: 12px;
+            margin: 2px;
+        }
+        
+        .search-tag .remove-tag {
+            cursor: pointer;
+            font-size: 14px;
+            line-height: 1;
+        }
+        
+        .search-tag .remove-tag:hover {
+            opacity: 0.8;
+        }
+        
+        .line-search-dropdown {
+            position: absolute;
+            top: 100%;
+            left: 0;
+            right: 0;
+            background: white;
+            border: 1px solid #ddd;
+            border-radius: 4px;
+            max-height: 150px;
+            overflow-y: auto;
+            z-index: 100;
+            display: none;
+        }
+        
+        .line-search-dropdown.show {
+            display: block;
+        }
+        
+        .line-option {
+            padding: 8px 12px;
+            cursor: pointer;
+            font-size: 13px;
+            display: flex;
+            align-items: center;
+        }
+        
+        .line-option:hover {
+            background: #f0f7ff;
+        }
+        
+        .location-marker {
+            cursor: crosshair;
+        }
+    </style>
+</head>
+<body class="m-0 p-0 box-border w-full h-full overflow-hidden font-['Microsoft_YaHei',Arial,sans-serif]">
+    <div id="map" class="w-full h-full absolute top-0 left-0 z-10"></div>
+    
+    <div class="absolute top-0 left-0 right-0 h-[50px] bg-[rgba(30,107,184,0.9)] text-white flex items-center justify-center text-[18px] font-bold z-[100] shadow-[0_2px_4px_rgba(0,0,0,0.1)]">
+        运能运力一盘棋
+    </div>
+    
+    <div class="absolute top-[60px] left-[20px] w-[400px] h-[30vh] bg-[rgba(255,255,255,0.95)] rounded-lg shadow-[0_2px_10px_rgba(0,0,0,0.15)] overflow-hidden z-[60]">
+        <div class="px-[15px] py-3 bg-[rgba(233,245,255,0.95)] border-b border-[#ddd] text-[14px] font-bold text-[#1e6bb8] text-center">
+            车辆运营概览
+        </div>
+        <div class="p-4 grid grid-cols-2 gap-5">
+            <div class="flex items-start">
+                <div class="relative w-[60px] h-[60px] flex flex-col items-center">
+                    <div class="w-[50px] h-[50px] bg-[#1e6bb8] rounded-full opacity-80 flex items-center justify-center">
+                        <div class="w-[30px] h-[30px] bg-white rounded-full flex items-center justify-center shadow-[0_2px_4px_rgba(0,0,0,0.1)]" style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 24 24%22 fill=%22%231e6bb8%22%3E%3Cpath d=%22M18.92 6.01C18.72 5.42 18.16 5 17.5 5H6.5c-.66 0-1.21.42-1.42 1.01L3 12v8c0 .55.45 1 1 1h1c.55 0 1-.45 1-1v-1h12v1c0 .55.45 1 1 1h1c.55 0 1-.45 1-1v-8l-2.08-5.99zM6.5 16c-.83 0-1.5-.67-1.5-1.5S5.67 13 6.5 13s1.5.67 1.5 1.5S7.33 16 6.5 16zm11 0c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zM5 11l1.5-4.5h11L19 11H5z%22/%3E%3C/svg%3E'); background-size: 60%; background-position: center; background-repeat: no-repeat;"></div>
+                    </div>
+                </div>
+                <div class="flex flex-col ml-[15px]">
+                    <div class="text-[12px] text-[#666] mb-1 whitespace-nowrap">总车辆数</div>
+                    <div class="text-[18px] font-bold text-[#1e6bb8]">500<span class="text-[12px] text-[#999] font-normal">辆</span></div>
+                </div>
+            </div>
+            <div class="flex items-start">
+                <div class="relative w-[60px] h-[60px] flex flex-col items-center">
+                    <div class="w-[50px] h-[50px] bg-[#1e6bb8] rounded-full opacity-80 flex items-center justify-center">
+                        <div class="w-[30px] h-[30px] bg-white rounded-full flex items-center justify-center shadow-[0_2px_4px_rgba(0,0,0,0.1)]" style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 24 24%22 fill=%22%231e6bb8%22%3E%3Cpath d=%22M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-1 17.93c-3.95-.49-7-3.85-7-7.93 0-.62.08-1.21.21-1.79L9 15v1c0 1.1.9 2 2 2v1.93zm6.9-2.54c-.26-.81-1-1.39-1.9-1.39h-1v-3c0-.55-.45-1-1-1H8v-2h2c.55 0 1-.45 1-1V7h2c1.1 0 2-.9 2-2v-.41c2.93 1.19 5 4.06 5 7.41 0 2.08-.8 3.97-2.1 5.39z%22/%3E%3C/svg%3E'); background-size: 60%; background-position: center; background-repeat: no-repeat;"></div>
+                    </div>
+                </div>
+                <div class="flex flex-col ml-[15px]">
+                    <div class="text-[12px] text-[#666] mb-1 whitespace-nowrap">当前运营车辆</div>
+                    <div class="text-[18px] font-bold text-[#1e6bb8]">200<span class="text-[12px] text-[#999] font-normal">辆</span></div>
+                </div>
+            </div>
+            <div class="flex items-start">
+                <div class="relative w-[60px] h-[60px] flex flex-col items-center">
+                    <div class="w-[50px] h-[50px] bg-[#1e6bb8] rounded-full opacity-80 flex items-center justify-center">
+                        <div class="w-[30px] h-[30px] bg-white rounded-full flex items-center justify-center shadow-[0_2px_4px_rgba(0,0,0,0.1)]" style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 24 24%22 fill=%22%231e6bb8%22%3E%3Cpath d=%22M19 3h-1V1h-2v2H8V1H6v2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7z%22/%3E%3C/svg%3E'); background-size: 60%; background-position: center; background-repeat: no-repeat;"></div>
+                    </div>
+                </div>
+                <div class="flex flex-col ml-[15px]">
+                    <div class="text-[12px] text-[#666] mb-1 whitespace-nowrap">今日计划出车</div>
+                    <div class="text-[18px] font-bold text-[#1e6bb8]">300<span class="text-[12px] text-[#999] font-normal">辆</span></div>
+                </div>
+            </div>
+            <div class="flex items-start">
+                <div class="relative w-[60px] h-[60px] flex flex-col items-center">
+                    <div class="w-[50px] h-[50px] bg-[#1e6bb8] rounded-full opacity-80 flex items-center justify-center">
+                        <div class="w-[30px] h-[30px] bg-white rounded-full flex items-center justify-center shadow-[0_2px_4px_rgba(0,0,0,0.1)]" style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 24 24%22 fill=%22%231e6bb8%22%3E%3Cpath d=%22M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z%22/%3E%3C/svg%3E'); background-size: 60%; background-position: center; background-repeat: no-repeat;"></div>
+                    </div>
+                </div>
+                <div class="flex flex-col ml-[15px]">
+                    <div class="text-[12px] text-[#666] mb-1 whitespace-nowrap">今日已出车</div>
+                    <div class="text-[18px] font-bold text-[#1e6bb8]">210<span class="text-[12px] text-[#999] font-normal">辆</span></div>
+                </div>
+            </div>
+            <div class="flex items-start">
+                <div class="relative w-[60px] h-[60px] flex flex-col items-center">
+                    <div class="w-[50px] h-[50px] bg-[#1e6bb8] rounded-full opacity-80 flex items-center justify-center">
+                        <div class="w-[30px] h-[30px] bg-white rounded-full flex items-center justify-center shadow-[0_2px_4px_rgba(0,0,0,0.1)]" style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 24 24%22 fill=%22%231e6bb8%22%3E%3Cpath d=%22M19.79 13.42c-.26-.81-1-1.39-1.9-1.39h-1v-3c0-.55-.45-1-1-1H8v-2h2c.55 0 1-.45 1-1V7h2c1.1 0 2-.9 2-2v-.41c2.93 1.19 5 4.06 5 7.41 0 2.08-.8 3.97-2.1 5.39l-1.43-1.43c.64-.66.99-1.53.99-2.54 0-.55-.1-1.07-.29-1.56zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-1 17.93c-3.95-.49-7-3.85-7-7.93 0-.62.08-1.21.21-1.79L9 15v1c0 1.1.9 2 2 2v1.93z%22/%3E%3C/svg%3E'); background-size: 60%; background-position: center; background-repeat: no-repeat;"></div>
+                    </div>
+                </div>
+                <div class="flex flex-col ml-[15px]">
+                    <div class="text-[12px] text-[#666] mb-1 whitespace-nowrap">当前维保车辆</div>
+                    <div class="text-[18px] font-bold text-[#1e6bb8]">5<span class="text-[12px] text-[#999] font-normal">辆</span></div>
+                </div>
+            </div>
+            <div class="flex items-start">
+                <div class="relative w-[60px] h-[60px] flex flex-col items-center">
+                    <div class="w-[50px] h-[50px] bg-[#1e6bb8] rounded-full opacity-80 flex items-center justify-center">
+                        <div class="w-[30px] h-[30px] bg-white rounded-full flex items-center justify-center shadow-[0_2px_4px_rgba(0,0,0,0.1)]" style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 24 24%22 fill=%22%231e6bb8%22%3E%3Cpath d=%22M19.43 12.98c.04-.3.07-.61.07-.98 0-.37-.03-.74-.07-1.1l2.03-1.58c.18-.14.23-.41.12-.61l-1.92-3.32c-.12-.22-.37-.29-.59-.22l-2.39.96c-.5-.38-1.03-.7-1.62-.94l-.36-2.54c-.04-.24-.24-.41-.48-.41h-3.84c-.24 0-.43.17-.47.41l-.36 2.54c-.59.24-1.13.57-1.62.94l-2.39-.96c-.22-.08-.47 0-.59.22L2.74 8.87c-.12.21-.08.47.12.61l2.03 1.58c-.04.36-.07.73-.07 1.1 0 .37.03.74.07 1.1l-2.03 1.58c-.18.14-.23.41-.12.61l1.92 3.32c.12.22.37.29.59.22l2.39-.96c.5.38 1.03.7 1.62.94l.36 2.54c.05.24.24.41.48.41h3.84c.24 0 .44-.17.47-.41l.36-2.54c.59-.24 1.13-.56 1.62-.94l2.39.96c.22.08.47 0 .59-.22l1.92-3.32c.12-.22.07-.47-.12-.61l-2.01-1.58zM12 15.6c-1.98 0-3.6-1.62-3.6-3.6s1.62-3.6 3.6-3.6 3.6 1.62 3.6 3.6-1.62 3.6-3.6 3.6z%22/%3E%3C/svg%3E'); background-size: 60%; background-position: center; background-repeat: no-repeat;"></div>
+                    </div>
+                </div>
+                <div class="flex flex-col ml-[15px]">
+                    <div class="text-[12px] text-[#666] mb-1 whitespace-nowrap">当前空驶率</div>
+                    <div class="text-[18px] font-bold text-[#1e6bb8]">15<span class="text-[12px] text-[#999] font-normal">%</span></div>
+                </div>
+            </div>
+        </div>
+    </div>
+    
+    <div class="absolute top-[calc(60px+30vh+20px)] left-[20px] w-[400px] h-[30vh] bg-[rgba(255,255,255,0.95)] rounded-lg shadow-[0_2px_10px_rgba(0,0,0,0.15)] overflow-hidden z-[60]">
+        <div class="px-[15px] py-3 bg-[rgba(233,245,255,0.95)] border-b border-[#ddd] text-[14px] font-bold text-[#1e6bb8] text-center">
+            人员运营概览
+        </div>
+        <div class="p-4 grid grid-cols-2 gap-5">
+            <div class="flex items-start">
+                <div class="relative w-[60px] h-[60px] flex flex-col items-center">
+                    <div class="w-[50px] h-[50px] bg-[#1e6bb8] rounded-full opacity-80 flex items-center justify-center">
+                        <div class="w-[30px] h-[30px] bg-white rounded-full flex items-center justify-center shadow-[0_2px_4px_rgba(0,0,0,0.1)]" style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 24 24%22 fill=%22%231e6bb8%22%3E%3Cpath d=%22M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z%22/%3E%3C/svg%3E'); background-size: 60%; background-position: center; background-repeat: no-repeat;"></div>
+                    </div>
+                </div>
+                <div class="flex flex-col ml-[15px]">
+                    <div class="text-[12px] text-[#666] mb-1 whitespace-nowrap">总人员数</div>
+                    <div class="text-[18px] font-bold text-[#1e6bb8]">600<span class="text-[12px] text-[#999] font-normal">人</span></div>
+                </div>
+            </div>
+            <div class="flex items-start">
+                <div class="relative w-[60px] h-[60px] flex flex-col items-center">
+                    <div class="w-[50px] h-[50px] bg-[#1e6bb8] rounded-full opacity-80 flex items-center justify-center">
+                        <div class="w-[30px] h-[30px] bg-white rounded-full flex items-center justify-center shadow-[0_2px_4px_rgba(0,0,0,0.1)]" style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 24 24%22 fill=%22%231e6bb8%22%3E%3Cpath d=%22M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z%22/%3E%3C/svg%3E'); background-size: 60%; background-position: center; background-repeat: no-repeat;"></div>
+                    </div>
+                </div>
+                <div class="flex flex-col ml-[15px]">
+                    <div class="text-[12px] text-[#666] mb-1 whitespace-nowrap">当前运营人员</div>
+                    <div class="text-[18px] font-bold text-[#1e6bb8]">200<span class="text-[12px] text-[#999] font-normal">人</span></div>
+                </div>
+            </div>
+            <div class="flex items-start">
+                <div class="relative w-[60px] h-[60px] flex flex-col items-center">
+                    <div class="w-[50px] h-[50px] bg-[#1e6bb8] rounded-full opacity-80 flex items-center justify-center">
+                        <div class="w-[30px] h-[30px] bg-white rounded-full flex items-center justify-center shadow-[0_2px_4px_rgba(0,0,0,0.1)]" style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 24 24%22 fill=%22%231e6bb8%22%3E%3Cpath d=%22M19 3h-1V1h-2v2H8V1H6v2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7z%22/%3E%3C/svg%3E'); background-size: 60%; background-position: center; background-repeat: no-repeat;"></div>
+                    </div>
+                </div>
+                <div class="flex flex-col ml-[15px]">
+                    <div class="text-[12px] text-[#666] mb-1 whitespace-nowrap">今日计划出人</div>
+                    <div class="text-[18px] font-bold text-[#1e6bb8]">350<span class="text-[12px] text-[#999] font-normal">人</span></div>
+                </div>
+            </div>
+            <div class="flex items-start">
+                <div class="relative w-[60px] h-[60px] flex flex-col items-center">
+                    <div class="w-[50px] h-[50px] bg-[#1e6bb8] rounded-full opacity-80 flex items-center justify-center">
+                        <div class="w-[30px] h-[30px] bg-white rounded-full flex items-center justify-center shadow-[0_2px_4px_rgba(0,0,0,0.1)]" style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 24 24%22 fill=%22%231e6bb8%22%3E%3Cpath d=%22M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z%22/%3E%3C/svg%3E'); background-size: 60%; background-position: center; background-repeat: no-repeat;"></div>
+                    </div>
+                </div>
+                <div class="flex flex-col ml-[15px]">
+                    <div class="text-[12px] text-[#666] mb-1 whitespace-nowrap">今日已出人</div>
+                    <div class="text-[18px] font-bold text-[#1e6bb8]">230<span class="text-[12px] text-[#999] font-normal">人</span></div>
+                </div>
+            </div>
+            <div class="flex items-start">
+                <div class="relative w-[60px] h-[60px] flex flex-col items-center">
+                    <div class="w-[50px] h-[50px] bg-[#1e6bb8] rounded-full opacity-80 flex items-center justify-center">
+                        <div class="w-[30px] h-[30px] bg-white rounded-full flex items-center justify-center shadow-[0_2px_4px_rgba(0,0,0,0.1)]" style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 24 24%22 fill=%22%231e6bb8%22%3E%3Cpath d=%22M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm.5-13H11v6l5.25 3.15.75-1.23-4.5-2.67z%22/%3E%3C/svg%3E'); background-size: 60%; background-position: center; background-repeat: no-repeat;"></div>
+                    </div>
+                </div>
+                <div class="flex flex-col ml-[15px]">
+                    <div class="text-[12px] text-[#666] mb-1 whitespace-nowrap">当前病休人员</div>
+                    <div class="text-[18px] font-bold text-[#1e6bb8]">1<span class="text-[12px] text-[#999] font-normal">人</span></div>
+                </div>
+            </div>
+            <div class="flex items-start">
+                <div class="relative w-[60px] h-[60px] flex flex-col items-center">
+                    <div class="w-[50px] h-[50px] bg-[#1e6bb8] rounded-full opacity-80 flex items-center justify-center">
+                        <div class="w-[30px] h-[30px] bg-white rounded-full flex items-center justify-center shadow-[0_2px_4px_rgba(0,0,0,0.1)]" style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 24 24%22 fill=%22%231e6bb8%22%3E%3Cpath d=%22M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z%22/%3E%3C/svg%3E'); background-size: 60%; background-position: center; background-repeat: no-repeat;"></div>
+                    </div>
+                </div>
+                <div class="flex flex-col ml-[15px]">
+                    <div class="text-[12px] text-[#666] mb-1 whitespace-nowrap">当日已完成运营</div>
+                    <div class="text-[18px] font-bold text-[#1e6bb8]">30<span class="text-[12px] text-[#999] font-normal">人</span></div>
+                </div>
+            </div>
+        </div>
+    </div>
+    
+    <div id="search-panel-container" class="absolute top-[60px] left-[calc(400px+40px)] right-[20px] z-[60]">
+        <div id="search-condition-panel" class="bg-[rgba(255,255,255,0.95)] rounded-lg shadow-[0_2px_10px_rgba(0,0,0,0.15)] p-4 mb-4">
+            <div class="flex gap-2 mb-4">
+                <div class="flex-1 relative">
+                    <div id="search-input" class="min-h-[40px] px-3 py-2 border border-[#ddd] rounded text-[13px] focus:outline-none focus:border-[#1e6bb8] cursor-text flex flex-wrap items-center gap-1">
+                        <span id="search-tags"></span>
+                        <input type="text" id="search-text" class="flex-1 min-w-[100px] outline-none border-none text-[13px]" placeholder="点击选择搜索条件...">
+                    </div>
+                </div>
+                <button id="btn-search" class="bg-[#1e6bb8] text-white px-6 py-2 rounded text-[13px] font-medium hover:bg-[#155a96] transition-colors">
+                    搜索
+                </button>
+            </div>
+            <div id="toggle-arrow" class="flex justify-center items-center h-6 cursor-pointer mb-2">
+                <svg id="arrow-icon" class="w-5 h-5 text-gray-500 transition-transform duration-300" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path>
+                </svg>
+            </div>
+            <div id="condition-panel" class="condition-panel">
+                <div class="grid grid-cols-2 gap-4 mb-4">
+                    <div>
+                        <label class="block text-[12px] text-[#666] mb-1">任务类型</label>
+                        <div class="flex gap-2">
+                            <label class="flex items-center cursor-pointer">
+                                <input type="radio" name="dispatchType" value="urgent" class="mr-1" data-type="dispatchType" data-label="紧急" data-value="urgent">
+                                <span class="text-[13px]">紧急</span>
+                            </label>
+                            <label class="flex items-center cursor-pointer">
+                                <input type="radio" name="dispatchType" value="normal" class="mr-1" data-type="dispatchType" data-label="普通" data-value="normal">
+                                <span class="text-[13px]">普通</span>
+                            </label>
+                        </div>
+                    </div>
+                    <div>
+                        <label class="block text-[12px] text-[#666] mb-1">线路选择</label>
+                        <div class="relative">
+                            <div id="lineSelectContainer" class="min-h-[40px] px-3 py-2 border border-[#ddd] rounded text-[13px] focus:outline-none focus:border-[#1e6bb8] cursor-pointer flex flex-wrap items-center gap-1">
+                                <span id="lineSelectedTags"></span>
+                                <input type="text" id="lineSearchInput" class="flex-1 min-w-[100px] outline-none border-none text-[13px]" placeholder="搜索线路...">
+                            </div>
+                            <div id="lineDropdown" class="line-search-dropdown">
+                                <div class="line-option" data-value="803111" data-label="线路1">
+                                    <input type="checkbox" class="line-checkbox mr-2" data-value="803111" data-label="线路1">
+                                    <span>803111 - 线路1</span>
+                                </div>
+                                <div class="line-option" data-value="803112" data-label="线路2">
+                                    <input type="checkbox" class="line-checkbox mr-2" data-value="803112" data-label="线路2">
+                                    <span>803112 - 线路2</span>
+                                </div>
+                                <div class="line-option" data-value="803113" data-label="线路3">
+                                    <input type="checkbox" class="line-checkbox mr-2" data-value="803113" data-label="线路3">
+                                    <span>803113 - 线路3</span>
+                                </div>
+                                <div class="line-option" data-value="803114" data-label="线路4">
+                                    <input type="checkbox" class="line-checkbox mr-2" data-value="803114" data-label="线路4">
+                                    <span>803114 - 线路4</span>
+                                </div>
+                                <div class="line-option" data-value="803115" data-label="线路5">
+                                    <input type="checkbox" class="line-checkbox mr-2" data-value="803115" data-label="线路5">
+                                    <span>803115 - 线路5</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="grid grid-cols-2 gap-4 mb-4">
+                    <div>
+                        <label class="block text-[12px] text-[#666] mb-1">停运时长</label>
+                        <select id="stopDuration" class="w-full px-3 py-2 border border-[#ddd] rounded text-[13px] focus:outline-none focus:border-[#1e6bb8]" data-type="stopDuration">
+                            <option value="">请选择</option>
+                            <option value="30" data-label="30分钟">30分钟</option>
+                            <option value="60" data-label="1小时">1小时</option>
+                            <option value="120" data-label="2小时">2小时</option>
+                        </select>
+                    </div>
+                    <div>
+                        <label class="block text-[12px] text-[#666] mb-1">任务位置 <span id="locationHint" class="text-[#999] text-[11px]">(右键地图设置)</span></label>
+                        <div class="flex gap-2">
+                            <input type="text" id="taskLocation" class="flex-1 px-3 py-2 border border-[#ddd] rounded text-[13px] focus:outline-none focus:border-[#1e6bb8]" readonly placeholder="未设置">
+                            <button id="clearLocation" class="px-3 py-2 bg-gray-200 text-gray-700 rounded text-[13px] hover:bg-gray-300 transition-colors">
+                                清除
+                            </button>
+                        </div>
+                    </div>
+                </div>
+                
+                <div class="grid grid-cols-2 gap-4 mb-4">
+                    <div>
+                        <label class="block text-[12px] text-[#666] mb-1">开始时间</label>
+                        <input type="datetime-local" id="startTime" class="w-full px-3 py-2 border border-[#ddd] rounded text-[13px] focus:outline-none focus:border-[#1e6bb8]" data-type="startTime">
+                    </div>
+                    <div>
+                        <label class="block text-[12px] text-[#666] mb-1">结束时间</label>
+                        <input type="datetime-local" id="endTime" class="w-full px-3 py-2 border border-[#ddd] rounded text-[13px] focus:outline-none focus:border-[#1e6bb8]" data-type="endTime">
+                    </div>
+                </div>
+            </div>
+        </div>
+        
+        <div id="results-panel" class="bg-[rgba(255,255,255,0.95)] rounded-lg shadow-[0_2px_10px_rgba(0,0,0,0.15)] p-4 hidden">
+            <div class="flex justify-between items-center mb-3">
+                <div class="text-[14px] font-bold text-[#1e6bb8]">搜索结果</div>
+                <button id="close-results" class="text-gray-500 hover:text-gray-700 p-1">
+                    <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+                    </svg>
+                </button>
+            </div>
+            <div class="max-h-[300px] overflow-y-auto">
+                <table class="w-full text-[12px]">
+                    <thead class="bg-[#f5f8fc] sticky top-0">
+                        <tr>
+                            <th class="px-2 py-2 text-left font-medium text-[#666]">序号</th>
+                            <th class="px-2 py-2 text-left font-medium text-[#666]">车辆编码</th>
+                            <th class="px-2 py-2 text-left font-medium text-[#666]">设备编码</th>
+                            <th class="px-2 py-2 text-left font-medium text-[#666]">线路</th>
+                            <th class="px-2 py-2 text-left font-medium text-[#666]">上下行</th>
+                        </tr>
+                    </thead>
+                    <tbody id="results-tbody">
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    
+    <script>
+        document.addEventListener('DOMContentLoaded', function() {
+            var map = new BMap.Map("map");
+            var point = new BMap.Point(121.0, 31.2);
+            map.centerAndZoom(point, 8);
+            map.enableScrollWheelZoom(true);
+            
+            var searchConditions = {};
+            var locationMarker = null;
+            var locationCircle = null;
+            var taskLocation = null;
+            var selectedLines = {};
+            
+            var vehicleLocations = [
+                {lng: 120.7, lat: 31.1, name: "W105-01", status: "正常"},
+                {lng: 120.8, lat: 31.3, name: "W105-02", status: "正常"},
+                {lng: 120.9, lat: 31.2, name: "W107-01", status: "正常"},
+                {lng: 121.1, lat: 31.4, name: "W107-02", status: "正常"},
+                {lng: 121.2, lat: 31.1, name: "W108-01", status: "正常"},
+                {lng: 121.0, lat: 31.3, name: "W108-02", status: "正常"}
+            ];
+            
+            vehicleLocations.forEach(function(vehicle) {
+                var point = new BMap.Point(vehicle.lng, vehicle.lat);
+                var fillColor = vehicle.status === "正常" ? "%231e6bb8" : "%23e67e22";
+                var icon = new BMap.Icon("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Ccircle cx='16' cy='16' r='14' fill='" + fillColor + "' stroke='white' stroke-width='2'/%3E%3Ccircle cx='16' cy='16' r='6' fill='white' fill-opacity='0.3'/%3E%3C/svg%3E", new BMap.Size(32, 32));
+                var marker = new BMap.Marker(point, {icon: icon});
+                var infoWindow = new BMap.InfoWindow("<div style='padding:10px;'><strong>车辆编号:</strong> " + vehicle.name + "<br/><strong>状态:</strong> " + vehicle.status + "</div>");
+                marker.addEventListener("click", function() {
+                    this.openInfoWindow(infoWindow);
+                });
+                map.addOverlay(marker);
+            });
+            
+            /**
+             * 在地图上绘制路线
+             * @param {Array} points - 地图点数组
+             * @param {string} color - 路线颜色
+             */
+            function drawRoute(points, color) {
+                var polyline = new BMap.Polyline(points, {
+                    strokeColor: color,
+                    strokeWeight: 8,
+                    strokeOpacity: 0.7,
+                    strokeStyle: "solid"
+                });
+                map.addOverlay(polyline);
+            }
+            
+            var routes = [
+                [
+                    new BMap.Point(120.5, 31.1),
+                    new BMap.Point(120.7, 31.1),
+                    new BMap.Point(120.9, 31.1),
+                    new BMap.Point(121.1, 31.1),
+                    new BMap.Point(121.3, 31.1),
+                    new BMap.Point(121.5, 31.1)
+                ]
+            ];
+            
+            routes.forEach(function(route) {
+                drawRoute(route, "#1e6bb8");
+            });
+            
+            map.addControl(new BMap.NavigationControl({
+                type: BMAP_NAVIGATION_CONTROL_ZOOM,
+                anchor: BMAP_ANCHOR_TOP_LEFT,
+                offset: new BMap.Size(10, 70)
+            }));
+            
+            map.addControl(new BMap.ScaleControl({
+                anchor: BMAP_ANCHOR_BOTTOM_LEFT
+            }));
+            
+            var searchInput = document.getElementById('search-input');
+            var searchText = document.getElementById('search-text');
+            var conditionPanel = document.getElementById('condition-panel');
+            var searchTags = document.getElementById('search-tags');
+            var toggleArrow = document.getElementById('toggle-arrow');
+            var arrowIcon = document.getElementById('arrow-icon');
+            
+            /**
+             * 切换条件面板展开/收拢状态
+             */
+            function toggleConditionPanel() {
+                if (conditionPanel.classList.contains('open')) {
+                    conditionPanel.classList.remove('open');
+                    arrowIcon.style.transform = 'rotate(0deg)';
+                } else {
+                    conditionPanel.classList.add('open');
+                    arrowIcon.style.transform = 'rotate(180deg)';
+                }
+            }
+            
+            toggleArrow.addEventListener('click', function(e) {
+                e.stopPropagation();
+                toggleConditionPanel();
+            });
+            
+            searchInput.addEventListener('click', function(e) {
+                if (!conditionPanel.classList.contains('open')) {
+                    toggleConditionPanel();
+                }
+                searchText.focus();
+            });
+            
+            document.querySelectorAll('input[type="radio"][data-type]').forEach(function(radio) {
+                radio.addEventListener('change', function() {
+                    if (this.checked) {
+                        var type = this.dataset.type;
+                        var label = this.dataset.label;
+                        var value = this.dataset.value;
+                        addCondition(type, label, value);
+                    }
+                });
+            });
+            
+            document.getElementById('stopDuration').addEventListener('change', function() {
+                var selectedOption = this.options[this.selectedIndex];
+                if (selectedOption.value) {
+                    addCondition('stopDuration', selectedOption.dataset.label, selectedOption.value);
+                } else {
+                    removeCondition('stopDuration');
+                }
+            });
+            
+            document.getElementById('startTime').addEventListener('change', function() {
+                if (this.value) {
+                    addCondition('startTime', '开始:' + this.value, this.value);
+                } else {
+                    removeCondition('startTime');
+                }
+            });
+            
+            document.getElementById('endTime').addEventListener('change', function() {
+                if (this.value) {
+                    addCondition('endTime', '结束:' + this.value, this.value);
+                } else {
+                    removeCondition('endTime');
+                }
+            });
+            
+            var lineSelectContainer = document.getElementById('lineSelectContainer');
+            var lineSearchInput = document.getElementById('lineSearchInput');
+            var lineDropdown = document.getElementById('lineDropdown');
+            var lineSelectedTags = document.getElementById('lineSelectedTags');
+            
+            /**
+             * 渲染已选择的线路标签
+             */
+            function renderLineTags() {
+                lineSelectedTags.innerHTML = '';
+                for (var value in selectedLines) {
+                    var tag = document.createElement('span');
+                    tag.className = 'search-tag';
+                    tag.innerHTML = selectedLines[value] + '<span class="remove-tag" data-value="' + value + '">×</span>';
+                    lineSelectedTags.appendChild(tag);
+                }
+                
+                document.querySelectorAll('#lineSelectedTags .remove-tag').forEach(function(btn) {
+                    btn.addEventListener('click', function(e) {
+                        e.stopPropagation();
+                        var value = this.dataset.value;
+                        removeLine(value);
+                    });
+                });
+                
+                updateLineCondition();
+            }
+            
+            /**
+             * 添加线路选择
+             * @param {string} value - 线路值
+             * @param {string} label - 线路标签
+             */
+            function addLine(value, label) {
+                selectedLines[value] = label;
+                renderLineTags();
+                updateLineCheckboxes();
+            }
+            
+            /**
+             * 移除线路选择
+             * @param {string} value - 线路值
+             */
+            function removeLine(value) {
+                delete selectedLines[value];
+                renderLineTags();
+                updateLineCheckboxes();
+            }
+            
+            /**
+             * 更新搜索条件中的线路
+             */
+            function updateLineCondition() {
+                var values = Object.keys(selectedLines);
+                var labels = Object.values(selectedLines);
+                if (values.length > 0) {
+                    searchConditions['line'] = { label: labels.join(','), value: values.join(',') };
+                } else {
+                    delete searchConditions['line'];
+                }
+                renderTags();
+            }
+            
+            /**
+             * 更新下拉框中复选框的选中状态
+             */
+            function updateLineCheckboxes() {
+                document.querySelectorAll('.line-checkbox').forEach(function(checkbox) {
+                    checkbox.checked = !!selectedLines[checkbox.dataset.value];
+                });
+            }
+            
+            lineSelectContainer.addEventListener('click', function(e) {
+                if (e.target.classList.contains('remove-tag')) {
+                    return;
+                }
+                lineDropdown.classList.add('show');
+                lineSearchInput.focus();
+            });
+            
+            lineSearchInput.addEventListener('focus', function() {
+                lineDropdown.classList.add('show');
+            });
+            
+            lineSearchInput.addEventListener('input', function() {
+                var filter = this.value.toLowerCase();
+                var options = lineDropdown.querySelectorAll('.line-option');
+                options.forEach(function(option) {
+                    var text = option.textContent.toLowerCase();
+                    option.style.display = text.indexOf(filter) > -1 ? 'flex' : 'none';
+                });
+            });
+            
+            document.querySelectorAll('.line-checkbox').forEach(function(checkbox) {
+                checkbox.addEventListener('change', function(e) {
+                    e.stopPropagation();
+                    var value = this.dataset.value;
+                    var label = this.dataset.label;
+                    if (this.checked) {
+                        addLine(value, label);
+                    } else {
+                        removeLine(value);
+                    }
+                });
+            });
+            
+            document.querySelectorAll('.line-option').forEach(function(option) {
+                option.addEventListener('click', function(e) {
+                    if (e.target.type === 'checkbox') {
+                        return;
+                    }
+                    var checkbox = this.querySelector('.line-checkbox');
+                    checkbox.checked = !checkbox.checked;
+                    var value = checkbox.dataset.value;
+                    var label = checkbox.dataset.label;
+                    if (checkbox.checked) {
+                        addLine(value, label);
+                    } else {
+                        removeLine(value);
+                    }
+                });
+            });
+            
+            document.addEventListener('click', function(e) {
+                if (!lineSelectContainer.contains(e.target) && !lineDropdown.contains(e.target)) {
+                    lineDropdown.classList.remove('show');
+                }
+            });
+            
+            map.addEventListener('rightclick', function(e) {
+                taskLocation = e.point;
+                var lng = e.point.lng.toFixed(4);
+                var lat = e.point.lat.toFixed(4);
+                
+                document.getElementById('taskLocation').value = lng + ', ' + lat;
+                addCondition('location', '位置:' + lng + ',' + lat, lng + ',' + lat);
+                
+                if (locationMarker) {
+                    map.removeOverlay(locationMarker);
+                }
+                if (locationCircle) {
+                    map.removeOverlay(locationCircle);
+                }
+                
+                var locationIcon = new BMap.Icon("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 48 48'%3E%3Cpath d='M24 4C15.163 4 8 11.163 8 20c0 5.219 3.438 11.641 8.203 17.484a31.841 31.841 0 0 0 7.797 9.672 31.807 31.807 0 0 0 7.797-9.672C36.562 31.641 40 25.219 40 20c0-8.837-7.163-16-16-16zm0 24a8 8 0 1 1 0-16 8 8 0 0 1 0 16z' fill='%231e6bb8'/%3E%3Ccircle cx='24' cy='20' r='5' fill='white'/%3E%3C/svg%3E", new BMap.Size(48, 48));
+                locationIcon.setAnchor(new BMap.Size(24, 48));
+                locationMarker = new BMap.Marker(e.point, {icon: locationIcon});
+                map.addOverlay(locationMarker);
+            });
+            
+            document.getElementById('clearLocation').addEventListener('click', function() {
+                document.getElementById('taskLocation').value = '';
+                removeCondition('location');
+                if (locationMarker) {
+                    map.removeOverlay(locationMarker);
+                    locationMarker = null;
+                }
+                if (locationCircle) {
+                    map.removeOverlay(locationCircle);
+                    locationCircle = null;
+                }
+                taskLocation = null;
+            });
+            
+            /**
+             * 添加搜索条件
+             * @param {string} type - 条件类型
+             * @param {string} label - 条件显示标签
+             * @param {*} value - 条件值
+             */
+            function addCondition(type, label, value) {
+                removeCondition(type);
+                searchConditions[type] = { label: label, value: value };
+                renderTags();
+            }
+            
+            /**
+             * 移除搜索条件
+             * @param {string} type - 要移除的条件类型
+             */
+            function removeCondition(type) {
+                delete searchConditions[type];
+                renderTags();
+            }
+            
+            /**
+             * 渲染搜索标签
+             */
+            function renderTags() {
+                searchTags.innerHTML = '';
+                for (var type in searchConditions) {
+                    var tag = document.createElement('span');
+                    tag.className = 'search-tag';
+                    tag.innerHTML = searchConditions[type].label + '<span class="remove-tag" data-type="' + type + '">×</span>';
+                    searchTags.appendChild(tag);
+                }
+                
+                document.querySelectorAll('.remove-tag').forEach(function(btn) {
+                    btn.addEventListener('click', function(e) {
+                        e.stopPropagation();
+                        var type = this.dataset.type;
+                        removeCondition(type);
+                        
+                        if (type === 'dispatchType') {
+                            document.querySelectorAll('input[name="dispatchType"]').forEach(function(r) { r.checked = false; });
+                        } else if (type === 'stopDuration') {
+                            document.getElementById('stopDuration').value = '';
+                        } else if (type === 'startTime') {
+                            document.getElementById('startTime').value = '';
+                        } else if (type === 'endTime') {
+                            document.getElementById('endTime').value = '';
+                        } else if (type === 'location') {
+                            document.getElementById('taskLocation').value = '';
+                            if (locationMarker) {
+                                map.removeOverlay(locationMarker);
+                                locationMarker = null;
+                            }
+                            if (locationCircle) {
+                                map.removeOverlay(locationCircle);
+                                locationCircle = null;
+                            }
+                            taskLocation = null;
+                        } else if (type === 'line') {
+                            selectedLines = {};
+                            renderLineTags();
+                            updateLineCheckboxes();
+                        }
+                    });
+                });
+            }
+            
+            document.getElementById('btn-search').addEventListener('click', function() {
+                if (conditionPanel.classList.contains('open')) {
+                    toggleConditionPanel();
+                }
+                
+                var mockData = {
+                    "gpsList": [
+                        {
+                            "lineId": "803111",
+                            "subLineId": 0,
+                            "deviceId": "77L0K001",
+                            "carparkNo": "",
+                            "stopNo": "",
+                            "lon": 0.0,
+                            "lat": 0.0,
+                            "timestamp": 1772591197000,
+                            "serverTimestamp": 1772591194152,
+                            "speed": 0.0,
+                            "direction": 0.0,
+                            "state": 0,
+                            "upDown": 1,
+                            "nbbm": "L0K-001",
+                            "schId": 1067376191,
+                            "version": 69,
+                            "instation": 0,
+                            "signalState": "normal",
+                            "abnormalStatus": "outBounds",
+                            "outOfBoundDistance": 1.3019440198864643E7,
+                            "valid": 1,
+                            "source": -1,
+                            "offline": false,
+                            "service": true
+                        },
+                        {
+                            "lineId": "803112",
+                            "subLineId": 0,
+                            "deviceId": "77L0K002",
+                            "carparkNo": "",
+                            "stopNo": "",
+                            "lon": 0.0,
+                            "lat": 0.0,
+                            "timestamp": 1772591197000,
+                            "serverTimestamp": 1772591194152,
+                            "speed": 0.0,
+                            "direction": 0.0,
+                            "state": 0,
+                            "upDown": 0,
+                            "nbbm": "L0K-002",
+                            "schId": 1067376192,
+                            "version": 70,
+                            "instation": 0,
+                            "signalState": "normal",
+                            "abnormalStatus": "",
+                            "outOfBoundDistance": 0,
+                            "valid": 1,
+                            "source": -1,
+                            "offline": false,
+                            "service": true
+                        },
+                        {
+                            "lineId": "803113",
+                            "subLineId": 0,
+                            "deviceId": "77L0K003",
+                            "carparkNo": "",
+                            "stopNo": "",
+                            "lon": 0.0,
+                            "lat": 0.0,
+                            "timestamp": 1772591197000,
+                            "serverTimestamp": 1772591194152,
+                            "speed": 0.0,
+                            "direction": 0.0,
+                            "state": 0,
+                            "upDown": 1,
+                            "nbbm": "L0K-003",
+                            "schId": 1067376193,
+                            "version": 71,
+                            "instation": 0,
+                            "signalState": "normal",
+                            "abnormalStatus": "",
+                            "outOfBoundDistance": 0,
+                            "valid": 1,
+                            "source": -1,
+                            "offline": false,
+                            "service": true
+                        }
+                    ],
+                    "overspeedList": [],
+                    "scis": []
+                };
+                
+                displayResults(mockData.gpsList);
+            });
+            
+            /**
+             * 关闭搜索结果面板
+             */
+            document.getElementById('close-results').addEventListener('click', function() {
+                document.getElementById('results-panel').classList.add('hidden');
+            });
+            
+            /**
+             * 显示搜索结果表格
+             * @param {Array} data - 搜索结果数据数组
+             */
+            function displayResults(data) {
+                var tbody = document.getElementById('results-tbody');
+                tbody.innerHTML = '';
+                
+                data.forEach(function(item, index) {
+                    var row = document.createElement('tr');
+                    row.className = 'border-b border-[#eee] hover:bg-[#f5f8fc]';
+                    row.innerHTML = 
+                        '<td class="px-2 py-2">' + (index + 1) + '</td>' +
+                        '<td class="px-2 py-2">' + item.nbbm + '</td>' +
+                        '<td class="px-2 py-2">' + item.deviceId + '</td>' +
+                        '<td class="px-2 py-2">' + item.lineId + '</td>' +
+                        '<td class="px-2 py-2">' + (item.upDown === 1 ? '上行' : '下行') + '</td>';
+                    tbody.appendChild(row);
+                });
+                
+                document.getElementById('results-panel').classList.remove('hidden');
+            }
+            
+            /**
+             * 监听文档点击，当点击搜索面板外部时收拢条件项
+             */
+            document.addEventListener('click', function(e) {
+                var searchPanel = document.getElementById('search-panel-container');
+                if (searchPanel && !searchPanel.contains(e.target)) {
+                    if (conditionPanel.classList.contains('open')) {
+                        toggleConditionPanel();
+                    }
+                }
+            });
+        });
+    </script>
+</body>
+</html>