Merge branch 'minhang' of http://192.168.168.201:8888/panzhaov5/bsth_control into minhang

mcy123
2 parents b7fe348a b5a2c433
Showing 55 changed files with 2001 additions and 1783 deletions
src/main/java/com/bsth/controller/schedule/BController.java
src/main/java/com/bsth/controller/schedule/basicinfo/CarDeviceController.java
src/main/java/com/bsth/controller/schedule/basicinfo/EmployeeController.java
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController.java
src/main/java/com/bsth/entity/CarDevice.java
src/main/java/com/bsth/entity/Cars.java
src/main/java/com/bsth/entity/Personnel.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/schedule/GuideboardInfo.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/java/com/bsth/service/schedule/CarDeviceService.java
src/main/java/com/bsth/service/schedule/EmployeeService.java
src/main/java/com/bsth/service/schedule/GuideboardInfoService.java
src/main/java/com/bsth/service/schedule/impl/CarConfigInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/CarDeviceServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/EmployeeConfigInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/EmployeeServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/GuideboardInfoServiceImpl.java
@@ -40,7 +40,7 @@ public class BController&lt;T, ID extends Serializable&gt; {
             t_b.setCreateDate(new Date());
         }
-        T t_saved = bService.save((T) t_b);
+        T t_saved = bService.save(t_b == null ? t : (T) t_b);
         Map<String, Object> rtn = new HashMap<>();
         rtn.put("status", ResponseCode.SUCCESS);
         rtn.put("data", t_saved);
@@ -58,7 +58,7 @@ public class BController&lt;T, ID extends Serializable&gt; {
             t_b.setUpdateDate(new Date());
         }
-        T t_updated = bService.save((T) t_b);
+        T t_updated = bService.save(t_b == null ? t : (T) t_b);
         Map<String, Object> rtn = new HashMap<>();
         rtn.put("status", ResponseCode.SUCCESS);
         rtn.put("data", t_updated);
