Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

娄高锋
2 parents 8b0a04de 29e2a138
Showing 6 changed files with 115 additions and 17 deletions
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/controller/schedule/core/CarConfigInfoController.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/schedule/CarConfigInfoService.java
src/main/java/com/bsth/service/schedule/impl/CarConfigInfoServiceImpl.java
src/main/resources/static/index.html
@@ -2,6 +2,8 @@ package com.bsth.controller;
  
 import java.util.Map;
  
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -34,6 +36,9 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
  
 	@Autowired
 	private StationService service;
+
+	/** 日志记录器 */
+	private static final Logger LOGGER = LoggerFactory.getLogger(StationController.class);
  
 	/**
 	 * @Description :TODO(根据坐标点匹配数据库中的站点)
@@ -153,10 +158,13 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	 */
 	@RequestMapping(value="updateStationAndSectionCode" , method = RequestMethod.GET)
 	public int updateStationAndSectionCode(@RequestParam Integer stationCount, Integer sectionCount) {
+		System.out.println(stationCount+" _ "+ sectionCount );
 		for(int i = 0; i <  stationCount; i++) {
+			System.out.println(stationCount);
 			GetUIDAndCode.getStationId();
 		}
 		for(int i = 0; i <  sectionCount; i++) {
+			System.out.println(sectionCount);
 			GetUIDAndCode.getSectionId();
 		}
 		return 1;
@@ -58,4 +58,25 @@ public class CarConfigInfoController extends BController&lt;CarConfigInfo, Long&gt; {
  
         return rtn;
     }
+
+    @RequestMapping(value = "/validate_cars_config", method = RequestMethod.GET)
+    public Map<String, Object> validate_cars_config(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            // 车辆重复配置验证
+            CarConfigInfo carConfigInfo = new CarConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("cl.id_eq")
+            );
+            carConfigInfoService.validate_cars_config(carConfigInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
 }
@@ -945,11 +945,11 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	 */
 	@Override
 	public String setSKB(String ids) {
-		String result = "failure";
+		String result = "上传失败，";
 		StringBuffer sBuffer = new StringBuffer();
 		DecimalFormat df = new DecimalFormat("######0.000");
-		Map<String,String> lsStationCode2NameMap;
-		Map<String, Integer> lsStationName2YgcNumber;
+		Map<String,String> lsStationCode2NameMap = null;
+		Map<String, Integer> lsStationName2YgcNumber = null;
 		try {
 			String[] idArray = ids.split(",");
 			StringBuffer sBufferA ,sBufferB ,sBufferC ;
@@ -965,14 +965,21 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			sBuffer.append("<SKBs>");
 			HashMap<String,String> paramMap;
 			HashMap<String,String> otherMap = new HashMap<>();
+			// 线路编码、周几执行、发车站点名称、发车站点序号、到达站点名称、到达站点序号
+			String xlbm,zjzx,fczdmc,zdxh,ddzdmc,ddxh;
+			// 得到时刻表版本号
+			int lineVersion;
+			long ttinfoId;
+			// 是否输出站点信息
+			boolean isLogStation;
 			for (int i = 0; i < idArray.length; i++) {
-				long ttinfoId = Long.valueOf(idArray[i]);
+				ttinfoId = Long.valueOf(idArray[i]);
 				ttInfo = ttInfoRepository.findOne(ttinfoId);
 				if(ttInfo == null)
 					continue;
 				ttinfoList.add(ttInfo); // 保存时刻表
 				// 得到时刻表版本号
-				int lineVersion = ttInfo.getLineVersion();
+				lineVersion = ttInfo.getLineVersion();
 				// 查询历史站点路由
 				lsStationCode2NameMap = getLsStationCode(ttInfo.getXl().getLineCode(),lineVersion);
 				// 查询历史站点路由
@@ -988,16 +995,35 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 				param = new HashMap();
 				param.put("line.id_eq", ttInfo.getXl().getId());
 				lineInformation = lineInformationRepository.findOne(new CustomerSpecs<LineInformation>(param));
+				// 初始化
+				isLogStation = true;
 				if(ttInfoDetailIterator.hasNext()){
+					// 得到线路信息
+					Line line = lineRepository.findOne(ttInfo.getXl().getId());
+					if(line == null){
+						result += "未找到相应的线路信息，请设置线路信息后再上传";
+						return result;
+					}
+					// 得到上海市线路编码
+					xlbm = line.getShanghaiLinecode();
+					if("".equals(xlbm) || "null".equals(xlbm)){
+						result += "线路编码为空，请设置线路编码后再上传";
+						return result;
+					}
+					// 拿到周几执行
+					zjzx = changeRuleDay(ttInfo.getRule_days());
+					if("".equals(zjzx) || "null".equals(zjzx)){
+						result += "时刻表执行时间为空，请设置执行时间后再上传";
+						return result;
+					}
 					sBuffer.append("<SKB>");
-					sBuffer.append("<XLBM>").append(BasicData.lineId2ShangHaiCodeMap.get(ttInfo.getXl().getId()))
-							.append("</XLBM>");
+					sBuffer.append("<XLBM>").append(xlbm).append("</XLBM>");
 					sBufferB = new StringBuffer();
 					sBufferC = new StringBuffer();
 					sBufferB.append("<KSRQ>").append(sdfnyr.format(ttInfo.getQyrq())).append("</KSRQ>");
 					// 结束日期暂时不要，节假日的班次表才需要，如春节的班次表
 					sBufferB.append("<JSRQ>").append("").append("</JSRQ>");
-					sBufferB.append("<ZJZX>").append(changeRuleDay(ttInfo.getRule_days())).append("</ZJZX>");
+					sBufferB.append("<ZJZX>").append(zjzx).append("</ZJZX>");
 					sBufferB.append("<TBYY>").append("").append("</TBYY>");
 					sBufferB.append("<UPDT>").append(sdfnyrsfm.format(new Date())).append("</UPDT>");
 					sBufferB.append("<BCList>");
@@ -1021,22 +1047,51 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 						if(changeTimeFormat(ttInfoDetail) == null){
 							continue;
 						}
+						// 发生站点名称
+						fczdmc = lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()+"_"+ttInfoDetail.getQdzCode());
+						if("".equals(fczdmc) || "null".equals(fczdmc)){
+							result += "发车站点名称为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
+							return result;
+						}
 						sBufferC.append("<BC>");
 						sBufferC.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
 						sBufferC.append("<SXX>").append(sxx).append("</SXX>");
-						sBufferC.append("<FCZDMC>").append(lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
-								+"_"+ttInfoDetail.getQdzCode())).append("</FCZDMC>");
+						sBufferC.append("<FCZDMC>").append(fczdmc).append("</FCZDMC>");
 						// 起点站的参数
 						otherMap.put("stationMark","B");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBufferC.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber)).append("</ZDXH>");
+						if(isLogStation){// 输出起点站信息
+							logger.info("setSKB:"+"起点站信息："+paramMap);
+						}
+						// 发车站点序号
+						zdxh = String.valueOf(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber));
+						if("".equals(zdxh) || "null".equals(zdxh) || "0".equals(zdxh)){
+							result += "发车站点序号为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
+							return result;
+						}
+						// 到达站点名称
+						ddzdmc = lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()+"_"+ttInfoDetail.getZdzCode());
+						if("".equals(ddzdmc) || "null".equals(ddzdmc)){
+							result += "到达站点名称为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
+							return result;
+						}
+						sBufferC.append("<ZDXH>").append(zdxh).append("</ZDXH>");
 						sBufferC.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
