1.浦东路单rest接口

王通
1 parent 033a3f71
Showing 2 changed files with 20 additions and 26 deletions
src/main/java/com/bsth/entity/ScheduleRealInfo.java
src/main/java/com/bsth/server_rs/waybill/WaybillRestService.java
@@ -52,14 +52,10 @@ public class ScheduleRealInfo implements Serializable{
 	private String jGh;
 	/** 驾驶员名字 */
 	private String jName;
-	/** 驾驶员身份证 */
-	private String jId;
 	/** 售票员工号 */
 	private String sGh;
 	/** 售票员名字 */
 	private String sName;
-	/** 售票员身份证 */
-	private String sId;
  
 	/** 线路方向 */
 	private String xlDir;
@@ -275,14 +271,6 @@ public class ScheduleRealInfo implements Serializable{
 		this.jName = jName;
 	}
  
-	public String getjId() {
-		return jId;
-	}
-
-	public void setjId(String jId) {
-		this.jId = jId;
-	}
-
 	public String getsGh() {
 		return sGh;
 	}
@@ -299,14 +287,6 @@ public class ScheduleRealInfo implements Serializable{
 		this.sName = sName;
 	}
  
-	public String getsId() {
-		return sId;
-	}
-
-	public void setsId(String sId) {
-		this.sId = sId;
-	}
-
 	public String getXlDir() {
 		return xlDir;
 	}
@@ -9,6 +9,7 @@ import java.util.Set;
  
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
  
@@ -47,16 +48,15 @@ public class WaybillRestService {
 	        fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
  
     @GET
-    @Path("/")
-    public Map<String, Object> waybill(Map<String, Object> param) {
+    @Path("/{companyCode}/{rq}")
+    public Map<String, Object> waybill(@PathParam("companyCode") String companyCode, @PathParam("rq") String rq) {
     	Map<String, Object> map = new HashMap<String, Object>();
-    	String rq = (String)param.get("date"), companyId = (String)param.get("companyCode");
         try {
             //日期减一天，老接口是这样的
             String prveRq = fmtyyyyMMdd.print(fmtyyyyMMdd.parseDateTime(rq).minusDays(1));
  
             //实际排班
-            ArrayListMultimap<String, ScheduleRealInfo> listMap = scheduleRedisService.findByDateAndGroupByNbbm(prveRq, companyId);
+            ArrayListMultimap<String, ScheduleRealInfo> listMap = scheduleRedisService.findByDateAndGroupByNbbm(prveRq, companyCode);
             //当班调派
             long st = fmtyyyyMMddHHmm.parseMillis(prveRq + "00:00"), et = fmtyyyyMMddHHmm.parseMillis(prveRq + "23:59");
             List<DutyEmployee> des = dutyEmployeeRepository.findByTime(st, et);
@@ -101,6 +101,10 @@ public class WaybillRestService {
             wb.setInsideCode(sch.getClZbh());
             //线路编码
             wb.setLineCode(sch.getXlBm());
+            wb.setLineName(sch.getXlName());
+            wb.setCompanyCode(sch.getGsBm());
+            wb.setBranchCompanyCode(sch.getFgsBm());
+            System.out.println(sch.getFgsBm() + "_" + sch.getFgsName());
  
             //按 驾驶员 分组班次，构造路单子项
             jGhListMap = new ConvertUtil<ScheduleRealInfo>().groupMultiList(list, "_", jGhField);
@@ -111,11 +115,11 @@ public class WaybillRestService {
                 //驾驶员工号
                 wb.setDriverJno(list.get(0).getjGh());
                 wb.setDriverName(list.get(0).getjName());
-                wb.setDriverId(list.get(0).getjId());
+                wb.setDriverId("");
                 //售票员工号
                 wb.setConductorJno(list.get(0).getsGh());
                 wb.setConductorName(list.get(0).getsName());
-                wb.setConductorId(list.get(0).getsId());
+                wb.setConductorId("");
                 for (ScheduleRealInfo sri : list) {
                 	if (StringUtils.isNotEmpty(sri.getsGh())) {
                 		wb.setConductorJno(sri.getsGh());
@@ -134,6 +138,8 @@ public class WaybillRestService {
     	private String date;
     	// 公司代码
     	private String companyCode;
+    	// 分公司代码
+    	private String branchCompanyCode;
     	// 线路名称
     	private String lineName;
     	// 线路代码
@@ -171,6 +177,14 @@ public class WaybillRestService {
 			this.companyCode = companyCode;
 		}
  
+		public String getBranchCompanyCode() {
+			return branchCompanyCode;
+		}
+
+		public void setBranchCompanyCode(String branchCompanyCode) {
+			this.branchCompanyCode = branchCompanyCode;
+		}
+
 		public String getLineName() {
 			return lineName;
 		}