+package com.bsth.controller.schedule.basicinfo;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.CarDevice;
+import com.bsth.service.schedule.CarDeviceService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.beans.factory.annotation.Autowired;
+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 java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+@RestController(value = "carDeviceController_sc")
+@RequestMapping("cde_sc")
+public class CarDeviceController extends BController<CarDevice, Long> {
+    @Autowired
+    private CarDeviceService carDeviceService;
+
+    @RequestMapping(value = "/validate_qyrq", method = RequestMethod.GET)
+    public Map<String, Object> validate_qyrq(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+
+        try {
+            // 启用日期验证
+            CarDevice carDevice = new CarDevice(
+                    param.get("id_eq"),
+                    param.get("xl_eq"),
+                    param.get("cl_eq"),
+                    param.get("qyrq_eq")
+            );
+            carDeviceService.validate_qyrq(carDevice);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
+}
+package com.bsth.controller.schedule.basicinfo;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.schedule.BController;
+import com.bsth.entity.Personnel;
+import com.bsth.service.schedule.EmployeeService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.beans.factory.annotation.Autowired;
+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 java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 人员基础信息Controller
+ */
+@RestController
+@RequestMapping("ee")
+public class EmployeeController extends BController<Personnel, Integer> {
+    @Autowired
+    private EmployeeService employeeService;
+
+    @RequestMapping(value = "/validate_gh", method = RequestMethod.GET)
+    public Map<String, Object> validate_gh(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 工号验证
+            Personnel personnel = new Personnel(
+                    param.get("id_eq"),
+                    param.get("companyCode_eq"),
+                    param.get("jobCode_eq")
+            );
+            employeeService.validate_gh(personnel);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+}
@@ -48,8 +48,8 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; 
         return guideboardInfoRepository.findLpName(ttid);
     }
-    @RequestMapping(value = "/validate1", method = RequestMethod.GET)
-    public Map<String, Object> validate1(@RequestParam Map<String, Object> param) {
+    @RequestMapping(value = "/validate_lpno", method = RequestMethod.GET)
+    public Map<String, Object> validate_lpno(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
         try {
             // 路牌编号验证
@@ -59,7 +59,7 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; 
                     param.get("lpNo_eq"),
                     null
             );
-            guideboardInfoService.validate(guideboardInfo);
+            guideboardInfoService.validate_lpno(guideboardInfo);
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (ScheduleException exp) {
             rtn.put("status", ResponseCode.ERROR);
@@ -68,8 +68,8 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; 
         return rtn;
     }
-    @RequestMapping(value = "/validate2", method = RequestMethod.GET)
-    public Map<String, Object> validate2(@RequestParam Map<String, Object> param) {
+    @RequestMapping(value = "/validate_lpname", method = RequestMethod.GET)
+    public Map<String, Object> validate_lpname(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
         try {
             // 路牌名称验证
@@ -79,7 +79,7 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; 
                     null,
                     param.get("lpName_eq")
             );
-            guideboardInfoService.validate(guideboardInfo);
+            guideboardInfoService.validate_lpname(guideboardInfo);
             rtn.put("status", ResponseCode.SUCCESS);
         } catch (ScheduleException exp) {
             rtn.put("status", ResponseCode.ERROR);
 package com.bsth.entity;
-import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.schedule.BEntity;
+import org.joda.time.DateTime;
 import javax.persistence.*;
 import java.util.Date;
@@ -10,7 +11,7 @@ import java.util.Date;
  */
 @Entity
 @Table(name = "bsth_c_car_device")
-public class CarDevice {
+public class CarDevice extends BEntity {
     /** 主键 */
     @Id
@@ -62,18 +63,26 @@ public class CarDevice {
     @Column(nullable = false)
     private Boolean isCancel = false;
-    /** 创建人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    private SysUser updateBy;
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
+    public CarDevice() {}
+    public CarDevice(Object id, Object xlid, Object clid, Object qyrq) {
+        if (id != null) {
+            this.id = Long.valueOf(id.toString());
+        }
+        if (xlid != null) {
+            this.xl = Integer.valueOf(xlid.toString());
+        }
+        if (clid != null) {
+            this.cl = Integer.valueOf(clid.toString());
+        }
+        if (qyrq != null) {
+            try {
+                this.qyrq = new Date();
+                this.qyrq.setTime(Long.parseLong(qyrq.toString()));
+            } catch (Exception exp) {
+                this.qyrq = new DateTime(qyrq.toString()).toDate();
+            }
+        }
+    }
     public Long getId() {
         return id;
@@ -179,38 +188,6 @@ public class CarDevice {
         this.guaranteeDesc = guaranteeDesc;
     }
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public Date getQyrq() {
         return qyrq;
     }
 package com.bsth.entity;
-import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.schedule.BEntity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
@@ -24,7 +24,7 @@ import java.util.Date;
 @Entity
 @Table(name = "bsth_c_cars")
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class Cars implements Serializable {
+public class Cars extends BEntity implements Serializable {
 	/** 主键Id */
 	@Id
@@ -136,23 +136,6 @@ public class Cars implements Serializable {
     /** 线路名称（TODO：在原系统里没有，这里暂时留着，并且不做线路关联，只保留个名字） */
     private String xlmc;
-
-	/** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-	private SysUser createBy;
-			
-	/** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-	private SysUser updateBy;
-		
-	/** 创建日期 */
-	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-	private Date createDate;
-		
-	/** 修改日期 */
-	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-	private Date updateDate;
-
     public Cars() {}
     public Cars(Object id, Object nbbh, Object clbh, Object cph, Object sbbh) {
@@ -516,36 +499,4 @@ public class Cars implements Serializable {
     public void setXlmc(String xlmc) {
         this.xlmc = xlmc;
     }
-
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
 }
 package com.bsth.entity;
-import com.bsth.entity.sys.SysUser;
+import com.bsth.entity.schedule.BEntity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
-import java.util.Date;
 /**
  * 
@@ -23,7 +22,7 @@ import java.util.Date;
 @Entity
 @Table(name = "bsth_c_personnel")
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class Personnel {
+public class Personnel extends BEntity {
     /** 主键Id */
 	@Id
@@ -59,6 +58,20 @@ public class Personnel {
     /** 身份证 */
     private String card;
+    public Personnel() {}
+
+    public Personnel(Object id, Object companyCode, Object gh) {
+        if (id != null) {
+            this.id = Integer.valueOf(id.toString());
+        }
+        if (companyCode != null) {
+            this.companyCode = companyCode.toString();
+        }
+        if (gh != null) {
+            this.jobCode = gh.toString();
+        }
+    }
+
 	public String getCard() {
 		return card;
 	}
@@ -78,23 +91,6 @@ public class Personnel {
     /** 描述（TODO：在原系统里没有，这里暂时留着） */
     private String descriptions;
-
-
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser updateBy;
-
-	/** 创建日期 */
-	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-	private Date createDate;
-		
-	/** 修改日期 */
-	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-	private Date updateDate;
-
     public Integer getId() {
         return id;
     }
@@ -222,36 +218,4 @@ public class Personnel {
     public void setDescriptions(String descriptions) {
         this.descriptions = descriptions;
     }
-
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
 }
@@ -163,7 +163,7 @@ public class ScheduleRealInfo {
 	private String qdzArrDatesj;
 	/** 子任务 */
-	@OneToMany(fetch = FetchType.LAZY/*, cascade = CascadeType.ALL*/)
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 	private Set<ChildTaskPlan> cTasks = new HashSet<>();
 	/** 关联的公司名称 */
 package com.bsth.entity.schedule;
 import com.bsth.entity.Line;
-import com.bsth.entity.sys.SysUser;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
-import java.util.Date;
 /**
  * 路牌信息。
@@ -18,7 +16,7 @@ import java.util.Date;
         })
 })
 @JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
-public class GuideboardInfo {
+public class GuideboardInfo extends BEntity {
     /** 主键Id */
     @Id
@@ -43,21 +41,6 @@ public class GuideboardInfo {
     @Column(nullable = false)
     private Boolean isCancel = false;
-    /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser createBy;
-    /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
-    private SysUser updateBy;
-
-    /** 创建日期 */
-    @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private Date createDate;
-    /** 修改日期 */
-    @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
-    private Date updateDate;
-
-
     public GuideboardInfo() {}
     public GuideboardInfo(Object id, Object xlid, Object lpNo, Object lpName) {
@@ -126,38 +109,6 @@ public class GuideboardInfo {
         this.lpType = lpType;
     }
-    public SysUser getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(SysUser createBy) {
-        this.createBy = createBy;
-    }
-
-    public SysUser getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(SysUser updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
     public Boolean getIsCancel() {
         return isCancel;
     }
 package com.bsth.repository.realcontrol;
-import java.util.List;
-import java.util.Map;
-
-import javax.transaction.Transactional;
-
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.BaseRepository;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.repository.BaseRepository;
+import javax.transaction.Transactional;
+import java.util.List;
+import java.util.Map;
 @Repository
 public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealInfo, Long>{
@@ -113,12 +111,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
 	List<ScheduleRealInfo> setLD(String date);
-	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,lpName,clZbh ORDER BY xlBm,lpName,clZbh")
-	List<ScheduleRealInfo> setLDGroup(String date);
+	@Query(value="select new map(xlBm as xlBm,lpName as lpName,clZbh as clZbh) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,lpName,clZbh ORDER BY xlBm,lpName,clZbh")
+	List<Map<String,Object>> setLDGroup(String date);
-	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,clZbh ORDER BY xlBm,clZbh")
-	List<ScheduleRealInfo> setLCYHGroup(String date);
+	@Query(value="select new map(xlBm as xlBm,clZbh as clZbh) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm,clZbh ORDER BY xlBm,clZbh")
+	List<Map<String,Object>> setLCYHGroup(String date);
-	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm ORDER BY xlBm")
-	List<ScheduleRealInfo> setDDRBGroup(String date);
+	@Query(value="select new map(xlBm as xlBm) from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm ORDER BY xlBm")
+	List<Map<String,Object>> setDDRBGroup(String date);
+
 }
@@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Service;
 import java.io.BufferedOutputStream;
@@ -104,9 +103,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	@Autowired
 	private ScheduleRealInfoRepository scheduleRealInfoRepository;
-	@Autowired
-	NamedParameterJdbcTemplate jdbcTemplate;
-
 	// 运管处接口
 	private InternalPortType portType = new Internal().getInternalHttpSoap11Endpoint();
@@ -308,31 +304,31 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		try {
 			sf.append("<DLDS>");
 			List<ScheduleRealInfo> list = scheduleRealInfoRepository.setLD(date);
-			List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setLDGroup(date);
+			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setLDGroup(date);
 			Map<String,Object> map = new HashMap<String,Object>();
-			for(ScheduleRealInfo schRealInfo:listGroup){
+			for(Map<String,Object> schRealInfo:listGroup){
 				if(schRealInfo != null){
 					//根据车辆自编号查询车牌号
-					map.put("insideCode_eq", schRealInfo.getClZbh());
+					map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
 					Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
 					// 获取线路是否使用标识，如果未使用，则不查该线路数据
-					line = lineRepository.findByLineCode(schRealInfo.getXlBm());
+					line = lineRepository.findByLineCode(schRealInfo.get("xlBm")+"");
 					if(line.getInUse() == null || line.getInUse() == 0){
 						continue;
 					}
 					sf.append("<DLD>");
-					sf.append("<RQ>"+schRealInfo.getScheduleDateStr()+"</RQ>");
-					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.getXlBm())+"</XLBM>");
-					sf.append("<LPBH>"+schRealInfo.getLpName()+"</LPBH>");
+					sf.append("<RQ>"+date+"</RQ>");
+					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm")+"")+"</XLBM>");
+					sf.append("<LPBH>"+schRealInfo.get("lpName")+"</LPBH>");
 					sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
-					sf.append("<UPDT>"+sdfnyrsfm.format(schRealInfo.getUpdateDate())+"</UPDT>");
+					sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
 					sf.append("<LDList>");
 					int seqNumber = 0;
 					for(ScheduleRealInfo scheduleRealInfo:list){
-						if(schRealInfo.getXlBm().equals(scheduleRealInfo.getXlBm()) && schRealInfo.getLpName()
+						if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("lpName")+"")
 								.equals(scheduleRealInfo.getLpName())
-								&& schRealInfo.getClZbh().equals(scheduleRealInfo.getClZbh())){
+								&& (schRealInfo.get("clZbh")+"").equals(scheduleRealInfo.getClZbh())){
 							if(scheduleRealInfo.getFcsjActual() == null ||scheduleRealInfo.getBcType().equals("in")
 									|| scheduleRealInfo.getBcType().equals("out")){
 								continue;
@@ -390,22 +386,22 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		StringBuffer sf = new StringBuffer();
 		try {
 			sf.append("<LCYHS>");
-			List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setLCYHGroup(date);
+			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setLCYHGroup(date);
 			List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date);
 			Map<String,Object> map = new HashMap<String,Object>();
-			for(ScheduleRealInfo schRealInfo:listGroup){
+			for(Map<String,Object> schRealInfo:listGroup){
 				if(schRealInfo != null){
 					//计算总公里和空驶公里，营运公里=总公里-空驶公里
 					double totalKilometers = 0,emptyKilometers =0;
 					sf.append("<LCYH>");
-					map.put("insideCode_eq", schRealInfo.getClZbh());
+					map.put("insideCode_eq", schRealInfo.get("clZbh")+"");
 					Cars car = carsRepository.findOne(new CustomerSpecs<Cars>(map));
 //					Cars car = carsRepository.findCarByClzbh(schRealInfo.getClZbh());
-					sf.append("<RQ>"+schRealInfo.getScheduleDateStr()+"</RQ>");
-					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.getXlBm())+"</XLBM>");
+					sf.append("<RQ>"+date+"</RQ>");
+					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm"))+"</XLBM>");
 					sf.append("<CPH>"+car.getCarPlate()+"</CPH>");
 					for(ScheduleRealInfo scheduleRealInfo:list){
-						if(schRealInfo.getXlBm().equals(scheduleRealInfo.getXlBm()) && schRealInfo.getClZbh()
+						if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm()) && (schRealInfo.get("clZbh")+"")
 								.equals(scheduleRealInfo.getClZbh())){
 							Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 							//如果没有子任务，里程就是已执行（Status=2）;有子任务的，忽略主任务，子任务的烂班
@@ -436,7 +432,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sf.append("<YH>"+""+"</YH>");
 					sf.append("<JZYL>"+""+"</JZYL>");
 					sf.append("<DH>"+""+"</DH>");
-					sf.append("<UPDT>"+sdfnyrsfm.format(schRealInfo.getUpdateDate())+"</UPDT>");
+					sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
 					sf.append("<BBSCBZ>"+0+"</BBSCBZ>");
 					sf.append("</LCYH>");
 				}
@@ -466,18 +462,18 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		StringBuffer sf = new StringBuffer();
 		try {
 			sf.append("<DDRBS>");
-			List<ScheduleRealInfo> listGroup = scheduleRealInfoRepository.setDDRBGroup(date);
+			List<Map<String,Object>> listGroup = scheduleRealInfoRepository.setDDRBGroup(date);
 			List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDate(date);
-			for(ScheduleRealInfo schRealInfo:listGroup){
+			for(Map<String,Object> schRealInfo:listGroup){
 				if(schRealInfo != null){
 					double jhlc = 0,zlc = 0,jhkslc = 0,sjkslc = 0;
 					int jhbc = 0,sjbc = 0,jhzgfbc = 0,sjzgfbc = 0,jhwgfbc = 0,sjwgfbc = 0;
 					sf.append("<DDRB>");
-					sf.append("<RQ>"+schRealInfo.getScheduleDateStr()+"</RQ>");
-					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.getXlBm())+"</XLBM>");
+					sf.append("<RQ>"+date+"</RQ>");
+					sf.append("<XLBM>"+BasicData.lineCode2ShangHaiCodeMap.get(schRealInfo.get("xlBm"))+"</XLBM>");
 					for(ScheduleRealInfo scheduleRealInfo:list){
 						if(scheduleRealInfo != null){
-							if(scheduleRealInfo.getXlBm().equals(scheduleRealInfo.getXlBm())){
+							if((schRealInfo.get("xlBm")+"").equals(scheduleRealInfo.getXlBm())){
 								//计划
 								if(!scheduleRealInfo.isSflj()){
 									jhlc += scheduleRealInfo.getJhlc()==null?0.0:scheduleRealInfo.getJhlc();
@@ -540,7 +536,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sf.append("<SJZGFBC>"+sjzgfbc+"</SJZGFBC>");
 					sf.append("<JHWGFBC>"+jhwgfbc+"</JHWGFBC>");
 					sf.append("<SJWGFBC>"+sjwgfbc+"</SJWGFBC>");
-					sf.append("<UPDT>"+sdfnyrsfm.format(schRealInfo.getUpdateDate())+"</UPDT>");
+					sf.append("<UPDT>"+sdfnyrsfm.format(new Date())+"</UPDT>");
 					sf.append("<RBSCBZ>"+0+"</RBSCBZ>");
 					sf.append("</DDRB>");
 				}
 package com.bsth.service.realcontrol.impl;
-import java.util.Map;
-
-import javax.transaction.Transactional;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.bsth.data.BasicData;
 import com.bsth.data.match.Arrival2Schedule;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ChildTaskPlanRepository;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ChildTaskPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.Map;
 @Service
 public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService{
 	/*@Autowired
 	ScheduleRealInfoServiceImpl scheduleRealInfoService;*/
+
+	@Autowired
+	ScheduleRealInfoRepository scheduleRealInfoRepository;
 	@Autowired
 	ChildTaskPlanRepository childTaskPlanRepository;
@@ -30,6 +33,9 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
 	@Autowired
 	Arrival2Schedule arrival2Schedule;
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
 	@Transactional
 	@Override
@@ -62,10 +68,13 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
 		//解除和主任务关联
 		ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
 		sch.getcTasks().remove(cPlan);
+		//删除关联表数据
+		jdbcTemplate.execute("delete from bsth_c_s_sp_info_real_c_tasks where bsth_c_s_sp_info_real="+sch.getId()+" and c_tasks="+cPlan.getId());
+
 		//删除子任务
 		rs = super.delete(id);
 		dayOfSchedule.save(sch);
-		
+
 		rs.put("t", sch);
 		return rs;
 	}
+package com.bsth.service.schedule;
+
+import com.bsth.entity.CarDevice;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+public interface CarDeviceService extends BService<CarDevice, Long> {
+    void validate_qyrq(CarDevice carDevice) throws ScheduleException;
+}
+package com.bsth.service.schedule;
+
+import com.bsth.entity.Personnel;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+public interface EmployeeService extends BService<Personnel, Integer> {
+    public void validate_gh(Personnel personnel) throws ScheduleException;
+}
@@ -6,6 +6,8 @@ import com.bsth.entity.schedule.GuideboardInfo;
  * Created by xu on 16/5/11.
  */
 public interface GuideboardInfoService extends BService<GuideboardInfo, Long> {
-    public void validate(GuideboardInfo guideboardInfo) throws ScheduleException;
+    public void validate_lpno(GuideboardInfo guideboardInfo) throws ScheduleException;
+    public void validate_lpname(GuideboardInfo guideboardInfo) throws ScheduleException;
     public void toggleCancel(Long id) throws ScheduleException;
+
 }
@@ -36,12 +36,14 @@ public class CarConfigInfoServiceImpl extends BServiceImpl&lt;CarConfigInfo, Long&gt; 
             throw new ScheduleException("线路未选择");
         } else {
 //            param.put("xl.id_eq", carConfigInfo.getXl().getId());
+            param.put("isCancel_eq", false);
             if (carConfigInfo.getCl() == null || carConfigInfo.getCl().getId() == null) {
                 throw new ScheduleException("车辆未选择");
             } else {
                 param.put("cl.id_eq", carConfigInfo.getCl().getId());
-                if (!CollectionUtils.isEmpty(list(param))) {
-                    throw new ScheduleException("车辆已经配置在" + carConfigInfo.getXl().getName() + "线路中！");
+                List<CarConfigInfo> carConfigInfos = list(param);
+                if (!CollectionUtils.isEmpty(carConfigInfos)) {
+                    throw new ScheduleException("车辆已经配置在" + carConfigInfos.get(0).getXl().getName() + "线路中！");
                 }
             }
         }
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.CarDevice;
+import com.bsth.entity.Cars;
+import com.bsth.service.CarsService;
+import com.bsth.service.schedule.CarDeviceService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+@Service(value = "carDeviceServiceImpl_sc")
+public class CarDeviceServiceImpl extends BServiceImpl<CarDevice, Long> implements CarDeviceService {
+    @Autowired
+    private CarsService carsService;
+
+    @Transactional
+    @Override
+    public CarDevice save(CarDevice carDevice) {
+        // 查找对应的车辆基础信息，更新设备编号数据
+        Cars cars = carsService.findById(carDevice.getCl());
+        cars.setEquipmentCode(carDevice.getNewDeviceNo());
+        return super.save(carDevice);
+    }
+
+    @Transactional
+    @Override
+    public void validate_qyrq(CarDevice carDevice) throws ScheduleException {
+        if (carDevice.getXl() == null) {
+            throw new ScheduleException("线路未选择");
+        }
+        if (carDevice.getCl() == null) {
+            throw new ScheduleException("车辆未选择");
+        }
+        Map<String, Object> param = new HashMap<>();
+        if (carDevice.getId() != null) {
+            param.put("id_ne", carDevice.getId());
+        }
+        param.put("xl_eq", carDevice.getXl());
+        param.put("cl_eq", carDevice.getCl());
+        param.put("qyrq_ge", carDevice.getQyrq());
+        if (!CollectionUtils.isEmpty(list(param))) {
+            throw new ScheduleException("启用日期必须比历史的启用日期大");
+        }
+    }
+
+    @Transactional
+    @Override
+    public void delete(Long aLong) throws ScheduleException {
+        toggleCancel(aLong);
+    }
+
+    @Transactional
+    public void toggleCancel(Long id) throws ScheduleException {
+        CarDevice carDevice = findById(id);
+        if (carDevice.getIsCancel()) {
+            carDevice.setIsCancel(false);
+        } else {
+            carDevice.setIsCancel(true);
+        }
+    }
+}
@@ -34,12 +34,15 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
                 employeeConfigInfo.getXl().getName() == null) {
             throw new ScheduleException("线路未选择");
         } else {
+//            param.put("xl.id_eq", employeeConfigInfo.getXl().getId());
+            param.put("isCancel_eq", false);
             if (employeeConfigInfo.getJsy() == null || employeeConfigInfo.getJsy().getId() == null) {
                 throw new ScheduleException("驾驶员未选择");
             } else {
                 param.put("jsy.id_eq", employeeConfigInfo.getJsy().getId());
+                List<EmployeeConfigInfo> employeeConfigInfos = list(param);
                 if (!CollectionUtils.isEmpty(list(param))) {
-                    throw new ScheduleException("驾驶员已经配置在" + employeeConfigInfo.getXl().getName() + "线路中！");
+                    throw new ScheduleException("驾驶员已经配置在" + employeeConfigInfos.get(0).getXl().getName() + "线路中！");
                 }
             }
         }
@@ -59,12 +62,14 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
                 employeeConfigInfo.getXl().getName() == null) {
             throw new ScheduleException("线路未选择");
         } else {
+//            param.put("xl.id_eq", employeeConfigInfo.getXl().getId());
             if (employeeConfigInfo.getSpy() == null || employeeConfigInfo.getSpy().getId() == null) {
                 throw new ScheduleException("售票员未选择");
             } else {
                 param.put("spy.id_eq", employeeConfigInfo.getSpy().getId());
+                List<EmployeeConfigInfo> employeeConfigInfos = list(param);
                 if (!CollectionUtils.isEmpty(list(param))) {
-                    throw new ScheduleException("售票员已经配置在" + employeeConfigInfo.getXl().getName() + "线路中！");
+                    throw new ScheduleException("售票员已经配置在" + employeeConfigInfos.get(0).getXl().getName() + "线路中！");
                 }
             }
         }
+package com.bsth.service.schedule.impl;
+
+import com.bsth.entity.Personnel;
+import com.bsth.service.schedule.EmployeeService;
+import com.bsth.service.schedule.ScheduleException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by xu on 16/12/15.
+ */
+@Service
+public class EmployeeServiceImpl extends BServiceImpl<Personnel, Integer> implements EmployeeService {
+    @Override
+    @Transactional
+    public void validate_gh(Personnel personnel) throws ScheduleException {
+        // 查询条件
+        Map<String, Object> param = new HashMap<>();
+        if (personnel.getId() != null) {
+            param.put("id_ne", personnel.getId());
+        }
+        param.put("companyCode_eq", personnel.getCompanyCode());
+        param.put("jobCode_eq", personnel.getJobCode());
+        if (!CollectionUtils.isEmpty(list(param))) {
+            throw new ScheduleException("相同公司工号重复");
+        }
+    }
+}
@@ -22,52 +22,44 @@ public class GuideboardInfoServiceImpl extends BServiceImpl&lt;GuideboardInfo, Long
     @Autowired
     private TTInfoDetailService ttInfoDetailService;
-    // 验证方法
-    @Transactional
-    public void validate(GuideboardInfo guideboardInfo) throws ScheduleException {
+    @Override
+    public void validate_lpno(GuideboardInfo guideboardInfo) throws ScheduleException {
         // 查询条件
         Map<String, Object> param = new HashMap<>();
-        if (guideboardInfo.getId() != null)
+        if (guideboardInfo.getId() != null) {
             param.put("id_ne", guideboardInfo.getId());
+        }
         if (guideboardInfo.getXl() == null || guideboardInfo.getXl().getId() == null) {
             throw new ScheduleException("线路未选择");
         } else {
+            param.put("isCancel_eq", false); // 作废的也算入判定区
             param.put("xl.id_eq", guideboardInfo.getXl().getId());
+            param.put("lpNo_eq", guideboardInfo.getLpNo());
+            if (!CollectionUtils.isEmpty(list(param))) {
+                throw new ScheduleException("路牌编号重复");
+            }
+        }
+    }
-//            param.put("isCancel_eq", false); // 作废的也算入判定区
-            if (guideboardInfo.getLpNo() != null) {
-                if (guideboardInfo.getLpName() != null) {
-                    // 如果两个都写了，分开查询
-                    param.put("lpNo_eq", guideboardInfo.getLpNo());
-                    if (!CollectionUtils.isEmpty(list(param))) {
-                        throw new ScheduleException("路牌编号重复");
-                    }
-                    param.remove("lpNo_eq");
-                    param.put("lpName_eq", guideboardInfo.getLpName());
-                    if (!CollectionUtils.isEmpty(list(param))) {
-                        throw new ScheduleException("路牌名称重复");
-                    }
+    @Override
+    public void validate_lpname(GuideboardInfo guideboardInfo) throws ScheduleException {
+        // 查询条件
+        Map<String, Object> param = new HashMap<>();
+        if (guideboardInfo.getId() != null) {
+            param.put("id_ne", guideboardInfo.getId());
+        }
-                } else {
-                    param.put("lpNo_eq", guideboardInfo.getLpNo());
-                    if (!CollectionUtils.isEmpty(list(param))) {
-                        throw new ScheduleException("路牌编号重复");
-                    }
-                }
-            } else {
-                if (guideboardInfo.getLpName() != null) {
-                    param.put("lpName_eq", guideboardInfo.getLpName());
-                    if (!CollectionUtils.isEmpty(list(param))) {
-                        throw new ScheduleException("路牌名字重复");
-                    }
-                } else {
-                    // 都为空
-                    throw new ScheduleException("路牌编号名字都为空");
-                }
+        if (guideboardInfo.getXl() == null || guideboardInfo.getXl().getId() == null) {
+            throw new ScheduleException("线路未选择");
+        } else {
+            param.put("isCancel_eq", false); // 作废的也算入判定区
+            param.put("xl.id_eq", guideboardInfo.getXl().getId());
+            param.put("lpName_eq", guideboardInfo.getLpName());
+            if (!CollectionUtils.isEmpty(list(param))) {
+                throw new ScheduleException("路牌名字重复");
             }
         }
-
     }
     @Transactional
@@ -83,7 +75,8 @@ public class GuideboardInfoServiceImpl extends BServiceImpl&lt;GuideboardInfo, Long
         GuideboardInfo guideboardInfo = findById(id);
         Map<String, Object> param = new HashMap<>();
         if (guideboardInfo.getIsCancel()) {
-            validate(guideboardInfo);
+            validate_lpno(guideboardInfo);
+            validate_lpname(guideboardInfo);
             guideboardInfo.setIsCancel(false);
         } else {
             param.clear();
@@ -96,7 +89,7 @@ public class GuideboardInfoServiceImpl extends BServiceImpl&lt;GuideboardInfo, Long
             } else {
                 throw new ScheduleException("在时刻表" +
                         ttInfoDetailList.get(0).getTtinfo().getName() +
-                        "已使用，无法删除！");
+                        "已使用，无法作废！");
             }
         }
     }
@@ -48,7 +48,7 @@
                                required ng-maxlength="20"
                                remote-Validation
                                remotevtype="cars_zbh"
-                               remotevparam="{{ {'insideCode_eq': ctrl.busInfoForSave.insideCode} | json}}"
+                               remotevparam="{{ {'id_eq': ctrl.busInfoForSave.id, 'insideCode_eq': ctrl.busInfoForSave.insideCode} | json}}"
                                placeholder="请输入车辆内部编码"/>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
@@ -66,18 +66,18 @@
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">所属公司*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.busInfoForSave"
-                                    name="gs"
-                                    placeholder="请选择所属公司..."
-                                    dcvalue="{{ctrl.busInfoForSave.businessCode}}"
+                        <sa-Select5 name="gs"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'businessCode': 'code', 'company': 'name'}"
                                     dcname="businessCode"
                                     icname="code"
-                                    dcname2="company"
-                                    icname2="name"
-                                    icnames="name"
-                                    datatype="gsType"
+                                    dsparams="{{ {type: 'dic', param: 'gsType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择所属公司..."
+                                    searchexp="this.name"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
@@ -108,7 +108,7 @@
                                required placeholder="请输入车辆编码"
                                remote-Validation
                                remotevtype="cars_clbh"
-                               remotevparam="{{ {'carCode_eq': ctrl.busInfoForSave.carCode} | json}}"
+                               remotevparam="{{ {'id_eq': ctrl.busInfoForSave.id, 'carCode_eq': ctrl.busInfoForSave.carCode} | json}}"
                                 />
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
@@ -128,7 +128,7 @@
                                required placeholder="请输入车牌号"
                                remote-Validation
                                remotevtype="cars_cph"
-                               remotevparam="{{ {'carPlate_eq': ctrl.busInfoForSave.carPlate} | json}}"
+                               remotevparam="{{ {'id_eq': ctrl.busInfoForSave.id, 'carPlate_eq': ctrl.busInfoForSave.carPlate} | json}}"
                                 />
                     </div>
                     <!-- 隐藏快，显示验证信息 -->
@@ -143,16 +143,18 @@
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">设备供应厂商*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.busInfoForSave"
-                                    name="supplierName"
-                                    placeholder="请选择设备厂商..."
-                                    dcvalue="{{ctrl.busInfoForSave.supplierName}}"
+                        <sa-Select5 name="supplierName"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'supplierName': 'code'}"
                                     dcname="supplierName"
                                     icname="code"
-                                    icnames="name"
-                                    datatype="snames"
+                                    dsparams="{{ {type: 'dic', param: 'snames' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择设备厂商..."
+                                    searchexp="this.name"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏快，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.supplierName.$error.required">
@@ -168,7 +170,7 @@
                                required placeholder="请输入设备终端号"
                                remote-Validation
                                remotevtype="cars_sbbh"
-                               remotevparam="{{ {'equipmentCode_eq': ctrl.busInfoForSave.equipmentCode} | json}}"
+                               remotevparam="{{ {'id_eq': ctrl.busInfoForSave.id, 'equipmentCode_eq': ctrl.busInfoForSave.equipmentCode} | json}}"
                                 />
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
@@ -369,45 +371,54 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">车辆类型：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.busInfoForSave"
-                                    name="carType"
-                                    placeholder="请选择车辆类型..."
-                                    dcvalue="{{ctrl.busInfoForSave.carType}}"
+                        <sa-Select5 name="carType"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'carType': 'code'}"
                                     dcname="carType"
                                     icname="code"
-                                    icnames="name"
-                                    datatype="carType" >
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'dic', param: 'carType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择车辆类型..."
+                                    searchexp="this.name"
+                                >
+                        </sa-Select5>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否机动车：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.busInfoForSave"
-                                    name="vehicleStats"
-                                    placeholder="请选择机动车类型..."
-                                    dcvalue="{{ctrl.busInfoForSave.vehicleStats}}"
+                        <sa-Select5 name="vehicleStats"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'vehicleStats': 'code'}"
                                     dcname="vehicleStats"
                                     icname="code"
-                                    icnames="name"
-                                    datatype="jdcType" >
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'dic', param: 'jdcType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择机动车类型..."
+                                    searchexp="this.name"
+                                >
+                        </sa-Select5>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">营运状态：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.busInfoForSave"
-                                    name="operatorsState"
-                                    placeholder="请选择营运状态..."
-                                    dcvalue="{{ctrl.busInfoForSave.operatorsState}}"
+                        <sa-Select5 name="operatorsState"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'operatorsState': 'code'}"
                                     dcname="operatorsState"
                                     icname="code"
-                                    icnames="name"
-                                    datatype="yyztType" >
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'dic', param: 'yyztType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择营运状态..."
+                                    searchexp="this.name"
+                                >
+                        </sa-Select5>
                     </div>
                 </div>
@@ -66,18 +66,18 @@
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">所属公司*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.busInfoForSave"
-                                    name="gs"
-                                    placeholder="请选择所属公司..."
-                                    dcvalue="{{ctrl.busInfoForSave.businessCode}}"
+                        <sa-Select5 name="gs"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'businessCode': 'code', 'company': 'name'}"
                                     dcname="businessCode"
                                     icname="code"
-                                    dcname2="company"
-                                    icname2="name"
-                                    icnames="name"
-                                    datatype="gsType"
+                                    dsparams="{{ {type: 'dic', param: 'gsType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择所属公司..."
+                                    searchexp="this.name"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
@@ -143,16 +143,18 @@
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">设备供应厂商*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.busInfoForSave"
-                                    name="supplierName"
-                                    placeholder="请选择设备厂商..."
-                                    dcvalue="{{ctrl.busInfoForSave.supplierName}}"
+                        <sa-Select5 name="supplierName"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'supplierName': 'code'}"
                                     dcname="supplierName"
                                     icname="code"
-                                    icnames="name"
-                                    datatype="snames"
+                                    dsparams="{{ {type: 'dic', param: 'snames' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择设备厂商..."
+                                    searchexp="this.name"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏快，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.supplierName.$error.required">
@@ -369,45 +371,54 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">车辆类型：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.busInfoForSave"
-                                    name="carType"
-                                    placeholder="请选择车辆类型..."
-                                    dcvalue="{{ctrl.busInfoForSave.carType}}"
+                        <sa-Select5 name="carType"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'carType': 'code'}"
                                     dcname="carType"
                                     icname="code"
-                                    icnames="name"
-                                    datatype="carType" >
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'dic', param: 'carType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择车辆类型..."
+                                    searchexp="this.name"
+                                     >
+                        </sa-Select5>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">是否机动车：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.busInfoForSave"
-                                    name="vehicleStats"
-                                    placeholder="请选择机动车类型..."
-                                    dcvalue="{{ctrl.busInfoForSave.vehicleStats}}"
+                        <sa-Select5 name="vehicleStats"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'vehicleStats': 'code'}"
                                     dcname="vehicleStats"
                                     icname="code"
-                                    icnames="name"
-                                    datatype="jdcType" >
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'dic', param: 'jdcType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择机动车类型..."
+                                    searchexp="this.name"
+                                    >
+                        </sa-Select5>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="col-md-2 control-label">营运状态：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.busInfoForSave"
-                                    name="operatorsState"
-                                    placeholder="请选择营运状态..."
-                                    dcvalue="{{ctrl.busInfoForSave.operatorsState}}"
+                        <sa-Select5 name="operatorsState"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'operatorsState': 'code'}"
                                     dcname="operatorsState"
                                     icname="code"
-                                    icnames="name"
-                                    datatype="yyztType" >
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'dic', param: 'yyztType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择营运状态..."
+                                    searchexp="this.name"
+                                >
+                        </sa-Select5>
                     </div>
                 </div>
@@ -30,15 +30,18 @@
                 </td>
                 <td>
                     <div>
-                        <sa-Select3 model="ctrl.searchCondition()"
-                                    name="gs"
-                                    placeholder="请选择..."
-                                    dcvalue="{{ctrl.searchCondition().businessCode_eq}}"
+                        <sa-Select5 name="gs"
+                                    model="ctrl.searchCondition()"
+                                    cmaps="{'businessCode_eq': 'code'}"
                                     dcname="businessCode_eq"
                                     icname="code"
-                                    icnames="name"
-                                    datatype="gsType">
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'dic', param: 'gsType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="选择公司..."
+                                    searchexp="this.name"
+                                >
+                        </sa-Select5>
                     </div>
                 </td>
                 <td>
@@ -247,9 +247,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 提交方法
             self.submit = function() {
                 console.log(self.busInfoForSave);
-                //if (self.busInfoForSave) {
-                //    delete $stateParams.id;
-                //}
+                // 保存或者更新
                 self.busInfoForSave.$save(function() {
                     $state.go("busInfoManage");
                 });
 // 车辆信息service
-angular.module('ScheduleApp').factory('BusInfoManageService_g', ['$resource', function($resource) {
-    return {
-        rest: $resource(
-            '/cars_sc/:id',
-            {order: 'carCode', direction: 'ASC', id: '@id_route'},
-            {
-                list: {
-                    method: 'GET',
-                    params: {
-                        page: 0
-                    },
-                    transformResponse: function(rs) {
-                        var dst = angular.fromJson(rs);
-                        if (dst.status == 'SUCCESS') {
-                            return dst.data;
-                        } else {
-                            return dst; // 业务错误留给控制器处理
+angular.module('ScheduleApp').factory(
+    'BusInfoManageService_g',
+    [
+        '$resource',
+        function($resource) {
+            return {
+                rest: $resource(
+                    '/cars_sc/:id',
+                    {order: 'carCode', direction: 'ASC', id: '@id'},
+                    {
+                        list: {
+                            method: 'GET',
+                            params: {
+                                page: 0
+                            },
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        },
+                        get: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst;
+                                }
+                            }
+                        },
+                        save: {
+                            method: 'POST'
                         }
                     }
-                },
-                get: {
-                    method: 'GET',
-                    transformResponse: function(rs) {
-                        var dst = angular.fromJson(rs);
-                        if (dst.status == 'SUCCESS') {
-                            return dst.data;
-                        } else {
-                            return dst;
+                ),
+                import: $resource(
+                    '/cars/importfile',
+                    {},
+                    {
+                        do: {
+                            method: 'POST',
+                            headers: {
+                                'Content-Type': 'application/x-www-form-urlencoded'
+                            },
+                            transformRequest: function(obj) {
+                                var str = [];
+                                for (var p in obj) {
+                                    str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+                                }
+                                return str.join("&");
+                            }
                         }
                     }
-                },
-                save: {
-                    method: 'POST'
-                }
-            }
-        ),
-        import: $resource(
-            '/cars/importfile',
-            {},
-            {
-                do: {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/x-www-form-urlencoded'
-                    },
-                    transformRequest: function(obj) {
-                        var str = [];
-                        for (var p in obj) {
-                            str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+                ),
+                dataTools: $resource(
+                    '/cars/:type',
+                    {},
+                    {
+                        dataExport: {
+                            method: 'GET',
+                            responseType: "arraybuffer",
+                            params: {
+                                type: "dataExport"
+                            },
+                            transformResponse: function(data, headers){
+                                return {data : data};
+                            }
                         }
-                        return str.join("&");
                     }
-                }
-            }
-        ),
-        validate: $resource(
-            '/cars/validate/:type',
-            {},
-            {
-                insideCode: {
-                    method: 'GET'
-                }
-            }
-        ),
-        dataTools: $resource(
-            '/cars/:type',
-            {},
-            {
-                dataExport: {
-                    method: 'GET',
-                    responseType: "arraybuffer",
-                    params: {
-                        type: "dataExport"
-                    },
-                    transformResponse: function(data, headers){
-                        return {data : data};
-                    }
-                }
-            }
-        )
-    };
-}]);
 \ No newline at end of file
+                )
+            };
+
+        }
+    ]
+);
 \ No newline at end of file
@@ -147,7 +147,7 @@
                                    ng-model="ctrl.deviceInfoForSave.qyrq" readonly
                                    remote-Validation
                                    remotevtype="cde1"
-                                   remotevparam="{{ {'qyrq': ctrl.deviceInfoForSave.qyrq, 'xl': ctrl.deviceInfoForSave.xl, 'cl': ctrl.deviceInfoForSave.cl} | json}}"/>
+                                   remotevparam="{{ {'id_eq': ctrl.deviceInfoForSave.id, 'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>
                             <span class="input-group-btn">
                                 <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
                                     <i class="glyphicon glyphicon-calendar"></i>
@@ -160,7 +160,7 @@
                         启用日期必须选择
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
-                        启用日期必须比历史的启用日期大
+                        {{$remote_msg}}
                     </div>
                 </div>
@@ -147,7 +147,7 @@
                                    ng-model="ctrl.deviceInfoForSave.qyrq" readonly
                                    remote-Validation
                                    remotevtype="cde1"
-                                   remotevparam="{{ {'qyrq': ctrl.deviceInfoForSave.qyrq, 'xl': ctrl.deviceInfoForSave.xl, 'cl': ctrl.deviceInfoForSave.cl} | json}}"/>
+                                   remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}"/>
                             <span class="input-group-btn">
                                 <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
                                     <i class="glyphicon glyphicon-calendar"></i>
@@ -160,7 +160,7 @@
                         启用日期必须选择
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
-                        启用日期必须比历史的启用日期大
+                        {{$remote_msg}}
                     </div>
                 </div>
@@ -12,7 +12,8 @@
                 <th>新设备编号</th>
                 <th>旧SIM卡</th>
                 <th>新SIM卡</th>
-                <th style="width: 180px;">创建时间</th>
+                <th style="width: 180px;">更新时间</th>
+                <th style="width: 80px;" >状态</th>
                 <th style="width: 150pt;">操作</th>
             </tr>
             <tr role="row" class="filter">
@@ -41,19 +42,24 @@
                 <td></td>
                 <td></td>
                 <td>
+                    <label class="checkbox-inline input">
+                        <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']" />已作废
+                    </label>
+                </td>
+                <td>
                     <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
-                            ng-click="ctrl.pageChanaged()">
+                            ng-click="ctrl.doPage()">
                         <i class="fa fa-search"></i> 搜索</button>
                     <button class="btn btn-sm red btn-outline filter-cancel"
-                            ng-click="ctrl.resetSearchCondition()">
+                            ng-click="ctrl.reset()">
                         <i class="fa fa-times"></i> 重置</button>
                 </td>
             </tr>
             </thead>
             <tbody>
-            <tr ng-repeat="info in ctrl.pageInfo.infos" ng-class="{odd: true, gradeX: true, danger: info.isCancel}">
+            <tr ng-repeat="info in ctrl.page()['content']" ng-class="{odd: true, gradeX: true, danger: info.isCancel}">
                 <td>
                     <span ng-bind="$index + 1"></span>
                 </td>
@@ -79,15 +85,19 @@
                     <span ng-bind="info.newSimNo"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.createDate | date:'yyyy-MM-dd HH:mm:ss'"></span>
+                    <span ng-bind="info.updateDate | date:'yyyy-MM-dd HH:mm:ss'"></span>
+                </td>
+                <td>
+                    <span class="glyphicon glyphicon-ok" ng-if="info.isCancel == '0'"></span>
+                    <span class="glyphicon glyphicon-remove" ng-if="info.isCancel == '1'"></span>
                 </td>
                 <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="deviceInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
                     <a ui-sref="deviceInfoManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>
-                    <a ng-click="ctrl.toggleCde(info.id)" class="btn btn-danger btn-sm" ng-if="info.isCancel == '0'"> 作废 </a>
-                    <a ng-click="ctrl.toggleCde(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> 撤销 </a>
+                    <a ng-click="ctrl.toggleCarDevice(info.id)" class="btn btn-danger btn-sm" ng-if="info.isCancel == '0'"> 作废 </a>
+                    <a ng-click="ctrl.toggleCarDevice(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> 撤销 </a>
                 </td>
             </tr>
             </tbody>
@@ -96,9 +106,9 @@
     </div>
     <div style="text-align: right;">
-        <uib-pagination total-items="ctrl.pageInfo.totalItems"
-                        ng-model="ctrl.pageInfo.currentPage"
-                        ng-change="ctrl.pageChanaged()"
+        <uib-pagination total-items="ctrl.page()['totalElements']"
+                        ng-model="ctrl.page()['uiNumber']"
+                        ng-change="ctrl.doPage()"
                         rotate="false"
                         max-size="10"
                         boundary-links="true"
 // 设备信息维护 service controller 等写在一起
-angular.module('ScheduleApp').factory('DeviceInfoManageService', ['DeviceInfoManageService_g', function(service) {
-    /** 当前的查询条件信息 */
-    var currentSearchCondition = {};
-
-    /** 当前第几页 */
-    var currentPageNo = 1;
-
-    return {
-        /**
-         * 获取查询条件信息，
-         * 用于给controller用来和页面数据绑定。
-         */
-        getSearchCondition: function() {
-            return currentSearchCondition;
-        },
-        /**
-         * 重置查询条件信息。
-         */
-        resetSearchCondition: function() {
-            var key;
-            for (key in currentSearchCondition) {
-                currentSearchCondition[key] = "";
-            }
-        },
-        /**
-         * 设置当前页码。
-         * @param cpn 从1开始，后台是从0开始的
-         */
-        setCurrentPageNo: function(cpn) {
-            currentPageNo = cpn;
-        },
-        /**
-         * 组装查询参数，返回一个promise查询结果。
-         * @param params 查询参数
-         * @return 返回一个 promise
-         */
-        getPage: function() {
-            var params = currentSearchCondition; // 查询条件
-            params.page = currentPageNo - 1; // 服务端页码从0开始
-            return service.list(params).$promise;
-        },
-        /**
-         * 获取明细信息。
-         * @param id 车辆id
-         * @return 返回一个 promise
-         */
-        getDetail: function(id) {
-            var params = {id: id};
-            return service.get(params).$promise;
-        },
-        /**
-         * 保存信息。
-         * @param obj 车辆详细信息
-         * @return 返回一个 promise
-         */
-        saveDetail: function(obj) {
-            return service.save(obj).$promise;
-        },
-        /**
-         * 删除信息。
-         * @param id 主键id
-         * @returns {*|Function|promise|n}
-         */
-        deleteDetail: function(id) {
-            return service.delete({id: id}).$promise;
+angular.module('ScheduleApp').factory(
+    'DeviceInfoManageService',
+    [
+        'DeviceInfoManageService_g',
+        function(service) {
+            /** 当前的查询条件信息 */
+            var currentSearchCondition = {'isCancel_eq': false};
+
+            // 当前查询返回的信息
+            var currentPage = { // 后台spring data返回的格式
+                totalElements: 0,
+                number: 0, // 后台返回的页码，spring返回从0开始
+                content: [],
+
+                uiNumber: 1 // 页面绑定的页码
+            };
+
+            // 查询对象
+            var queryClass = service;
+
+            return {
+                getQueryClass: function() {
+                    return queryClass;
+                },
+                getSearchCondition: function() {
+                    currentSearchCondition.page = currentPage.uiNumber - 1;
+                    return currentSearchCondition;
+                },
+                getPage: function(page) {
+                    if (page) {
+                        currentPage.totalElements = page.totalElements;
+                        currentPage.number = page.number;
+                        currentPage.content = page.content;
+                    }
+                    return currentPage;
+                },
+                resetStatus: function() {
+                    currentSearchCondition = {page: 0, 'isCancel_eq': false};
+                    currentPage = {
+                        totalElements: 0,
+                        number: 0,
+                        content: [],
+                        uiNumber: 1
+                    };
+                }
+
+            };
+
         }
-    };
-
-}]);
-
-angular.module('ScheduleApp').controller('DeviceInfoManageCtrl', ['DeviceInfoManageService', '$state', function(deviceInfoManageService, $state) {
-    var self = this;
-
-    // 切换到form状态
-    self.goForm = function() {
-        //alert("切换");
-        $state.go("deviceInfoManage_form");
-    }
-
-
-}]);
-
-angular.module('ScheduleApp').controller('DeviceInfoManageListCtrl', ['DeviceInfoManageService', function(deviceInfoManageService) {
-    var self = this;
-    self.pageInfo = {
-        totalItems : 0,
-        currentPage : 1,
-        infos: []
-    };
-
-    // 初始创建的时候，获取一次列表数据
-    deviceInfoManageService.getPage().then(
-        function(result) {
-            self.pageInfo.totalItems = result.totalElements;
-            self.pageInfo.currentPage = result.number + 1;
-            self.pageInfo.infos = result.content;
-            deviceInfoManageService.setCurrentPageNo(result.number + 1);
-        },
-        function(result) {
-            alert("出错啦！");
+    ]
+);
+
+// index.html控制器
+angular.module('ScheduleApp').controller(
+    'DeviceInfoManageCtrl',
+    [
+        'DeviceInfoManageService',
+        '$state',
+        function(service, $state) {
+            var self = this;
+
+            // 切换到form状态
+            self.goForm = function() {
+                //alert("切换");
+                $state.go("deviceInfoManage_form");
+            };
+
         }
-    );
-
-    // 翻页的时候调用
-    self.pageChanaged = function() {
-        deviceInfoManageService.setCurrentPageNo(self.pageInfo.currentPage);
-        deviceInfoManageService.getPage().then(
-            function(result) {
-                self.pageInfo.totalItems = result.totalElements;
-                self.pageInfo.currentPage = result.number + 1;
-                self.pageInfo.infos = result.content;
-                deviceInfoManageService.setCurrentPageNo(result.number + 1);
-            },
-            function(result) {
-                alert("出错啦！");
-            }
-        );
-    };
-    // 获取查询条件数据
-    self.searchCondition = function() {
-        return deviceInfoManageService.getSearchCondition();
-    };
-    // 重置查询条件
-    self.resetSearchCondition = function() {
-        deviceInfoManageService.resetSearchCondition();
-        self.pageInfo.currentPage = 1;
-        self.pageChanaged();
-    };
-
-    // 作废/撤销
-    self.toggleCde = function(id) {
-        // TODO:
-        deviceInfoManageService.deleteDetail(id).then(
-            function(result) {
-                if (result.message) { // 暂时这样做，之后全局拦截
-                    alert("失败：" + result.message);
-                } else {
-                    alert("成功！");
-
-                    deviceInfoManageService.getPage().then(
-                        function(result) {
-                            self.pageInfo.totalItems = result.totalElements;
-                            self.pageInfo.currentPage = result.number + 1;
-                            self.pageInfo.infos = result.content;
-                            deviceInfoManageService.setCurrentPageNo(result.number + 1);
-                        },
-                        function(result) {
-                            alert("出错啦！");
-                        }
-                    );
-                }
+    ]
+);
+
+// list.html控制器
+angular.module('ScheduleApp').controller(
+    'DeviceInfoManageListCtrl',
+    [
+        'DeviceInfoManageService',
+        function(service) {
+            var self = this;
+            var CarDevice = service.getQueryClass();
+
+            self.page = function() {
+                return service.getPage();
+            };
+
+            self.searchCondition = function() {
+                return service.getSearchCondition();
+            };
+
+            self.doPage = function() {
+                var page = CarDevice.list(self.searchCondition(), function() {
+                    service.getPage(page);
+                });
+            };
+            self.reset = function() {
+                service.resetStatus();
+                var page = CarDevice.list(self.searchCondition(), function() {
+                    service.getPage(page);
+                });
+            };
+            self.toggleCarDevice = function(id) {
+                CarDevice.delete({id: id}, function(result) {
+                    if (result.msg) { // 暂时这样做，之后全局拦截
+                        alert("失败：" + result.msg);
+                    } else {
+                        self.doPage();
+                    }
+                });
+            };
+
+            self.doPage();
-            },
-            function(result) {
-                alert("出错啦！" + result);
-            }
-        );
-    };
-
-}]);
-
-angular.module('ScheduleApp').controller('DeviceInfoManageFormCtrl', ['DeviceInfoManageService', '$stateParams', '$state', function(deviceInfoManageService, $stateParams, $state) {
-    var self = this;
-
-    // 启用日期 日期控件开关
-    self.qyrqOpen = false;
-    self.qyrq_open = function() {
-        self.qyrqOpen = true;
-    };
-
-    // 欲保存的busInfo信息，绑定
-    self.deviceInfoForSave = {};
-
-    // 获取传过来的id，有的话就是修改，获取一遍数据
-    var id = $stateParams.id;
-    if (id) {
-        self.deviceInfoForSave.id = id;
-        deviceInfoManageService.getDetail(id).then(
-            function(result) {
-                var key;
-                for (key in result) {
-                    self.deviceInfoForSave[key] = result[key];
-                }
-                // 填写所有的 select 控件选中框数据
-                // 公司字典
-                if (self.deviceInfoForSave.gsName) {
-                    angular.forEach(self.gses, function(data) {
-                        if (self.deviceInfoForSave.gsName == data.gsmc) {
-                            self.deviceInfoForSave.gs_selected = data;
-                        }
-                    });
-                }
-            },
-            function(result) {
-                alert("出错啦！");
+
+        }
+    ]
+);
+
+// form.html控制器
+angular.module('ScheduleApp').controller(
+    'DeviceInfoManageFormCtrl',
+    [
+        'DeviceInfoManageService',
+        '$stateParams',
+        '$state',
+        function(service, $stateParams, $state) {
+            var self = this;
+            var CarDevice = service.getQueryClass();
+
+            // 启用日期 日期控件开关
+            self.qyrqOpen = false;
+            self.qyrq_open = function() {
+                self.qyrqOpen = true;
+            };
+
+            // 欲保存的busInfo信息，绑定
+            self.deviceInfoForSave = new CarDevice;
+
+            // 获取传过来的id，有的话就是修改，获取一遍数据
+            var id = $stateParams.id;
+            if (id) {
+                CarDevice.get({id: id}, function(value) {
+                    self.deviceInfoForSave = value;
+                });
             }
-        );
-    }
-
-    // 提交方法
-    self.submit = function() {
-        console.log(self.deviceInfoForSave);
-        deviceInfoManageService.saveDetail(self.deviceInfoForSave).then(
-            function(result) {
-                // TODO：弹出框方式以后改
-                if (result.status == 'SUCCESS') {
-                    alert("保存成功！");
+
+            // 提交方法
+            self.submit = function() {
+                console.log(self.deviceInfoForSave);
+
+                // 保存或者更新
+                self.deviceInfoForSave.$save(function() {
                     $state.go("deviceInfoManage");
-                } else {
-                    alert("保存异常！");
-                }
-            },
-            function(result) {
-                // TODO：弹出框方式以后改
-                alert("出错啦！");
-            }
-        );
-    };
-
-}]);
-
-angular.module('ScheduleApp').controller('DeviceInfoManageDetailCtrl', ['DeviceInfoManageService', '$stateParams', function(deviceInfoManageService, $stateParams) {
-    var self = this;
-    self.title = "";
-    self.deviceInfoForDetail = {};
-    self.deviceInfoForDetail.id = $stateParams.id;
-
-    // 当转向到此页面时，就获取明细信息并绑定
-    deviceInfoManageService.getDetail($stateParams.id).then(
-        function(result) {
-            var key;
-            for (key in result) {
-                self.deviceInfoForDetail[key] = result[key];
-            }
+                });
+            };
+
+        }
+    ]
+);
+
+// detail.html控制器
+angular.module('ScheduleApp').controller(
+    'DeviceInfoManageDetailCtrl',
+    [
+        'DeviceInfoManageService',
+        '$stateParams',
+        function(service, $stateParams) {
+            var self = this;
+            var CarDevice = service.getQueryClass();
+            var id = $stateParams.id;
+
+            self.title = "";
+            self.deviceInfoForDetail = {};
+
+            // 当转向到此页面时，就获取明细信息并绑定
+            CarDevice.get({id: id}, function(value) {
+                self.deviceInfoForDetail = value;
+                self.title = "车辆 " +
+                    self.deviceInfoForDetail.clZbh +
+                    "设备信息";
+            });
-            self.title = "车辆 " + self.deviceInfoForDetail.clZbh + "设备信息";
-        },
-        function(result) {
-            // TODO：弹出框方式以后改
-            alert("出错啦！");
         }
-    );
-}]);
 \ No newline at end of file
+    ]
+);
 \ No newline at end of file
 // 车辆设备信息service
 angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) {
     return $resource(
-        '/cde/:id',
-        {order: 'xl,isCancel,cl,qyrq', direction: 'ASC,ASC,ASC,DESC', id: '@id_route'},
+        '/cde_sc/:id',
+        {order: 'xl,isCancel,cl,qyrq', direction: 'ASC,ASC,ASC,DESC', id: '@id'},
         {
             list: {
                 method: 'GET',
                 params: {
                     page: 0
+                },
+                transformResponse: function(rs) {
+                    var dst = angular.fromJson(rs);
+                    if (dst.status == 'SUCCESS') {
+                        return dst.data;
+                    } else {
+                        return dst; // 业务错误留给控制器处理
+                    }
                 }
             },
             get: {
-                method: 'GET'
+                method: 'GET',
+                transformResponse: function(rs) {
+                    var dst = angular.fromJson(rs);
+                    if (dst.status == 'SUCCESS') {
+                        return dst.data;
+                    } else {
+                        return dst;
+                    }
+                }
             },
             save: {
                 method: 'POST'
@@ -36,18 +36,18 @@
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">所属公司*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.employeeInfoForSave"
-                                    name="gs"
-                                    placeholder="请选择所属公司..."
-                                    dcvalue="{{ctrl.employeeInfoForSave.companyCode}}"
+                        <sa-Select5 name="gs"
+                                    model="ctrl.employeeInfoForSave"
+                                    cmaps="{'companyCode': 'code', 'company': 'name'}"
                                     dcname="companyCode"
                                     icname="code"
-                                    dcname2="company"
-                                    icname2="name"
-                                    icnames="name"
-                                    datatype="gsType"
+                                    dsparams="{{ {type: 'dic', param: 'gsType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请输拼音..."
+                                    searchexp="this.name"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.gs.$error.required">
@@ -74,15 +74,17 @@
                     <div class="col-md-3">
                         <input type="text" class="form-control"
                                name="jobCode" ng-model="ctrl.employeeInfoForSave.jobCode"
-                               remote-Validaton rvtype="jobCode" rv1="{{ctrl.employeeInfoForSave.companyCode}}"
-                               required placeholder="请输入工号"/>
+                               required placeholder="请输入工号"
+                               remote-Validation
+                               remotevtype="ee_gh"
+                               remotevparam="{{ {'id_eq': ctrl.employeeInfoForSave.id, 'companyCode_eq' : ctrl.employeeInfoForSave.companyCode, 'jobCode_eq': ctrl.employeeInfoForSave.jobCode} | json}}"/>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.jobCode.$error.required">
                         工号必须填写
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.jobCode.$error.remote">
-                        选择公司并且相同公司工号不能重复
+                        {{$remote_msg}}
                     </div>
                 </div>
@@ -125,15 +127,18 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">工种：</label>
                     <div class="col-md-4">
-                        <sa-Select3 model="ctrl.employeeInfoForSave"
-                                    name="posts"
-                                    placeholder="请选择工种..."
-                                    dcvalue="{{ctrl.employeeInfoForSave.posts}}"
+                        <sa-Select5 name="posts"
+                                    model="ctrl.employeeInfoForSave"
+                                    cmaps="{'posts': 'code'}"
                                     dcname="posts"
                                     icname="code"
-                                    icnames="name"
-                                    datatype="gzType">
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'dic', param: 'gzType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请输拼音..."
+                                    searchexp="this.name"
+                                >
+                        </sa-Select5>
                     </div>
                 </div>
@@ -36,18 +36,18 @@
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">所属公司*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.employeeInfoForSave"
-                                    name="gs"
-                                    placeholder="请选择所属公司..."
-                                    dcvalue="{{ctrl.employeeInfoForSave.companyCode}}"
+                        <sa-Select5 name="gs"
+                                    model="ctrl.employeeInfoForSave"
+                                    cmaps="{'companyCode': 'code', 'company': 'name'}"
                                     dcname="companyCode"
                                     icname="code"
-                                    dcname2="company"
-                                    icname2="name"
-                                    icnames="name"
-                                    datatype="gsType"
+                                    dsparams="{{ {type: 'dic', param: 'gsType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请输拼音..."
+                                    searchexp="this.name"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.gs.$error.required">
@@ -74,15 +74,17 @@
                     <div class="col-md-3">
                         <input type="text" class="form-control"
                                name="jobCode" ng-model="ctrl.employeeInfoForSave.jobCode"
-                               remote-Validaton rvtype="jobCode" rv1="{{ctrl.employeeInfoForSave.companyCode}}"
-                               required placeholder="请输入工号"/>
+                               required placeholder="请输入工号"
+                               remote-Validation
+                               remotevtype="ee_gh"
+                               remotevparam="{{ {'companyCode_eq' : ctrl.employeeInfoForSave.companyCode, 'jobCode_eq': ctrl.employeeInfoForSave.jobCode} | json}}"/>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.jobCode.$error.required">
                         工号必须填写
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.jobCode.$error.remote">
-                        选择公司并且相同公司工号不能重复
+                        {{$remote_msg}}
                     </div>
                 </div>
@@ -125,15 +127,18 @@
                 <div class="form-group">
                     <label class="col-md-2 control-label">工种：</label>
                     <div class="col-md-4">
-                        <sa-Select3 model="ctrl.employeeInfoForSave"
-                                    name="posts"
-                                    placeholder="请选择工种..."
-                                    dcvalue="{{ctrl.employeeInfoForSave.posts}}"
+                        <sa-Select5 name="posts"
+                                    model="ctrl.employeeInfoForSave"
+                                    cmaps="{'posts': 'code'}"
                                     dcname="posts"
                                     icname="code"
-                                    icnames="name"
-                                    datatype="gzType">
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'dic', param: 'gzType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请输拼音..."
+                                    searchexp="this.name"
+                                     >
+                        </sa-Select5>
                     </div>
                 </div>
@@ -26,41 +26,46 @@
                 </td>
                 <td>
                     <div>
-                        <sa-Select3 model="ctrl.searchCondition()"
-                                    name="gs"
-                                    placeholder="请选择..."
-                                    dcvalue="{{ctrl.searchCondition().companyCode_eq}}"
+                        <sa-Select5 name="gs"
+                                    model="ctrl.searchCondition()"
+                                    cmaps="{'companyCode_eq': 'code'}"
                                     dcname="companyCode_eq"
                                     icname="code"
-                                    icnames="name"
-                                    datatype="gsType">
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'dic', param: 'gsType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请输拼音..."
+                                    searchexp="this.name"
+                                     >
+                        </sa-Select5>
                     </div>
                 </td>
-                <td style="width: 100px">
-
+                <td>
                 </td>
                 <td>
                     <div>
-                        <sa-Select3 model="ctrl.searchCondition()"
-                                    name="gs"
-                                    placeholder="请选择..."
-                                    dcvalue="{{ctrl.searchCondition().posts_eq}}"
+                        <sa-Select5 name="gz"
+                                    model="ctrl.searchCondition()"
+                                    cmaps="{'posts_eq': 'code'}"
                                     dcname="posts_eq"
                                     icname="code"
-                                    icnames="name"
-                                    datatype="gzType">
-                        </sa-Select3>
+                                    dsparams="{{ {type: 'dic', param: 'gzType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请输拼音..."
+                                    searchexp="this.name"
+                                    >
+                        </sa-Select5>
                     </div>
                 </td>
                 <td>
                     <div>
                         <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
-                                ng-click="ctrl.pageChanaged()">
+                                ng-click="ctrl.doPage()">
                             <i class="fa fa-search"></i> 搜索</button>
                         <button class="btn btn-sm red btn-outline filter-cancel"
-                                ng-click="ctrl.resetSearchCondition()">
+                                ng-click="ctrl.reset()">
                             <i class="fa fa-times"></i> 重置</button>
                     </div>
@@ -69,7 +74,7 @@
             </tr>
             </thead>
             <tbody>
-            <tr ng-repeat="info in ctrl.pageInfo.infos" class="odd gradeX">
+            <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX">
                 <td>
                     <span ng-bind="$index + 1"></span>
                 </td>
@@ -104,9 +109,9 @@
     <div style="text-align: right;">
-        <uib-pagination total-items="ctrl.pageInfo.totalItems"
-                        ng-model="ctrl.pageInfo.currentPage"
-                        ng-change="ctrl.pageChanaged()"
+        <uib-pagination total-items="ctrl.page()['totalElements']"
+                        ng-model="ctrl.page()['uiNumber']"
+                        ng-change="ctrl.doPage()"
                         rotate="false"
                         max-size="10"
                         boundary-links="true"
 // 人员信息管理 service controller等写在一起
-angular.module('ScheduleApp').factory('EmployeeInfoManageService', ['EmployeeInfoManageService_g', function(service) {
-
-    /** 当前的查询条件信息 */
-    var currentSearchCondition = {
-        //"carCode_like" : "",
-        //"insideCode_like" : "",
-        //"equipmentCode_like" : "",
-        //"carPlate_like" : ""
-    };
+angular.module('ScheduleApp').factory(
+    'EmployeeInfoManageService',
+    [
+        'EmployeeInfoManageService_g',
+        function(service) {
-    /** 当前第几页 */
-    var currentPageNo = 1;
-
-    return {
-        /**
-         * 获取查询条件信息，
-         * 用于给controller用来和页面数据绑定。
-         */
-        getSearchCondition: function() {
-            return currentSearchCondition;
-        },
-        /**
-         * 重置查询条件信息。
-         */
-        resetSearchCondition: function() {
-            var key;
-            for (key in currentSearchCondition) {
-                currentSearchCondition[key] = undefined;
-            }
-            currentPageNo = 1;
-        },
-        /**
-         * 设置当前页码。
-         * @param cpn 从1开始，后台是从0开始的
-         */
-        setCurrentPageNo: function(cpn) {
-            currentPageNo = cpn;
-        },
-        /**
-         * 组装查询参数，返回一个promise查询结果。
-         * @param params 查询参数
-         * @return 返回一个 promise
-         */
-        getPage: function() {
-            var params = currentSearchCondition; // 查询条件
-            params.page = currentPageNo - 1; // 服务端页码从0开始
-            return service.rest.list(params).$promise;
-        },
-        /**
-         * 获取明细信息。
-         * @param id 车辆id
-         * @return 返回一个 promise
-         */
-        getDetail: function(id) {
-            var params = {id: id};
-            return service.rest.get(params).$promise;
-        },
-        /**
-         * 保存信息。
-         * @param obj 车辆详细信息
-         * @return 返回一个 promise
-         */
-        saveDetail: function(obj) {
-            return service.rest.save(obj).$promise;
-        },
-        /**
-         * 数据导出。
-         * @returns {*|Function|promise|n}
-         */
-        dataExport: function() {
-            return service.dataTools.dataExport().$promise;
-        }
-    }
+            /** 当前的查询条件信息 */
+            var currentSearchCondition = {
+                //"carCode_like" : "",
+                //"insideCode_like" : "",
+                //"equipmentCode_like" : "",
+                //"carPlate_like" : ""
+            };
-}]);
+            // 当前查询返回的信息
+            var currentPage = { // 后台spring data返回的格式
+                totalElements: 0,
+                number: 0, // 后台返回的页码，spring返回从0开始
+                content: [],
-angular.module('ScheduleApp').controller('EmployeeInfoManageCtrl', [
-    'EmployeeInfoManageService', '$state', '$uibModal', 'FileDownload_g',
-    function(employeeInfoManageService, $state, $uibModal, fileDownload) {
-        var self = this;
+                uiNumber: 1 // 页面绑定的页码
+            };
-        // 切换到form状态
-        self.goForm = function() {
-            //alert("切换");
-            $state.go("employeeInfoManage_form");
-        }
+            // 查询对象
+            var queryClass = service.rest;
-        // 导入excel
-        self.importData = function() {
-            // large方式弹出模态对话框
-            var modalInstance = $uibModal.open({
-                templateUrl: '/pages/scheduleApp/module/basicInfo/employeeInfoManage/dataImport.html',
-                size: "lg",
-                animation: true,
-                backdrop: 'static',
-                resolve: {
-                    // 可以传值给controller
+            return {
+                getQueryClass: function() {
+                    return queryClass;
                 },
-                windowClass: 'center-modal',
-                controller: "EmployInfoManageToolsCtrl",
-                controllerAs: "ctrl",
-                bindToController: true
-            });
-            modalInstance.result.then(
-                function() {
-                    console.log("dataImport.html打开");
+                /**
+                 * 获取查询条件信息，
+                 * 用于给controller用来和页面数据绑定。
+                 */
+                getSearchCondition: function() {
+                    currentSearchCondition.page = currentPage.uiNumber - 1;
+                    return currentSearchCondition;
                 },
-                function() {
-                    console.log("dataImport.html消失");
-                }
-            );
-        };
-
-        // 导出excel
-        self.exportData = function() {
-            employeeInfoManageService.dataExport().then(
-                function(result) {
-                    fileDownload.downloadFile(result.data, "application/octet-stream", "人员基础信息.xls");
+                /**
+                 * 组装查询参数，返回一个promise查询结果。
+                 * @param params 查询参数
+                 * @return 返回一个 promise
+                 */
+                getPage: function(page) {
+                    if (page) {
+                        currentPage.totalElements = page.totalElements;
+                        currentPage.number = page.number;
+                        currentPage.content = page.content;
+                    }
+                    return currentPage;
+                },
+                resetStatus: function() {
+                    currentSearchCondition = {page: 0};
+                    currentPage = {
+                        totalElements: 0,
+                        number: 0,
+                        content: [],
+                        uiNumber: 1
+                    };
                 },
-                function(result) {
-                    console.log("exportData failed：" + result);
+
+                /**
+                 * 数据导出。
+                 * @returns {*|Function|promise|n}
+                 */
+                dataExport: function() {
+                    return service.dataTools.dataExport().$promise;
                 }
-            );
-        };
-    }]);
+            }
+        }
+    ]
+);
+
+// index.html控制器
+angular.module('ScheduleApp').controller(
+    'EmployeeInfoManageCtrl',
+    [
+        'EmployeeInfoManageService',
+        '$state',
+        '$uibModal',
+        'FileDownload_g',
+        function(employeeInfoManageService, $state, $uibModal, fileDownload) {
+            var self = this;
+
+            // 切换到form状态
+            self.goForm = function() {
+                //alert("切换");
+                $state.go("employeeInfoManage_form");
+            };
+
+            // 导入excel
+            self.importData = function() {
+                // large方式弹出模态对话框
+                var modalInstance = $uibModal.open({
+                    templateUrl: '/pages/scheduleApp/module/basicInfo/employeeInfoManage/dataImport.html',
+                    size: "lg",
+                    animation: true,
+                    backdrop: 'static',
+                    resolve: {
+                        // 可以传值给controller
+                    },
+                    windowClass: 'center-modal',
+                    controller: "EmployInfoManageToolsCtrl",
+                    controllerAs: "ctrl",
+                    bindToController: true
+                });
+                modalInstance.result.then(
+                    function() {
+                        console.log("dataImport.html打开");
+                    },
+                    function() {
+                        console.log("dataImport.html消失");
+                    }
+                );
+            };
+
+            // 导出excel
+            self.exportData = function() {
+                employeeInfoManageService.dataExport().then(
+                    function(result) {
+                        fileDownload.downloadFile(result.data, "application/octet-stream", "人员基础信息.xls");
+                    },
+                    function(result) {
+                        console.log("exportData failed：" + result);
+                    }
+                );
+            };
+
+        }
+    ]
+);
 angular.module('ScheduleApp').controller('EmployInfoManageToolsCtrl', ['$modalInstance', 'FileUploader', function($modalInstance, FileUploader) {
     var self = this;
@@ -161,124 +167,101 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;EmployInfoManageToolsCtrl&#39;, [&#39;$modalIn
 }]);
-angular.module('ScheduleApp').controller('EmployeeInfoManageListCtrl', ['EmployeeInfoManageService', function(employeeInfoManageService) {
-    var self = this;
-    self.pageInfo = {
-        totalItems : 0,
-        currentPage : 1,
-        infos: []
-    };
+// list.html控制器
+angular.module('ScheduleApp').controller(
+    'EmployeeInfoManageListCtrl',
+    [
+        'EmployeeInfoManageService',
+        function(service) {
+            var self = this;
+            var Employee = service.getQueryClass();
+
+            self.page = function() {
+                return service.getPage();
+            };
+
+            self.searchCondition = function() {
+                return service.getSearchCondition();
+            };
+
+            self.doPage = function() {
+                var result = Employee.list(self.searchCondition(), function() {
+                    if (!result.status) {
+                        service.getPage(result);
+                    }
+                });
+            };
+            self.reset = function() {
+                service.resetStatus();
+                var result = Employee.list(self.searchCondition(), function() {
+                    if (!result.status) {
+                        service.getPage(result);
+                    }
+                });
+            };
+
+            self.doPage();
-    // 初始创建的时候，获取一次列表数据
-    employeeInfoManageService.getPage().then(
-        function(result) {
-            self.pageInfo.totalItems = result.totalElements;
-            self.pageInfo.currentPage = result.number + 1;
-            self.pageInfo.infos = result.content;
-            employeeInfoManageService.setCurrentPageNo(result.number + 1);
-        },
-        function(result) {
-            alert("出错啦！");
         }
-    );
-
-    //$scope.$watch("ctrl.pageInfo.currentPage", function() {
-    //    alert("dfdfdf");
-    //});
-
-    // 翻页的时候调用
-    self.pageChanaged = function() {
-        employeeInfoManageService.setCurrentPageNo(self.pageInfo.currentPage);
-        employeeInfoManageService.getPage().then(
-            function(result) {
-                self.pageInfo.totalItems = result.totalElements;
-                self.pageInfo.currentPage = result.number + 1;
-                self.pageInfo.infos = result.content;
-                employeeInfoManageService.setCurrentPageNo(result.number + 1);
-            },
-            function(result) {
-                alert("出错啦！");
-            }
-        );
-    };
-    // 获取查询条件数据
-    self.searchCondition = function() {
-        return employeeInfoManageService.getSearchCondition();
-    };
-    // 重置查询条件
-    self.resetSearchCondition = function() {
-        employeeInfoManageService.resetSearchCondition();
-        self.pageInfo.currentPage = 1;
-        self.pageChanaged();
-    };
-}]);
+    ]
+);
-angular.module('ScheduleApp').controller('EmployeeInfoManageFormCtrl', ['EmployeeInfoManageService', '$stateParams', '$state', function(employeeInfoManageService, $stateParams, $state) {
-    var self = this;
+// form.html控制器
+angular.module('ScheduleApp').controller(
+    'EmployeeInfoManageFormCtrl',
+    [
+        'EmployeeInfoManageService',
+        '$stateParams',
+        '$state',
+        function(service, $stateParams, $state) {
+            var self = this;
+            var Employee = service.getQueryClass();
-    // 欲保存的busInfo信息，绑定
-    self.employeeInfoForSave = {};
-
-    // 获取传过来的id，有的话就是修改，获取一遍数据
-    var id = $stateParams.id;
-    if (id) {
-        self.employeeInfoForSave.id = id;
-        employeeInfoManageService.getDetail(id).then(
-            function(result) {
-                var key;
-                for (key in result) {
-                    self.employeeInfoForSave[key] = result[key];
-                }
-            },
-            function(result) {
-                alert("出错啦！");
+            // 欲保存的busInfo信息，绑定
+            self.employeeInfoForSave = new Employee;
+
+            // 获取传过来的id，有的话就是修改，获取一遍数据
+            var id = $stateParams.id;
+            if (id) {
+                self.employeeInfoForSave = Employee.get({id: id}, function() {});
             }
-        );
-    }
-
-    // 提交方法
-    self.submit = function() {
-        console.log(self.employeeInfoForSave);
-        employeeInfoManageService.saveDetail(self.employeeInfoForSave).then(
-            function(result) {
-                // TODO：弹出框方式以后改
-                if (result.status == 'SUCCESS') {
-                    alert("保存成功！");
+
+            // 提交方法
+            self.submit = function() {
+                console.log(self.employeeInfoForSave);
+
+                // 保存或更新
+                self.employeeInfoForSave.$save(function() {
                     $state.go("employeeInfoManage");
-                } else {
-                    alert("保存异常！");
-                }
-            },
-            function(result) {
-                // TODO：弹出框方式以后改
-                alert("出错啦！");
-            }
-        );
-    };
+                });
+            };
+        }
+    ]
+);
-}]);
+// detail.html控制器
+angular.module('ScheduleApp').controller(
+    'EmployeeInfoManageDetailCtrl',
+    [
+        'EmployeeInfoManageService',
+        '$stateParams',
+        function(service, $stateParams) {
+            var self = this;
+            var Employee = service.getQueryClass();
+            var id = $stateParams.id;
-angular.module('ScheduleApp').controller('EmployeeInfoManageDetailCtrl', ['EmployeeInfoManageService', '$stateParams', function(employeeInfoManageService, $stateParams) {
-    var self = this;
-    self.title = "";
-    self.employeeInfoForDetail = {};
-    self.employeeInfoForDetail.id = $stateParams.id;
-
-    // 当转向到此页面时，就获取明细信息并绑定
-    employeeInfoManageService.getDetail($stateParams.id).then(
-        function(result) {
-            var key;
-            for (key in result) {
-                self.employeeInfoForDetail[key] = result[key];
-            }
+            self.title = "";
+            self.employeeInfoForDetail = {};
+
+            // 当转向到此页面时，就获取明细信息并绑定
+            self.employeeInfoForDetail = Employee.get({id: id}, function() {
+                self.title = "员工 " +
+                    self.employeeInfoForDetail.personnelName +
+                    " 详细信息";
+            });
-            self.title = "员工 " + self.employeeInfoForDetail.personnelName + " 详细信息";
-        },
-        function(result) {
-            // TODO：弹出框方式以后改
-            alert("出错啦！");
         }
-    );
-}]);
+    ]
+);
 // 人员信息service
-angular.module('ScheduleApp').factory('EmployeeInfoManageService_g', ['$resource', function($resource) {
-    return {
-        rest : $resource(
-            '/personnel/:id',
-            {order: 'jobCode', direction: 'ASC', id: '@id_route'},
-            {
-                list: {
-                    method: 'GET',
-                    params: {
-                        page: 0
+angular.module('ScheduleApp').factory(
+    'EmployeeInfoManageService_g',
+    [
+        '$resource',
+        function($resource) {
+            return {
+                rest : $resource(
+                    '/ee/:id',
+                    {order: 'jobCode', direction: 'ASC', id: '@id'},
+                    {
+                        list: {
+                            method: 'GET',
+                            params: {
+                                page: 0
+                            },
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        },
+                        get: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst;
+                                }
+                            }
+                        },
+                        save: {
+                            method: 'POST'
+                        }
                     }
-                },
-                get: {
-                    method: 'GET'
-                },
-                save: {
-                    method: 'POST'
-                }
-            }
-        ),
-        validate: $resource(
-            '/personnel/validate/:type',
-            {},
-            {
-                jobCode: {
-                    method: 'GET'
-                }
-            }
-        ),
-        dataTools: $resource(
-            '/personnel/:type',
-            {},
-            {
-                dataExport: {
-                    method: 'GET',
-                    responseType: "arraybuffer",
-                    params: {
-                        type: "dataExport"
-                    },
-                    transformResponse: function(data, headers){
-                        return {data : data};
+                ),
+
+                dataTools: $resource(
+                    '/personnel/:type',
+                    {},
+                    {
+                        dataExport: {
+                            method: 'GET',
+                            responseType: "arraybuffer",
+                            params: {
+                                type: "dataExport"
+                            },
+                            transformResponse: function(data, headers){
+                                return {data : data};
+                            }
+                        }
                     }
-                }
-            }
-        )
-    };
-}]);
+                )
+            };
+
+        }
+    ]
+);
@@ -109,6 +109,10 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                 // dom，span ng-bind属性设置，TODO：暂时无法用transclude设置，先用属性设置
                 tElem.find("ui-select-choices").html("{{" + $iterobjexp_attr + "}}");
+
+                // 当前的数据模式，ajax,dic,local
+                var dataModelType = undefined;
+
                 return {
                     pre: function (scope, element, attr) {
                         // TODO：
@@ -167,17 +171,19 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                                 // 处理search
                                 console.log("search:" + search);
-                                scope[ctrlAs].$$data = [];
-                                for (var k = 0; k < scope[ctrlAs].$$data_real.length; k++) {
-                                    var upTerm = search.toUpperCase();
-                                    if (scope[ctrlAs].$$data.length < 10) {
-                                        if (scope[ctrlAs].$$data_real[k].$fullChars.indexOf(upTerm) != -1
-                                            || scope[ctrlAs].$$data_real[k].$camelChars.indexOf(upTerm) != -1
-                                            || scope[ctrlAs].$$data_real[k].$calcu_str.indexOf(upTerm) != -1) {
-                                            scope[ctrlAs].$$data.push(angular.copy(scope[ctrlAs].$$data_real[k]));
+                                if (dataModelType == 'ajax') {
+                                    scope[ctrlAs].$$data = [];
+                                    for (var k = 0; k < scope[ctrlAs].$$data_real.length; k++) {
+                                        var upTerm = search.toUpperCase();
+                                        if (scope[ctrlAs].$$data.length < 10) {
+                                            if (scope[ctrlAs].$$data_real[k].$fullChars.indexOf(upTerm) != -1
+                                                || scope[ctrlAs].$$data_real[k].$camelChars.indexOf(upTerm) != -1
+                                                || scope[ctrlAs].$$data_real[k].$calcu_str.indexOf(upTerm) != -1) {
+                                                scope[ctrlAs].$$data.push(angular.copy(scope[ctrlAs].$$data_real[k]));
+                                            }
+                                        } else {
+                                            break;
                                         }
-                                    } else {
-                                        break;
                                     }
                                 }
                             }
@@ -327,16 +333,18 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                             // 重新创建内部保存的数据
                             scope[ctrlAs].$$data_real = [];
-                            var origin_dicgroup = dictionaryUtils.getByGroup(dicgroup);
+                            var origin_dicgroup = dictionaryUtils.getByGroup(dictype);
                             var dic_key; // 字典key
+                            //console.log(origin_dicgroup);
+
                             for (dic_key in origin_dicgroup) {
                                 var data = {}; // 重新组合的字典元素对象
                                 if (dic_key == "true")
                                     data[$icname_attr] = true;
                                 else
                                     data[$icname_attr] = dic_key;
-                                data[$dscol_attr] = origin_dicgroup[dic_key];
+                                data['name'] = origin_dicgroup[dic_key]; // 字典写死name这个key名字
                                 scope[ctrlAs].$$data_real.push(data);
                             }
@@ -380,11 +388,14 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                                 // {type: 'dic/ajax', param: 'dic名字'/'ajax查询参数对象', atype: 'ajax查询类型'}
                                 if (obj.type == 'dic') {
+                                    dataModelType = 'dic';
                                     scope[ctrlAs].$$internal_dic_data(obj.param);
                                 } else if (obj.type == 'ajax') {
+                                    dataModelType = 'ajax';
                                     scope[ctrlAs].$$internal_ajax_data(obj.atype, obj.param);
                                 } else if (obj.type == 'local') {
+                                    dataModelType = 'local';
                                     scope[ctrlAs].$$internal_local_data(obj.ldata);
                                 } else {
                                     throw new Error("dsparams参数格式异常=" + obj);
@@ -104,18 +104,17 @@ ScheduleApp.factory(
                     // 如：{"timestamp":1478674739246,"status":500,"error":"Internal Server Error","exception":"java.lang.ClassCastException","message":"java.lang.String cannot be cast to java.lang.Long","path":"/tidc/importfile"}
                     var output = [];
-                    if (!status) {
+                    if (!rejection.status) {
                         alert("我擦，后台返回连个状态码都没返回，见鬼了，服务器可能重启了");
-                    } else if (status == -1) {
+                    } else if (rejection.status == -1) {
                         // 服务器断开了
                         alert("貌似服务端连接不上");
                     } else {
-                        output.push("状态编码：" + status);
-                        output.push("访问路径：" + rejection.path);
-                        output.push("错误消息：" + rejection.message);
-                        if (status == 500) {
+                        output.push("状态编码：" + rejection.status);
+                        output.push("错误内容：" + angular.toJson(rejection.data));
+                        if (rejection.status == 500) {
                             alert("服务端错误：" + "\n" + output.join("\n"));
-                        } else if (status == 407) {
+                        } else if (rejection.status == 407) {
                             alert("请重新登录：" + "\n" + output.join("\n"));
                         } else {
                             alert("其他错误：" + "\n" + output.join("\n"));
@@ -59,7 +59,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;remoteValidation&#39;, [
                         // 判定如果参数对象不全，没有完全和模版参数里对应上，则不验证
                         var isParamAll = true;
                         for (var key in paramTemplate) {
-                            if (!$watch_rvparam_obj[key]) {
+                            if (key != "id" && !$watch_rvparam_obj[key]) { // id去掉
                                 isParamAll = false;
                                 break;
                             }
@@ -1385,6 +1385,10 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                 // dom，span ng-bind属性设置，TODO：暂时无法用transclude设置，先用属性设置
                 tElem.find("ui-select-choices").html("{{" + $iterobjexp_attr + "}}");
+
+                // 当前的数据模式，ajax,dic,local
+                var dataModelType = undefined;
+
                 return {
                     pre: function (scope, element, attr) {
                         // TODO：
@@ -1443,17 +1447,19 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                                 // 处理search
                                 console.log("search:" + search);
-                                scope[ctrlAs].$$data = [];
-                                for (var k = 0; k < scope[ctrlAs].$$data_real.length; k++) {
-                                    var upTerm = search.toUpperCase();
-                                    if (scope[ctrlAs].$$data.length < 10) {
-                                        if (scope[ctrlAs].$$data_real[k].$fullChars.indexOf(upTerm) != -1
-                                            || scope[ctrlAs].$$data_real[k].$camelChars.indexOf(upTerm) != -1
-                                            || scope[ctrlAs].$$data_real[k].$calcu_str.indexOf(upTerm) != -1) {
-                                            scope[ctrlAs].$$data.push(angular.copy(scope[ctrlAs].$$data_real[k]));
+                                if (dataModelType == 'ajax') {
+                                    scope[ctrlAs].$$data = [];
+                                    for (var k = 0; k < scope[ctrlAs].$$data_real.length; k++) {
+                                        var upTerm = search.toUpperCase();
+                                        if (scope[ctrlAs].$$data.length < 10) {
+                                            if (scope[ctrlAs].$$data_real[k].$fullChars.indexOf(upTerm) != -1
+                                                || scope[ctrlAs].$$data_real[k].$camelChars.indexOf(upTerm) != -1
+                                                || scope[ctrlAs].$$data_real[k].$calcu_str.indexOf(upTerm) != -1) {
+                                                scope[ctrlAs].$$data.push(angular.copy(scope[ctrlAs].$$data_real[k]));
+                                            }
+                                        } else {
+                                            break;
                                         }
-                                    } else {
-                                        break;
                                     }
                                 }
                             }
@@ -1603,16 +1609,18 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                             // 重新创建内部保存的数据
                             scope[ctrlAs].$$data_real = [];
-                            var origin_dicgroup = dictionaryUtils.getByGroup(dicgroup);
+                            var origin_dicgroup = dictionaryUtils.getByGroup(dictype);
                             var dic_key; // 字典key
+                            //console.log(origin_dicgroup);
+
                             for (dic_key in origin_dicgroup) {
                                 var data = {}; // 重新组合的字典元素对象
                                 if (dic_key == "true")
                                     data[$icname_attr] = true;
                                 else
                                     data[$icname_attr] = dic_key;
-                                data[$dscol_attr] = origin_dicgroup[dic_key];
+                                data['name'] = origin_dicgroup[dic_key]; // 字典写死name这个key名字
                                 scope[ctrlAs].$$data_real.push(data);
                             }
@@ -1656,11 +1664,14 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
                                 // {type: 'dic/ajax', param: 'dic名字'/'ajax查询参数对象', atype: 'ajax查询类型'}
                                 if (obj.type == 'dic') {
+                                    dataModelType = 'dic';
                                     scope[ctrlAs].$$internal_dic_data(obj.param);
                                 } else if (obj.type == 'ajax') {
+                                    dataModelType = 'ajax';
                                     scope[ctrlAs].$$internal_ajax_data(obj.atype, obj.param);
                                 } else if (obj.type == 'local') {
+                                    dataModelType = 'local';
                                     scope[ctrlAs].$$internal_local_data(obj.ldata);
                                 } else {
                                     throw new Error("dsparams参数格式异常=" + obj);
@@ -263,7 +263,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
             gbv1: { // 路牌序号验证
                 template: {'xl.id_eq': -1, 'lpNo_eq': 'ddd'},
                 remote: $resource(
-                    '/gic/validate1',
+                    '/gic/validate_lpno',
                     {},
                     {
                         do: {
@@ -275,7 +275,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
             gbv2: { // 路牌名称验证
                 template: {'xl.id_eq': -1, 'lpName_eq': 'ddd'},
                 remote: $resource(
-                    '/gic/validate2',
+                    '/gic/validate_lpname',
                     {},
                     {
                         do: {
@@ -336,6 +336,20 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
                     }
                 )
             },
+
+            ee_gh: { // 工号不能重复
+                template: {'companyCode_eq': '-1', 'jobCode_eq': '-1'}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/ee/validate_gh',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
+
             cc_cars: { // 车辆不能重复配置
                 template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'cl.id_eq': -1}, // 查询参数模版
                 remote: $resource( // $resource封装对象
@@ -374,9 +388,9 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
             },
             cde1: { // 车辆设备启用日期验证
-                template: {'qyrq': 0, 'xl': 1, 'cl': 1}, // 日期毫秒
+                template: {'xl_eq': -1, 'cl_eq': -1, 'qyrq_eq': 1}, // 日期毫秒
                 remote: $resource( // $resource封装对象
-                    '/cde//validate/qyrq',
+                    '/cde_sc/validate_qyrq',
                     {},
                     {
                         do: {
 //所有模块service配置
 // 车辆信息service
-angular.module('ScheduleApp').factory('BusInfoManageService_g', ['$resource', function($resource) {
+angular.module('ScheduleApp').factory(
+    'BusInfoManageService_g',
+    [
+        '$resource',
+        function($resource) {
+            return {
+                rest: $resource(
+                    '/cars_sc/:id',
+                    {order: 'carCode', direction: 'ASC', id: '@id'},
+                    {
+                        list: {
+                            method: 'GET',
+                            params: {
+                                page: 0
+                            },
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        },
+                        get: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst;
+                                }
+                            }
+                        },
+                        save: {
+                            method: 'POST'
+                        }
+                    }
+                ),
+                import: $resource(
+                    '/cars/importfile',
+                    {},
+                    {
+                        do: {
+                            method: 'POST',
+                            headers: {
+                                'Content-Type': 'application/x-www-form-urlencoded'
+                            },
+                            transformRequest: function(obj) {
+                                var str = [];
+                                for (var p in obj) {
+                                    str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+                                }
+                                return str.join("&");
+                            }
+                        }
+                    }
+                ),
+                dataTools: $resource(
+                    '/cars/:type',
+                    {},
+                    {
+                        dataExport: {
+                            method: 'GET',
+                            responseType: "arraybuffer",
+                            params: {
+                                type: "dataExport"
+                            },
+                            transformResponse: function(data, headers){
+                                return {data : data};
+                            }
+                        }
+                    }
+                )
+            };
+
+        }
+    ]
+);
+// 车辆设备信息service
+angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) {
+    return $resource(
+        '/cde_sc/:id',
+        {order: 'xl,isCancel,cl,qyrq', direction: 'ASC,ASC,ASC,DESC', id: '@id'},
+        {
+            list: {
+                method: 'GET',
+                params: {
+                    page: 0
+                },
+                transformResponse: function(rs) {
+                    var dst = angular.fromJson(rs);
+                    if (dst.status == 'SUCCESS') {
+                        return dst.data;
+                    } else {
+                        return dst; // 业务错误留给控制器处理
+                    }
+                }
+            },
+            get: {
+                method: 'GET',
+                transformResponse: function(rs) {
+                    var dst = angular.fromJson(rs);
+                    if (dst.status == 'SUCCESS') {
+                        return dst.data;
+                    } else {
+                        return dst;
+                    }
+                }
+            },
+            save: {
+                method: 'POST'
+            },
+            delete: {
+                method: 'DELETE'
+            }
+        }
+    );
+}]);
+// 人员信息service
+angular.module('ScheduleApp').factory(
+    'EmployeeInfoManageService_g',
+    [
+        '$resource',
+        function($resource) {
+            return {
+                rest : $resource(
+                    '/ee/:id',
+                    {order: 'jobCode', direction: 'ASC', id: '@id'},
+                    {
+                        list: {
+                            method: 'GET',
+                            params: {
+                                page: 0
+                            },
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        },
+                        get: {
+                            method: 'GET',
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst;
+                                }
+                            }
+                        },
+                        save: {
+                            method: 'POST'
+                        }
+                    }
+                ),
+
+                dataTools: $resource(
+                    '/personnel/:type',
+                    {},
+                    {
+                        dataExport: {
+                            method: 'GET',
+                            responseType: "arraybuffer",
+                            params: {
+                                type: "dataExport"
+                            },
+                            transformResponse: function(data, headers){
+                                return {data : data};
+                            }
+                        }
+                    }
+                )
+            };
+
+        }
+    ]
+);
+
+// 车辆配置service
+angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', function($resource) {
     return {
-        rest: $resource(
-            '/cars_sc/:id',
-            {order: 'carCode', direction: 'ASC', id: '@id_route'},
+        rest : $resource(
+            '/cci/:id',
+            {order: 'xl.id,cl.insideCode,isCancel', direction: 'ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -35,99 +220,66 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusInfoManageService_g&#39;, [&#39;$resource&#39;, fu
                     method: 'POST'
                 }
             }
-        ),
-        import: $resource(
-            '/cars/importfile',
-            {},
-            {
-                do: {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/x-www-form-urlencoded'
-                    },
-                    transformRequest: function(obj) {
-                        var str = [];
-                        for (var p in obj) {
-                            str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
-                        }
-                        return str.join("&");
-                    }
-                }
-            }
-        ),
-        validate: $resource(
-            '/cars/validate/:type',
-            {},
-            {
-                insideCode: {
-                    method: 'GET'
-                }
-            }
-        ),
-        dataTools: $resource(
-            '/cars/:type',
-            {},
-            {
-                dataExport: {
-                    method: 'GET',
-                    responseType: "arraybuffer",
-                    params: {
-                        type: "dataExport"
-                    },
-                    transformResponse: function(data, headers){
-                        return {data : data};
-                    }
-                }
-            }
         )
     };
 }]);
-// 车辆设备信息service
-angular.module('ScheduleApp').factory('DeviceInfoManageService_g', ['$resource', function($resource) {
+// 线路运营统计service
+angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', function($resource) {
     return $resource(
-        '/cde/:id',
-        {order: 'xl,isCancel,cl,qyrq', direction: 'ASC,ASC,ASC,DESC', id: '@id_route'},
+        '/bic/:id',
+        {order: 'createDate', direction: 'DESC', id: '@id_route'}, // TODO：以后需要根据属性对象的属性查询
         {
             list: {
                 method: 'GET',
                 params: {
                     page: 0
                 }
-            },
-            get: {
-                method: 'GET'
-            },
-            save: {
-                method: 'POST'
-            },
-            delete: {
-                method: 'DELETE'
             }
         }
     );
-}]);
-// 人员信息service
-angular.module('ScheduleApp').factory('EmployeeInfoManageService_g', ['$resource', function($resource) {
+}]);
+
+// 人员配置service
+angular.module('ScheduleApp').factory('EmployeeConfigService_g', ['$resource', function($resource) {
     return {
         rest : $resource(
-            '/personnel/:id',
-            {order: 'jobCode', direction: 'ASC', id: '@id_route'},
+            '/eci/:id',
+            {order: 'xl.id,isCancel,dbbmFormula', direction: 'ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
                     params: {
                         page: 0
+                    },
+                    transformResponse: function(rs) {
+                        var dst = angular.fromJson(rs);
+                        if (dst.status == 'SUCCESS') {
+                            return dst.data;
+                        } else {
+                            return dst; // 业务错误留给控制器处理
+                        }
                     }
                 },
                 get: {
-                    method: 'GET'
+                    method: 'GET',
+                    transformResponse: function(rs) {
+                        var dst = angular.fromJson(rs);
+                        if (dst.status == 'SUCCESS') {
+                            return dst.data;
+                        } else {
+                            return dst;
+                        }
+                    }
                 },
                 save: {
                     method: 'POST'
+                },
+                delete: {
+                    method: 'DELETE'
                 }
             }
         ),
-        validate: $resource(
+        validate: $resource( // TODO：
             '/personnel/validate/:type',
             {},
             {
@@ -135,138 +287,15 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeInfoManageService_g&#39;, [&#39;$resource
                     method: 'GET'
                 }
             }
-        ),
-        dataTools: $resource(
-            '/personnel/:type',
-            {},
-            {
-                dataExport: {
-                    method: 'GET',
-                    responseType: "arraybuffer",
-                    params: {
-                        type: "dataExport"
-                    },
-                    transformResponse: function(data, headers){
-                        return {data : data};
-                    }
-                }
-            }
         )
     };
-}]);
-
-// 车辆配置service
-angular.module('ScheduleApp').factory('BusConfigService_g', ['$resource', function($resource) {
-    return {
-        rest : $resource(
-            '/cci/:id',
-            {order: 'xl.id,cl.insideCode,isCancel', direction: 'ASC', id: '@id_route'},
-            {
-                list: {
-                    method: 'GET',
-                    params: {
-                        page: 0
-                    },
-                    transformResponse: function(rs) {
-                        var dst = angular.fromJson(rs);
-                        if (dst.status == 'SUCCESS') {
-                            return dst.data;
-                        } else {
-                            return dst; // 业务错误留给控制器处理
-                        }
-                    }
-                },
-                get: {
-                    method: 'GET',
-                    transformResponse: function(rs) {
-                        var dst = angular.fromJson(rs);
-                        if (dst.status == 'SUCCESS') {
-                            return dst.data;
-                        } else {
-                            return dst;
-                        }
-                    }
-                },
-                save: {
-                    method: 'POST'
-                }
-            }
-        )
-    };
-}]);
-// 线路运营统计service
-angular.module('ScheduleApp').factory('BusLineInfoStatService_g', ['$resource', function($resource) {
-    return $resource(
-        '/bic/:id',
-        {order: 'createDate', direction: 'DESC', id: '@id_route'}, // TODO：以后需要根据属性对象的属性查询
-        {
-            list: {
-                method: 'GET',
-                params: {
-                    page: 0
-                }
-            }
-        }
-    );
-}]);
-
-// 人员配置service
-angular.module('ScheduleApp').factory('EmployeeConfigService_g', ['$resource', function($resource) {
-    return {
-        rest : $resource(
-            '/eci/:id',
-            {order: 'xl.id,isCancel,dbbmFormula', direction: 'ASC', id: '@id_route'},
-            {
-                list: {
-                    method: 'GET',
-                    params: {
-                        page: 0
-                    },
-                    transformResponse: function(rs) {
-                        var dst = angular.fromJson(rs);
-                        if (dst.status == 'SUCCESS') {
-                            return dst.data;
-                        } else {
-                            return dst; // 业务错误留给控制器处理
-                        }
-                    }
-                },
-                get: {
-                    method: 'GET',
-                    transformResponse: function(rs) {
-                        var dst = angular.fromJson(rs);
-                        if (dst.status == 'SUCCESS') {
-                            return dst.data;
-                        } else {
-                            return dst;
-                        }
-                    }
-                },
-                save: {
-                    method: 'POST'
-                },
-                delete: {
-                    method: 'DELETE'
-                }
-            }
-        ),
-        validate: $resource( // TODO：
-            '/personnel/validate/:type',
-            {},
-            {
-                jobCode: {
-                    method: 'GET'
-                }
-            }
-        )
-    };
 }]);
 // 路牌管理service
 angular.module('ScheduleApp').factory('GuideboardManageService_g', ['$resource', function($resource) {
     return {
         rest: $resource(
             '/gic/:id',
-            {order: 'xl,isCancel', direction: 'DESC,ASC', id: '@id_route'},
+            {order: 'xl,isCancel', direction: 'DESC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -523,454 +552,468 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;TimeTableDetailManageService_g&#39;, [&#39;$resou
         // TODO：导入数据
     };
 }]);
-// 项目通用的全局service服务，供不同的controller使用，自定义指令不使用
-
-// 文件下载服务
-angular.module('ScheduleApp').factory('FileDownload_g', function() {
-    return {
-        downloadFile: function (data, mimeType, fileName) {
-            var success = false;
-            var blob = new Blob([data], { type: mimeType });
-            try {
-                if (navigator.msSaveBlob)
-                    navigator.msSaveBlob(blob, fileName);
-                else {
-                    // Try using other saveBlob implementations, if available
-                    var saveBlob = navigator.webkitSaveBlob || navigator.mozSaveBlob || navigator.saveBlob;
-                    if (saveBlob === undefined) throw "Not supported";
-                    saveBlob(blob, fileName);
-                }
-                success = true;
-            } catch (ex) {
-                console.log("saveBlob method failed with the following exception:");
-                console.log(ex);
-            }
-
-            if (!success) {
-                // Get the blob url creator
-                var urlCreator = window.URL || window.webkitURL || window.mozURL || window.msURL;
-                if (urlCreator) {
-                    // Try to use a download link
-                    var link = document.createElement('a');
-                    if ('download' in link) {
-                        // Try to simulate a click
-                        try {
-                            // Prepare a blob URL
-                            var url = urlCreator.createObjectURL(blob);
-                            link.setAttribute('href', url);
-
-                            // Set the download attribute (Supported in Chrome 14+ / Firefox 20+)
-                            link.setAttribute("download", fileName);
-
-                            // Simulate clicking the download link
-                            var event = document.createEvent('MouseEvents');
-                            event.initMouseEvent('click', true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, null);
-                            link.dispatchEvent(event);
-                            success = true;
-
-                        } catch (ex) {
-                            console.log("Download link method with simulated click failed with the following exception:");
-                            console.log(ex);
-                        }
-                    }
-
-                    if (!success) {
-                        // Fallback to window.location method
-                        try {
-                            // Prepare a blob URL
-                            // Use application/octet-stream when using window.location to force download
-                            var url = urlCreator.createObjectURL(blob);
-                            window.location = url;
-                            console.log("Download link method with window.location succeeded");
-                            success = true;
-                        } catch (ex) {
-                            console.log("Download link method with window.location failed with the following exception:");
-                            console.log(ex);
-                        }
-                    }
-                }
-            }
-
-            if (!success) {
-                // Fallback to window.open method
-                console.log("No methods worked for saving the arraybuffer, using last resort window.open");
-                window.open("", '_blank', '');
-            }
-        }
-    };
-});
-
-
-/**
- * saSelect2指令，根据属性值，动态载入数据，然后支持拼音搜索，点击右边的按钮清除选择并重新载入数据。
- * 1、compile阶段使用的属性如下：
- *      required：用于和表单验证连接，指定成required="true"才有效。
- * 2、link阶段使用的属性如下
- *      model：关联的模型对象
- *      name：表单验证时需要的名字
- *      type：关联的那种数据值（xl/cl/ry）-> 对应线路信息/车辆信息/人员信息，后面有的继续加
- *      modelcolname1：关联的模型字段名字1（一般应该是编码字段）
- *      modelcolname2：关联的模型字段名字2（一般应该是名字字段）
- *      datacolname1；内部数据对应的字段名字1（与模型字段1对应）
- *      datacolname2：内部数据对应的字段名字2（与模型字段2对应）
- *      showcolname：下拉框显示的内部数据字段名（注意：不是模型数据字段名），TODO：以后考虑放动态表达式，并在compile阶段使用
- *      placeholder：select placeholder字符串描述
- *
- * $$pyFilter，内部的filter指令，结合简拼音进行拼音过滤。
- * $$SearchInfoService_g，内部使用的数据服务
- */
-// saSelect2指令使用的内部信service
-angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', function($resource) {
-    return {
-        xl: $resource(
-            '/line/:type',
-            {order: 'name', direction: 'ASC'},
-            {
-                list: {
-                    method: 'GET',
-                    isArray: true
-                }
-            }
-        ),
-        xlinfo: $resource(
-            '/lineInformation/:type',
-            {order: 'line.name', direction: 'ASC'},
-            {
-                list: {
-                    method: 'GET',
-                    isArray: true
-                }
-            }
-        ),
-        zd: $resource(
-            '/stationroute/stations',
-            {order: 'stationCode', direction: 'ASC'},
-            {
-                list: {
-                    method: 'GET',
-                    isArray: true
-                }
-            }
-        ),
-        tcc: $resource(
-            '/carpark/:type',
-            {order: 'parkCode', direction: 'ASC'},
-            {
-                list: {
-                    method: 'GET',
-                    isArray: true
-                }
-            }
-        ),
-        ry: $resource(
-            '/personnel/:type',
-            {order: 'personnelName', direction: 'ASC'},
-            {
-                list: {
-                    method: 'GET',
-                    isArray: true
-                }
-            }
-        ),
-        cl: $resource(
-            '/cars/:type',
-            {order: "insideCode", direction: 'ASC'},
-            {
-                list: {
-                    method: 'GET',
-                    isArray: true
-                }
-            }
-        ),
-        ttInfo: $resource(
-            '/tic/:type',
-            {order: "name", direction: 'ASC'},
-            {
-                list: {
-                    method: 'GET',
-                    isArray: true
-                }
-            }
-        ),
-        lpInfo: $resource(
-            '/gic/ttlpnames',
-            {order: "lpName", direction: 'ASC'},
-            {
-                list: {
-                    method: 'GET',
-                    isArray: true
-                }
-            }
-        ),
-        lpInfo2: $resource(
-            '/gic/:type',
-            {order: "lpName", direction: 'ASC'},
-            {
-                list: {
-                    method: 'GET',
-                    isArray: true
-                }
-            }
-        ),
-        cci: $resource(
-            '/cci/cars',
-            {},
-            {
-                list: {
-                    method: 'GET',
-                    isArray: true
-                }
-            }
-
-        ),
-        cci2: $resource(
-            '/cci/:type',
-            {},
-            {
-                list: {
-                    method: 'GET',
-                    isArray: true,
-                    transformResponse: function(rs) {
-                        var dst = angular.fromJson(rs);
-                        if (dst.status == 'SUCCESS') {
-                            return dst.data;
-                        } else {
-                            return dst; // 业务错误留给控制器处理
-                        }
-                    }
-                }
-            }
-        ),
-        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
-                }
-            }
-        ),
-        eci3: $resource(
-            '/eci/:type',
-            {},
-            {
-                list: {
-                    method: 'GET',
-                    isArray: true
-                }
-            }
-        ),
-
-
-        validate: { // remoteValidation指令用到的resource
-            gbv1: { // 路牌序号验证
-                template: {'xl.id_eq': -1, 'lpNo_eq': 'ddd'},
-                remote: $resource(
-                    '/gic/validate1',
-                    {},
-                    {
-                        do: {
-                            method: 'GET'
-                        }
-                    }
-                )
-            },
-            gbv2: { // 路牌名称验证
-                template: {'xl.id_eq': -1, 'lpName_eq': 'ddd'},
-                remote: $resource(
-                    '/gic/validate2',
-                    {},
-                    {
-                        do: {
-                            method: 'GET'
-                        }
-                    }
-                )
-            },
-
-            cars_zbh: { // 自编号验证
-                template: {'insideCode_eq': '-1'}, // 查询参数模版
-                remote: $resource( // $resource封装对象
-                    '/cars_sc/validate_zbh',
-                    {},
-                    {
-                        do: {
-                            method: 'GET'
-                        }
-                    }
-                )
-            },
-
-            cars_sbbh: { // 验证设备编号
-                template: {'equipmentCode_eq': '-1'}, // 查询参数模版
-                remote: $resource( // $resource封装对象
-                    '/cars_sc/validate_sbbh',
-                    {},
-                    {
-                        do: {
-                            method: 'GET'
-                        }
-                    }
-                )
-            },
-
-            cars_clbh: { // 车辆编号验证
-                template: {'carCode_eq': '-1'}, // 查询参数模版
-                remote: $resource( // $resource封装对象
-                    '/cars_sc/validate_clbh',
-                    {},
-                    {
-                        do: {
-                            method: 'GET'
-                        }
-                    }
-                )
-            },
-
-            cars_cph: { // 车牌号验证
-                template: {'carPlate_eq': '-1'}, // 查询参数模版
-                remote: $resource( // $resource封装对象
-                    '/cars_sc/validate_cph',
-                    {},
-                    {
-                        do: {
-                            method: 'GET'
-                        }
-                    }
-                )
-            },
-            cc_cars: { // 车辆不能重复配置
-                template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'cl.id_eq': -1}, // 查询参数模版
-                remote: $resource( // $resource封装对象
-                    '/cci/validate_cars',
-                    {},
-                    {
-                        do: {
-                            method: 'GET'
-                        }
-                    }
-                )
-            },
-            ec_jsy: { // 驾驶员不能重复配置
-                template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'jsy.id_eq': -1}, // 查询参数模版
-                remote: $resource( // $resource封装对象
-                    '/eci/validate_jsy',
-                    {},
-                    {
-                        do: {
-                            method: 'GET'
-                        }
-                    }
-                )
-            },
-            ec_spy: { // 售票员不能重复配置
-                template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'spy.id_eq': -1}, // 查询参数模版
-                remote: $resource( // $resource封装对象
-                    '/eci/validate_spy',
-                    {},
-                    {
-                        do: {
-                            method: 'GET'
-                        }
-                    }
-                )
-            },
-
-            cde1: { // 车辆设备启用日期验证
-                template: {'qyrq': 0, 'xl': 1, 'cl': 1}, // 日期毫秒
-                remote: $resource( // $resource封装对象
-                    '/cde//validate/qyrq',
-                    {},
-                    {
-                        do: {
-                            method: 'GET'
-                        }
-                    }
-                )
-            },
-            ttc1: { // 时刻表名字验证
-                template: {'xl.id_eq': -1, 'name_eq': 'ddd'},
-                remote: $resource( // $resource封装对象
-                    '/tic/validate/equale',
-                    {},
-                    {
-                        do: {
-                            method: 'GET'
-                        }
-                    }
-                )
-            },
-            sheet: { // 时刻表sheet工作区验证
-                template: {'filename': '', 'sheetname': '', 'lineid': -1, 'linename': ''},
-                remote: $resource( // $resource封装对象
-                    '/tidc/validate/sheet',
-                    {},
-                    {
-                        do: {
-                            method: 'POST',
-                            headers: {
-                                'Content-Type': 'application/x-www-form-urlencoded'
-                            },
-                            transformRequest: function(obj) {
-                                var str = [];
-                                for (var p in obj) {
-                                    str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
-                                }
-                                return str.join("&");
-                            }
-                        }
-                    }
-                )
-            },
-            sheetli: { // 时刻表线路标准验证
-                template: {'lineinfoid': -1},
-                remote: $resource( // $resource封装对象
-                    '/tidc/validate/lineinfo',
-                    {},
-                    {
-                        do: {
-                            method: 'GET'
-                        }
-                    }
-                )
-            }
-        }
-
-        //validate: $resource(
-        //    '/cars/validate/:type',
-        //    {},
-        //    {
-        //        insideCode: {
-        //            method: 'GET'
-        //        }
-        //    }
-        //)
-
-
-
-    }
-}]);
-
-
+// 项目通用的全局service服务，供不同的controller使用，自定义指令不使用
+
+// 文件下载服务
+angular.module('ScheduleApp').factory('FileDownload_g', function() {
+    return {
+        downloadFile: function (data, mimeType, fileName) {
+            var success = false;
+            var blob = new Blob([data], { type: mimeType });
+            try {
+                if (navigator.msSaveBlob)
+                    navigator.msSaveBlob(blob, fileName);
+                else {
+                    // Try using other saveBlob implementations, if available
+                    var saveBlob = navigator.webkitSaveBlob || navigator.mozSaveBlob || navigator.saveBlob;
+                    if (saveBlob === undefined) throw "Not supported";
+                    saveBlob(blob, fileName);
+                }
+                success = true;
+            } catch (ex) {
+                console.log("saveBlob method failed with the following exception:");
+                console.log(ex);
+            }
+
+            if (!success) {
+                // Get the blob url creator
+                var urlCreator = window.URL || window.webkitURL || window.mozURL || window.msURL;
+                if (urlCreator) {
+                    // Try to use a download link
+                    var link = document.createElement('a');
+                    if ('download' in link) {
+                        // Try to simulate a click
+                        try {
+                            // Prepare a blob URL
+                            var url = urlCreator.createObjectURL(blob);
+                            link.setAttribute('href', url);
+
+                            // Set the download attribute (Supported in Chrome 14+ / Firefox 20+)
+                            link.setAttribute("download", fileName);
+
+                            // Simulate clicking the download link
+                            var event = document.createEvent('MouseEvents');
+                            event.initMouseEvent('click', true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, null);
+                            link.dispatchEvent(event);
+                            success = true;
+
+                        } catch (ex) {
+                            console.log("Download link method with simulated click failed with the following exception:");
+                            console.log(ex);
+                        }
+                    }
+
+                    if (!success) {
+                        // Fallback to window.location method
+                        try {
+                            // Prepare a blob URL
+                            // Use application/octet-stream when using window.location to force download
+                            var url = urlCreator.createObjectURL(blob);
+                            window.location = url;
+                            console.log("Download link method with window.location succeeded");
+                            success = true;
+                        } catch (ex) {
+                            console.log("Download link method with window.location failed with the following exception:");
+                            console.log(ex);
+                        }
+                    }
+                }
+            }
+
+            if (!success) {
+                // Fallback to window.open method
+                console.log("No methods worked for saving the arraybuffer, using last resort window.open");
+                window.open("", '_blank', '');
+            }
+        }
+    };
+});
+
+
+/**
+ * saSelect2指令，根据属性值，动态载入数据，然后支持拼音搜索，点击右边的按钮清除选择并重新载入数据。
+ * 1、compile阶段使用的属性如下：
+ *      required：用于和表单验证连接，指定成required="true"才有效。
+ * 2、link阶段使用的属性如下
+ *      model：关联的模型对象
+ *      name：表单验证时需要的名字
+ *      type：关联的那种数据值（xl/cl/ry）-> 对应线路信息/车辆信息/人员信息，后面有的继续加
+ *      modelcolname1：关联的模型字段名字1（一般应该是编码字段）
+ *      modelcolname2：关联的模型字段名字2（一般应该是名字字段）
+ *      datacolname1；内部数据对应的字段名字1（与模型字段1对应）
+ *      datacolname2：内部数据对应的字段名字2（与模型字段2对应）
+ *      showcolname：下拉框显示的内部数据字段名（注意：不是模型数据字段名），TODO：以后考虑放动态表达式，并在compile阶段使用
+ *      placeholder：select placeholder字符串描述
+ *
+ * $$pyFilter，内部的filter指令，结合简拼音进行拼音过滤。
+ * $$SearchInfoService_g，内部使用的数据服务
+ */
+// saSelect2指令使用的内部信service
+angular.module('ScheduleApp').factory('$$SearchInfoService_g', ['$resource', function($resource) {
+    return {
+        xl: $resource(
+            '/line/:type',
+            {order: 'name', direction: 'ASC'},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+        ),
+        xlinfo: $resource(
+            '/lineInformation/:type',
+            {order: 'line.name', direction: 'ASC'},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+        ),
+        zd: $resource(
+            '/stationroute/stations',
+            {order: 'stationCode', direction: 'ASC'},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+        ),
+        tcc: $resource(
+            '/carpark/:type',
+            {order: 'parkCode', direction: 'ASC'},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+        ),
+        ry: $resource(
+            '/personnel/:type',
+            {order: 'personnelName', direction: 'ASC'},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+        ),
+        cl: $resource(
+            '/cars/:type',
+            {order: "insideCode", direction: 'ASC'},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+        ),
+        ttInfo: $resource(
+            '/tic/:type',
+            {order: "name", direction: 'ASC'},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+        ),
+        lpInfo: $resource(
+            '/gic/ttlpnames',
+            {order: "lpName", direction: 'ASC'},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+        ),
+        lpInfo2: $resource(
+            '/gic/:type',
+            {order: "lpName", direction: 'ASC'},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+        ),
+        cci: $resource(
+            '/cci/cars',
+            {},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+
+        ),
+        cci2: $resource(
+            '/cci/:type',
+            {},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true,
+                    transformResponse: function(rs) {
+                        var dst = angular.fromJson(rs);
+                        if (dst.status == 'SUCCESS') {
+                            return dst.data;
+                        } else {
+                            return dst; // 业务错误留给控制器处理
+                        }
+                    }
+                }
+            }
+        ),
+        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
+                }
+            }
+        ),
+        eci3: $resource(
+            '/eci/:type',
+            {},
+            {
+                list: {
+                    method: 'GET',
+                    isArray: true
+                }
+            }
+        ),
+
+
+        validate: { // remoteValidation指令用到的resource
+            gbv1: { // 路牌序号验证
+                template: {'xl.id_eq': -1, 'lpNo_eq': 'ddd'},
+                remote: $resource(
+                    '/gic/validate_lpno',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
+            gbv2: { // 路牌名称验证
+                template: {'xl.id_eq': -1, 'lpName_eq': 'ddd'},
+                remote: $resource(
+                    '/gic/validate_lpname',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
+
+            cars_zbh: { // 自编号验证
+                template: {'insideCode_eq': '-1'}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/cars_sc/validate_zbh',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
+
+            cars_sbbh: { // 验证设备编号
+                template: {'equipmentCode_eq': '-1'}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/cars_sc/validate_sbbh',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
+
+            cars_clbh: { // 车辆编号验证
+                template: {'carCode_eq': '-1'}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/cars_sc/validate_clbh',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
+
+            cars_cph: { // 车牌号验证
+                template: {'carPlate_eq': '-1'}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/cars_sc/validate_cph',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
+
+            ee_gh: { // 工号不能重复
+                template: {'companyCode_eq': '-1', 'jobCode_eq': '-1'}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/ee/validate_gh',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
+
+            cc_cars: { // 车辆不能重复配置
+                template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'cl.id_eq': -1}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/cci/validate_cars',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
+            ec_jsy: { // 驾驶员不能重复配置
+                template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'jsy.id_eq': -1}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/eci/validate_jsy',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
+            ec_spy: { // 售票员不能重复配置
+                template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'spy.id_eq': -1}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/eci/validate_spy',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
+
+            cde1: { // 车辆设备启用日期验证
+                template: {'xl_eq': -1, 'cl_eq': -1, 'qyrq_eq': 1}, // 日期毫秒
+                remote: $resource( // $resource封装对象
+                    '/cde_sc/validate_qyrq',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
+            ttc1: { // 时刻表名字验证
+                template: {'xl.id_eq': -1, 'name_eq': 'ddd'},
+                remote: $resource( // $resource封装对象
+                    '/tic/validate/equale',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
+            sheet: { // 时刻表sheet工作区验证
+                template: {'filename': '', 'sheetname': '', 'lineid': -1, 'linename': ''},
+                remote: $resource( // $resource封装对象
+                    '/tidc/validate/sheet',
+                    {},
+                    {
+                        do: {
+                            method: 'POST',
+                            headers: {
+                                'Content-Type': 'application/x-www-form-urlencoded'
+                            },
+                            transformRequest: function(obj) {
+                                var str = [];
+                                for (var p in obj) {
+                                    str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+                                }
+                                return str.join("&");
+                            }
+                        }
+                    }
+                )
+            },
+            sheetli: { // 时刻表线路标准验证
+                template: {'lineinfoid': -1},
+                remote: $resource( // $resource封装对象
+                    '/tidc/validate/lineinfo',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            }
+        }
+
+        //validate: $resource(
+        //    '/cars/validate/:type',
+        //    {},
+        //    {
+        //        insideCode: {
+        //            method: 'GET'
+        //        }
+        //    }
+        //)
+
+
+
+    }
+}]);
+
+
@@ -135,17 +135,18 @@
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">停车场*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.busConfigForSave"
-                                    name="tcd"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.busConfigForSave.tcd}}"
+                        <sa-Select5 name="tcd"
+                                    model="ctrl.busConfigForSave"
+                                    cmaps="{'tcd': 'parkName'}"
                                     dcname="tcd"
                                     icname="parkName"
-                                    icnames="parkName"
-                                    datatype="tcc"
-                                    mlp="true"
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'tcc' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.parkName"
+                                    searchph="请输拼音..."
+                                    searchexp="this.parkName"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.tcd.$error.required">
@@ -79,7 +79,7 @@
                         <input type="hidden" name="cl_h" ng-model="ctrl.busConfigForSave.cl.id"
                                remote-Validation
                                remotevtype="cc_cars"
-                               remotevparam="{{ {'id_eq': ctrl.busConfigForSave.id, 'xl.id_eq': ctrl.busConfigForSave.xl.id, 'xl.name_eq': ctrl.busConfigForSave.xl.name, 'cl.id_eq': ctrl.busConfigForSave.cl.id} | json}}"
+                               remotevparam="{{ {'xl.id_eq': ctrl.busConfigForSave.xl.id, 'xl.name_eq': ctrl.busConfigForSave.xl.name, 'cl.id_eq': ctrl.busConfigForSave.cl.id} | json}}"
                                 />
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
@@ -135,17 +135,18 @@
                 <div class="form-group has-success has-feedback">
                     <label class="col-md-2 control-label">停车场*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.busConfigForSave"
-                                    name="tcd"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.busConfigForSave.tcd}}"
+                        <sa-Select5 name="tcd"
+                                    model="ctrl.busConfigForSave"
+                                    cmaps="{'tcd': 'parkName'}"
                                     dcname="tcd"
                                     icname="parkName"
-                                    icnames="parkName"
-                                    datatype="tcc"
-                                    mlp="true"
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'tcc' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.parkName"
+                                    searchph="请输拼音..."
+                                    searchexp="this.parkName"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.tcd.$error.required">
@@ -222,17 +222,10 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 提交方法
             self.submit = function() {
-                if (id) {
-                    // 更新
-                    self.busConfigForSave.$save({id: id}, function() {
-                        $state.go("busConfig");
-                    });
-                } else {
-                    // 保存
-                    self.busConfigForSave.$save(function() {
-                        $state.go("busConfig");
-                    });
-                }
+                // 保存或者更新
+                self.busConfigForSave.$save(function() {
+                    $state.go("busConfig");
+                });
             };
 }]);
@@ -3,7 +3,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;BusConfigService_g&#39;, [&#39;$resource&#39;, functi
     return {
         rest : $resource(
             '/cci/:id',
-            {order: 'xl.id,cl.insideCode,isCancel', direction: 'ASC', id: '@id_route'},
+            {order: 'xl.id,cl.insideCode,isCancel', direction: 'ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -92,7 +92,7 @@
                         <input type="hidden" name="jsy_h" ng-model="ctrl.employeeConfigForSave.jsy.id"
                                remote-Validation
                                remotevtype="ec_jsy"
-                               remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.jsy.id} | json}}"
+                               remotevparam="{{ {'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.jsy.id} | json}}"
                                 />
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
@@ -122,7 +122,7 @@
                         <input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id"
                                remote-Validation
                                remotevtype="ec_spy"
-                               remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'spy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}"
+                               remotevparam="{{ {'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'spy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}"
                                 />
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
@@ -220,17 +220,10 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     self.employeeConfigForSave.spy = null;
                 }
-                if (id) {
-                    // 更新
-                    self.employeeConfigForSave.$save({id: id}, function() {
-                        $state.go("employeeConfig");
-                    });
-                } else {
-                    // 保存
-                    self.employeeConfigForSave.$save(function() {
-                        $state.go("employeeConfig");
-                    });
-                }
+                // 保存或更新
+                self.employeeConfigForSave.$save(function() {
+                    $state.go("employeeConfig");
+                });
             };
 }]);
@@ -3,7 +3,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;EmployeeConfigService_g&#39;, [&#39;$resource&#39;, f
     return {
         rest : $resource(
             '/eci/:id',
-            {order: 'xl.id,isCancel,dbbmFormula', direction: 'ASC', id: '@id_route'},
+            {order: 'xl.id,isCancel,dbbmFormula', direction: 'ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -63,7 +63,7 @@
                                name="lpNo" placeholder="请输入路牌编号..." min="1" required
                                remote-Validation
                                remotevtype="gbv1"
-                               remotevparam="{{ {'id_eq': ctrl.guideboardManageForForm.id, 'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpNo_eq': ctrl.guideboardManageForForm.lpNo} | json}}"
+                               remotevparam="{{ {'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpNo_eq': ctrl.guideboardManageForForm.lpNo} | json}}"
                                 />
                     </div>
@@ -85,7 +85,7 @@
                                name="lpName" placeholder="请输入路牌名字..." required
                                remote-Validation
                                remotevtype="gbv2"
-                               remotevparam="{{ {'id_eq': ctrl.guideboardManageForForm.id, 'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpName_eq': ctrl.guideboardManageForForm.lpName} | json}}"
+                               remotevparam="{{ {'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpName_eq': ctrl.guideboardManageForForm.lpName} | json}}"
                                />
                     </div>
@@ -77,8 +77,8 @@
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="guideboardManage_detail({id : info.id})" class="btn btn-info btn-sm"> 详细 </a>
                     <a ui-sref="guideboardManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>
-                    <a ng-click="ctrl.toggleCancel(info.id)" class="btn btn-danger btn-sm" ng-if="info.isCancel == '0'"> 作废 </a>
-                    <a ng-click="ctrl.toggleCancel(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> 撤销 </a>
+                    <a ng-click="ctrl.toggleGuideboard(info.id)" class="btn btn-danger btn-sm" ng-if="info.isCancel == '0'"> 作废 </a>
+                    <a ng-click="ctrl.toggleGuideboard(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> 撤销 </a>
                 </td>
             </tr>
             </tbody>
@@ -180,18 +180,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                     service.getPage(result);
                 });
             };
-            self.toggleTtinfo = function(id) {
-                Gb.delete({id: id}, function(result) {
-                    if (result.message) { // 暂时这样做，之后全局拦截
-                        alert("失败：" + result.message);
-                    } else {
-                        self.doPage();
-                    }
-                });
-            };
-
             // 作废切换
-            self.toggleCancel = function(id) {
+            self.toggleGuideboard = function(id) {
                 Gb.delete({id: id}, function(result) {
                     if (result.status == "ERROR") { // 暂时这样做，之后全局拦截
                         alert("失败：" + result.msg);
@@ -3,7 +3,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
     return {
         rest: $resource(
             '/gic/:id',
-            {order: 'xl,isCancel', direction: 'DESC,ASC', id: '@id_route'},
+            {order: 'xl,isCancel', direction: 'DESC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -18,6 +18,7 @@
     background: #f5f5f5;
     width: 100%;
     line-height: 30px;
+    z-index: 3;
 }
 .ct_table>.ct_table_head dl {
@@ -943,4 +943,73 @@ input.i-cbox[type=checkbox]{
 .fixed_legend .tl-qrlb::before{
     font-size: 12px;
+}
+
+.schedule-body .ct_table dl.dl-last-sch{
+    height: 55px;
+}
+
+.schedule-body .ct_table dl.dl-last-sch dd{
+    line-height: 55px;
+}
+
+.schedule-body .ct_table dl.dl-last-sch dd.fcsjActualCell{
+    line-height: 28px;
+}
+
+dd.fcsjActualCell div.last-sch-sunken{
+    height: 25px;
+    line-height: 25px;
+    margin: 0;
+    background: #fff;
+    /*border-top: 1px solid #eeeeee;*/
+}
+
+dd.fcsjActualCell div.last-sch-sunken span._badge{
+    font-size: 12px;
+    border-radius: 0 7px 7px 0;
+    padding-left: 0;
+    width: 29px;
+    display: inline-block;
+    height: 18px;
+    line-height: 18px;
+    box-shadow: 2px 0px 2px 0 rgba(0,0,0,0.16), 2px 0px 4px 0 rgba(0,0,0,0.12);
+    vertical-align: top;
+    margin-right: 3px;
+    margin-top: 3px;
+    margin-left: -7px;
+    text-indent: 2px;
+    border-left: 0;
+    transform: scale(.9);
+    color: grey;
+}
+
+.relevance-active dd.fcsjActualCell div.last-sch-sunken{
+    background: #f1efef;
+}
+
+.intimity.relevance-active dd.fcsjActualCell div.last-sch-sunken{
+    background: #76a6c7 !important;
+    border-top: 1px solid #f7f8f8 !important;
+    color: #f8f8f8;
+}
+
+.intimity.relevance-active dd.fcsjActualCell div.last-sch-sunken span._badge{
+    background: #76a6c7 ;
+    color: #ffffff ;
+}
+
+.drag-active  dd.fcsjActualCell div.last-sch-sunken{
+    background: #cef9e3 !important;
+    border-top: 1px solid #d9e6e0 !important;
+}
+
+.drag-active  dd.fcsjActualCell div.last-sch-sunken span._badge{
+    color: #6e6969;
+    background: #cef9e3;
+}
+
+.ct_table>.ct_table_body dl.dl-last-sch:hover div.last-sch-sunken,
+.ct_table>.ct_table_body dl.dl-last-sch.context-menu-active div.last-sch-sunken{
+    background: #f5fbff;
 }
 \ No newline at end of file
@@ -369,4 +369,32 @@ li.map-panel{
 .ct-bottom-drawer-body{
     width: 100%;
     height: 100%;
+}
+
+#station_route_spacing_chart_drawer .svg_wrap{
+    width: 80%;height: 100%;display: inline-block;font-size: 14px;overflow: hidden;
+    position: relative;
+}
+
+#station_route_spacing_chart_drawer .drawer_right_map{
+    width: 20%;height: 100%;display: inline-block;
+}
+
+#station_route_spacing_chart_drawer .svg_cont_body{
+    height:100%;
+    position: absolute;
+    top:0;
+    left: 0;
+}
+
+#station_route_spacing_chart_drawer svg{
+    width: 100%;
+    height: 100%;
+}
+
+#station_route_spacing_chart_drawer svg g._item rect{
+    stroke: rgb(62, 80, 179);
+    fill: rgb(62, 80, 179);
+    width: 30px;
+    height: 140px;
 }
 \ No newline at end of file
@@ -322,7 +322,8 @@
                         name: "添加子任务",
                         items: {
                             'add_sub_task_in': {
-                                name: '回场'
+                                name: '回场',
+                                disabled: true
                             },
                             'add_sub_task_out': {
                                 name: '出场',