Merge branch 'minhang' into qingpu

# Conflicts: # src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js # src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js # src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js # src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list_report.html # src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanReportManage.js

Merge branch 'minhang' into qingpu
# Conflicts: # src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js # src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js # src/main/resources/static/pages/scheduleApp/module/common/prj-common-ui-route-state.js # src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list_report.html # src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanReportManage.js
潘钊
2 parents d5fd0b77 0bca86d7
Showing 53 changed files with 2125 additions and 479 deletions
pom.xml
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/forecast/SampleController.java
src/main/java/com/bsth/controller/forecast/dto/CreateSampleParam.java
src/main/java/com/bsth/controller/schedule/CarConfigInfoController.java
src/main/java/com/bsth/controller/schedule/EmployeeConfigInfoController.java
src/main/java/com/bsth/controller/schedule/SchedulePlanController.java
src/main/java/com/bsth/controller/schedule/SchedulePlanInfoController.java
src/main/java/com/bsth/controller/sys/KaptchaController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/filter/AccessLogFilter.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/filter/XssFilter.java
src/main/java/com/bsth/filter/XssHttpServletRequestWrapper.java
src/main/java/com/bsth/repository/schedule/CarConfigInfoRepository.java
src/main/java/com/bsth/repository/schedule/EmployeeConfigInfoRepository.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
@@ -180,6 +180,11 @@
             <version>1.4.7</version>
         </dependency>
+		<dependency>
+        	<groupId>com.github.axet</groupId>
+        	<artifactId>kaptcha</artifactId>
+        	<version>0.0.9</version>
+    	</dependency>
 	</dependencies>
     <dependencyManagement>
