Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents d531ff0f 3c109706
Showing 8 changed files with 366 additions and 31 deletions
src/main/java/com/bsth/data/schedule/thread/SubmitToTrafficManage.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/java/com/bsth/service/traffic/YgcBasicDataService.java
src/main/java/com/bsth/service/traffic/impl/YgcBasicDataServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleAnaly_sum.html
src/main/resources/static/pages/report/timetable/timetable.html
 package com.bsth.data.schedule.thread;
 import com.bsth.service.TrafficManageService;
+import com.bsth.service.traffic.YgcBasicDataService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,9 @@ public class SubmitToTrafficManage extends Thread{
     @Autowired
     TrafficManageService trafficManageService;
+    @Autowired
+    YgcBasicDataService ygcBasicDataService;
+
     @Override
     public void run() {
         logger.info("开始提交数据到运管处...");
@@ -46,6 +50,12 @@ public class SubmitToTrafficManage extends Thread{
         } catch (Exception e) {
             logger.error("提交线路计划班次表到运管处失败", e);
         }
+        try {
+            // 运管处基础数据更新
+            ygcBasicDataService.updateYgcBasicData();
+        } catch (Exception e) {
+            logger.error("运管处基础数据更新失败", e);
+        }
         logger.info("提交数据到运管处结束！");
     }
 }
@@ -977,9 +977,11 @@ public class FormsServiceImpl implements FormsService {
 		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, startDate, endDate, company, subCompany);
 		List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line.length()==0?"%"+line+"%":line);
-		
-		String sql = "select * from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
-				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+startDate+"' and '"+endDate+"' ";
+
+		String sql = "select gs_name, fgs_name, cl_zbh, fcsj, bc_type, xl_bm, xl_name, schedule_date"
+				+ " from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
+				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') >= '"+startDate+"' "
+				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') <= '"+endDate+"' ";
 		if(line.trim().length() != 0){
 			sql += "and xl_bm = '"+line+"' ";
 		}
@@ -720,36 +720,40 @@ public class ReportServiceImpl implements ReportService{
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			List<Map<String, Object>> list2 = keyMap.get(key);
 			List<Integer> cjs = new ArrayList<Integer>();
-			int sxsj = 0, xxsj = 0, zcj = 0, tssj = 0;
-			int sxbc = 0, xxbc = 0;
-			int temp = 24*60+1;
+			int sxsj = 0, xxsj = 0, sxtssj = 0, xxtssj = 0;
+			int sxbc = 0, xxbc = 0, sxtsbc = 0, xxtsbc = 0;
+			int temp = 24*60+1, zcj = 0;
 			boolean ists = false;
 			for(Map<String, Object> m : list2){
 				String[] split = m.get("fcsj").toString().split(":");
 				int fcsj = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
 				int xlDir = Integer.valueOf(m.get("dir").toString());
 				int bcsj = Integer.valueOf(m.get("bcsj").toString());
+				if(temp >= fcsj){
+					temp = fcsj;
+					ists = false;
+				}
 				if(xlDir == 0){
 					sxsj += bcsj;
 					sxbc ++;
+					if(ists){
+						sxtssj += fcsj - temp;
+						sxtsbc++;
+					}
 				} else {
 					xxsj += bcsj;
 					xxbc ++;
-				}
-				if(temp >= fcsj){
-					temp = fcsj;
-					ists = false;
-				} else {
 					if(ists){
-						tssj += fcsj - temp;
-						ists = false;
-					} else {
-						cjs.add(fcsj - temp);
+						xxtssj += fcsj - temp;
+						xxtsbc++;
 					}
+				}
+				if(temp < fcsj){
+					cjs.add(fcsj - temp);
 					temp = fcsj;
-					if(m.get("ists").equals("1")){
-						ists = true;
-					}
+				}
+				if(m.get("ists").toString().trim().equals("1")){
+					ists = true;
 				}
 			}
 			Collections.sort(cjs);
@@ -757,12 +761,14 @@ public class ReportServiceImpl implements ReportService{
 				zcj += i;
 			}
 			tempMap.put("sjd", key);
-			tempMap.put("sxsj", sxsj / sxbc);
-			tempMap.put("xxsj", xxsj / xxbc);
-			tempMap.put("fqsj", (sxsj + xxsj) / list2.size());
+			tempMap.put("sxsj", sxbc != 0 ? sxsj / sxbc : "0");
+			tempMap.put("xxsj", xxbc != 0 ? xxsj / xxbc : "0");
+			tempMap.put("sxtssj", sxtsbc != 0 ? sxtssj / sxtsbc : "0");
+			tempMap.put("xxtssj", xxtsbc != 0 ? xxtssj / xxtsbc : "0");
+			tempMap.put("fqsj", Integer.valueOf(tempMap.get("sxsj").toString()) + Integer.valueOf(tempMap.get("xxsj").toString())
+						+ Integer.valueOf(tempMap.get("sxtssj").toString()) + Integer.valueOf(tempMap.get("xxtssj").toString()));
 			tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
 			tempMap.put("pjcj", cjs.size()>0?zcj/cjs.size():"/");
-			tempMap.put("tssj", tssj);
 			maps.put(key, tempMap);
 		}
 		newList.add(maps.get("(首)——6:30"));
