Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents 277db0ee ac9f3a6e
Showing 3 changed files with 50 additions and 3 deletions
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
src/main/java/com/bsth/service/TrafficManageService.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
@@ -30,6 +30,15 @@ public class TrafficManageController {
         }
     }
+    @RequestMapping(value = "/setXLByInUse", method = RequestMethod.GET)
+    public String setXLByInUse(@RequestParam("inUse") String inUse) throws Exception {
+        try {
+            return trManageService.setXLByInUse(inUse);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
     @RequestMapping(value = "/setCL", method = RequestMethod.GET)
     public String setCL() throws Exception {
         try {
 package com.bsth.service;
-import java.util.Map;
-
 /**
  *
  * @Interface: LineService(线路service业务层实现接口)
@@ -27,6 +25,13 @@ public interface TrafficManageService {
 	String setXL(String ids);
 	/**
+	 * 上传线路信息
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setXLByInUse(String ids);
+
+	/**
 	 * 上传车辆信息
 	 *
 	 * @return 调用接口返回信息
@@ -160,6 +160,9 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 		String[] idArray = ids.split(",");
 		try {
 			for (String id : idArray) {
+				if(id == null || id.trim().equals("")){
+					continue;
+				}
 				Map<String,Object> map = new HashMap<>();
 				map.put("lineCode_eq", id);
 				Line line ;
@@ -237,6 +240,36 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	}
 	/**
+	 * 上传线路信息(按in_use上传)
+	 */
+	@Override
+	public String setXLByInUse(String inUse) {
+		StringBuffer result = new StringBuffer();
+		try {
+			Map<String,Object> map = new HashMap<>();
+			if(inUse != null && inUse.equals("1")){
+				map.put("inUse_eq", inUse);
+			}
+			List<Line> lines ;
+			Line line;
+			lines = lineRepository.findAll(new CustomerSpecs<Line>(map));
+			if(lines != null && lines.size() > 0){
+				for(int i = 0 ; i < lines.size() ; i ++){
+					line = lines.get(i);
+					if(line != null && line.getId() != null){
+						result.append(line.getLineCode()).append(":").append(setXL(line.getLineCode())).append(";");
+					}
+				}
+			}
+		} catch (Exception e) {
+			result.append("failure");
+			logger.error("setXLByInUse:",e);
+			e.printStackTrace();
+		}
+		return result.toString();
+	}
+
+	/**
 	 * 上传车辆信息
 	 */
 	@Override
@@ -762,7 +795,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			// 判断XML是否以</BCList>结尾，如果不是，则加上
 			String regex = "^*</JHBC>$";
 			Pattern p = Pattern.compile(regex);
-			java.util.regex.Matcher m = p.matcher(sBuffer);
+			Matcher m = p.matcher(sBuffer);
 			boolean isEndWithTrueFlag = false;
 			while (m.find()) {
 				isEndWithTrueFlag = true;