@@ -13,12 +13,13 @@ public class Constants {
 	/**
 	 * 不需要拦截的资源
 	 */
-	public static final String LOGIN = "/login";
+	public static final String LOGIN = "/user/login/**";
 	public static final String LOGIN_PAGE = "/login.html";
 	public static final String ASSETS_URL = "/assets/**";
 	public static final String FAVICON_URL = "/favicon.ico";
 	public static final String METRONIC_URL = "/metronic_v4.5.4/**";
 	public static final String LOGIN_FAILURE = "/user/loginFailure";
+	public static final String CAPTCHA = "/captcha.jpg";
 	/**
 	 * 线调部分子页面不做拦截，便于浏览器缓存
@@ -62,7 +62,7 @@ public class DirectiveController {
 	 * @param @param lineId 新线路编码
 	 * @throws
 	 */
-	@RequestMapping(value = "/lineChnage", method = RequestMethod.POST)
+	@RequestMapping(value = "/lineChnage", method = RequestMethod.GET)
 	public int lineChange(@RequestParam String nbbm, @RequestParam Integer lineId){
 		SysUser user = SecurityUtils.getCurrentUser();
 		return directiveService.lineChange(nbbm, lineId, user.getUserName());
 package com.bsth.controller.forecast;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.controller.BaseController;
+import com.bsth.controller.forecast.dto.CreateSampleParam;
 import com.bsth.entity.forecast.Sample;
 import com.bsth.service.forecast.SampleService;
@@ -16,7 +23,15 @@ public class SampleController extends BaseController&lt;Sample, Long&gt;{
 	SampleService sampleService;
 	@RequestMapping("/create/gps")
-	public int createDataByGps(String lineCode, Integer updown){
-		return sampleService.createDataByGps(lineCode, updown);
+	public int createDataByGps(@RequestParam String data){
+		
+		try {
+			data = URLDecoder.decode(data, "utf-8");
+			CreateSampleParam param = JSONObject.toJavaObject(JSON.parseObject(data), CreateSampleParam.class);
+			System.out.println(param);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return 0;
 	}
 }
+package com.bsth.controller.forecast.dto;
+
+import java.util.Set;
+
+public class CreateSampleParam {
+	
+	private String lineCode;
+	
+	private String startDate;
+	
+	private String endDate;
+	
+	private Integer updown;
+	
+	private Set<TimeRange> timeRange;
+	
+	public static class TimeRange{
+		private String s;
+		private String e;
+		private String tag;
+		public String getS() {
+			return s;
+		}
+		public void setS(String s) {
+			this.s = s;
+		}
+		public String getE() {
+			return e;
+		}
+		public void setE(String e) {
+			this.e = e;
+		}
+		public String getTag() {
+			return tag;
+		}
+		public void setTag(String tag) {
+			this.tag = tag;
+		}
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+
+	public String getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+
+	public Integer getUpdown() {
+		return updown;
+	}
+
+	public void setUpdown(Integer updown) {
+		this.updown = updown;
+	}
+
+	public Set<TimeRange> getTimeRange() {
+		return timeRange;
+	}
+
+	public void setTimeRange(Set<TimeRange> timeRange) {
+		this.timeRange = timeRange;
+	}
+}
@@ -51,4 +51,9 @@ public class CarConfigInfoController extends BaseController&lt;CarConfigInfo, Long&gt;
     public List<Map<String, Object>> findCarConfigCars() {
         return carConfigInfoRepository.findCarConfigCars();
     }
+
+    @RequestMapping(value = "/cars2", method = RequestMethod.GET)
+    public List<Map<String, Object>> findCarsFromConfig() {
+        return carConfigInfoRepository.findCarsFromConfig();
+    }
 }
@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.web.bind.annotation.*;
+import java.util.List;
 import java.util.Map;
 /**
@@ -45,4 +46,14 @@ public class EmployeeConfigInfoController extends BaseController&lt;EmployeeConfigI
     public Map<String, Object> save(@RequestBody EmployeeConfigInfo t){
         return baseService.save(t);
     }
+
+    @RequestMapping(value = "/jsy", method = RequestMethod.GET)
+    public List<Map<String, Object>> findJsyFromConfig() {
+        return employeeConfigInfoRepository.findJsyFromConfig();
+    }
+
+    @RequestMapping(value = "/spy", method = RequestMethod.GET)
+    public List<Map<String, Object>> findSpyFromConfig() {
+        return employeeConfigInfoRepository.findSpyFromConfig();
+    }
 }
@@ -4,10 +4,11 @@ import com.bsth.controller.BaseController;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.service.schedule.SchedulePlanService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
-import java.util.Date;
-import java.util.List;
 import java.util.Map;
 /**
@@ -34,21 +35,18 @@ public class SchedulePlanController extends BaseController&lt;SchedulePlan, Long&gt; {
         return baseService.save(t);
     }
-    // TODO:
-//    @RequestMapping(value = "/groupinfos/{xlid}/{date}", method = RequestMethod.GET)
-//    public List<Map<String, Object>> findGroupInfo(
-//            Integer xlid, Date scheduleDate) {
-//
-//    }
-
-    @RequestMapping(value = "/groupinfos/{xlid}/{date}", method = RequestMethod.GET)
-    public List<Map<String, Object>> findGroupInfo(
-            @PathVariable(value = "xlid") Integer xlid,
-            @PathVariable(value = "date") Date scheduleDate) {
-        return schedulePlanService.findGroupInfo(xlid, scheduleDate);
+    /**
+     * 获取明天的一歌排班计划。
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tommorw", method = RequestMethod.GET)
+    public SchedulePlan getTommorwPlan() throws Exception {
+        try {
+            return schedulePlanService.findSchedulePlanTommorw();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
     }
-//    public int updateGroupInfo
-
-
 }
 package com.bsth.controller.schedule;
+import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.schedule.SchedulePlanInfo;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.bsth.service.schedule.SchedulePlanInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 /**
  * Created by xu on 16/6/16.
@@ -11,5 +18,30 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("spic")
 public class SchedulePlanInfoController extends BaseController<SchedulePlanInfo, Long> {
+    @Autowired
+    private SchedulePlanInfoService schedulePlanInfoService;
+
+    @RequestMapping(value = "/groupinfos/{xlid}/{date}", method = RequestMethod.GET)
+    public List<SchedulePlanInfoService.GroupInfo> findGroupInfo(
+            @PathVariable(value = "xlid") Integer xlid,
+            @PathVariable(value = "date") Date scheduleDate) {
+        return schedulePlanInfoService.findGroupInfo(xlid, scheduleDate);
+    }
+
+    @RequestMapping(value = "/groupinfos/update", method = RequestMethod.POST)
+    public Map<String, Object> updateGroupInfo(@RequestBody SchedulePlanInfoService.GroupInfoUpdate groupInfoUpdate) {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            schedulePlanInfoService.updateGroupInfo(groupInfoUpdate);
+
+            resultMap.put("status", ResponseCode.SUCCESS);
+            resultMap.put("msg", "更新成功");
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            resultMap.put("status", ResponseCode.ERROR);
+            resultMap.put("msg", exp.getLocalizedMessage());
+        }
+        return resultMap;
+    }
 }
+package com.bsth.controller.sys;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.google.code.kaptcha.servlet.KaptchaExtend;
+
+@RestController
+public class KaptchaController extends KaptchaExtend{
+
+	@RequestMapping(value = "/captcha.jpg", method = RequestMethod.GET)
+    public void captcha(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        super.captcha(req, resp);
+    }
+}
 package com.bsth.controller.sys;
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.net.util.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.authentication.session.SessionAuthenticationException;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.bsth.common.Constants;
+import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
@@ -18,75 +28,158 @@ import com.bsth.service.sys.SysUserService;
 @RestController
 @RequestMapping("user")
-public class UserController extends BaseController<SysUser, Integer>{
-	
+public class UserController extends BaseController<SysUser, Integer> {
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
 	@Autowired
 	SysUserService sysUserService;
+	//需要验证码的账号
+	public static Map<String, Integer> captchaMap = new HashMap<>();
+
+	@RequestMapping(value = "/login", method = RequestMethod.POST)
+	public Map<String, Object> login(HttpServletRequest request, @RequestParam String userName,
+			@RequestParam String password) {
+		Map<String, Object> rs = new HashMap<>();
+		rs.put("status", ResponseCode.ERROR);
+		try {
+			HttpSession session = request.getSession();
+			rs.put("captcha", session.getAttribute("captcha"));
+			
+			if(captchaMap.get(userName) != null && captchaMap.get(userName) >= 3){
+				//校验验证码
+				String verCode = (String) session
+						.getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY);
+				String captcha = request.getParameter("captcha");
+				
+				if(StringUtils.isBlank(captcha)){
+					rs.put("msg", "请输入验证码");
+					return rs;
+				}
+				
+				if(!verCode.equals(captcha)){
+					rs.put("msg", "验证码有误，请刷新后重新输入");
+					return rs;
+				}
+			}
+			
+			SysUser user = sysUserService.findByUserName(userName);
+			if (null == user) {
+				rs.put("msg", "不存在的用户");
+				return rs;
+			}
+			
+			if (!user.isEnabled()) {
+				rs.put("msg", "该用户已被锁定，请联系管理员");
+				return rs;
+			}
+			
+			// 校验密码
+			password = fourDecodeBase64(password);
+			boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
+			if (!matchStatus) {
+				rs.put("msg", "密码有误");
+				
+				Integer captchSize = captchaMap.get(userName);
+				if(null == captchSize)
+					captchSize = 0;
+				
+				captchSize ++;
+				captchaMap.put(userName, captchSize);
+				return rs;
+			}
+
+			// 登录
+			SecurityUtils.login(user, request);
+			//session里写入用户名，webSocket连接时标识身份用
+			session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
+			
+			captchaMap.remove(userName);
+			rs.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			logger.error("", e);
+			rs.put("msg", "服务器出现异常，请联系管理员");
+		}
+		return rs;
+	}
+	
+	@RequestMapping(value = "/login/captchaStatus")
+	public int captchaStatus(String userName){
+		Integer size = captchaMap.get(userName);
+		return size == null?0:size;
+	}
+
+	private String fourDecodeBase64(String t) {
+		return new String(Base64.decodeBase64(Base64.decodeBase64(Base64.decodeBase64(Base64.decodeBase64(t)))));
+	}
+
 	/**
 	 * 
-	 * @Title: loginFailure 
-	 * @Description: TODO(查询登录失败的详细信息) 
-	 * @param @param request
-	 * @return String    返回类型 
-	 * @throws
+	 * @Title: loginFailure @Description: TODO(查询登录失败的详细信息) @param @param
+	 * request @return String 返回类型 @throws
 	 */
 	@RequestMapping("/loginFailure")
-	public String loginFailure(HttpServletRequest request){
+	public String loginFailure(HttpServletRequest request) {
 		String msg = "";
 		HttpSession session = request.getSession();
-		
+
 		Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION");
-		
-		if(obj instanceof BadCredentialsException)
+
+		if (obj instanceof BadCredentialsException)
 			msg = "登录失败，用户名或密码错误.";
-		else if(obj instanceof SessionAuthenticationException)
+		else if (obj instanceof SessionAuthenticationException)
 			msg = "登录失败，当前策略不允许重复登录.";
 		session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION");
 		return msg;
 	}
-	
+
 	@RequestMapping("/currentUser")
-	public SysUser currentUser(){
+	public SysUser currentUser() {
 		return SecurityUtils.getCurrentUser();
 	}
-	
+
 	/**
 	 * @Title changeEnabled
-	 * @Description: TODO(改变用户状态) 
-	 * @param id 用户ID
-	 * @param enabled 状态
+	 * @Description: TODO(改变用户状态)
+	 * @param id
+	 *            用户ID
+	 * @param enabled
+	 *            状态
 	 * @return
 	 */
 	@RequestMapping("/changeEnabled")
-	public int changeEnabled(@RequestParam int id,@RequestParam int enabled){
-		return sysUserService.changeEnabled(id,enabled);
+	public int changeEnabled(@RequestParam int id, @RequestParam int enabled) {
+		return sysUserService.changeEnabled(id, enabled);
 	}
-	
+
 	/**
 	 * @Title changePWD
-	 * @Description: TODO(修改密码) 
-	 * @param oldPWD 原始密码
-	 * @param newwPWD 新密码
-	 * @param cnewPWD 确认新密码
+	 * @Description: TODO(修改密码)
+	 * @param oldPWD
+	 *            原始密码
+	 * @param newwPWD
+	 *            新密码
+	 * @param cnewPWD
+	 *            确认新密码
 	 * @return
 	 */
 	@RequestMapping("/changePWD")
-	public String changePWD(@RequestParam String oldPWD,@RequestParam String newPWD,@RequestParam String cnewPWD){
+	public String changePWD(@RequestParam String oldPWD, @RequestParam String newPWD, @RequestParam String cnewPWD) {
 		SysUser sysUser = SecurityUtils.getCurrentUser();
 		String msg = "";
-		if(new BCryptPasswordEncoder(4).matches(oldPWD, sysUser.getPassword())){
-			if(oldPWD.equals(newPWD)){
+		if (new BCryptPasswordEncoder(4).matches(oldPWD, sysUser.getPassword())) {
+			if (oldPWD.equals(newPWD)) {
 				msg = "新密码不能跟原始密码一样！";
-			}else{
-				if(newPWD.equals(cnewPWD)){
-					sysUserService.changePWD(sysUser.getId(),newPWD);
+			} else {
+				if (newPWD.equals(cnewPWD)) {
+					sysUserService.changePWD(sysUser.getId(), newPWD);
 					msg = "修改成功！";
-				}else{
-					msg= "新密码两次输入不一致！";
+				} else {
+					msg = "新密码两次输入不一致！";
 				}
 			}
-		}else{
+		} else {
 			msg = "原始密码错误！";
 		}
 		return msg;
@@ -50,7 +50,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
-		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 15, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 12, TimeUnit.SECONDS);
 	}
 	@Component
@@ -9,6 +9,7 @@ import java.util.Map;
 import java.util.NavigableSet;
 import java.util.concurrent.TimeUnit;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -146,9 +147,14 @@ public class GpsRealData implements CommandLineRunner{
 					if (jsonObj != null) 
 						list = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
+					String nbbm;
 					//附加车辆内部编码
 					for(GpsEntity gps : list){
-						gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
+						nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
+						if(StringUtils.isBlank(nbbm))
+							continue;
+						
+						gps.setNbbm(nbbm);
 						gps.setStationName(BasicData.stationCode2NameMap.get(gps.getStopNo()));
 						add(gps);
 					}
@@ -38,7 +38,7 @@ public class AccessLogFilter extends BaseFilter {
 			HttpServletResponse response, FilterChain chain)
 			throws IOException, ServletException {
-		String username = /*SecurityUtils.getCurrentUser().getName()*/"test"; //等集成shiro之后再取
+		String username = SecurityUtils.getCurrentUser().getName(); 
 		String jsessionId = request.getRequestedSessionId();
 		String ip = IpUtils.getIpAddr(request);
 		String userAgent = request.getHeader("User-Agent");
@@ -23,7 +23,7 @@ public abstract class BaseFilter implements Filter {
 	/**
 	 * 白名单
 	 */
-	private String[] whiteListURLs = { Constants.LOGIN_PAGE,
+	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA,
 			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_TEMPS };
 	@Override
+package com.bsth.filter;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class XssFilter extends BaseFilter{
+
+	@Override
+	public void doFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
+			throws IOException, ServletException {
+		
+		chain.doFilter(new XssHttpServletRequestWrapper((HttpServletRequest) request), response);  
+	}
+}
+package com.bsth.filter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+
+public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
+	public XssHttpServletRequestWrapper(HttpServletRequest request) {
+		super(request);
+	}
+
+	@Override
+	public String getHeader(String name) {
+		return StringEscapeUtils.escapeHtml4(super.getHeader(name));
+	}
+
+	@Override
+	public String getQueryString() {
+		return StringEscapeUtils.escapeHtml4(super.getQueryString());
+	}
+
+	@Override
+	public String getParameter(String name) {
+		return StringEscapeUtils.escapeHtml4(super.getParameter(name));
+	}
+
+	@Override
+	public String[] getParameterValues(String name) {
+		String[] values = super.getParameterValues(name);
+		if (values != null) {
+			int length = values.length;
+			String[] escapseValues = new String[length];
+			for (int i = 0; i < length; i++) {
+				escapseValues[i] = StringEscapeUtils.escapeHtml4(values[i]);
+			}
+			return escapseValues;
+		}
+		return super.getParameterValues(name);
+	}
+}
@@ -42,4 +42,7 @@ public interface CarConfigInfoRepository extends BaseRepository&lt;CarConfigInfo, L
     @Query("select new map(cc.cl.insideCode as nbbm, cc.id as id) from CarConfigInfo cc")
     List<Map<String, Object>> findCarConfigCars();
+
+    @Query("select new map(cc.cl.id as id, cc.cl.insideCode as insideCode) from CarConfigInfo cc")
+    List<Map<String, Object>> findCarsFromConfig();
 }
 \ No newline at end of file
@@ -5,6 +5,7 @@ import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.repository.BaseRepository;
 import java.util.List;
+import java.util.Map;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -34,4 +35,18 @@ public interface EmployeeConfigInfoRepository extends BaseRepository&lt;EmployeeCon
     @EntityGraph(value = "employeeConfigInfo_jsy_spy_xl", type = EntityGraph.EntityGraphType.FETCH)
     @Query("select cc from EmployeeConfigInfo cc where cc.id=?1")
     EmployeeConfigInfo findOneExtend(Long aLong);
+
+    @Query("select new map(" +
+            "ec.jsy.id as jsyId, " +
+            "ec.jsy.jobCode as jsyGh, " +
+            "ec.jsy.personnelName as jsyName) " +
+            "from EmployeeConfigInfo ec ")
+    List<Map<String, Object>> findJsyFromConfig();
+
+    @Query("select new map(" +
+            "ec.spy.id as spyId, " +
+            "ec.spy.jobCode as spyGh, " +
+            "ec.spy.personnelName as spyName) " +
+            "from EmployeeConfigInfo ec ")
+    List<Map<String, Object>> findSpyFromConfig();
 }
@@ -9,7 +9,9 @@ import java.util.List;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 /**
@@ -23,4 +25,97 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
     Long deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(Integer xlid, Date startDate, Date endDate);
+
+    @Query(value = " select " +
+            "xl as xlId, " +
+            "xl_name as xlName, " +
+            "schedule_date as scheduleDate, " +
+            "lp_name as lpName, " +
+            "cl as clId, " +
+            "cl_zbh as clZbh, " +
+            "group_concat(distinct fcsj) ccsj, " +
+            "group_concat(distinct j) jsyId, " +
+            "group_concat(distinct j_gh) jsyGh, " +
+            "group_concat(distinct j_name) jsyName, " +
+            "group_concat(distinct s) spyId, " +
+            "group_concat(distinct s_gh) spyGh, " +
+            "group_concat(distinct s_name) spyName, " +
+            "max(create_date) as createDate " +
+            "from bsth_c_s_sp_info " +
+            "where bc_type = 'out' and " +
+            "xl = ?1 and " +
+            "schedule_date = ?2 " +
+            "group by xl_name, schedule_date, lp_name " +
+            "order by xl_name, schedule_date, lp ", nativeQuery = true)
+    List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
+
+    @Modifying
+    @Query(value = "update " +
+            "SchedulePlanInfo scpinfo " +
+            "set scpinfo.cl = :p1, scpinfo.clZbh = :p2 " +
+            "where scpinfo.xl = :p3 and " +
+            "scpinfo.scheduleDate = :p4 and " +
+            "scpinfo.lpName = :p5 ")
+    int updateGroupInfo_type_1(
+            @Param("p1") Integer clid,
+            @Param("p2") String clZbh,
+            @Param("p3") Integer xlid,
+            @Param("p4") Date scheduleDate,
+            @Param("p5") String lpName);
+
+    @Modifying
+    @Query(value = "update " +
+            "SchedulePlanInfo scpinfo " +
+            "set scpinfo.fcsj = :p1 " +
+            "where scpinfo.xl = :p2 and " +
+            "scpinfo.scheduleDate = :p3 and " +
+            "scpinfo.lpName = :p4 and " +
+            "scpinfo.fcsj = :p5 and " +
+            "scpinfo.bcType = :p6 ")
+    int updateGroupInfo_type_2_4(
+            @Param("p1") String fcsj,
+            @Param("p2") Integer xlid,
+            @Param("p3") Date scheduleDate,
+            @Param("p4") String lpName,
+            @Param("p5") String fcsj_src,
+            @Param("p6") String bcType);
+
+    @Modifying
+    @Query(value = "update " +
+            "SchedulePlanInfo scpinfo " +
+            "set scpinfo.j = :p1, " +
+            "scpinfo.jGh = :p2, " +
+            "scpinfo.jName = :p3  " +
+            "where scpinfo.xl = :p4 and " +
+            "scpinfo.scheduleDate = :p5 and " +
+            "scpinfo.lpName = :p6 and " +
+            "scpinfo.j = :p7 ")
+    int updateGroupInfo_type_3_5_jsy(
+            @Param("p1") Integer jsyId,
+            @Param("p2") String jsyGh,
+            @Param("p3") String jsyName,
+            @Param("p4") Integer xlId,
+            @Param("p5") Date scheduleDate,
+            @Param("p6") String lpName,
+            @Param("p7") Integer jsyId_src);
+
+    @Modifying
+    @Query(value = "update " +
+            "SchedulePlanInfo scpinfo " +
+            "set scpinfo.s = :p1, " +
+            "scpinfo.sGh = :p2, " +
+            "scpinfo.sName = :p3  " +
+            "where scpinfo.xl = :p4 and " +
+            "scpinfo.scheduleDate = :p5 and " +
+            "scpinfo.lpName = :p6 and " +
+            "scpinfo.s = :p7 ")
+    int updateGroupInfo_type_3_5_spy(
+            @Param("p1") Integer spyId,
+            @Param("p2") String spyGh,
+            @Param("p3") String spyName,
+            @Param("p4") Integer xlId,
+            @Param("p5") Date scheduleDate,
+            @Param("p6") String lpName,
+            @Param("p7") Integer spyId_src);
+
 }
@@ -6,15 +6,8 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.EntityGraph;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import javax.persistence.SqlResultSetMapping;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Created by xu on 16/6/16.
  */
@@ -24,37 +17,4 @@ public interface SchedulePlanRepository extends BaseRepository&lt;SchedulePlan, Lon
     @Override
     Page<SchedulePlan> findAll(Specification<SchedulePlan> spec, Pageable pageable);
-    @Query(value = " select " +
-            "xl_name as xlName, " +
-            "schedule_date as scheduleDate, " +
-            "lp_name as lpName, " +
-            "cl_zbh as clZbh, " +
-            "group_concat(distinct fcsj) ccsj, " +
-            "group_concat(distinct j_gh) jsyGh, " +
-            "group_concat(distinct j_name) jsyName, " +
-            "group_concat(distinct s_gh) spyGh, " +
-            "group_concat(distinct s_name) spyName, " +
-            "max(create_date) as createDate " +
-            "from bsth_c_s_sp_info " +
-            "where bc_type = 'out' and " +
-            "xl = ?1 and " +
-            "schedule_date = ?2 " +
-            "group by xl_name, schedule_date, lp_name " +
-            "order by xl_name, schedule_date, lp ", nativeQuery = true)
-    List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);
-
-    @Query(value = "update " +
-            "bsth_c_s_sp_info " +
-            "set cl = :p1, cl_zbh = :p2 " +
-            "where xl = :p3 and " +
-            "schedule_date = :p4 and " +
-            "lp_name = :p5 ",
-            nativeQuery = true)
-    int updateGroupInfo_clinfo(
-            @Param("p1") Integer clid,
-            @Param("p2") String clZbh,
-            @Param("p3") Integer xlid,
-            @Param("p4") Date scheduleDate,
-            @Param("p5") String lpName);
-
 }
@@ -14,13 +14,11 @@ import org.springframework.security.core.session.SessionRegistryImpl;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
-import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
 import org.springframework.security.web.session.HttpSessionEventPublisher;
 import com.bsth.common.Constants;
 import com.bsth.security.filter.LoginInterceptor;
 import com.bsth.security.handler.CustomLogoutHandler;
-import com.bsth.security.handler.LoginSuccessHandler;
 @Configuration
 @EnableWebSecurity
@@ -39,7 +37,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	public void configure(WebSecurity web) throws Exception {
 		// 白名单
-		web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.ASSETS_URL, Constants.FAVICON_URL,
+		web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
 				Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_TEMPS);
 	}
@@ -58,11 +56,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 				 //指定登录页
 				.loginPage(Constants.LOGIN_PAGE)
 				.loginProcessingUrl(Constants.LOGIN).permitAll()
-				 //登录失败跳转的链接
-				.failureUrl(Constants.LOGIN_PAGE + "?error=true")
-				 //登录成功后处理
-				.successHandler(loginSuccessHandler())
-				 //登出
+				//.failureUrl(Constants.LOGIN_PAGE + "?error=true")登录失败跳转的链接
+				//.successHandler(loginSuccessHandler())登录成功后处理
 				.and().logout()
 				.addLogoutHandler(logoutHandler())
 				 //禁用CXRF
@@ -92,10 +87,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 		return filterSecurityInterceptor;
 	}
-	@Bean
+/*	@Bean
 	public LoginSuccessHandler loginSuccessHandler(){
 		return new LoginSuccessHandler();
-	}
+	}*/
 	@Bean
 	public LogoutHandler logoutHandler(){
-package com.bsth.security.handler;
-
-import java.io.IOException;
-import java.util.Date;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
-
-import com.bsth.common.Constants;
-import com.bsth.entity.sys.SessionLog;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.util.IpUtils;
-
-public class LoginSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler{
-
-	@Override
-	public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
-			Authentication authentication) throws ServletException, IOException {
-		
-		SysUser user = (SysUser) authentication.getPrincipal();
-		
-		//日志
-		SessionLog sLog = new SessionLog();
-		sLog.setLoginDate(new Date());
-		sLog.setUser(user);
-		sLog.setIp(IpUtils.getIpAddr(request));
-		
-		//session里写入用户名
-		request.getSession().setAttribute(Constants.SESSION_USERNAME, user.getUserName());
-		super.onAuthenticationSuccess(request, response, authentication);  
-    }
-	
-}
+//package com.bsth.security.handler;
+//
+//import java.io.IOException;
+//import java.util.Date;
+//
+//import javax.servlet.ServletException;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//
+//import org.springframework.security.core.Authentication;
+//import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
+//
+//import com.bsth.common.Constants;
+//import com.bsth.entity.sys.SessionLog;
+//import com.bsth.entity.sys.SysUser;
+//import com.bsth.util.IpUtils;
+//
+//public class LoginSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler{
+//
+//	@Override
+//	public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
+//			Authentication authentication) throws ServletException, IOException {
+//		
+//		SysUser user = (SysUser) authentication.getPrincipal();
+//		
+//		//日志
+//		SessionLog sLog = new SessionLog();
+//		sLog.setLoginDate(new Date());
+//		sLog.setUser(user);
+//		sLog.setIp(IpUtils.getIpAddr(request));
+//		
+//		//session里写入用户名
+//		request.getSession().setAttribute(Constants.SESSION_USERNAME, user.getUserName());
+//		super.onAuthenticationSuccess(request, response, authentication);  
+//    }
+//	
+//}
 package com.bsth.security.util;
+import javax.servlet.http.HttpServletRequest;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
+import com.bsth.entity.sys.SecurityUser;
 import com.bsth.entity.sys.SysUser;
 /**
@@ -33,4 +38,12 @@ public class SecurityUtils {
 		}
 		return user;
 	}
+	
+	public static void login(SysUser user, HttpServletRequest request){
+		SecurityUser securityUser = new SecurityUser(user);
+		SecurityContext sContext = SecurityContextHolder.getContext();
+		sContext.setAuthentication(
+				new UsernamePasswordAuthenticationToken(securityUser, securityUser.getAuthorities()));
+		request.getSession(true).setAttribute("SPRING_SECURITY_CONTEXT", sContext);
+	}
 }
@@ -579,12 +579,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				File textFile = clientUtils.GetFtpFile(url, port, username, password, remotePath, textFileName);
 				/*File[] sources = new File[] {textFile};*/
-				File[] sources = new File[] {textFile};
+				//File[] sources = new File[] {textFile};
 				File target = new File(odlGzFileName);
 				// 将txt文件打包
-				File targetFile = packTarGZUtils.pack(sources, target);
+				File targetFile = PackTarGZUtils.compress(textFile, target);
 				/*clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());*/
@@ -2,9 +2,387 @@ package com.bsth.service.schedule;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.BaseService;
+import org.joda.time.DateTime;
+
+import java.util.Date;
+import java.util.List;
 /**
  * Created by xu on 16/6/16.
  */
 public interface SchedulePlanInfoService extends BaseService<SchedulePlanInfo, Long> {
+    /**
+     * 查找分组排班信息。
+     * @param xlid 线路Id
+     * @param scheduleDate 排班日期
+     * @return
+     */
+    List<GroupInfo> findGroupInfo(Integer xlid, Date scheduleDate);
+
+    /**
+     * 更新分组信息。
+     * type=1，替换车辆
+     * type=2，修改出场班次1时间（首班车时间）
+     * type=3，替换分组人员（驾驶员1和售票员1）
+     * type=4，如果分班，修改出场班次2时间（分班后的第一个出场班次时间）
+     * type=5，如果分班，修改分组人员（驾驶员2和售票员2）
+     * @param groupInfoUpdate 分组更新信息，包含类型，更新前的信息，更新后的信息
+     * @return
+     */
+    int updateGroupInfo(GroupInfoUpdate groupInfoUpdate);
+
+    /**
+     * 分组更新信息。
+     */
+    static class GroupInfoUpdate {
+        /** 类型 */
+        private int type;
+        /** 原始分组值 */
+        private GroupInfo src;
+        /** 更新分组值 */
+        private GroupInfo update;
+
+        public int getType() {
+            return type;
+        }
+
+        public void setType(int type) {
+            this.type = type;
+        }
+
+        public GroupInfo getSrc() {
+            return src;
+        }
+
+        public void setSrc(GroupInfo src) {
+            this.src = src;
+        }
+
+        public GroupInfo getUpdate() {
+            return update;
+        }
+
+        public void setUpdate(GroupInfo update) {
+            this.update = update;
+        }
+    }
+
+    /**
+     * 分组信息。
+     */
+    static class GroupInfo {
+        /** 线路Id */
+        private Integer xlId;
+        /** 线路名称 */
+        private String xlName;
+        /** 排班时间 */
+        private Date scheduleDate;
+        /** 路牌名字 */
+        private String lpName;
+        /** 车辆Id */
+        private Integer clId;
+        /** 车辆自编号 */
+        private String clZbh;
+        /** 出场班次1时间 */
+        private String ccsj1;
+        /** 出场班次2时间 */
+        private String ccsj2;
+
+        /** 驾驶员1id */
+        private Integer jsy1Id;
+        /** 驾驶员1工号 */
+        private String jsy1Gh;
+        /** 驾驶员1姓名 */
+        private String jsy1Name;
+        /** 驾驶员1id */
+        private Integer jsy2Id;
+        /** 驾驶员1工号 */
+        private String jsy2Gh;
+        /** 驾驶员1姓名 */
+        private String jsy2Name;
+
+        /** 售票员1id */
+        private Integer spy1Id;
+        /** 售票员1工号 */
+        private String spy1Gh;
+        /** 售票员1姓名 */
+        private String spy1Name;
+        /** 售票员1id */
+        private Integer spy2Id;
+        /** 售票员1工号 */
+        private String spy2Gh;
+        /** 售票员1姓名 */
+        private String spy2Name;
+
+        /** 创建时间 */
+        private Date createDate;
+
+        public GroupInfo() {}
+
+        public GroupInfo(Object[] datas) {
+            // 线路Id
+            this.xlId = Integer.valueOf(String.valueOf(datas[0]));
+            // 线路名称
+            this.xlName = String.valueOf(datas[1]);
+            // 排班时间
+            this.scheduleDate = new DateTime(datas[2]).toDate();
+            // 路牌名字
+            this.lpName = String.valueOf(datas[3]);
+            // 车辆id
+            this.clId = Integer.valueOf(String.valueOf(datas[4]));
+            // 车辆自编号
+            this.clZbh = String.valueOf(datas[5]);
+            // 出场时间，如果有多个，需要分开
+            Object ccsj = datas[6];
+            if (ccsj != null) {
+                String[] ccsj_array = ((String) ccsj).split(",");
+                if (ccsj_array.length > 1) {
+                    this.ccsj1 = String.valueOf(ccsj_array[0]);
+                    this.ccsj2 = String.valueOf(ccsj_array[1]);
+                } else {
+                    this.ccsj1 = String.valueOf(ccsj_array[0]);
+                }
+            }
+            // 驾驶员id，如果有多个，需要分开
+            Object jsyId = datas[7];
+            if (jsyId != null) {
+                String[] jsyId_array = ((String) jsyId).split(",");
+                if (jsyId_array.length > 1) {
+                    this.jsy1Id = Integer.valueOf(String.valueOf(jsyId_array[0]));
+                    this.jsy2Id = Integer.valueOf(String.valueOf(jsyId_array[1]));
+                } else {
+                    this.jsy1Id = Integer.valueOf(String.valueOf(jsyId_array[0]));
+                }
+            }
+            // 驾驶员工号，如果有多个，需要分开
+            Object jsyGh = datas[8];
+            if (jsyGh != null) {
+                String[] jsyGh_array = ((String) jsyGh).split(",");
+                if (jsyGh_array.length > 1) {
+                    this.jsy1Gh = String.valueOf(jsyGh_array[0]);
+                    this.jsy2Gh = String.valueOf(jsyGh_array[1]);
+                } else {
+                    this.jsy1Gh = String.valueOf(jsyGh_array[0]);
+                }
+            }
+            // 驾驶员名字，如果有多个，需要分开
+            Object jsyName = datas[9];
+            if (jsyName != null) {
+                String[] jsyName_array = ((String) jsyName).split(",");
+                if (jsyName_array.length > 1) {
+                    this.jsy1Name = String.valueOf(jsyName_array[0]);
+                    this.jsy2Name = String.valueOf(jsyName_array[1]);
+                } else {
+                    this.jsy1Name = String.valueOf(jsyName_array[0]);
+                }
+            }
+
+            // 售票员id，如果有多个，需要分开
+            Object spyId = datas[10];
+            if (spyId != null) {
+                String[] spyId_array = ((String) spyId).split(",");
+                if (spyId_array.length > 1) {
+                    this.spy1Id = Integer.valueOf(String.valueOf(spyId_array[0]));
+                    this.spy2Id = Integer.valueOf(String.valueOf(spyId_array[1]));
+                } else {
+                    this.spy1Id = Integer.valueOf(String.valueOf(spyId_array[0]));
+                }
+            }
+
+            // 售票员工号，如果有多个，需要分开
+            Object spyGh = datas[11];
+            if (spyGh != null) {
+                String[] spyGh_array = ((String) spyGh).split(",");
+                if (spyGh_array.length > 1) {
+                    this.spy1Gh = String.valueOf(spyGh_array[0]);
+                    this.spy2Gh = String.valueOf(spyGh_array[1]);
+                } else {
+                    this.spy1Gh = String.valueOf(spyGh_array[0]);
+                }
+            }
+            // 售票员名字，如果有多个，需要分开
+            Object spyName = datas[12];
+            if (spyName != null) {
+                String[] spyName_array = ((String) spyName).split(",");
+                if (spyName_array.length > 1) {
+                    this.spy1Name = String.valueOf(spyName_array[0]);
+                    this.spy2Name = String.valueOf(spyName_array[1]);
+                } else {
+                    this.spy1Name = String.valueOf(spyName_array[0]);
+                }
+            }
+            // 创建时间
+            this.createDate = new DateTime(datas[13]).toDate();
+
+            // TODO：可能还有其他字段
+        }
+
+        public String getXlName() {
+            return xlName;
+        }
+
+        public void setXlName(String xlName) {
+            this.xlName = xlName;
+        }
+
+        public Date getScheduleDate() {
+            return scheduleDate;
+        }
+
+        public void setScheduleDate(Date scheduleDate) {
+            this.scheduleDate = scheduleDate;
+        }
+
+        public String getLpName() {
+            return lpName;
+        }
+
+        public void setLpName(String lpName) {
+            this.lpName = lpName;
+        }
+
+        public Integer getClId() {
+            return clId;
+        }
+
+        public void setClId(Integer clId) {
+            this.clId = clId;
+        }
+
+        public String getClZbh() {
+            return clZbh;
+        }
+
+        public void setClZbh(String clZbh) {
+            this.clZbh = clZbh;
+        }
+
+        public String getCcsj1() {
+            return ccsj1;
+        }
+
+        public void setCcsj1(String ccsj1) {
+            this.ccsj1 = ccsj1;
+        }
+
+        public String getCcsj2() {
+            return ccsj2;
+        }
+
+        public void setCcsj2(String ccsj2) {
+            this.ccsj2 = ccsj2;
+        }
+
+        public Integer getJsy1Id() {
+            return jsy1Id;
+        }
+
+        public void setJsy1Id(Integer jsy1Id) {
+            this.jsy1Id = jsy1Id;
+        }
+
+        public String getJsy1Gh() {
+            return jsy1Gh;
+        }
+
+        public void setJsy1Gh(String jsy1Gh) {
+            this.jsy1Gh = jsy1Gh;
+        }
+
+        public String getJsy1Name() {
+            return jsy1Name;
+        }
+
+        public void setJsy1Name(String jsy1Name) {
+            this.jsy1Name = jsy1Name;
+        }
+
+        public Integer getJsy2Id() {
+            return jsy2Id;
+        }
+
+        public void setJsy2Id(Integer jsy2Id) {
+            this.jsy2Id = jsy2Id;
+        }
+
+        public String getJsy2Gh() {
+            return jsy2Gh;
+        }
+
+        public void setJsy2Gh(String jsy2Gh) {
+            this.jsy2Gh = jsy2Gh;
+        }
+
+        public String getJsy2Name() {
+            return jsy2Name;
+        }
+
+        public void setJsy2Name(String jsy2Name) {
+            this.jsy2Name = jsy2Name;
+        }
+
+        public Integer getSpy1Id() {
+            return spy1Id;
+        }
+
+        public void setSpy1Id(Integer spy1Id) {
+            this.spy1Id = spy1Id;
+        }
+
+        public String getSpy1Gh() {
+            return spy1Gh;
+        }
+
+        public void setSpy1Gh(String spy1Gh) {
+            this.spy1Gh = spy1Gh;
+        }
+
+        public String getSpy1Name() {
+            return spy1Name;
+        }
+
+        public void setSpy1Name(String spy1Name) {
+            this.spy1Name = spy1Name;
+        }
+
+        public Integer getSpy2Id() {
+            return spy2Id;
+        }
+
+        public void setSpy2Id(Integer spy2Id) {
+            this.spy2Id = spy2Id;
+        }
+
+        public String getSpy2Gh() {
+            return spy2Gh;
+        }
+
+        public void setSpy2Gh(String spy2Gh) {
+            this.spy2Gh = spy2Gh;
+        }
+
+        public String getSpy2Name() {
+            return spy2Name;
+        }
+
+        public void setSpy2Name(String spy2Name) {
+            this.spy2Name = spy2Name;
+        }
+
+        public Date getCreateDate() {
+            return createDate;
+        }
+
+        public void setCreateDate(Date createDate) {
+            this.createDate = createDate;
+        }
+
+        public Integer getXlId() {
+            return xlId;
+        }
+
+        public void setXlId(Integer xlId) {
+            this.xlId = xlId;
+        }
+    }
 }
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 /**
  * Created by xu on 16/6/16.
  */
 @Service
 public class SchedulePlanInfoServiceImpl extends BaseServiceImpl<SchedulePlanInfo, Long> implements SchedulePlanInfoService {
+    @Autowired
+    private SchedulePlanInfoRepository schedulePlanInfoRepository;
+
+    @Override
+    public List<GroupInfo> findGroupInfo(Integer xlid, Date scheduleDate) {
+        List<Object[]> groupInfos = schedulePlanInfoRepository.findGroupInfo(xlid, scheduleDate);
+        List<GroupInfo> groupInfoList = new ArrayList<>();
+        for (Object[] groupInfo : groupInfos) {
+            groupInfoList.add(new GroupInfo(groupInfo));
+        }
+        return groupInfoList;
+    }
+
+    @Override
+    @Transactional
+    public int updateGroupInfo(GroupInfoUpdate groupInfoUpdate) {
+        int type = groupInfoUpdate.getType();
+        int result;
+        if (type == 1) {
+            // 换车
+            if (groupInfoUpdate.getUpdate().getClId() != groupInfoUpdate.getSrc().getClId()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_1(
+                        groupInfoUpdate.getUpdate().getClId(),
+                        groupInfoUpdate.getUpdate().getClZbh(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName()
+                );
+            }
+
+        } else if (type == 2) {
+            // 更改出场班次1的时间
+            if (!groupInfoUpdate.getUpdate().getCcsj1().equals(groupInfoUpdate.getSrc().getCcsj1())) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_2_4(
+                        groupInfoUpdate.getUpdate().getCcsj1(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getUpdate().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getCcsj1(),
+                        "out"
+                );
+            }
+
+        } else if (type == 3) {
+            // 更改驾驶员1
+            if (groupInfoUpdate.getUpdate().getJsy1Id() != groupInfoUpdate.getSrc().getJsy1Id()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_3_5_jsy(
+                        groupInfoUpdate.getUpdate().getJsy1Id(),
+                        groupInfoUpdate.getUpdate().getJsy1Gh(),
+                        groupInfoUpdate.getUpdate().getJsy1Name(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getJsy1Id()
+                );
+            }
+            // 更改售票员1
+            if (groupInfoUpdate.getUpdate().getSpy1Id() != groupInfoUpdate.getSrc().getSpy1Id()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_3_5_spy(
+                        groupInfoUpdate.getUpdate().getSpy1Id(),
+                        groupInfoUpdate.getUpdate().getSpy1Gh(),
+                        groupInfoUpdate.getUpdate().getSpy1Name(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getSpy1Id()
+                );
+            }
+
+        } else if (type == 4) {
+            // 更改出场班次2的时间
+            if (!groupInfoUpdate.getUpdate().getCcsj2().equals(groupInfoUpdate.getSrc().getCcsj2())) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_2_4(
+                        groupInfoUpdate.getUpdate().getCcsj2(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getUpdate().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getCcsj2(),
+                        "out"
+                );
+            }
+
+        } else if (type == 5) {
+            // 更改驾驶员2
+            if (groupInfoUpdate.getUpdate().getJsy2Id() != groupInfoUpdate.getSrc().getJsy2Id()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_3_5_jsy(
+                        groupInfoUpdate.getUpdate().getJsy2Id(),
+                        groupInfoUpdate.getUpdate().getJsy2Gh(),
+                        groupInfoUpdate.getUpdate().getJsy2Name(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getJsy2Id()
+                );
+            }
+            // 更改售票员2
+            if (groupInfoUpdate.getUpdate().getSpy2Id() != groupInfoUpdate.getSrc().getSpy2Id()) {
+                result = this.schedulePlanInfoRepository.updateGroupInfo_type_3_5_spy(
+                        groupInfoUpdate.getUpdate().getSpy2Id(),
+                        groupInfoUpdate.getUpdate().getSpy2Gh(),
+                        groupInfoUpdate.getUpdate().getSpy2Name(),
+                        groupInfoUpdate.getSrc().getXlId(),
+                        groupInfoUpdate.getSrc().getScheduleDate(),
+                        groupInfoUpdate.getSrc().getLpName(),
+                        groupInfoUpdate.getSrc().getSpy2Id()
+                );
+            }
+
+        } else {
+            throw new RuntimeException("未知的更新类型，type=" + type);
+        }
+
+        return 0;
+    }
 }
@@ -3,31 +3,13 @@ package com.bsth.service.schedule;
 import com.bsth.entity.schedule.SchedulePlan;
 import com.bsth.service.BaseService;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Created by xu on 16/6/16.
  */
 public interface SchedulePlanService extends BaseService<SchedulePlan, Long> {
-
-    /**
-     * 查找分组排班信息。
-     * @param xlid 线路Id
-     * @param scheduleDate 排班日期
-     * @return
-     */
-    List<Map<String, Object>> findGroupInfo(Integer xlid, Date scheduleDate);
-
     /**
-     * 更新分组排班信息。
-     * @param clid 车辆id
-     * @param clZbh 车辆自编号
-     * @param xlid 线路id
-     * @param scheduleDate 排班日期
-     * @param lpName 路牌名字
+     * 获取有明日排班的计划。
      * @return
      */
-    int updateGroupInfo_clinfo(Integer clid, String clZbh, Integer xlid, Date scheduleDate, String lpName);
+    SchedulePlan findSchedulePlanTommorw();
 }
@@ -12,6 +12,7 @@ import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
 import com.bsth.service.schedule.rules.strategy.IStrategy;
 import com.google.common.collect.Multimap;
+import org.joda.time.DateTime;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -122,90 +123,16 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
     }
     @Override
-    public List<Map<String, Object>> findGroupInfo(Integer xlid, Date scheduleDate) {
-        List<Object[]> groupInfos = schedulePlanRepository.findGroupInfo(xlid, scheduleDate);
-        List<Map<String, Object>> ret = new ArrayList<>();
-        for (Object[] datas : groupInfos) {
-            // TODO：貌似springdata没有优雅的方式把List<Object[]>转换成List<Map<String, Object>>方法，
-            // TODO：可能jpa有相关标注，以后找到，此方法就作废
-
-            Map<String, Object> map = new HashMap<>();
-
-            // 线路名称
-            map.put("xlName", datas[0]);
-            // 排班时间
-            map.put("scheduleDate", datas[1]);
-            // 路牌名字
-            map.put("lpName", datas[2]);
-            // 车辆自编号
-            map.put("clZbh", datas[3]);
-            // 出场时间，如果有多个，需要分开
-            Object ccsj = datas[4];
-            if (ccsj != null) {
-                String[] ccsj_array = ((String) ccsj).split(",");
-                if (ccsj_array.length > 1) {
-                    map.put("ccsj1", ccsj_array[0]);
-                    map.put("ccsj2", ccsj_array[1]);
-                } else {
-                    map.put("ccsj1", ccsj_array[0]);
-                }
-            }
-            // 驾驶员工号，如果有多个，需要分开
-            Object jsyGh = datas[5];
-            if (jsyGh != null) {
-                String[] jsyGh_array = ((String) jsyGh).split(",");
-                if (jsyGh_array.length > 1) {
-                    map.put("jsy1Gh", jsyGh_array[0]);
-                    map.put("jsy2Gh", jsyGh_array[1]);
-                } else {
-                    map.put("jsy1Gh", jsyGh_array[0]);
-                }
-            }
-            // 驾驶员名字，如果有多个，需要分开
-            Object jsyName = datas[6];
-            if (jsyName != null) {
-                String[] jsyName_array = ((String) jsyName).split(",");
-                if (jsyName_array.length > 1) {
-                    map.put("jsy1Name", jsyName_array[0]);
-                    map.put("jsy2Name", jsyName_array[1]);
-                } else {
-                    map.put("jsy1Name", jsyName_array[0]);
-                }
-            }
-            // 售票员工号，如果有多个，需要分开
-            Object spyGh = datas[7];
-            if (spyGh != null) {
-                String[] spyGh_array = ((String) spyGh).split(",");
-                if (spyGh_array.length > 1) {
-                    map.put("spy1Gh", spyGh_array[0]);
-                    map.put("spy2Gh", spyGh_array[1]);
-                } else {
-                    map.put("spy1Gh", spyGh_array[0]);
-                }
-            }
-            // 售票员名字，如果有多个，需要分开
-            Object spyName = datas[8];
-            if (spyName != null) {
-                String[] spyName_array = ((String) spyName).split(",");
-                if (spyName_array.length > 1) {
-                    map.put("spy1Name", spyName_array[0]);
-                    map.put("spy2Name", spyName_array[1]);
-                } else {
-                    map.put("spy1Name", spyName_array[0]);
-                }
-            }
-            // 创建时间
-            map.put("createDate", datas[9]);
-
-            // TODO：可能还有其他字段
-
-            ret.add(map);
+    public SchedulePlan findSchedulePlanTommorw() {
+        DateTime today = new DateTime(new Date());
+        DateTime tommorw = new DateTime(today.getYear(), today.getMonthOfYear(), today.getDayOfMonth(), 0, 0).plusDays(1);
+        Map<String, Object> param = new HashMap<>();
+        param.put("scheduleFromTime_le", tommorw);
+        param.put("scheduleToTime_ge", tommorw);
+        Iterator<SchedulePlan> schedulePlanIterator = this.list(param).iterator();
+        if (schedulePlanIterator.hasNext()) {
+            return schedulePlanIterator.next();
         }
-        return ret;
-    }
-
-    @Override
-    public int updateGroupInfo_clinfo(Integer clid, String clZbh, Integer xlid, Date scheduleDate, String lpName) {
-        return schedulePlanRepository.updateGroupInfo_clinfo(clid, clZbh, xlid, scheduleDate, lpName);
+        return null;
     }
 }
 package com.bsth.service.sys.impl;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -82,6 +80,7 @@ public class ModuleServiceImpl extends BaseServiceImpl&lt;Module, Integer&gt; implemen
 			searchParentNode(m, map, pSet);
 		}
 		results.addAll(pSet);
+		
 		return results;
 	}
@@ -66,12 +66,10 @@ public class FTPClientUtils {
 			}
 			ftp.changeWorkingDirectory(path);
-			
+			ftp.setFileType(FTPClient.BINARY_FILE_TYPE);
 			ftp.enterLocalPassiveMode();
-			
 			success = ftp.storeFile(new String(filename.getBytes("gbk"),"gbk"), input);
 			/*success = ftp.storeFile(filename, input);	*/
-			
 			input.close();
 			ftp.logout();
@@ -322,6 +320,7 @@ public class FTPClientUtils {
             }  
+            out.flush();
             ftp.logout(); 
         } catch (IOException e){  
@@ -95,9 +95,9 @@ public class PackTarGZUtils {
 	  * @throws
 	  * 
 	  */
-	 public static File compress(File source) {
+	 public static File compress(File source, File target) {
-	  File target = new File(source.getName() + ".gz");
+	  //File target = new File(source.getName() + ".gz");
 	  FileInputStream in = null;
@@ -117,6 +117,9 @@ public class PackTarGZUtils {
 			  out.write(array, 0, number);
 		  }
+		  
+		  out.finish();
+		  out.flush();
 	  } catch (FileNotFoundException e) {
 	   e.printStackTrace();
@@ -164,4 +167,9 @@ public class PackTarGZUtils {
 	return target;
    }
+	 
+	 public static void main(String[] args) {
+		 File f = compress(new File("C:\\Users\\panzhao\\Desktop\\111\\1025.txt"), new File("C:\\Users\\panzhao\\Desktop\\111\\333\\1025.txt.gz"));
+		 
+	}
 }
@@ -26,6 +26,6 @@ spring.datasource.validation-query=select 1
 ##
 #222.66.0.204:5555
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://192.168.168.201:9090/transport_server/rtgps/
+http.gps.real.url= http://192.168.168.192:8080/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.201:9090/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://192.168.168.192:8080/transport_server/message/
 \ No newline at end of file
 spring.profiles: dev,prod
-spring.profiles.active: prod
+spring.profiles.active: dev
 spring.view.suffix=.html
 server.session-timeout=-1
-ftp.url=222.66.0.205
+ftp.url=116.236.238.212
 ftp.port=21
 ftp.username=transport
 ftp.password=transport123
@@ -5,7 +5,7 @@
  * success 删除成功之后的回调
  */
 function removeConfirm(text, url, success) {
-	layer.confirm(text, {
+	layer.confirm(html_encode(text), {
 		btn : [ '确定删除', '取消' ],
 		icon : 3,
 		skin : 'layui-layer-cfm-delete'
@@ -19,6 +19,19 @@ function removeConfirm(text, url, success) {
 	});
 }
+function html_encode(str)   {   
+  var s = "";   
+  if (str.length == 0) return ""; 
+  
+  s = str.replace(/&/g, "&gt;");   
+  s = s.replace(/</g, "&lt;");   
+  s = s.replace(/>/g, "&gt;");   
+  s = s.replace(/ /g, "&nbsp;");   
+  s = s.replace(/\'/g, "&#39;");   
+  s = s.replace(/\"/g, "&quot;");   
+  return s;   
+}   
+ 
 function successHandle(json, handle){
 	var status = json.status;
+"use strict";jQuery.base64=(function($){var _PADCHAR="=",_ALPHA="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",_VERSION="1.0";function _getbyte64(s,i){var idx=_ALPHA.indexOf(s.charAt(i));if(idx===-1){throw"Cannot decode base64"}return idx}function _decode(s){var pads=0,i,b10,imax=s.length,x=[];s=String(s);if(imax===0){return s}if(imax%4!==0){throw"Cannot decode base64"}if(s.charAt(imax-1)===_PADCHAR){pads=1;if(s.charAt(imax-2)===_PADCHAR){pads=2}imax-=4}for(i=0;i<imax;i+=4){b10=(_getbyte64(s,i)<<18)|(_getbyte64(s,i+1)<<12)|(_getbyte64(s,i+2)<<6)|_getbyte64(s,i+3);x.push(String.fromCharCode(b10>>16,(b10>>8)&255,b10&255))}switch(pads){case 1:b10=(_getbyte64(s,i)<<18)|(_getbyte64(s,i+1)<<12)|(_getbyte64(s,i+2)<<6);x.push(String.fromCharCode(b10>>16,(b10>>8)&255));break;case 2:b10=(_getbyte64(s,i)<<18)|(_getbyte64(s,i+1)<<12);x.push(String.fromCharCode(b10>>16));break}return x.join("")}function _getbyte(s,i){var x=s.charCodeAt(i);if(x>255){throw"INVALID_CHARACTER_ERR: DOM Exception 5"}return x}function _encode(s){if(arguments.length!==1){throw"SyntaxError: exactly one argument required"}s=String(s);var i,b10,x=[],imax=s.length-s.length%3;if(s.length===0){return s}for(i=0;i<imax;i+=3){b10=(_getbyte(s,i)<<16)|(_getbyte(s,i+1)<<8)|_getbyte(s,i+2);x.push(_ALPHA.charAt(b10>>18));x.push(_ALPHA.charAt((b10>>12)&63));x.push(_ALPHA.charAt((b10>>6)&63));x.push(_ALPHA.charAt(b10&63))}switch(s.length-imax){case 1:b10=_getbyte(s,i)<<16;x.push(_ALPHA.charAt(b10>>18)+_ALPHA.charAt((b10>>12)&63)+_PADCHAR+_PADCHAR);break;case 2:b10=(_getbyte(s,i)<<16)|(_getbyte(s,i+1)<<8);x.push(_ALPHA.charAt(b10>>18)+_ALPHA.charAt((b10>>12)&63)+_ALPHA.charAt((b10>>6)&63)+_PADCHAR);break}return x.join("")}return{decode:_decode,encode:_encode,VERSION:_VERSION}}(jQuery));
 \ No newline at end of file
@@ -308,28 +308,6 @@ tr.row-active td {
 <script src="/assets/js/common.js"></script>
 <script src="/assets/js/dictionary.js"></script>
-<!-- d3 -->
-<script src="/assets/js/d3.min.js" data-exclude=1></script>
-<!-- webSocket JS -->
-<script src="/assets/js/sockjs.min.js"></script>
-
-<!-- TODO：angularJS相关库 -->
-
-<!-- angularJS相关库 -->
-<!-- 这个是基于angularjs 1.4.10修改的版本，主要是修改了history控制部分，用于兼容route和pjax的同时操作history的冲突 -->
-<script src="/assets/js/angular.js" data-autocephaly=1></script>
-<script src="/assets/bower_components/angular-resource/angular-resource.min.js" data-exclude=1></script>
-<script src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js" data-exclude=1></script>
-<script src="/assets/bower_components/angular-touch/angular-touch.min.js" data-exclude=1></script>
-<script src="/assets/bower_components/angular-ui-router/release/angular-ui-router.min.js" data-exclude=1></script>
-<script src="/assets/bower_components/oclazyload/dist/ocLazyLoad.min.js" data-exclude=1></script>
-<script src="/assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js" data-exclude=1></script>
-<!-- schedule计划调度AngularJS模块主JS -->
-<script src="/pages/scheduleApp/module/common/main.js" data-exclude=1></script>
-<script src="/pages/scheduleApp/module/common/prj-common-globalservice.js" data-exclude=1></script>
-<script src="/pages/scheduleApp/module/common/prj-common-filter.js" data-exclude=1></script>
-<script src="/pages/scheduleApp/module/common/prj-common-directive.js" data-exclude=1></script>
-<script src="/pages/scheduleApp/module/common/prj-common-ui-route-state.js" data-exclude=1></script>
 <script data-exclude=1>
 //初始打开的片段地址
@@ -457,6 +435,28 @@ $(function(){
 	}
 </script>
+<!-- d3 -->
+<script src="/assets/js/d3.min.js" data-exclude=1></script>
+<!-- webSocket JS -->
+<script src="/assets/js/sockjs.min.js"></script>
+
+<!-- TODO：angularJS相关库 -->
+
+<!-- angularJS相关库 -->
+<!-- 这个是基于angularjs 1.4.10修改的版本，主要是修改了history控制部分，用于兼容route和pjax的同时操作history的冲突 -->
+<script src="/assets/js/angular.js" data-autocephaly=1></script>
+<script src="/assets/bower_components/angular-resource/angular-resource.min.js" data-exclude=1></script>
+<script src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js" data-exclude=1></script>
+<script src="/assets/bower_components/angular-touch/angular-touch.min.js" data-exclude=1></script>
+<script src="/assets/bower_components/angular-ui-router/release/angular-ui-router.min.js" data-exclude=1></script>
+<script src="/assets/bower_components/oclazyload/dist/ocLazyLoad.min.js" data-exclude=1></script>
+<script src="/assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js" data-exclude=1></script>
+<!-- schedule计划调度AngularJS模块主JS -->
+<script src="/pages/scheduleApp/module/common/main.js" data-exclude=1></script>
+<script src="/pages/scheduleApp/module/common/prj-common-globalservice.js" data-exclude=1></script>
+<script src="/pages/scheduleApp/module/common/prj-common-filter.js" data-exclude=1></script>
+<script src="/pages/scheduleApp/module/common/prj-common-directive.js" data-exclude=1></script>
+<script src="/pages/scheduleApp/module/common/prj-common-ui-route-state.js" data-exclude=1></script>
 <!-- 地图相关 -->
 <!-- 百度 -->
@@ -3,152 +3,352 @@
 <head>
 <meta charset="utf-8" />
 <title>登录</title>
-<meta name=”renderer” content=”webkit”>
-<meta http-equiv=”X-UA-Compatible” content=”IE=Edge,chrome=1″>
-<meta content="width=device-width, initial-scale=1" name="viewport" />
-<meta content="" name="description" />
-<meta content="" name="author" />
-<!-- BEGIN GLOBAL MANDATORY STYLES -->
 <link
-	href="metronic_v4.5.4/plugins/font-awesome/css/font-awesome.min.css"
+	href="/metronic_v4.5.4/plugins/font-awesome/css/font-awesome.min.css"
 	rel="stylesheet" type="text/css" />
-<link href="metronic_v4.5.4/plugins/bootstrap/css/bootstrap.min.css"
+<!-- Bootstrap style -->
+<link href="/metronic_v4.5.4/plugins/bootstrap/css/bootstrap.min.css"
 	rel="stylesheet" type="text/css" />
-<link href="metronic_v4.5.4/css/components.css" rel="stylesheet"
-	type="text/css" />
-<link href="metronic_v4.5.4/css/plugins.css" rel="stylesheet"
-	type="text/css" />
+<!-- METRONIC style -->
+<link href="/metronic_v4.5.4/css/components.css" rel="stylesheet"
+	type="text/css" />
+	
 <style type="text/css">
-/* Cubic Bezier Transition */
-/***
-Login page
-***/
-/* bg color */
-.login {
-	width: 100%;
-	height: 100%;
-	background-image: url(./assets/img/login_bgbg.png);
-	background-size: 100%
-}
-
-.loginCenter {
-    background-image: url(./assets/img/login_bgcenter.png);
-    background-repeat: no-repeat;
-    background-size: 100%;
+body>.wrapper {
+	background-image: url(/assets/img/bg_9b9dcb65ff.png);
+	background-size: 100px;
+	background-repeat: repeat;
+	min-height: 800px;
+	min-width: 630px;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+}
+
+#loginPanel.dialog-shadow {
+	width: 450px;
+	/* height: 400px; */
+	border: 1px solid #dadada;
+	border-radius: 10px !important;
+	position: absolute;
+	box-shadow: 0 9px 30px -6px rgba(0, 0, 0, .2), 0 18px 20px -10px
+		rgba(0, 0, 0, .04), 0 18px 20px -10px rgba(0, 0, 0, .04), 0 10px 20px
+		-10px rgba(0, 0, 0, .04);
+	background: url(/assets/img/dialog-gray-bg_42c40b3eb6.png) #fff bottom
+		repeat-x;
+	top: 50%;
+	left: 50%;
+	margin-left: -225px;
+	margin-top: -300px;
+	text-align: center;
+	color: #333;
+	opacity: .5;
+	
+	padding-bottom: 56px;
+	
+	animation: to_center 1s forwards;
+	animation-delay: .2s;
+	
+	transition: all .3s ease;
+}
+
+@keyframes to_center
+{
+	0%   {margin-top: -300px;opacity: .5;}
+	100% {margin-top: -270px;opacity: 1;}
+}
+
+
+h3 {
+    font-size: 25px;
+    font-weight: 600;
+    color: #4a4a4a
+}
+
+.input-icon input {
+	height: 48px;
+	border-radius: 5px !important;
+	transition: all .5s ease;
+}
+
+.input-icon input:FOCUS {
+	border-color: #c2cad8;
+	box-shadow: 0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12) !important;
+}
+
+.input-icon>i {
+	margin-top: 16px;
+}
+
+#loginPanel #loginBtn.btn{
+	border-radius: 6px !important;
+    width: 378px;
+    height: 48px;
+    font-size: 20px;
+    font-family: 微软雅黑;
+    transition: all .3s ease;
-    width: 768px;
-    height: 283.2px;
-    margin: auto;
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
+    background: #5f7ed7;
+    background: linear-gradient(#6f97e5,#527ed9);
+    box-shadow: inset 0 1px 2px #7ea1e8 !important;
+    color: #fff;
+    text-shadow: #4f70b3 0 -1px 0;
+    border: none;
+}
+
+#loginPanel #loginBtn.btn:HOVER {
+	box-shadow: inset 0 1px 1px #7696de,inset 0 0 2px #627dca,inset 0 -2px 3px #5a77c7,inset 0 0 100px rgba(48,77,147,.4) !important;
+}
+
+
+#loginPanel.show_msg{
+	top: calc(50% - 10px);
+}
+
+#loginPanel .alert{
+	display: none;
+	padding: 12px;
+    margin-top: 21px;
+    border-radius: 0 0 10px 10px !important;
+    font-size: 13px;
+    position: absolute;
+    width: 100%;
+    border-bottom: 1px solid #dadada;
 }
-.loginInputDiv {
-	top: 48%;
-/* 	width: 80%;
-	position: absolute;
-	vertical-align: middle;
-	text-align: center; */
-}
-
-/* .loginInput {
-	height: 35px;
-    padding: 6px 12px;
-    background-color: #fff;
-    border: 1px solid #c2cad8;
-    border-radius: 2px !important;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-    box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-    -webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-    -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-    transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-} */
-
-.buttonLogin {
+#loginPanel .alert.login-success{
+    color: #27a4b0;
+    background: #abe7ed;
+    border-color: #abe7ed;
+}
+
+#loginPanel .alert i{
+    font-size: 16px;
+    vertical-align: middle;
+    margin: 0 5px 3px;
+}
+
+#loginPanel.show_msg .alert{
+	display: block;
+}
+
+#captchaWrap{
+	display: none;
+	text-align: left;
+    border-top: 1px solid #f3f2f2;
+}
+
+img.captcha-img{
 	cursor: pointer;
 }
-.login-form{
-    position: relative;
+.login-footer{
+    position: fixed;
     width: 100%;
-    height: 100%;
+    bottom: 35px;
     text-align: center;
+    color: #a6a6a6;
+}
+
+h3.logo-text{
+	font-family: 华文楷体,华文细黑;
+	font-size: 28px;
 }
 </style>
 </head>
-<body class="login">
-	<div class="loginCenter">
-		<form class="login-form" action="/login" method="post">
-			<div class="col-md-12 loginInputDiv">
+<body>
+	<div class="wrapper ng-scope">
+		<div id="loginPanel" class="dialog dialog-shadow">
+			<br>
+			<h3 class="logo-text">青浦公交调度系统  </h3>
+			<hr>
+			<form style="padding: 0px 35px;">
+				<div class="form-group" style="margin-bottom: 0">
+					<label></label>
+					<div class="input-icon">
+						<i class="fa fa-user font-gray"></i> <input type="text" name="userName"
+							class="form-control" placeholder="输入用户名" autofocus="autofocus" autocomplete="off">
+					</div>
+				</div>
-				<div class="input-icon  right" style="display: inline-block;">
-                   <i class="fa fa-user"></i>
-                	<input type="text" class="form-control " placeholder="用户名" name="username" value=""> </div>
-					
+				<div class="form-group">
+					<label></label>
+					<div class="input-icon">
+						<i class="fa fa-key font-gray"></i> <input type="password" name="password"
+							class="form-control" placeholder="输入密码" >
+					</div>
+				</div>
-				<div class="input-icon  right" style="display: inline-block;">
-                   <i class="fa fa-key"></i>
-                	<input type="password" class="form-control " placeholder="密码" name="password" value="" > </div>
-				&nbsp;&nbsp;
-                   <button type="submit" class="btn blue buttonLogin" style="border-radius: 5px !important;
-    font-family: 微软雅黑;">登&nbsp;录</button>
-				
-			</div>
-		</form>
+				<div class="form-group" id="captchaWrap">
+					<label></label>
+					<div class="input-icon">
+						<input type="text" name="captcha" style="width: 153px !important;"
+							class="form-control input-inline input-medium" placeholder="输入验证码" >
+							
+						<span class="help-inline"> <img alt="验证码" class="captcha-img" title="点击刷新验证码"> </span>
+					</div>
+                </div>
+			</form>
+			<br><br>
+			<div class="form-actions" >
+                    <button type="button" class="btn blue-steel" id="loginBtn" disabled="disabled">登录</button>
+            </div>
+            
+            <div class="alert alert-danger"></div>
+		</div>
+		
+		<div class="login-footer"> © 2016 上海巴士拓华科技发展有限公司 Some Rights Reserved </div>
 	</div>
-	<script src="metronic_v4.5.4/plugins/jquery.min.js"
-		type="text/javascript"></script>
-	<script src="metronic_v4.5.4/plugins/bootstrap/js/bootstrap.min.js"
-		type="text/javascript"></script>
-	<script src="metronic_v4.5.4/scripts/app.min.js" type="text/javascript"></script>
-
-	<script src="assets/plugins/purl.js"></script>
-
-	<script type="text/javascript">
-		$(function() {
-			$('input[name=username]').focus();
-			/* setCenterCss(); */
-			if ($.url().param('error')) {
-				//去session里查一下失败信息
-				$.get('/user/loginFailure', function(msg) {
-					if (msg && msg != '')
-						alert(msg);
-					location.href = '/login.html';
-				});
+
+<!-- jQuery -->
+<script src="/metronic_v4.5.4/plugins/jquery.min.js" ></script>
+<script src="/assets/plugins/jquery.base64.min.js" ></script>
+
+<script>
+!function(){
+	var form = $('#loginPanel form')
+		,nameInput = $('input[name=userName]', form)
+		,pwdInput = $('input[name=password]', form)
+		,msgAlert = $('#loginPanel .alert-danger');
+	
+	$('input', form).on('keyup', checkBtnStatus);
+	
+	function checkBtnStatus(){
+		var es = $('input:visible', form);
+		for(var i = 0, e; e = es[i++];){
+			if($.trim($(e).val()) == ''){
+				$('#loginBtn').attr('disabled', 'disabled');
+				$('#loginPanel').removeClass('show_msg');
+				return;
 			}
-			/* $(window).resize(setCenterCss); */
-			// 设置登录界面样式,让登陆框始终居中
-			/* function setCenterCss() {
-				$(".loginCenter").css({
-					width : $(window).width() * 0.4,
-					height : $(window).height() * 0.2,
-				});
-				$(".loginCenter").css({
-					left : ($(window).width() - $(".loginCenter") .outerWidth()) / 2,
-					top : ($(window).height() - $(".loginCenter") .outerHeight()) / 2
-				});
-			} */
-			// 设置两个输入框的高度和左边图片高度一致，宽度为父DIV loginInputDiv减 去三个按钮的宽带度/2*0。8
-			/* $(".loginInput").css({
-				height : $("#img_user").height(),
-				width : ($(".loginInputDiv").width()- $("#img_user").width() * 2 - 
-						$(".buttonLogin").width()) / 2 * 0.8
-			}); */
-			// 设置中间登陆框DIV左右居中
-			/* $(".loginInputDiv").css({
-				left : ($(".loginCenter").outerWidth() - $(".loginInputDiv").outerWidth()) / 2,
-			}); */
-			$(".buttonLogin").bind("click", function() {
-				$(".login-form").submit();
-			});
+		}
+		$('#loginBtn').removeAttr('disabled');
+	}
+	
+	nameInput.on('blur', checkStatus);
+	//keyup 事件做延迟
+	var uNameKeyup;
+	nameInput.on('keyup', function(){
+		if(uNameKeyup)
+			return;
+		uNameKeyup = true;
+		setTimeout(function(){
+			checkStatus();
+			uNameKeyup = false;
+		}, 200);
+	});
+	
+	//密码框回车事件
+	pwdInput.on('keyup', function(e){
+		if (e.keyCode == 13) 
+			$('#loginBtn').click();
+	});
+	//验证码框回车事件
+	$('input[name=captcha]').on('keyup', function(e){
+		if (e.keyCode == 13) 
+			$('#loginBtn').click();
+	});
+	
+	$('#loginBtn').on('click', function(){
+		if(lock || $(this).attr('disabled')) return;
+		var userName = nameInput.val()
+			,pwd = fourBase64(pwdInput.val());
+		
+		login(userName, pwd);
+	});
+	
+	var lock;
+	function login(userName, pwd){
+		lock = true;
+		$('#loginBtn').attr('disabled', 'disabled');
+		var params = {
+				userName: userName, 
+				password: pwd, 
+				captcha: $('input[name=captcha]').val()
+		};
+		$.post('/user/login', params
+			,function(rs){
+			
+			$('#loginPanel').addClass('show_msg');
+			if(error(rs)){
+				lock = false;
+				$('#loginBtn').removeAttr('disabled');
+				
+				msgAlert.html('<i class="fa fa-times-circle"> </i> 登录失败，' + rs.msg);
+				
+				_captcha.refresh();
+				checkStatus();
+			}
+			else{
+				msgAlert.html('<i class="fa fa-check"> </i> 登录成功!');
+				msgAlert.addClass('login-success');
+				window.location.href = '/';
+			}
+		});
+	}
+	
+	function checkStatus(){
+		var t = nameInput.val();
+		if(!t){
+			hide();
+			return;
+		}
+		
+		$.get('/user/login/captchaStatus', {userName: t}, function(rs){
+			if(rs >= 3)
+				_captcha.show();
+			else
+				hide();
 		});
-	</script>
+		
+		function hide(){
+			if(!$("#captchaWrap").is(":hidden")){
+				_captcha.hide();
+				//隐藏提示消息
+				msgAlert.html('');
+				$('#loginPanel').removeClass('show_msg');
+			}
+		}
+	}
+	
+	
+	var _captcha = {
+		show: function(){
+			if($("#captchaWrap").is(":hidden")){
+				$('#captchaWrap').fadeIn(500);
+				_captcha.refresh();
+				checkBtnStatus();
+			}
+		},
+		refresh: function(){
+			if($("#captchaWrap").is(":hidden"))
+				return;
+			$('#captchaWrap img.captcha-img').attr('src', '/captcha.jpg?t=' + Math.random());
+		},
+		hide: function(){
+			$('#captchaWrap').hide();
+			$('input[name=captcha]').val('');
+		}
+	};
+	
+	$('#captchaWrap img.captcha-img').on('click', function(){
+		$(this).attr('src', '/captcha.jpg?t=' + Math.random());
+	});
+	
+	function fourBase64(t){
+		var ed = $.base64.encode;
+		return ed(ed(ed(ed(t))));
+	}
+	
+	function error(rs){
+		return rs.status == 'ERROR' || rs.status == 500;
+	}
+}();
+</script>
 </body>
-
 </html>
 \ No newline at end of file
@@ -228,8 +228,8 @@ function countDown(name){
 <script>
 var updateLog = {
-	text: '<div class="updete_log"><p>1、...</p></div>'
-	,title: '2016年8月28号更新日志'
+	text: '<div class="updete_log"><p>1、过滤掉未加入调度配置的GPS信号。</p></div>'
+	,title: '2016年9月13号更新日志'
 }
 var lineCodes = '' //全部线路编码字符串，由data.js初始化
@@ -85,18 +85,18 @@ var _home = (function() {
 				$('menu.menu').show();
 			}, 400);
-			/*setTimeout(function() {
+			setTimeout(function() {
 				// 提示文本
-				var promptFlag = storage.getItem('promptFlag_0828');
+				var promptFlag = storage.getItem('promptFlag_0913');
 				if (!promptFlag) {
 					layer.alert(updateLog.text, {
 						title: updateLog.title,
 						area: ['410px', '250px'],
 						shift : 5
 					});
-					storage.setItem('promptFlag_0828', 1);
+					storage.setItem('promptFlag_0913', 1);
 				}
-			}, 1500);*/
+			}, 1500);
 		}
 	}
@@ -273,7 +273,7 @@ butto.line-config-btn:active{
 	}
 	function defaultConfig(lineCode, name){
-		layer.confirm('没有找到['+name+']的配置信息，系统将生成默认配置？', {
+		layer.confirm('没有找到['+html_encode(name)+']的配置信息，系统将生成默认配置？', {
 			btn : [ '我同意' ],
 			icon : 3,
 			shift: 5,
@@ -225,24 +225,90 @@ rect.f_rect{
 #forecastSamplePanel .tab-content::-webkit-scrollbar,
-#forecastSamplePanel #trafficChart::-webkit-scrollbar {  
+#forecastSamplePanel #trafficChart::-webkit-scrollbar,
+#sptItems::-webkit-scrollbar{  
     width: 15px;
     height: 16px;  
 }  
 #forecastSamplePanel .tab-content::-webkit-scrollbar-track,  
 #forecastSamplePanel .tab-content::-webkit-scrollbar-thumb,
 #forecastSamplePanel #trafficChart::-webkit-scrollbar-track,  
-#forecastSamplePanel #trafficChart::-webkit-scrollbar-thumb {  
+#forecastSamplePanel #trafficChart::-webkit-scrollbar-thumb,
+#sptItems::-webkit-scrollbar-track,
+#sptItems::-webkit-scrollbar-thumb {  
   border-radius: 999px;  
   border: 5px solid transparent;  
 }  
 #forecastSamplePanel .tab-content::-webkit-scrollbar-thumb,
-#forecastSamplePanel #trafficChart::-webkit-scrollbar-thumb {  
+#forecastSamplePanel #trafficChart::-webkit-scrollbar-thumb,
+#sptItems::-webkit-scrollbar-thumb {  
   min-height: 20px;  
   background-clip: content-box;  
   box-shadow: 0 0 0 5px rgba(0,0,0,.2) inset;  
 }  
 #forecastSamplePanel .tab-content::-webkit-scrollbar-corner,
-#forecastSamplePanel #trafficChart::-webkit-scrollbar-corner {  
+#forecastSamplePanel #trafficChart::-webkit-scrollbar-corner,
+#sptItems::-webkit-scrollbar-corner {  
   background: transparent;  
+}
+
+#forecastPopForm.form-horizontal .form-group{
+    margin: 15px 7px 0;
+}
+
+#forecastPopForm.form-horizontal{
+    margin: 15px;
+}
+
+#forecastPopForm.form-horizontal h6{
+	border-bottom: 1px solid #eeeeee;padding: 8px 0 10px;color: gray;
+}
+
+.forecast-spt-item{
+    margin: 8px 0;
+    padding: 8px 0;
+    /* border-bottom: 1px solid #c2cad8; */
+    position: relative;
+}
+
+.forecast-spt-item>div{
+    padding: 0 0 0 15px;
+}
+
+.forecast-spt-item>div.e-date{
+	padding: 0 15px 0 0;
+}
+
+#forecastPopForm .form-actions{
+	    border-top: 1px solid #eeeeee;
+    margin-top: 12px;
+    padding-top: 13px;
+    text-align: center;
+}
+
+.forecast-item-close{
+    position: absolute;
+    z-index: 9;
+    left: 15px;
+    top: 13px;
+    width: 10px;
+    height: 10px;
+    background: #fff;
+    padding: 0 5px !important;
+    font-size: 18px;
+    cursor: pointer;
+    font-weight: 600;
+    color: #ea8d8d;
+}
+
+.forecast-item-close:HOVER {
+	color: red;
+}
+
+#sptItems{
+    height: 304px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding-right: 15px;
+    margin: 15px 0px;
 }
 \ No newline at end of file
@@ -56,6 +56,74 @@
 {{/each}}
 </script>
+<script id="forecast_gps_create_temp" type="text/html">
+<form class="form-horizontal" role="form" id="forecastPopForm">
+    <div class="form-body">
+        <div class="form-group">
+            <label class="col-md-3 control-label">线路</label>
+            <div class="col-md-9">
+				<input type="hidden" name="lineCode" value="{{line.code}}">
+                <input type="text" class="form-control" value="{{line.name}}" style="width: 180px;" readonly>
+            </div>
+        </div>
+		<div class="form-group">
+		     <label class="col-md-3 control-label">走向</label>
+		     <div class="col-md-9">
+				 <input type="hidden" name="updown" value={{updown}}>
+				 <input type="text" class="form-control" value='{{updown == 0?"上行":"下行"}}' style="width: 180px;" readonly>
+		     </div>
+		 </div>
+
+		 <h6><i class="fa fa-question-circle"></i> 使用哪些天的GPS数据</h6>
+		 <div class="form-group">
+            <label class="col-md-3 control-label">起始日期</label>
+            <div class="col-md-9">
+                <input type="date" class="form-control" style="width: 180px;" name="startDate" value="{{sdate}}" required>
+            </div>
+        </div>
+		<div class="form-group">
+            <label class="col-md-3 control-label">截止日期</label>
+            <div class="col-md-9">
+                <input type="date" class="form-control" style="width: 180px;" name="endDate" value="{{cdate}}" required>
+            </div>
+        </div>
+
+
+		 <h6><i class="fa fa-question-circle"></i> 你想怎么划分时区</h6>
+		 <div class="form-group" id="sptItems">
+			{{each drs as dr i }}
+			<div class="forecast-spt-item row">
+				<div class="forecast-item-close"><i class="fa fa-times-circle" ></i></div>
+				<div class="col-md-offset-1 col-md-4">
+					<input type="text" class="form-control" name="dr_name[]" placeholder="时区名称"  value="{{dr.name}}" required>
+				</div>
+				<div class="col-md-3 s-date">
+					<input type="time" class="form-control" name="dr_stime[]" placeholder="开始时间"  value="{{dr.s}}" required> 
+				</div>
+				<div class="col-md-1" style="padding-top: 10px;">至</div>
+				<div class="col-md-3 e-date">
+					<input type="time" class="form-control" name="dr_etime[]" placeholder="结束时间"  value="{{dr.e}}" required>
+				</div>
+			</div>
+			{{/each}}
+         </div>
+
+			<div class="footer">
+				<a href="javascript:;" style="text-indent: 28px;" class="add-item"><i class="fa fa-plus"></i> 添加项</a>
+			</div>
+
+			<div class="form-actions">
+			    <div class="row">
+			        <div class="col-md-12" style="">
+			            <button type="submit" class="btn green">开始生成数据</button>
+			            <button type="button" class="btn default layui-layer-close">取消</button>
+			        </div>
+			    </div>
+			</div>
+     </div>
+</form>
+</script>
+
 <script src="/pages/forecast/sample/js/svg.js"></script>
 <script>
 !function(){
@@ -74,12 +142,6 @@
 		opacity : .8
 	});
-/*  	//路由
-	$('.left_station_route .tab-content').slimscroll({
-		height : 'calc(100% - 46px)',
-		opacity : .8
-	}); */
-	
 	//上下行切换事件 
 	$('.left_station_route .tabbable-line ul li').on('click', function(){setTimeout(drawSvg, 300);});
@@ -144,6 +206,10 @@
 		return $('.line_config_tree li.selected').data('code');
 	}
+	function getLineName(){
+		return $.trim($('.line_config_tree li.selected').text());
+	}
+	
 	function drawSvg(){
 		//绘制svg
 		var rts = [], updown = getUpdown();
@@ -160,15 +226,87 @@
 	$('#gpsCreateDataLink').on('click', function(){
-		var lineName = $('.line_config_tree ul li.selected button').text();
-		var updownText = $('.left_station_route ul li.active a').text();
+		var drs = [{name: '早低谷', s: '00:00', e: '07:00'},{name: '早高峰', s: '07:01', e: '09:00'},{name: '平峰', s: '09:01', e: '16:00'},{name: '晚高峰', s: '16:01', e: '20:00'},{name: '晚低谷', s: '20:01', e: '23:59'}];
+		var line = {code: getLineCode(), name: getLineName()};
-		layer.confirm('使用GPS轨迹生成【'+lineName+' -'+updownText+'】站点间耗时数据？ 该操作将会清除原有数据。', {
-		  btn: ['我确定','算了吧'],
-		  icon: 3
-		}, function(){
-			
+		var cdate = moment().format('YYYY-MM-DD')
+			,sdate = moment().subtract(14, 'days').format('YYYY-MM-DD');
+		layer.open({
+		  type: 1,
+		  area: '580px',
+		 // maxmin: true,
+		  content: template('forecast_gps_create_temp', {updown: getUpdown(), line: line, drs: drs, cdate: cdate, sdate: sdate}),
+		  shift: 5,
+		  title: '根据历史轨迹生成数据',
+		  success: function(layero){
+			  var f = $('#forecastPopForm');
+			  
+			  f.on('click', '.forecast-item-close' , function(){
+				   $(this).parent('.forecast-spt-item').remove();
+			   });
+			   $('.add-item', f).on('click', function(){
+				    var item = '<div class="forecast-spt-item row"><div class="forecast-item-close"><i class="fa fa-times-circle" ></i></div><div class="col-md-offset-1 col-md-4"><input type="text" class="form-control" name="dr_name[]" placeholder="时区名称"   required></div><div class="col-md-3 s-date"><input type="time" class="form-control" name="dr_stime[]" placeholder="开始时间"   required> </div><div class="col-md-1" style="padding-top: 10px;">至</div><div class="col-md-3 e-date"><input type="time" class="form-control" name="dr_etime[]" placeholder="结束时间"   required></div></div>';
+					$('#sptItems').append(item);
+					$('#sptItems').scrollTop( $('#sptItems')[0].scrollHeight );
+			   });
+			   
+			   f.on('submit', function(){
+				  try{
+					  if(customFormValidate(f)){
+						  var param = f.serializeJSON()
+						  		,timeRange = []
+						  		,size = param.dr_name.length;
+						  for(var i = 0; i < size; i ++)
+							  timeRange.push({tag: param.dr_name[i], s: param.dr_stime[i], e: param.dr_etime[i]});
+						  
+						  delete param.dr_name;
+						  delete param.dr_stime;
+						  delete param.dr_etime;
+						  param.timeRange = timeRange;
+						  
+						  $.post('/sample/create/gps', {data: encodeURI(JSON.stringify(param))}, function(rs){
+							 console.log(rs); 
+						  });
+					  }
+				  }catch (e){
+					  console.log(e);
+				  }
+				  
+				  return false;
+			   });
+		  }
 		});
 	});
+	
+	
+	/**
+	 * 自定义表单校验
+	 */
+	function customFormValidate(f){
+		var rs = true;
+		//所有可见的项
+		var es = $('input,select', f);
+		
+		for(var i = 0, e; e = es[i++];){
+			if($(e).attr('required') && ( $(e).val() == null || $(e).val() == '')){
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').addClass('custom-val-error');
+				else
+					$(e).addClass('custom-val-error');
+				rs = false;
+			}
+			else{
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').removeClass('custom-val-error');
+				else
+					$(e).removeClass('custom-val-error');
+			}
+		}
+		
+		if(!rs){
+			layer.alert('数据完整性校验失败，请检查输入项', {icon: 2, title: '操作失败',  shift: 5});    
+		}
+		return rs;
+	}
 }();
 </script>
 \ No newline at end of file
@@ -39,7 +39,7 @@
 		            </div>
 		        </div>
 		        <div class="form-group">
-		            <label class="col-md-3 control-label">时段：</label>
+		            <label class="col-md-3 control-label">时间段：</label>
 		            <div class="col-md-4" style="padding-right: 0;">
 		                 <input type="time" class="form-control" name="sDate" value="{{obj.d.sDate}}" required> 
 		            </div>
@@ -86,7 +86,7 @@
 		            </div>
 		        </div>
 				<div class="form-group">
-            		<label class="col-md-3 control-label">标签：</label>
+            		<label class="col-md-3 control-label">时区：</label>
             		<div class="col-md-9">
 						<select class="form-control" name="tag" style="width:100%;" multiple required>
 							<option value="早高峰">早高峰</option>
@@ -96,7 +96,7 @@
             		</div>
         		</div>
 		        <div class="form-group">
-		            <label class="col-md-3 control-label">时段：</label>
+		            <label class="col-md-3 control-label">时间段：</label>
 		            <div class="col-md-4" style="padding-right: 0;">
 		                 <input type="time" class="form-control" name="sDate"  required> 
 		            </div>
@@ -478,6 +478,37 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
                     isArray: true
                 }
             }
+        ),
+        cci3: $resource(
+            '/cci/cars2',
+            {},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+
+        ),
+        eci: $resource(
+            '/eci/jsy',
+            {},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+        ),
+        eci2: $resource(
+            '/eci/spy',
+            {},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
         )
     }
 }]);
@@ -671,6 +702,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect2&quot;, [
  * icname（必须）：内部与之对应的字段名，如：icname=code
  * dcname2（可选）：其他需要赋值的model字段名2，如：dcname2=xl.name
  * icname2（可选）：内部与之对应的字段名2，如：icname2=name
+ * dcname3（可选）：其他需要赋值的model字段名3，如：dcname2=xl.name
+ * icname3（可选）：内部与之对应的字段名3，如：icname2=name
  * icnames（必须）：用于用于显示，以及简评处理的内部数据字段，如：icnames=name
  * required（可选）：是否要用required验证
  * datatype（必须）：业务数据类型，有字典类型，动态数据类型，暂时写的死点
@@ -714,6 +747,9 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [
                 var $icname_attr = tAttrs["icname"]; // 内部与之对应的字段名
                 var $dcname2_attr = tAttrs["dcname2"]; // 其他需要赋值的model字段名2
                 var $icname2_attr = tAttrs["icname2"]; // 内部与之对应的字段名2
+                var $dcname3_attr = tAttrs["dcname3"]; // 其他需要赋值的model字段名3
+                var $icname3_attr = tAttrs["icname3"]; // 内部与之对应的字段名3
+
                 var $icname_s_attr = tAttrs["icnames"]; // 用于用于显示，以及简评处理的内部数据字段
                 var $datatype_attr = tAttrs["datatype"]; // 内部业务数据类型
                 var $required_attr = tAttrs["required"]; // 是否需要required验证
@@ -769,6 +805,13 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [
                                     scope[ctrlAs].model[$dcname2_attr] = $item[$icname2_attr];
                                 }
                             }
+                            if ($dcname3_attr && $icname3_attr) {
+                                if ($mlp_attr) {
+                                    eval("scope[ctrlAs].model" + "." + $dcname3_attr + " = $item" + "." + $icname3_attr + ";");
+                                } else {
+                                    scope[ctrlAs].model[$dcname3_attr] = $item[$icname3_attr];
+                                }
+                            }
                         };
                         // 删除选中事件处理函数
@@ -787,6 +830,13 @@ angular.module(&#39;ScheduleApp&#39;).directive(&quot;saSelect3&quot;, [
                                     scope[ctrlAs].model[$dcname2_attr] = undefined;
                                 }
                             }
+                            if ($dcname3_attr) {
+                                if ($mlp_attr) {
+                                    eval("scope[ctrlAs].model" + "." + $dcname3_attr + " = undefined;");
+                                } else {
+                                    scope[ctrlAs].model[$dcname3_attr] = undefined;
+                                }
+                            }
                         };
                         /**
@@ -390,13 +390,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanManageService_g&#39;, [&#39;$resource
                 }
             }
         ),
-        groupinfo : $resource(
-            '/spc/groupinfos/:xlid/:sdate',
+        tommorw: $resource(
+            '/spc/tommorw',
             {},
             {
                 list: {
-                    method: 'GET',
-                    isArray: true
+                    method: 'GET'
                 }
             }
         )
@@ -423,6 +422,25 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
                     method: 'POST'
                 }
             }
+        ),
+        groupinfo : $resource(
+            '/spic/groupinfos/:xlid/:sdate',
+            {},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+        ),
+        updateGroupInfo : $resource(
+            '/spic/groupinfos/update',
+            {},
+            {
+                update: {
+                    method: 'POST'
+                }
+            }
         )
     };
 }]);
@@ -765,7 +765,8 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
         })
         .state("schedulePlanReportManage_edit", {
-            url: '/schedulePlanReportManage_edit/:xlid/:sdate/:lp',
+            url: '/schedulePlanReportManage_edit',
+            params: {type: 0, groupInfo: null},
             views: {
                 "": {
                     templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/edit_report.html'
@@ -819,5 +820,4 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
         // TODO:
     ;
-
 }]);
 \ No newline at end of file
+<div class="page-head">
+    <div class="page-title">
+        <h1>调度值勤日报</h1>
+    </div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+    <li>
+        <a href="/pages/home.html" data-pjax>首页</a>
+        <i class="fa fa-circle"></i>
+    </li>
+    <li>
+        <span class="active">运营计划管理</span>
+        <i class="fa fa-circle"></i>
+    </li>
+    <li>
+        <a ui-sref="schedulePlanReportManage">调度值勤日报</a>
+        <i class="fa fa-circle"></i>
+    </li>
+    <li>
+        <span class="active">修改</span>
+    </li>
+</ul>
+
+<div class="portlet light bordered" ng-controller="SchedulePlanReportManageFormCtrl as ctrl">
+    <div class="portlet-title">
+        <div class="caption">
+            <i class="icon-equalizer font-red-sunglo"></i>
+
+            <span ng-if="ctrl.type == 1" class="caption-subject font-red-sunglo bold uppercase">换车，改变指定路牌的配置车辆，可以是其他线路的车辆（套跑）</span>
+            <span ng-if="ctrl.type == 2" class="caption-subject font-red-sunglo bold uppercase">更改出场班次时间，改变指定路牌的第一个首发班次时间（第一个出场班次）</span>
+            <span ng-if="ctrl.type == 3" class="caption-subject font-red-sunglo bold uppercase">更改人员配置，更改驾驶员、售票员</span>
+            <span ng-if="ctrl.type == 4" class="caption-subject font-red-sunglo bold uppercase">当前是分班，更改出场便次时间，改变指定路牌的分班后的第一个首发班次时间</span>
+            <span ng-if="ctrl.type == 5" class="caption-subject font-red-sunglo bold uppercase">当前是分班，更改分班后的人员配置，更改驾驶员、售票员</span>
+        </div>
+    </div>
+
+    <div class="portlet-body form">
+        <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
+            <!--<div class="alert alert-danger display-hide">-->
+            <!--<button class="close" data-close="alert"></button>-->
+            <!--您的输入有误，请检查下面的输入项-->
+            <!--</div>-->
+
+
+            <!-- 其他信息放置在这里 -->
+            <div class="form-body">
+                <div class="form-group">
+                    <label class="col-md-2 control-label">线路：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="xlName" ng-model="ctrl.groupInfo.xlName" readonly/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-md-2 control-label">日期：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="scheduleDate" uib-datepicker-popup="yyyy年MM月dd日" ng-model="ctrl.groupInfo.scheduleDate" readonly/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-md-2 control-label">路牌：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="lpName" ng-model="ctrl.groupInfo.lpName" readonly/>
+                    </div>
+                </div>
+
+                <!-- 修改车辆 -->
+                <div class="form-group has-success has-feedback" ng-if="ctrl.type == 1">
+                    <label class="col-md-2 control-label">车辆配置-修改前*：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="cl_before" ng-model="ctrl.groupInfo_src.clZbh" readonly/>
+                    </div>
+                </div>
+                <div class="form-group has-success has-feedback" ng-if="ctrl.type == 1">
+                    <label class="col-md-2 control-label">车辆配置-修改后*：</label>
+                    <div class="col-md-3">
+                        <sa-Select3 model="ctrl.groupInfo"
+                                    name="cl_after"
+                                    placeholder="请输拼音..."
+                                    dcvalue="{{ctrl.groupInfo.clId}}"
+                                    dcname="clId"
+                                    icname="id"
+                                    dcname2="clZbh"
+                                    icname2="insideCode"
+                                    icnames="insideCode"
+                                    datatype="cci3"
+                                    required >
+                        </sa-Select3>
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.cl_after.$error.required">
+                        车辆必须选择
+                    </div>
+                </div>
+
+                <!-- 修改出场班次时间1 -->
+                <div class="form-group has-success has-feedback" ng-if="ctrl.type == 2">
+                    <label class="col-md-2 control-label">出场时间-修改前*：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="ccsj_before" ng-model="ctrl.groupInfo_src.ccsj1" readonly/>
+                    </div>
+                </div>
+                <div class="form-group has-success has-feedback" ng-if="ctrl.type == 2">
+                    <label class="col-md-2 control-label">出场时间-修改后*；</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="ccsj_after" ng-model="ctrl.groupInfo.ccsj1" ng-pattern="ctrl.time_regex"/>
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.ccsj_after.$error.pattern">
+                        时间格式错误，应该是格式hh:mm，如：06:39
+                    </div>
+                </div>
+
+                <!-- 修改第一组人员配置 -->
+                <div class="form-group has-success has-feedback" ng-if="ctrl.type == 3">
+                    <label class="col-md-2 control-label">驾驶员-修改前*：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="jsy_before" ng-value="ctrl.groupInfo_src.jsy1Name + '（' + ctrl.groupInfo_src.jsy1Gh + '）'" readonly/>
+                    </div>
+                </div>
+                <div class="form-group has-success has-feedback" ng-if="ctrl.type == 3">
+                    <label class="col-md-2 control-label">驾驶员-修改后*：</label>
+                    <div class="col-md-3">
+                        <sa-Select3 model="ctrl.groupInfo"
+                                    name="jsy"
+                                    placeholder="请输拼音..."
+                                    dcvalue="{{ctrl.groupInfo.jsy1Id}}"
+                                    dcname="jsy1Id"
+                                    icname="jsyId"
+                                    dcname2="jsy1Gh"
+                                    icname2="jsyGh"
+                                    dcname3="jsy1Name"
+                                    icname3="jsyName"
+                                    icnames="jsyName"
+                                    datatype="eci"
+                                    mlp="true"
+                                    required >
+                        </sa-Select3>
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
+                        驾驶员必须选择
+                    </div>
+                </div>
+                <div class="form-group" ng-if="ctrl.type == 3">
+                    <label class="col-md-2 control-label">售票员-修改前：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="jsy_before" ng-value="ctrl.groupInfo_src.spy1Name + '（' + ctrl.groupInfo_src.spy1Gh + '）'" readonly/>
+                    </div>
+                </div>
+                <div class="form-group" ng-if="ctrl.type == 3">
+                    <label class="col-md-2 control-label">售票员-修改后：</label>
+                    <div class="col-md-3">
+                        <sa-Select3 model="ctrl.groupInfo"
+                                    name="spy"
+                                    placeholder="请输拼音..."
+                                    dcvalue="{{ctrl.groupInfo.spy1Id}}"
+                                    dcname="spy1Id"
+                                    icname="spyId"
+                                    dcname2="spy1Gh"
+                                    icname2="spyGh"
+                                    dcname3="spy1Name"
+                                    icname3="spyName"
+                                    icnames="spyName"
+                                    datatype="eci2"
+                                    mlp="true">
+                        </sa-Select3>
+                    </div>
+                </div>
+
+                <!-- 修改出场班次时间2 -->
+                <div class="form-group has-success has-feedback" ng-if="ctrl.type == 4">
+                    <label class="col-md-2 control-label">出场时间-修改前*：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="ccsj_before" ng-model="ctrl.groupInfo_src.ccsj2" readonly/>
+                    </div>
+                </div>
+                <div class="form-group has-success has-feedback" ng-if="ctrl.type == 4">
+                    <label class="col-md-2 control-label">出场时间-修改后*；</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="ccsj_after" ng-model="ctrl.groupInfo.ccsj2" ng-pattern="ctrl.time_regex"/>
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.ccsj_after.$error.pattern">
+                        时间格式错误，应该是格式hh:mm，如：06:39
+                    </div>
+                </div>
+
+                <!-- 修改第二组人员配置 -->
+                <div class="form-group has-success has-feedback" ng-if="ctrl.type == 5">
+                    <label class="col-md-2 control-label">驾驶员-修改前*：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="jsy_before" ng-value="ctrl.groupInfo_src.jsy2Name + '（' + ctrl.groupInfo_src.jsy2Gh + '）'" readonly/>
+                    </div>
+                </div>
+                <div class="form-group has-success has-feedback" ng-if="ctrl.type == 5">
+                    <label class="col-md-2 control-label">驾驶员-修改后*：</label>
+                    <div class="col-md-3">
+                        <sa-Select3 model="ctrl.groupInfo"
+                                    name="jsy"
+                                    placeholder="请输拼音..."
+                                    dcvalue="{{ctrl.groupInfo.jsy2Id}}"
+                                    dcname="jsy2Id"
+                                    icname="jsyId"
+                                    dcname2="jsy2Gh"
+                                    icname2="jsyGh"
+                                    dcname3="jsy2Name"
+                                    icname3="jsyName"
+                                    icnames="jsyName"
+                                    datatype="eci"
+                                    mlp="true"
+                                    required >
+                        </sa-Select3>
+                    </div>
+                    <!-- 隐藏块，显示验证信息 -->
+                    <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
+                        驾驶员必须选择
+                    </div>
+                </div>
+                <div class="form-group" ng-if="ctrl.type == 5">
+                    <label class="col-md-2 control-label">售票员-修改前：</label>
+                    <div class="col-md-3">
+                        <input type="text" class="form-control" name="jsy_before" ng-value="ctrl.groupInfo_src.spy2Name + '（' + ctrl.groupInfo_src.spy2Gh + '）'" readonly/>
+                    </div>
+                </div>
+                <div class="form-group" ng-if="ctrl.type == 5">
+                    <label class="col-md-2 control-label">售票员-修改后：</label>
+                    <div class="col-md-3">
+                        <sa-Select3 model="ctrl.groupInfo"
+                                    name="spy"
+                                    placeholder="请输拼音..."
+                                    dcvalue="{{ctrl.groupInfo.spy2Id}}"
+                                    dcname="spy2Id"
+                                    icname="spyId"
+                                    dcname2="spy2Gh"
+                                    icname2="spyGh"
+                                    dcname3="spy2Name"
+                                    icname3="spyName"
+                                    icnames="spyName"
+                                    datatype="eci2"
+                                    mlp="true">
+                        </sa-Select3>
+                    </div>
+                </div>
+
+
+                <!-- 其他form-group -->
+
+            </div>
+
+            <div class="form-actions">
+                <div class="row">
+                    <div class="col-md-offset-3 col-md-4">
+                        <button type="submit" class="btn green"
+                                ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
+                        <a type="button" class="btn default" ui-sref="schedulePlanReportManage" ><i class="fa fa-times"></i> 取消</a>
+                    </div>
+                </div>
+            </div>
+
+        </form>
+
+    </div>
+
+
+</div>
 \ No newline at end of file
@@ -79,57 +79,57 @@
                     <span ng-bind="info.lpName"></span>
                 </td>
                 <td>
-                    <a class="btn btn-success" ng-click="ctrl.goEditForm()">
+                    <a class="btn btn-primary" ng-click="ctrl.goEditForm(1, info)">
                         <span ng-bind="info.clZbh"></span>
                     </a>
                 </td>
                 <td>
-                    <a class="btn btn-success" ng-show="info.ccsj1">
+                    <a class="btn btn-info" ng-show="info.ccsj1" ng-click="ctrl.goEditForm(2, info)">
                         <span ng-bind="info.ccsj1"></span>
                     </a>
                 </td>
                 <td>
-                    <a class="btn btn-success" ng-show="info.jsy1Gh">
+                    <a class="btn btn-success" ng-show="info.jsy1Gh" ng-click="ctrl.goEditForm(3, info)">
                         <span ng-bind="info.jsy1Gh"></span>
                     </a>
                 </td>
                 <td>
-                    <a class="btn btn-success" ng-show="info.jsy1Name">
+                    <a class="btn btn-success" ng-show="info.jsy1Name" ng-click="ctrl.goEditForm(3, info)">
                         <span ng-bind="info.jsy1Name"></span>
                     </a>
                 </td>
                 <td>
-                    <a class="btn btn-success" ng-show="info.spy1Gh">
+                    <a class="btn btn-info" ng-show="info.spy1Gh" ng-click="ctrl.goEditForm(3, info)">
                         <span ng-bind="info.spy1Gh"></span>
                     </a>
                 </td>
                 <td>
-                    <a class="btn btn-success" ng-show="info.spy1Name">
+                    <a class="btn btn-info" ng-show="info.spy1Name" ng-click="ctrl.goEditForm(3, info)">
                         <span ng-bind="info.spy1Name"></span>
                     </a>
                 </td>
                 <td>
-                    <a class="btn btn-success" ng-show="info.ccsj2">
+                    <a class="btn btn-success" ng-show="info.ccsj2" ng-click="ctrl.goEditForm(4, info)">
                         <span ng-bind="info.ccsj2"></span>
                     </a>
                 </td>
                 <td>
-                    <a class="btn btn-success" ng-show="info.jsy2Gh">
+                    <a class="btn btn-info" ng-show="info.jsy2Gh" ng-click="ctrl.goEditForm(5, info)">
                         <span ng-bind="info.jsy2Gh"></span>
                     </a>
                 </td>
                 <td>
-                    <a class="btn btn-success" ng-show="info.jsy2Name">
+                    <a class="btn btn-info" ng-show="info.jsy2Name" ng-click="ctrl.goEditForm(5, info)">
                         <span ng-bind="info.jsy2Name"></span>
                     </a>
                 </td>
                 <td>
-                    <a class="btn btn-success" ng-show="info.spy2Gh">
+                    <a class="btn btn-info" ng-show="info.spy2Gh" ng-click="ctrl.goEditForm(5, info)">
                         <span ng-bind="info.spy2Gh"></span>
                     </a>
                 </td>
                 <td>
-                    <a class="btn btn-success" ng-show="info.spy2Name">
+                    <a class="btn btn-info" ng-show="info.spy2Name" ng-click="ctrl.goEditForm(5, info)">
                         <span ng-bind="info.spy2Name"></span>
                     </a>
                 </td>
 // 调度值勤日报管理 service controller 等写在一起
 // TODO：使用的global服务需要修正
-angular.module('ScheduleApp').factory('SchedulePlanReportManageService', ['SchedulePlanManageService_g', function(service) {
+angular.module('ScheduleApp').factory('SchedulePlanReportManageService', [
+    'SchedulePlanInfoManageService_g', 'SchedulePlanManageService_g',
+    function(service, service2) {
     /** 当前的查询条件信息 */
     var currentSearchCondition = {};