@@ -803,6 +803,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		String line = map.get("line").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
+		String bcType = map.get("bcType").toString();
 		String nbbm = map.get("nbbm").toString();
 		String type = map.get("type").toString();
@@ -829,6 +830,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				sql += " and gs_bm like '%"+company+"%' and fgs_bm like '%"+subCompany+"%'";
 //			}
 			sql += " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+			if(bcType.trim().equals("1")){
+				sql += " and bc_type != 'region'";
+			} else if(bcType.trim().equals("2")){
+				sql += " and bc_type = 'region'";
+			}
 			list = jdbcTemplate.query(sql,
 					new RowMapper<ScheduleRealInfo>(){
+package com.bsth.service.traffic;
+
+/**
+ * 运管处基础数据操作接口类
+ * Created by zlz on 2017/6/16.
+ */
+public interface YgcBasicDataService {
+    /**
+     * 更新运管处基础数据
+     */
+    void updateYgcBasicData();
+}
+
+package com.bsth.service.traffic.impl;
+
+import com.bsth.service.impl.TrafficManageServiceImpl;
+import com.bsth.service.traffic.YgcBasicDataService;
+import com.bsth.util.db.DBUtils_oldSystem;
+import org.apache.axiom.om.*;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.client.Options;
+import org.apache.axis2.client.ServiceClient;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
+import javax.activation.DataHandler;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.*;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
+
+/**
+ * 运管处基础数据操作类
+ * Created by zq on 2017/6/15.
+ */
+@Service
+public class YgcBasicDataServiceImpl implements YgcBasicDataService{
+    Logger logger = LoggerFactory.getLogger(TrafficManageServiceImpl.class);
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    private static String IP = "218.242.195.76:9091";
+    private static String targetEndpoint = "http://" + IP +"/ygc.TransManager.Basicdown?wsdl";
+    private static String namespace = "http://service.shygc.com";
+    private static String userName = "admin";
+    private static String passWord = "000000";
+    private static EndpointReference targetEPR;
+    {
+        try {
+            targetEPR = new EndpointReference(targetEndpoint);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 更新运管处基础数据
+     */
+    public void updateYgcBasicData(){
+        String saveFile = "ygcBasicData.zip";
+        String flag = "failure";
+        try {
+            // 调用接口下载基础数据
+            if(download(userName, DigestUtils.md5Hex(passWord), saveFile)){
+                // 读取基础数据zip
+                StringBuffer sb = readZipFile(saveFile);
+                // 解析xml
+                List<HashMap<String,String>> result = parseXml(sb);
+                // 插入数据库
+                if(result != null && result.size() > 0){
+                    insertRecord(result);
+                }
+            }
+            flag = "success";
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        finally {
+            // 删除文件
+            File fill = new File(saveFile);
+            logger.info("updateYgcBasicData:"+fill.getAbsolutePath());
+            logger.info("updateYgcBasicData:"+flag);
+            if(fill.exists()){
+                fill.delete();
+            }
+        }
+    }
+    /**
+     *  下载基础数据，并生成rar文件
+     * @param userName
+     * @param password
+     * @param saveFile
+     * @return
+     */
+    private boolean download(String userName, String password,  String saveFile)
+    {
+        try
+        {
+            OMElement data = buildDownloadEnvelope(userName, password);
+            ServiceClient sender = new ServiceClient();
+            Options options = sender.getOptions();
+            options.setProperty("SO_TIMEOUT", Integer.valueOf(1800000));
+            options.setTo(targetEPR);
+            sender.setOptions(options);
+            System.out.println("The data in method download: " + data);
+            data.build();
+            OMElement ome = sender.sendReceive(data);
+
+            OMText binaryNode = (OMText)ome.getFirstOMChild();
+            binaryNode.setOptimize(true);
+            DataHandler actualDH = (DataHandler)binaryNode.getDataHandler();
+            FileOutputStream imageOutStream = new FileOutputStream(saveFile);
+            InputStream is = actualDH.getInputStream();
+            int read ;
+            byte[] buffer = new byte[1024];
+            while ((read = is.read(buffer)) != -1) {
+                imageOutStream.write(buffer, 0, read);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }return false;
+    }
+
+    /**
+     * 构建webservice接口参数
+     * @param userName
+     * @param password
+     * @return
+     */
+    private OMElement buildDownloadEnvelope(String userName, String password)
+    {
+        OMFactory fac = OMAbstractFactory.getOMFactory();
+        OMNamespace omNs = fac.createOMNamespace(namespace,
+                "ser");
+        OMElement data = fac.createOMElement("downloadAllDataFile", omNs);
+        OMElement _userName = fac.createOMElement("userName", omNs);
+        _userName.setText(userName);
+        OMElement _passWord = fac.createOMElement("passWord", omNs);
+        _passWord.setText(String.valueOf(password));
+
+        data.addChild(_userName);
+        data.addChild(_passWord);
+
+        OMElement soap = fac.createOMElement("downloadAllDataFile", omNs);
+        soap.addChild(data);
+        return soap;
+    }
+
+    /**
+     * 读取zip文件的内容
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    public StringBuffer readZipFile(String file) throws Exception {
+        ZipFile zf = new ZipFile(file);
+        InputStream in = new BufferedInputStream(new FileInputStream(file));
+        ZipInputStream zin = new ZipInputStream(in);
+        ZipEntry ze;
+        StringBuffer sb = new StringBuffer();
+        while ((ze = zin.getNextEntry()) != null) {
+            System.out.print(ze);
+            if (ze.isDirectory()) {
+            } else {
+                System.err.println("file - " + ze.getName() + " : "
+                        + ze.getSize() + " bytes");
+                long size = ze.getSize();
+                if (size > 0) {
+                    BufferedReader br = new BufferedReader(
+                            new InputStreamReader(zf.getInputStream(ze),"GBK"));
+                    String line;
+                    boolean addFlag = false;
+                    while ((line = br.readLine()) != null) {
+                        if(line.indexOf("BusLineList") != -1){
+                            addFlag = true;
+                        }
+                        if(addFlag){
+                            sb.append(line);
+                        }
+
+                        if(line.indexOf("/BusLineList") != -1){
+                            break;
+                        }
+                    }
+                    br.close();
+                }
+            }
+        }
+        zin.closeEntry();
+        return  sb;
+    }
+
+    /**
+     * 解析xml
+     * @param sb
+     */
+    private List<HashMap<String,String>> parseXml(StringBuffer sb){
+        List<HashMap<String,String>> list = new ArrayList<>();
+        HashMap<String,String> map;
+        try {
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            Document doc = builder.parse(new ByteArrayInputStream(sb.toString().getBytes()));
+            NodeList nl = doc.getElementsByTagName("BusLine");
+            String lineName; //线路名称
+            String lineId; // 线路ID
+            String abbreviation ; // 公司名称
+            String ddfs ; // 调度方式
+            String lineStandardCode; // 上海市线路编码
+            String parentUnitName ; // 总公司
+            for (int i = 0; i < nl.getLength(); i++) {
+                parentUnitName = doc.getElementsByTagName("ParentUnitName").item(i).getFirstChild() == null ?"":
+                        doc.getElementsByTagName("ParentUnitName").item(i).getFirstChild().getNodeValue();
+                if(parentUnitName.indexOf("浦东") != -1){// 只查找浦东的数据
+                    lineName = doc.getElementsByTagName("LineName").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("LineName").item(i).getFirstChild().getNodeValue();
+                    lineId = doc.getElementsByTagName("LineId").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("LineId").item(i).getFirstChild().getNodeValue();
+                    abbreviation = doc.getElementsByTagName("Abbreviation").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("Abbreviation").item(i).getFirstChild().getNodeValue();
+                    ddfs = doc.getElementsByTagName("DDFS").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("DDFS").item(i).getFirstChild().getNodeValue();
+                    lineStandardCode = doc.getElementsByTagName("LineStandardCode").item(i).getFirstChild() == null ?"":
+                            doc.getElementsByTagName("LineStandardCode").item(i).getFirstChild().getNodeValue();
+                    map = new HashMap<>();
+                    map.put("lineName",lineName);
+                    map.put("lineId",lineId);
+                    map.put("abbreviation",abbreviation);
+                    map.put("ddfs",ddfs);
+                    map.put("lineStandardCode",lineStandardCode);
+                    list.add(map);
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();;
+        }
+        return list;
+    }
+
+    /**
+     * 批量插入用法
+     * @param list
+     */
+    public boolean insertRecord(List<HashMap<String,String>> list)
+    {
+        boolean flag = false;
+        final List<HashMap<String,String>> tempList=list;
+        String sql="INSERT INTO JJWGPS_T_SHSXLFILE(XLID,SHSXLBM,XLMC,GSMC,DDFS,CREATETIME,XLMC_ALL) VALUES (?,?,?,?,?,SYSDATE,?)";
+        jdbcTemplate = new JdbcTemplate(DBUtils_oldSystem.getDataSource());
+        jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter()
+        {
+            public void setValues(PreparedStatement ps, int i)throws SQLException
+            {
+                String lineId =tempList.get(i).get("lineId");
+                String lineStandardCode =tempList.get(i).get("lineStandardCode");
+                String lineName =tempList.get(i).get("lineName");
+                String abbreviation =tempList.get(i).get("abbreviation");
+                String ddfs =tempList.get(i).get("ddfs");
+                String lineNameAll = lineName;
+                if(ddfs.equals("2")){
+                    lineNameAll = lineName+"区间（走向部分在全程线路之外）";
+                }else if(ddfs.equals("7")){
+                    lineNameAll = lineName+"区间（走向在全程线路之内）";
+                }
+                ps.setString(1, lineId);
+                ps.setString(2, lineStandardCode);
+                ps.setString(3, lineName);
+                ps.setString(4, abbreviation);
+                ps.setString(5, ddfs);
+                ps.setString(6, lineNameAll);
+            }
+            public int getBatchSize()
+            {
+                return tempList.size();
+            }
+        });
+        flag = true;
+        return flag;
+    }
+}
@@ -41,6 +41,14 @@
 						<span class="item-label" style="width: 80px;">线路: </span>
 						<select class="form-control" name="line" id="line" style="width: 160px;"></select>
 					</div>
+					<div style="display: inline-block;margin-left: 10px;">
+						<span class="item-label" style="width: 80px;">班次类型: </span>
+						<select class="form-control" name="bcType" id="bcType" style="width: 160px;">
+							<option value="0">全部</option>
+							<option value="1">全程</option>
+							<option value="2">区间</option>
+						</select>
+					</div>
 					<div style="margin-top: 10px"></div>
 					<div style="display: inline-block;margin-left: 10px;">
 						<span class="item-label" style="width: 80px;">开始时间: </span>
@@ -60,7 +68,7 @@
 <!-- 							<option value="">请选择...</option> -->
 <!-- 						</select> -->
 <!-- 					</div> -->
-					<div class="form-group">
+					<div class="form-group" style="margin-left: 10px">
 						<input class="btn btn-default" type="button" id="query" value="筛选"/>
 						<input class="btn btn-default" type="button" id="export" value="导出"/>
 					</div>
@@ -207,6 +215,7 @@
 		var startDate = $("#startDate").val();
 		var endDate = $("#endDate").val();
 		var model = $("#model").val();
+		var bcType = "0";
 		var nbbm = "";
 		var company = $("#company").val();
 		var subCompany = $("#subCompany").val();
@@ -224,6 +233,7 @@
 			startDate = $("#startDate").val();
 			endDate = $("#endDate").val();
 // 			model = $("#model").val();
+			bcType = $("#bcType").val();
 			nbbm = $("#nbbm").val()!=null?$("#nbbm").val():"";
 			company = $("#company").val();
 			subCompany = $("#subCompany").val();
@@ -231,6 +241,7 @@
 			params['line'] = line;
 			params['startDate'] = startDate;
 			params['endDate'] = endDate;
+			params['bcType'] = bcType;
 // 			params['model'] = model;
 			params['company'] = company;
 			params['subCompany'] = subCompany;
@@ -265,6 +276,7 @@
 			params['line'] = line;
 			params['startDate'] = startDate;
 			params['endDate'] = endDate;
+			params['bcType'] = bcType;
 // 			params['model'] = model;
 			params['company'] = company;
 			params['subCompany'] = subCompany;
@@ -165,19 +165,21 @@
 							<div class="col-md-6" >
 								<table  class="table table-bordered table-checkable" id="formsTime5">
 									<tr>
-										<td colspan="7">全日分组行驶时间(区间除外)</td>
+										<td colspan="8">全日分组行驶时间(区间除外)</td>
 									</tr>
 									<tr>
 										<td width="20%" rowspan="2" style="text-align:center;vertical-align:middle;">分组   时间</td>
-										<td width="23%" colspan="2" style="text-align:center;vertical-align:middle;">计划行驶（分）</td>
-										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">分圈时间</td>
-										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">停驶时间</td>
-										<td width="15%" rowspan="2" style="text-align:center;vertical-align:middle;">车距区间</td>
-										<td width="12%" rowspan="2" style="text-align:center;vertical-align:middle;">平均车距</td>
+										<td width="19%" colspan="2" style="text-align:center;vertical-align:middle;">计划行驶（分）</td>
+										<td width="19%" colspan="2" style="text-align:center;vertical-align:middle;">停站时间</td>
+										<td width="14%" rowspan="2" style="text-align:center;vertical-align:middle;">周转时间</td>
+										<td width="14%" rowspan="2" style="text-align:center;vertical-align:middle;">车距区间</td>
+										<td width="14%" rowspan="2" style="text-align:center;vertical-align:middle;">平均车距</td>
 									</tr>
 									<tr>
 										<td>上行</td>
 										<td style="text-align:center;">下行</td>
+										<td>上行</td>
+										<td style="text-align:center;">下行</td>
 									</tr>
 									<tbody class="tbody_time_5">
@@ -405,15 +407,16 @@
 		<td align="center">{{result.sjd}}</td>
 		<td align="center">{{result.sxsj}}</td>
 		<td align="center">{{result.xxsj}}</td>
+		<td align="center">{{result.sxtssj}}</td>
+		<td align="center">{{result.xxtssj}}</td>
 		<td align="center">{{result.fqsj}}</td>
-		<td align="center">{{result.tssj}}</td>
 		<td align="center">{{result.cjqj}}</td>
 		<td align="center">{{result.pjcj}}</td>
 	</tr>
 {{/each}}
 {{if list.length == 0}}
 		<tr>
-			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="8"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>