-						sBufferC.append("<DDZDMC>").append(lsStationCode2NameMap.get(ttInfoDetail.getXl().getLineCode()+"_"+ttInfoDetail.getXlDir()
-								+"_"+ttInfoDetail.getZdzCode())).append("</DDZDMC>");
-						// 起点站的参数
+						sBufferC.append("<DDZDMC>").append(ddzdmc).append("</DDZDMC>");
+						// 终点站的参数
 						otherMap.put("stationMark","E");
 						paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
-						sBufferC.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber)).append("</DDXH>");
+						if(isLogStation){// 输出终点站信息
+							logger.info("setSKB:"+"终点站信息："+paramMap);
+						}
+						// 到达站点序号
+						ddxh = String.valueOf(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,lsStationName2YgcNumber));
+						if("".equals(ddxh) || "null".equals(ddxh) || "0".equals(ddxh)){
+							result += "到达站点序号为空，请根据时刻表当前的版本号设置好历史站点路由再上传";
+							return result;
+						}
+						isLogStation = false; // 一条线路只输出一次，后面的不输出了
+						sBufferC.append("<DDXH>").append(ddxh).append("</DDXH>");
 						sBufferC.append("<JHDDSJ>").append(calcDdsj(ttInfoDetail.getFcsj(),ttInfoDetail.getBcsj())).append("</JHDDSJ>");
 						sBufferC.append("</BC>");
 						// 0：上行；1：下行
@@ -1055,10 +1110,11 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 					sBufferA.append("<JHYYLC>").append(df.format(yylc)).append("</JHYYLC>");
 					sBuffer.append(sBufferA).append(sBufferB).append(sBufferC);
 				}
+				logger.info("setSKB:"+"ttinfoId:"+ttinfoId+";当前站点版本号："+lineVersion+"；查询历史站点路由:"+lsStationCode2NameMap+";查询历史站点编号:"+lsStationName2YgcNumber);
 			}
 			sBuffer.append("</SKBs>");
 			if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
-				result = "success";
+				result = "上传成功";
 				SKBUploadLogger skbUploadLogger ;
 				SysUser user = SecurityUtils.getCurrentUser();
 				// 保存时刻表上传记录
@@ -8,5 +8,6 @@ import com.bsth.service.schedule.exception.ScheduleException;
  */
 public interface CarConfigInfoService extends BService<CarConfigInfo, Long> {
     void validate_cars(CarConfigInfo carConfigInfo) throws ScheduleException;
+    void validate_cars_config(CarConfigInfo carConfigInfo) throws ScheduleException;
     void toggleCancel(Long id) throws ScheduleException;
 }
@@ -73,6 +73,17 @@ public class CarConfigInfoServiceImpl extends BServiceImpl&lt;CarConfigInfo, Long&gt; 
  
     }
  
+    @Override
+    public void validate_cars_config(CarConfigInfo carConfigInfo) throws ScheduleException {
+        Map<String, Object> param = new HashMap<>();
+        param.put("xl.id_eq", carConfigInfo.getXl().getId());
+        param.put("cl.id_eq", carConfigInfo.getCl().getId());
+        List<CarConfigInfo> carConfigInfos = list(param);
+        if (CollectionUtils.isEmpty(carConfigInfos)) {
+            throw new ScheduleException("当前车辆没有配置在当前线路中，不属于当前线路！");
+        }
+    }
+
     @Transactional
     @Override
     public void delete(Long aLong) throws ScheduleException {
@@ -630,7 +630,8 @@
 <script
 		src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
 		data-exclude=1></script>
-
+<!-- echarts4 误删 -->
+<script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
 <script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
  
 </body>