@@ -56,6 +58,17 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanReportManageService&#39;, [&#39;Sched
          */
         saveDetail: function(obj) {
             return service.save(obj).$promise;
+        },
+        /**
+         * 更新分组信息。
+         * @param obj
+         * @returns {*|Function|promise|n}
+         */
+        updateDetail: function(obj) {
+            return service.updateGroupInfo.update(obj).$promise;
+        },
+        tommorwPlan: function() {
+            return service2.tommorw.list().$promise;
         }
     };
@@ -88,16 +101,6 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;SchedulePlanReportManageListCtrl&#39;, [
             self.scheduleDateOpen = true;
         };
-        // 初始创建的时候，获取一次列表数据
-        schedulePlanReportManageService.getPage().then(
-            function(result) {
-                self.pageInfo.infos = result;
-            },
-            function(result) {
-                alert("出错啦！");
-            }
-        );
-
         // 翻页的时候调用
         self.pageChanaged = function() {
             schedulePlanReportManageService.getPage().then(
@@ -133,21 +136,87 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;SchedulePlanReportManageListCtrl&#39;, [
             true
         );
-        // 切换到修改页面
-        self.goEditForm = function() {
-            //$state.go("schedulePlanReportManage_edit");
-        }
+        /**
+         * ui-route中param不定义在template-url后，定义在params参数对象中
+         * 参数说明，type=更新方式，groupInfo=分组排班信息
+         * @param type 1=替换车辆，2=修改出场班次1，3=替换分组人员（驾驶员1和售票员1）
+         //   有分班的话，4=修改出场班次2，5=修改分组人员（驾驶员2和售票员2）
+         * @param groupInfo 列表单条数据，表示每条线路，每天，每个路牌谁跑的
+         */
+        self.goEditForm = function(type, groupInfo) {
+            $state.go("schedulePlanReportManage_edit", {
+                type: type,
+                groupInfo: groupInfo
+            });
+        };
+
+
+        // 初始创建的时候，获取一次列表数据
+        schedulePlanReportManageService.tommorwPlan().then(
+            function(result) {
+                self.searchCondition().xlid = result.xl.id;
+                var dd = new Date();
+                dd.setHours(0);
+                dd.setMinutes(0);
+                dd.setSeconds(0);
+                dd.setMilliseconds(0);
+                dd.setTime(dd.getTime() + 24 * 3600 * 1000);
+                self.searchCondition().sdate = dd;
+                self.pageChanaged();
+            },
+            function(result) {
+                self.pageChanaged();
+            }
+        );
     }
 ]);
-angular.module('ScheduleApp').controller('SchedulePlanReportManageFormCtrl', ['SchedulePlanReportManageService', '$stateParams', '$state', function(schedulePlanReportManageService, $stateParams, $state) {
-    // TODO：
-}]);
-
-angular.module('ScheduleApp').controller('SchedulePlanReportManageDetailCtrl', ['SchedulePlanReportManageService', '$stateParams', function(schedulePlanReportManageService, $stateParams) {
-    // TODO：
-}]);
+angular.module('ScheduleApp').controller('SchedulePlanReportManageFormCtrl', [
+    'SchedulePlanReportManageService',
+    '$stateParams',
+    '$state',
+    function(schedulePlanReportManageService, $stateParams, $state) {
+        var self = this;
+        // 传过来的值
+        var type_src = $stateParams.type;
+        var groupInfo_src = $stateParams.groupInfo;
+
+        // 时间正则表达式（格式hh:mm，如：06:39）
+        self.time_regex = /^(([0-1]\d)|(2[0-4])):[0-5]\d$/;
+
+        // 欲修改的groupInfo值
+        self.groupInfo_src = groupInfo_src;
+        self.groupInfo = {};
+        self.type = type_src;
+        angular.copy(groupInfo_src, self.groupInfo);
+
+        // 提交方法
+        self.submit = function() {
+            var param = {
+                type: self.type,
+                src: self.groupInfo_src,
+                update: self.groupInfo
+            };
+            schedulePlanReportManageService.updateDetail(param).then(
+                function(result) {
+                    if (result.status == 'SUCCESS') {
+                        alert("保存成功！");
+                        $state.go("schedulePlanReportManage");
+                    } else {
+                        alert("保存异常！");
+                    }
+                },
+                function(result) {
+                    alert("出错啦！");
+                }
+            );
+        }
+    }
+]);
+angular.module('ScheduleApp').controller('SchedulePlanReportManageDetailCtrl', ['SchedulePlanReportManageService', '$stateParams', function(schedulePlanReportManageService, $stateParams) {
+    // TODO：
+}]);
 \ No newline at end of file