1.报站语音合成代码合并(lggj)

2.设备管理权限控制 3.站点加入公司分公司加权限控制 4.视频播放调整(多sim情况处理)

1.报站语音合成代码合并(lggj)
2.设备管理权限控制 3.站点加入公司分公司加权限控制 4.视频播放调整(多sim情况处理)
王通
1 parent e9257718
Showing 22 changed files with 1038 additions and 49 deletions
pom.xml
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata_v2/entity/GpsEntity.java
src/main/java/com/bsth/data/gpsdata_v2/load/GatewayHttpLoader.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/Station.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/speech/SpeechRequest.java
src/main/java/com/bsth/entity/speech/SpeechResponse.java
src/main/java/com/bsth/service/gps/GpsService.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/util/AudioOperationUtils.java
src/main/java/com/bsth/util/IFlyUtils.java
src/main/resources/application-cloud.properties
src/main/resources/application-dev.properties
src/main/resources/application-test.properties
src/main/resources/static/pages/base/station/js/station-list-table.js
src/main/resources/static/pages/base/station/list.html
@@ -433,7 +433,25 @@
 			<artifactId>kotlin-stdlib</artifactId>
 			<version>1.3.72</version>
 		</dependency>
-    </dependencies>
+
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>4.10.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.java-websocket</groupId>
+			<artifactId>Java-WebSocket</artifactId>
+			<version>1.5.3</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.bytedeco</groupId>
+			<artifactId>javacv-platform</artifactId>
+			<version>1.5.11</version>
+		</dependency>
+	</dependencies>
 	<dependencyManagement>
 		<dependencies>
 package com.bsth.controller.gps;
+import com.bsth.common.Constants;
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
@@ -7,13 +8,16 @@ import com.bsth.data.gpsdata_v2.handlers.overspeed.GpsOverspeed;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
 import com.bsth.data.schedule.e_state_check.ScheduleStationCodeChecker;
 import com.bsth.data.schedule.e_state_check.entity.SCodeInfo;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.service.gps.GpsService;
 import com.bsth.service.gps.entity.GpsSpeed;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,10 +42,11 @@ public class GpsController {
                                       @RequestParam(defaultValue = "0") int page,
                                       @RequestParam(defaultValue = "15") int size,
                                       @RequestParam(defaultValue = "timestamp") String order,
-                                      @RequestParam(defaultValue = "DESC") String direction) {
+                                      @RequestParam(defaultValue = "DESC") String direction, HttpServletRequest request) {
-
-        return gpsService.search(map, page, size, order, direction);
+        HttpSession session = request.getSession();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) session.getAttribute(Constants.COMPANY_AUTHORITYS);
+        return gpsService.search(map, page, size, order, direction, cmyAuths);
     }
     @RequestMapping(value = "/real/line/{lineCode}")
@@ -14,6 +14,7 @@ import java.util.Set;
 import com.bsth.entity.*;
 import com.bsth.repository.*;
+import com.bsth.util.db.DBUtils_MS;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,6 +63,9 @@ public class BasicData {
     //车辆自编号和sim号对照 （K：车辆自编号 V: sim号）
     public static Map<String, String> nbbm2SimMap;
+    //车辆自编号和sim号对照 （K：车辆自编号 V: sim号）
+    public static Map<String, String> nbbm2Sim2Map;
+
     //站点编码和名称对照，包括停车场 （K: lineCode_updown_stationCode ，V：站点名称）
     public static Map<String, String> stationCode2NameMap;
@@ -105,6 +109,8 @@ public class BasicData {
     // 线路编码_日期 等级
     public static Map<String, String> lineDate2Level;
+    private static JdbcTemplate msJdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
+
     static Logger logger = LoggerFactory.getLogger(BasicData.class);
     public static String getStationNameByCode(String code, String prefix){
@@ -238,8 +244,10 @@ public class BasicData {
             Map<String, String> nbbmCompanyPlate = new HashMap<>();
             // 车辆自编号和sim对照
             Map<String, String> nbbm2Sim = new HashMap<>();
+            Map<String, String> nbbm2Sim2 = new HashMap<>();
             Iterator<Cars> carIterator = carsRepository.findAll().iterator();
+            List<Map<String, Object>> maps = msJdbcTemplate.queryForList("SELECT in_code, sim, relation_sim FROM bsth_c_device_sim_mapping");
             Cars car;
             while (carIterator.hasNext()) {
                 car = carIterator.next();
@@ -247,7 +255,11 @@ public class BasicData {
                 nbbm2CompanyCode.put(car.getInsideCode(), car.getBusinessCode());
                 nbbm2FgsCompanyCode.put(car.getInsideCode(), car.getBrancheCompanyCode() + "_" + car.getBusinessCode() );
                 nbbmCompanyPlate.put(car.getInsideCode(), car.getCarPlate());
-                nbbm2Sim.put(car.getInsideCode(), car.getSim());
+            }
+            for (Map<String, Object> map : maps) {
+                String inCode = (String) map.get("in_code"), sim = (String) map.get("sim"), sim2 = (String) map.get("relation_sim");
+                nbbm2Sim.put(inCode, sim);
+                nbbm2Sim2.put(inCode, sim2);
             }
             deviceId2NbbmMap = deviceId2Nbbm;
@@ -255,6 +267,7 @@ public class BasicData {
             nbbm2FgsCompanyCodeMap = nbbm2FgsCompanyCode;
             nbbmCompanyPlateMap = nbbmCompanyPlate;
             nbbm2SimMap = nbbm2Sim;
+            nbbm2Sim2Map = nbbm2Sim2;
         }
         /**
@@ -129,6 +129,11 @@ public class GpsEntity implements Cloneable{
 	private String sim;
 	/**
+	 * sim号 拓华有两套设备
+	 */
+	private String sim2;
+
+	/**
 	 * 当前乘客数
 	 */
 	private int passengerNum;
@@ -450,6 +455,14 @@ public class GpsEntity implements Cloneable{
 		this.sim = sim;
 	}
+	public String getSim2() {
+		return sim2;
+	}
+
+	public void setSim2(String sim2) {
+		this.sim2 = sim2;
+	}
+
 	public int getPassengerNum() {
 		return passengerNum;
 	}
@@ -71,7 +71,7 @@ public class GatewayHttpLoader implements ApplicationContextAware, InitializingB
             list = GpsDataUtils.clearInvalid(list);
             List<GpsEntity> ups = new ArrayList<>();
-            String nbbm, sim;
+            String nbbm, sim, sim2;
             for (GpsEntity gps : list) {
                 if (StringUtils.isBlank(gps.getDeviceId()))
                     continue;
@@ -82,7 +82,9 @@ public class GatewayHttpLoader implements ApplicationContextAware, InitializingB
                 nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
                 if (!StringUtils.isBlank(nbbm)) {
                     sim = BasicData.nbbm2SimMap.get(nbbm);
+                    sim2 = BasicData.nbbm2Sim2Map.get(nbbm);
                     gps.setSim(sim);
+                    gps.setSim2(sim2);
                 }
                 gps.setNbbm(nbbm);
                 ups.add(gps);
@@ -366,6 +366,9 @@ public class DayOfSchedule {
                 sch.setScheduleDateStr(fmtyyyyMMdd.print(sch.getScheduleDate().getTime()));
                 sch.setRealExecDate(sch.getScheduleDateStr());
                 sch.setCreateDate(d);
+                if (sch.getStatus() == null) {
+                    sch.setStatus(0);
+                }
                 if (StringUtils.isEmpty(sch.getFcsj()))
                     sch.setFcsj("00:00");
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.geolatte.geom.Point;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Formula;
 import javax.persistence.*;
 import java.util.Date;
@@ -130,6 +131,20 @@ public class Station {
 	private String standardStationCode;
+	private String company;
+
+	@Transient
+	private String companyName;
+
+	private String brancheCompany;
+
+	@Transient
+	private String brancheCompanyName;
+
+	/** 组合公司分公司编码 */
+	@Formula(" concat(company, '_', branche_company) ")
+	private String cgsbm;
+
 	public Integer getId() {
 		return id;
 	}
@@ -321,4 +336,44 @@ public class Station {
 	public void setStandardStationCode(String standardStationCode) {
 		this.standardStationCode = standardStationCode;
 	}
+
+	public String getCompany() {
+		return company;
+	}
+
+	public void setCompany(String company) {
+		this.company = company;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	public String getBrancheCompany() {
+		return brancheCompany;
+	}
+
+	public void setBrancheCompany(String brancheCompany) {
+		this.brancheCompany = brancheCompany;
+	}
+
+	public String getBrancheCompanyName() {
+		return brancheCompanyName;
+	}
+
+	public void setBrancheCompanyName(String brancheCompanyName) {
+		this.brancheCompanyName = brancheCompanyName;
+	}
+
+	public String getCgsbm() {
+		return cgsbm;
+	}
+
+	public void setCgsbm(String cgsbm) {
+		this.cgsbm = cgsbm;
+	}
 }
@@ -137,7 +137,7 @@ public class ScheduleRealInfo {
 	private Long zdsjActualTime;
 	/**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
-	private int status;
+	private Integer status;
 	private String adjustExps;
@@ -617,11 +617,11 @@ public class ScheduleRealInfo {
 		this.zdsjActualTime = zdsjActualTime;
 	}
-	public int getStatus() {
+	public Integer getStatus() {
 		return status;
 	}
-	public void setStatus(int status) {
+	public void setStatus(Integer status) {
 		this.status = status;
 	}
+package com.bsth.entity.speech;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SpeechRequest {
+
+    /**
+     * 包含appid
+     */
+    private Map<String, Object> common = new HashMap<>();
+
+    /**
+     * 音频合成参数
+     */
+    private Map<String, Object> business = new HashMap<>();
+
+    /**
+     * 数据、状态参数
+     */
+    private Map<String, Object> data = new HashMap<>();
+
+    @JsonIgnore
+    private boolean completed = false;
+
+    public Map<String, Object> getCommon() {
+        return common;
+    }
+
+    public void setCommon(Map<String, Object> common) {
+        this.common = common;
+    }
+
+    public Map<String, Object> getBusiness() {
+        return business;
+    }
+
+    public void setBusiness(Map<String, Object> business) {
+        this.business = business;
+    }
+
+    public Map<String, Object> getData() {
+        return data;
+    }
+
+    public void setData(Map<String, Object> data) {
+        this.data = data;
+    }
+
+    public boolean isCompleted() {
+        return completed;
+    }
+
+    public void setCompleted(boolean completed) {
+        this.completed = completed;
+    }
+}
+package com.bsth.entity.speech;
+
+/**
+ * 讯飞在线语音合成返回json
+ */
+public class SpeechResponse {
+
+    private int code;
+
+    private String message;
+
+    private String sid;
+
+    private AudioData data;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getSid() {
+        return sid;
+    }
+
+    public void setSid(String sid) {
+        this.sid = sid;
+    }
+
+    public AudioData getData() {
+        return data;
+    }
+
+    public void setData(AudioData data) {
+        this.data = data;
+    }
+
+    public final static class AudioData {
+
+        private String audio;
+
+        private String ced;
+
+        private int status;
+
+        public String getAudio() {
+            return audio;
+        }
+
+        public void setAudio(String audio) {
+            this.audio = audio;
+        }
+
+        public String getCed() {
+            return ced;
+        }
+
+        public void setCed(String ced) {
+            this.ced = ced;
+        }
+
+        public int getStatus() {
+            return status;
+        }
+
+        public void setStatus(int status) {
+            this.status = status;
+        }
+
+        @Override
+        public String toString() {
+            return "AudioData{" +
+                    "audio='" + audio + '\'' +
+                    ", ced='" + ced + '\'' +
+                    ", status=" + status +
+                    '}';
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "SpeechResponse{" +
+                "code=" + code +
+                ", message='" + message + '\'' +
+                ", sid='" + sid + '\'' +
+                ", audioData=" + data +
+                '}';
+    }
+}
 package com.bsth.service.gps;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.service.gps.entity.GpsOutbound_DTO;
 import com.bsth.service.gps.entity.GpsSpeed;
 import com.bsth.service.gps.entity.GpsSpeed_DTO;
@@ -17,7 +18,7 @@ public interface GpsService {
 	Map<String, Object> findBuffAeraByCode(String lineCode, String code, String type);
-	Map<String, Object> search(Map<String, Object> map, int page, int size, String order, String direction);
+	Map<String, Object> search(Map<String, Object> map, int page, int size, String order, String direction, List<CompanyAuthority> cmyAuths);
     Map<String,Object> removeRealGps(String device);
@@ -28,6 +28,9 @@ import java.util.Set;
 import javax.servlet.http.HttpServletResponse;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -644,9 +647,13 @@ public class GpsServiceImpl implements GpsService {
     }
     @Override
-    public Map<String, Object> search(Map<String, Object> map, int page, int size, String order, String direction) {
+    public Map<String, Object> search(Map<String, Object> map, int page, int size, String order, String direction, List<CompanyAuthority> cmyAuths) {
         Map<String, Object> rsMap = new HashMap<>();
+        Set<String> codes = new HashSet<>();
         try {
+            for (CompanyAuthority ca : cmyAuths) {
+                codes.add(ca.getCompanyCode());
+            }
             //全量
             List<GpsEntity> list = new ArrayList<>(gpsRealData.all());
             //过滤后的
@@ -661,7 +668,8 @@ public class GpsServiceImpl implements GpsService {
             }
             //过滤数据
             for (GpsEntity gps : list) {
-                if (fieldEquals(fs, gps, map))
+                String companyCode = BasicData.nbbm2CompanyCodeMap.get(gps.getNbbm());
+                if (codes.contains(companyCode) && fieldEquals(fs, gps, map))
                     rs.add(gps);
             }
@@ -5,27 +5,25 @@ import com.bsth.entity.*;
 import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.*;
 import com.bsth.service.StationRouteService;
-import com.bsth.util.CoordinateConverter;
-import com.bsth.util.ExcelUtil;
-import com.bsth.util.FTPClientUtils;
+import com.bsth.util.*;
 import com.bsth.util.Geo.GeoUtils;
 import com.bsth.util.Geo.Point;
-import com.bsth.util.PackTarGZUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.google.common.base.Splitter;
 import org.apache.commons.lang3.StringUtils;
 import org.geolatte.geom.Polygon;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
+import java.io.*;
 import java.text.DecimalFormat;
 import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 /**
  * 
@@ -44,7 +42,13 @@ import java.util.*;
  */
 @Service
-public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integer> implements StationRouteService{
+public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integer> implements StationRouteService {
+
+	@Value("${path.speech.common}")
+	private String commonPath;
+
+	@Value("${path.speech.line}")
+	private String linePathPattern;
 	@Autowired
 	private StationRouteRepository stationRouteRepository;
@@ -422,6 +426,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			/** 查询线路信息下的站点路由信息 @param：<lineId：线路ID> */
 			List<Object[]> objects = stationRouteRepository.usingSingle(lineId);
 			if (objects.size()>0) {
+				// 报站音频
+				Set<String> languages = new HashSet<>();
+				languages.add("cn");
+				//languages.add("sh");
+				//languages.add("en");
+				InputStream tts = ttsAndZip(objects, line, languages);
 				/** 获取配置文件里的ftp登录参数 */
 				Map<String, Object> FTPParamMap = readPropertiesGetFTPParam();
 				// 压缩文件名
@@ -490,6 +500,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 //				textFile.delete();
+				clientUtils.deleteFtpFile(url, port, username, password, remotePath + "/voice/", String.format("%s.zip", line.getLineCode()));
+				clientUtils.uploadFile(url, port, username, password, remotePath + "/voice/", String.format("%s.zip", line.getLineCode()), tts);
 				resultMap.put("status", ResponseCode.SUCCESS);
 			}else {
@@ -1001,4 +1013,266 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			}
 		}
 	}
+
+	private String subLine2Ftp(LineRegion lineRegion) {
+		StringBuilder builder = new StringBuilder();
+		int len = lineRegion.getStationRoutes().size();
+		int idx = 1;
+		for (int i = 0;i < len;i++) {
+			LsStationRoute route = lineRegion.getStationRoutes().get(i);
+			builder.append(route.getCenterPointWgs().getPosition().getCoordinate(0))
+			.append("\t").append(route.getCenterPointWgs().getPosition().getCoordinate(1))
+			.append("\t").append(i == len - 1 ? 2 : 1)
+			.append("\t").append(idx).append("\t");
+			for (int j = 0;j < 8 - route.getStationCode().length();j++) {
+				builder.append("0");
+			}
+			builder.append(route.getStationCode())
+			.append("\t").append((int) route.getDistances().doubleValue() * 1000)
+			.append("\t0")
+			.append("\t").append(route.getStationName())
+			.append("\t").append(route.getStationNameEn())
+			.append("\r\n");
+
+			idx++;
+		}
+
+		return builder.toString();
+	}
+
+	/**
+	 * tts合成及打包
+	 * @param objects
+	 * @param line
+	 * @param languages 语言 如：cn、en、sh
+	 */
+	private InputStream ttsAndZip(List<Object[]> objects, Line line, Set<String> languages) throws Exception {
+		String lineId = line.getLineCode();
+		StringBuilder cnBuilder = new StringBuilder(line.getName()).append("[p1000]"), enBuilder = new StringBuilder("Hello[p1000]");
+		int ups = 0, downs = 0;
+		for (int i = 0;i < objects.size();i++) {
+			Object[] objArr = objects.get(i);
+			int direction = (int) objArr[8];
+			String stationName =  objArr[7] == null ? null : objArr[7].toString(), stationNameEn = objArr[9] == null ? null : objArr[9].toString();
+			if (StringUtils.isEmpty(stationName)) {
+				throw new RuntimeException("存在异常的中文站点名称");
+			}
+			// 如果要生成英语报站语音
+			if (languages.contains("en")) {
+				if (StringUtils.isEmpty(stationNameEn)) {
+					throw new RuntimeException("存在异常的英文站点名称");
+				}
+				enBuilder.append(stationNameEn).append("[p1000]");
+			}
+			cnBuilder.append(stationName).append("[p1000]");
+			if (direction == 0) {
+				ups++;
+			} else if (direction == 1) {
+				// 环线
+				if (line.getLinePlayType() == 1) {
+					break;
+				}
+				downs++;
+			}
+		}
+		cnBuilder.delete(cnBuilder.length() - 8, cnBuilder.length() - 1);
+		enBuilder.delete(enBuilder.length() - 8, enBuilder.length() - 1);
+
+		// 文本转语音并进行分割
+		// 音频存放及压缩文件路径
+		String linePath = String.format(linePathPattern, lineId), voicePath = String.format("%s%s.zip", linePath, lineId);
+		try {
+			String path = String.format("%scn.mp3", linePath);
+			IFlyUtils.textToSpeechCn(cnBuilder.toString(), path);
+			AudioOperationUtils.splitBySilence(path, String.format("%scn", linePath), 500, -40);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+		if (languages.contains("sh")) {
+            try {
+				String path = String.format("%ssh.mp3", linePath);
+                IFlyUtils.textToSpeechSh(cnBuilder.toString(), path);
+				AudioOperationUtils.splitBySilence(path, String.format("%ssh", linePath), 500, -40);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+		if (languages.contains("en")) {
+			try {
+				String path = String.format("%sen.mp3", linePath);
+				IFlyUtils.textToSpeechEn(enBuilder.toString(), path);
+				AudioOperationUtils.splitBySilence(path, String.format("%sen", linePath), 500, -40);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		}
+		// 删除原线路音频
+		File file = new File(linePath);
+		for (File f : file.listFiles()) {
+			if (f.isFile() && f.getName().endsWith(".mp3")) {
+				file.delete();
+			}
+		}
+
+		// 合并每站起步、到达语音
+		int seq = 1, startSeq = 1, direction = 0;
+		seq = merge(lineId, seq, startSeq, direction, ups, languages);
+		startSeq = ups + 1;
+		direction = 1;
+		merge(lineId, seq, startSeq, direction, ups + downs, languages);
+
+		// 压缩音频到zip
+		ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(voicePath));
+		for (File f : file.listFiles()) {
+			if (f.isFile() && f.getName().endsWith(".mp3")) {
+				addFileToZip(zos, f);
+			}
+		}
+		// Key打头音频
+		file = new File(commonPath);
+		for (File f : file.listFiles()) {
+			if (f.isFile() && f.getName().startsWith("Key-")) {
+				addFileToZip(zos, f);
+			}
+		}
+		zos.flush();
+		zos.close();
+
+		return new FileInputStream(voicePath);
+	}
+
+	private static void addFileToZip(ZipOutputStream zos, File file) throws IOException {
+		FileInputStream fis = new FileInputStream(file);
+		ZipEntry zipEntry = new ZipEntry(file.getName());
+		zos.putNextEntry(zipEntry);
+
+		byte[] bytes = new byte[4096];
+		int length;
+		while ((length = fis.read(bytes)) >= 0) {
+			zos.write(bytes, 0, length);
+		}
+
+		zos.closeEntry();
+		fis.close();
+	}
+
+	private int merge(String lineId, int seq, int startSeq, int direction, int terminal, Set<String> languages) throws Exception {
+		for (int i = startSeq;i <= terminal;i++) {
+			if (i > startSeq) {
+				if (i == startSeq + 1) {
+					// 生成首站
+					mergeOriginStart(lineId, seq, i, direction, terminal, languages);
+					mergeNormalArrive(lineId, seq, i, direction, terminal, languages);
+				} else if (i == terminal) {
+					// 生成终点站
+					mergeNormalStart(lineId, seq, i, direction, terminal, languages);
+					mergeTerminalArrive(lineId, seq, i, direction, terminal, languages);
+				} else {
+					// 生成中途站
+					mergeNormalStart(lineId, seq, i, direction, terminal, languages);
+					mergeNormalArrive(lineId, seq, i, direction, terminal, languages);
+				}
+				seq++;
+			}
+		}
+
+		return seq;
+	}
+
+	private void mergeOriginStart(String lineId, int seq, int stationLevel, int direction, int terminal, Set<String> languages) throws Exception {
+		String linePath = String.format(linePathPattern, lineId);
+		List<String> arr = Arrays.asList(commonPath + "cn_origin_1.mp3", linePath + String.format("cn/%03d.mp3", 0), commonPath + "cn_origin_2.mp3", linePath + String.format("cn/%03d.mp3", terminal), commonPath + "sh_origin_1.mp3", linePath + String.format("sh/%03d.mp3", 0), commonPath + "sh_origin_2.mp3", linePath + String.format("cn/%03d.mp3", terminal), commonPath + "cn_start_1.mp3", linePath + String.format("cn/%03d.mp3", stationLevel), commonPath + "cn_start_2.mp3", commonPath + "sh_start_1.mp3", linePath + String.format("sh/%03d.mp3", stationLevel), commonPath + "sh_start_2.mp3", commonPath + "en_1.mp3", linePath + String.format("en/%03d.mp3", stationLevel), commonPath + "cn_start_3.mp3", commonPath + "sh_start_3.mp3");
+		List<String> inputPaths = new ArrayList<>();
+		for (String path : arr) {
+			for (String lang : languages) {
+				if (path.indexOf(lang) > -1) {
+					inputPaths.add(path);
+					break;
+				}
+			}
+		}
+		AudioOperationUtils.merge(inputPaths, String.format("%s%03da%s-%03d-%s-Start.mp3", linePath, seq, direction == 0 ? "u" : "d", direction == 0 ? stationLevel : terminal - stationLevel + 1, direction == 0 ? "Up" : "Dn"));
+	}
+
+	private void mergeNormalStart(String lineId, int seq, int stationLevel, int direction, int terminal, Set<String> languages) throws Exception {
+		String linePath = String.format(linePathPattern, lineId);
+		List<String> arr = Arrays.asList(commonPath + "cn_start.mp3", linePath + String.format("cn/%03d.mp3", stationLevel), commonPath + "cn_start_2.mp3", commonPath + "sh_start_1.mp3", linePath + String.format("sh/%03d.mp3", stationLevel), commonPath + "sh_start_2.mp3", commonPath + "en_1.mp3", linePath + String.format("en/%03d.mp3", stationLevel), commonPath + "cn_start_3.mp3", commonPath + "sh_start_3.mp3");
+		List<String> inputPaths = new ArrayList<>();
+		for (String path : arr) {
+			for (String lang : languages) {
+				if (path.indexOf(lang) > -1) {
+					inputPaths.add(path);
+					break;
+				}
+			}
+		}
+		AudioOperationUtils.merge(inputPaths, String.format("%s%03da%s-%03d-%s-Start.mp3", linePath, seq, direction == 0 ? "u" : "d", direction == 0 ? stationLevel : terminal - stationLevel + 1, direction == 0 ? "Up" : "Dn"));
+	}
+
+	private void mergeNormalArrive(String lineId, int seq, int stationLevel, int direction, int terminal, Set<String> languages) throws Exception {
+		String linePath = String.format(linePathPattern, lineId);
+		List<String> arr = new ArrayList<>(Arrays.asList(commonPath + "cn_arrive.mp3", linePath + String.format("cn/%03d.mp3", stationLevel), commonPath + "cn_arrive_1.mp3", linePath + String.format("sh/%03d.mp3", stationLevel), commonPath + "sh_arrive_1.mp3", commonPath + "en_2.mp3", linePath + String.format("en/%03d.mp3", stationLevel)));
+		List<String> inputPaths = new ArrayList<>();
+		if (languages.contains("sh")) {
+			for (int i = 0;i < 3;i++) {
+				arr.add(linePath + String.format("cn/%03d.mp3", 0));
+				arr.add(commonPath + "cn_origin_2.mp3");
+				arr.add(linePath + String.format("cn/%03d.mp3", terminal));
+				arr.add(linePath + String.format("sh/%03d.mp3", 0));
+				arr.add(commonPath + "sh_origin_2.mp3");
+				arr.add(linePath + String.format("sh/%03d.mp3", terminal));
+			}
+		} else {
+			arr.add(linePath + String.format("cn/%03d.mp3", 0));
+			arr.add(commonPath + "cn_origin_2.mp3");
+			arr.add(linePath + String.format("cn/%03d.mp3", terminal));
+		}
+		for (String path : arr) {
+			for (String lang : languages) {
+				if (path.indexOf(lang) > -1) {
+					inputPaths.add(path);
+					break;
+				}
+			}
+		}
+		AudioOperationUtils.merge(inputPaths, String.format("%s%03db%s-%03d-%s-Arrive.mp3", linePath, seq, direction == 0 ? "u" : "d", direction == 0 ? stationLevel : terminal - stationLevel + 1, direction == 0 ? "Up" : "Dn"));
+	}
+
+	private void mergeTerminalArrive(String lineId, int seq, int stationLevel, int direction, int terminal, Set<String> languages) throws Exception {
+		String linePath = String.format(linePathPattern, lineId);
+		List<String> arr = Arrays.asList(commonPath + "cn_terminal.mp3", linePath + String.format("cn/%03d.mp3", stationLevel), commonPath + "cn_arrive_1.mp3", commonPath + "sh_terminal.mp3", linePath + String.format("sh/%03d.mp3", stationLevel), commonPath + "sh_arrive_1.mp3", commonPath + "en_3.mp3", linePath + String.format("en/%03d.mp3", stationLevel), commonPath + "terminal_music.mp3");
+		List<String> inputPaths = new ArrayList<>();
+		for (String path : arr) {
+			for (String lang : languages) {
+				if (path.indexOf(lang) > -1 || path.indexOf("terminal_music") > -1) {
+					inputPaths.add(path);
+					break;
+				}
+			}
+		}
+		AudioOperationUtils.merge(inputPaths, String.format("%s%03db%s-%03d-%s-Arrive.mp3", linePath, seq, direction == 0 ? "u" : "d", direction == 0 ? stationLevel : terminal - stationLevel + 1, direction == 0 ? "Up" : "Dn"));
+	}
+
+	private void description() {
+		// Next stop is (en_1.mp3)
+		// We are arrival at (en_2.mp3)
+		// We are arrival at the terminal (en_3.mp3)
+		// 叮咚+欢迎乘坐 (cn_origin_1.mp3)
+		// 公交车方向 (cn_origin_2.mp3)
+		// 叮咚+车辆起步请拉好扶手投币后请配合朝里走下一站 (cn_start.mp3)
+		// 下一站 (cn_start_1.mp3)
+		// 请准备从后门下车 (cn_start_2.mp3)
+		// 乘客们请给需要帮助的乘客让个座谢谢 (cn_start_3.mp3)
+		// 叮咚+车辆进站请注意安全 (cn_arrive.mp3)
+		// 到了请配合从后门下车开门请当心 (cn_arrive_1.mp3)
+		// 叮咚+终点站 (cn_terminal.mp3)
+		// 欢迎乘坐(沪) (sh_origin_1.mp3)
+		// 公交车方向(沪) (sh_origin_2.mp3)
+		// 下一站(沪) (sh_start_1.mp3)
+		// 请准备从后门下车 (sh_start_2.mp3)
+		// 乘客们请给需要帮助的乘客让个座谢谢(沪) (sh_start_3.mp3)
+		// 到了请配合从后门下车开门请当心(沪) (sh_arrive_1.mp3)
+		// 终点站(沪) (sh_terminal.mp3)
+		// 终点音乐 (terminal_music.mp3)
+	}
 }
+package com.bsth.util;
+
+
+import org.bytedeco.javacv.FFmpegFrameGrabber;
+import org.bytedeco.javacv.FFmpegFrameRecorder;
+import org.bytedeco.javacv.Frame;
+
+import java.io.*;
+import java.nio.ShortBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+public class AudioOperationUtils {
+    public static void main(String[] args) throws Exception {
+//        int duration = 450000;
+//        double silenceThreshold = -40; // 声音阈值，可以根据需要调整，单位通常是分贝dB
+//        splitBySilence("D:\\tts.mp3", "D:\\88814\\cn", duration, silenceThreshold);
+
+        List<String> paths = new ArrayList<>();
+        paths.add("D:/speech/803111/cn/000.mp3");
+        paths.add("D:/speech/803111/cn/001.mp3");
+        merge(paths, "D:/speech/803111/results.mp3");
+    }
+
+    public static void merge(List<String> inputPaths, String outputPath) throws Exception {
+        File file = new File(outputPath);
+        if (!file.getParentFile().exists()) {
+            file.getParentFile().mkdirs();
+        }
+        FFmpegFrameRecorder recorder = new FFmpegFrameRecorder(new File(outputPath), 1);
+
+        int i = 0;
+        Frame frame = null;
+        for (String inputPath : inputPaths) {
+            FFmpegFrameGrabber grabber = new FFmpegFrameGrabber(inputPath);
+            grabber.start();
+            if (i == 0) {
+                recorder.setAudioCodec(grabber.getAudioCodec());
+                recorder.setFrameRate(grabber.getFrameRate());
+                recorder.setFormat(grabber.getFormat());
+                recorder.start();
+            }
+            while ((frame = grabber.grabSamples()) != null) {
+                recorder.record(frame);
+            }
+            grabber.stop();
+            grabber.close();
+            i++;
+        }
+        recorder.stop();
+        recorder.close();
+    }
+
+    public static void splitBySilence(String inputPath, String outputPath, int duration, double silenceThreshold) throws Exception {
+        File file = new File(outputPath);
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        boolean isSilent = false;
+        FFmpegFrameGrabber grabber = new FFmpegFrameGrabber(inputPath);
+        grabber.start();
+        Frame frame = null;
+        List<SilenceInfo> silenceInfos = new ArrayList<>();
+        long start = 0, end = 0;
+        while((frame = grabber.grabSamples()) != null) {
+            ShortBuffer buffer = (ShortBuffer) frame.samples[0];
+            double energy = 0;
+            while (buffer.hasRemaining()) {
+                short sample = buffer.get();
+                energy += sample * sample;
+            }
+            energy /= buffer.capacity();
+            double db = 20 * Math.log10(Math.sqrt(energy));
+            if (db < silenceThreshold) {
+                if (!isSilent && start == 0) {
+                    isSilent = true;
+                    start = frame.timestamp;
+                }
+            } else {
+                if (start != 0 && frame.timestamp - start >= duration) {
+                    SilenceInfo info = new SilenceInfo(end, start);
+                    silenceInfos.add(info);
+                    end = frame.timestamp;
+                }
+                isSilent = false;
+                start = 0;
+            }
+        }
+        if (silenceInfos.size() > 0) {
+            SilenceInfo info = new SilenceInfo(end, grabber.getLengthInTime());
+            silenceInfos.add(info);
+        }
+        grabber.stop();
+        grabber.close();
+        grabber = new FFmpegFrameGrabber(inputPath);
+        grabber.start();
+        int idx = 0;
+        boolean flag = false;
+        FFmpegFrameRecorder recorder = new FFmpegFrameRecorder(new File(String.format("%s%s%03d.mp3", outputPath, File.separator, idx)), 1);
+        recorder.setAudioCodec(grabber.getAudioCodec());
+        recorder.setFrameRate(grabber.getFrameRate());
+        recorder.setFormat(grabber.getFormat());
+        recorder.start();
+        SilenceInfo info = silenceInfos.get(idx);
+        while ((frame = grabber.grabSamples()) != null) {
+            if (idx < silenceInfos.size()) {
+                if (frame.timestamp >= info.start && frame.timestamp <= info.end) {
+                    recorder.record(frame);
+                    flag = false;
+                } else {
+                    if (!flag) {
+                        flag = true;
+                        recorder.stop();
+                        recorder.close();
+                        idx++;
+                        info = silenceInfos.get(idx);
+                        recorder = new FFmpegFrameRecorder(new File(String.format("%s%s%03d.mp3", outputPath, File.separator, idx)), 1);
+                        recorder.start();
+                        recorder.setAudioCodec(grabber.getAudioCodec());
+                        recorder.setFrameRate(grabber.getFrameRate());
+                        recorder.setFormat(grabber.getFormat());
+                    }
+                }
+            }
+        }
+        if (recorder != null) {
+            recorder.stop();
+            recorder.close();
+        }
+    }
+
+    public final static class SilenceInfo {
+
+        private long start;
+
+        private long end;
+
+        public SilenceInfo() {}
+
+        public SilenceInfo(long start, long end) {
+            this.start = start;
+            this.end = end;
+        }
+
+        public long getStart() {
+            return start;
+        }
+
+        public void setStart(long start) {
+            this.start = start;
+        }
+
+        public long getEnd() {
+            return end;
+        }
+
+        public void setEnd(long end) {
+            this.end = end;
+        }
+    }
+}
+package com.bsth.util;
+
+import com.bsth.entity.speech.SpeechRequest;
+import com.bsth.entity.speech.SpeechResponse;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.handshake.ServerHandshake;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.*;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public class IFlyUtils {
+
+    private final static ObjectMapper mapper = new ObjectMapper();
+
+    private final static Logger log = LoggerFactory.getLogger(IFlyUtils.class);
+
+    private final static String apiKey = "46780e6779b6b1ba93503f24f097b771";
+
+    private final static String apiSecret = "ZWFjNzkzMTkzNzI3YmMzMTgwMWUzMWE0";
+
+    private final static String appId = "b4b21ad4";
+
+    /**
+     * 生成普通话语音
+     * text以","进行分割
+     * @param text
+     */
+    public static void textToSpeechCn(String text, String outputPath) throws Exception {
+        File file = new File(outputPath);
+        if (!file.getParentFile().exists()) {
+            file.getParentFile().mkdirs();
+        }
+        String wsUrl = getAuthUrl("https://tts-api.xfyun.cn/v2/tts", apiKey, apiSecret).replace("https://", "wss://");
+        SpeechRequest request = new SpeechRequest();
+        request.getCommon().put("app_id", appId);
+        request.getBusiness().put("aue", "lame");
+        request.getBusiness().put("sfl", 1);
+        request.getBusiness().put("vcn", "x4_lingxiaoshan_profnews");
+        request.getData().put("text", Base64.getEncoder().encodeToString(text.replace(",", "[p1000]").getBytes("GBK")));
+        request.getData().put("status", 2);
+        websocketWork(wsUrl, request, new FileOutputStream(file));
+        while (!request.isCompleted()) {
+            Thread.sleep(500);
+        }
+    }
+
+    /**
+     * 生成上海话语音
+     * text以","进行分割
+     * @param text
+     */
+    public static void textToSpeechSh(String text, String outputPath) throws Exception {
+        String wsUrl = getAuthUrl("https://tts-api.xfyun.cn/v2/tts", apiKey, apiSecret).replace("https://", "wss://");
+        SpeechRequest request = new SpeechRequest();
+        request.getCommon().put("app_id", appId);
+        request.getBusiness().put("aue", "lame");
+        request.getBusiness().put("sfl", 1);
+        request.getBusiness().put("vcn", "x3_ziling");
+        request.getData().put("text", Base64.getEncoder().encodeToString(text.replace(",", "[p1000]").getBytes("GBK")));
+        request.getData().put("status", 2);
+        websocketWork(wsUrl, request, new FileOutputStream(outputPath));
+        while (!request.isCompleted()) {
+            Thread.sleep(500);
+        }
+    }
+
+    /**
+     * 生成英语语音
+     * text以","进行分割
+     * @param text
+     */
+    public static void textToSpeechEn(String text, String outputPath) throws Exception {
+        String wsUrl = getAuthUrl("https://tts-api.xfyun.cn/v2/tts", apiKey, apiSecret).replace("https://", "wss://");
+        SpeechRequest request = new SpeechRequest();
+        request.getCommon().put("app_id", appId);
+        request.getBusiness().put("aue", "lame");
+        request.getBusiness().put("sfl", 1);
+        request.getBusiness().put("vcn", "x4_enus_luna_assist");
+        request.getData().put("text", Base64.getEncoder().encodeToString(text.replace(",", "[p1000]").getBytes(StandardCharsets.UTF_8)));
+        request.getData().put("status", 2);
+        websocketWork(wsUrl, request, new FileOutputStream(outputPath));
+        while (!request.isCompleted()) {
+            Thread.sleep(500);
+        }
+    }
+
+    public static void websocketWork(String wsUrl, SpeechRequest request, OutputStream out) {
+        try {
+            URI uri = new URI(wsUrl);
+            WebSocketClient webSocketClient = new WebSocketClient(uri) {
+                @Override
+                public void onOpen(ServerHandshake serverHandshake) {
+                    try {
+                        this.send(mapper.writeValueAsString(request));
+                    } catch (JsonProcessingException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+
+                @Override
+                public void onMessage(String text) {
+                    try {
+                        SpeechResponse response = mapper.readValue(text, SpeechResponse.class);
+                        log.info("response: {}", response);
+                        if (response.getCode() != 0) {
+                            log.error("在线语音合成发生错误");
+                        }
+                        if (response.getData() != null) {
+                            byte[] bytes = Base64.getDecoder().decode(response.getData().getAudio());
+                            out.write(bytes);
+                            out.flush();
+                            if (response.getData().getStatus() == 2) {
+                                request.setCompleted(true);
+                                out.close();
+                            }
+                        }
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+
+                @Override
+                public void onClose(int i, String s, boolean b) {
+                    System.out.println("ws链接已关闭，本次请求完成...");
+                }
+
+                @Override
+                public void onError(Exception e) {
+                    log.error("发生错误", e);
+                }
+            };
+            webSocketClient.connect();
+        } catch (Exception e) {
+            log.error("", e);
+        }
+    }
+
+    /**
+     * 讯飞语音合成鉴权
+     * @param hostUrl
+     * @param apiKey
+     * @param apiSecret
+     * @return
+     * @throws Exception
+     */
+    public static String getAuthUrl(String hostUrl, String apiKey, String apiSecret) throws Exception {
+        URL url = new URL(hostUrl);
+        // 时间
+        SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
+        format.setTimeZone(TimeZone.getTimeZone("GMT"));
+        String date = format.format(new Date());
+        // 拼接
+        String preStr = "host: " + url.getHost() + "\n" +
+                "date: " + date + "\n" +
+                "GET " + url.getPath() + " HTTP/1.1";
+        // SHA256加密
+        Mac mac = Mac.getInstance("hmacsha256");
+        SecretKeySpec spec = new SecretKeySpec(apiSecret.getBytes(StandardCharsets.UTF_8), "hmacsha256");
+        mac.init(spec);
+        byte[] hexDigits = mac.doFinal(preStr.getBytes(StandardCharsets.UTF_8));
+        // Base64加密
+        String sha = Base64.getEncoder().encodeToString(hexDigits);
+        // 拼接
+        String authorization = String.format("api_key=\"%s\", algorithm=\"%s\", headers=\"%s\", signature=\"%s\"", apiKey, "hmac-sha256", "host date request-line", sha);
+        StringBuilder sb = new StringBuilder(hostUrl);
+        sb.append("?authorization=").append(Base64.getEncoder().encodeToString(authorization.getBytes(StandardCharsets.UTF_8)))
+        .append("&date=").append(URLEncoder.encode(date))
+        .append("&host=").append(URLEncoder.encode(url.getHost()));
+//        // 拼接地址
+//        HttpUrl httpUrl = Objects.requireNonNull(HttpUrl.parse("https://" + url.getHost() + url.getPath())).newBuilder().//
+//                addQueryParameter("authorization", Base64.getEncoder().encodeToString(authorization.getBytes(StandardCharsets.UTF_8))).//
+//                addQueryParameter("date", date).//
+//                addQueryParameter("host", url.getHost()).//
+//                build();
+
+        return sb.toString();
+    }
+}
@@ -73,4 +73,7 @@ sso.enabled= false
 sso.systemcode = SYS0023
 sso.http.url.login= https://127.0.0.1/portal/index.html#/login
 sso.http.url.logout= https://127.0.0.1/information/api/v1/logout
-sso.http.url.auth= https://127.0.0.1/information/authenticate/authorityAuthentication
 \ No newline at end of file
+sso.http.url.auth= https://127.0.0.1/information/authenticate/authorityAuthentication
+
+path.speech.common = /data/control/speech/common/
+path.speech.line = /data/control/speech/%s/
 \ No newline at end of file
@@ -71,4 +71,7 @@ sso.enabled= false
 sso.systemcode = SYS0019
 sso.http.url.login= http://180.169.154.251:28090/portal/index.html#/login
 sso.http.url.logout= http://180.169.154.251:18080/information/api/v1/logout
-sso.http.url.auth= http://180.169.154.251:18080/information/authenticate/authorityAuthentication
 \ No newline at end of file
+sso.http.url.auth= http://180.169.154.251:18080/information/authenticate/authorityAuthentication
+
+path.speech.common = D:/speech/common/
+path.speech.line = D:/speech/%s/
 \ No newline at end of file
@@ -71,4 +71,7 @@ sso.enabled= false
 sso.systemcode = SYS0023
 sso.http.url.login= https://112.64.45.51/portal/index.html#/login
 sso.http.url.logout= https://112.64.45.51/information/api/v1/logout
-sso.http.url.auth= https://112.64.45.51/information/authenticate/authorityAuthentication
 \ No newline at end of file
+sso.http.url.auth= https://112.64.45.51/information/authenticate/authorityAuthentication
+
+path.speech.common = /data/control/speech/common/
+path.speech.line = /data/control/speech/%s/
 \ No newline at end of file
@@ -13,27 +13,40 @@
  */
 (function(){
+	var code2company = {}, cgsbm = [];
 	function getComp(cb) {
 		$.get('/user/companyData',null,function(rs) {
 			 return cb && cb(rs);
 		});
 	}
-	function getCompInfo(cb) {
-		// get请求获取公司
-		$get('/business/all', {upCode_eq: '88'}, function(gs_d){
-			 return cb && cb(gs_d);
-		});
-	}
-	function gsdmTogsName(gsD,code) {
-		var rsStr = '';
-		for(var s = 0 ; s < gsD.length; s++) {
-			if(gsD[s].businessCode == code) {
-				rsStr = rsStr + '(' + gsD[s].businessName.replace('公司','') + ')';
-				break;
+	$.ajaxSettings.async = false;
+	getComp(function(rs) {
+		var html = new Array('<option value="">请选择</option>');
+		for (var i = 0;i < rs.length;i++) {
+			var item = rs[i], children = item.children;
+			var company = {};
+			company.name = item.companyName;
+			company.children = children;
+			for (var j = 0;j < children.length;j++) {
+				cgsbm.push(item.companyCode + '_' + children[j].code);
 			}
+			code2company[item.companyCode] = company;
+			html.push('<option value="', item.companyCode, '">', item.companyName, '</option>');
 		}
-		return rsStr;
-	}
+
+		$('#companySelect').html(html.join(''));
+		$('#companySelect').on('change', function() {
+			var companyCode = $(this).val(), html = ['<option value="">请选择</option>'];
+			if (companyCode) {
+				for (var i = 0;i < code2company[companyCode].children.length;i++) {
+					var item = code2company[companyCode].children[i];
+					html.push('<option value="', item.code, '">', item.name, '</option>');
+				}
+			}
+			$('#brancheCompanySelect').html(html.join(''));
+		}).trigger('change');
+	})
+	$.ajaxSettings.async = true;
 	function splitxlName(str) {
 		var rsStr = '';
 		if(str) {
@@ -46,9 +59,9 @@
 	if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
 	/** page : 当前页  initPag : */
 	var page = 0,initPag;
-	
+
 	/** 表格数据分页加载 */
-	loadTableDate(null,true);
+	loadTableDate(null, true);
 	/** 重置按钮事件  */
 	$('tr.filter .filter-cancel').on('click',function(){
@@ -57,7 +70,7 @@
 		 $('.tipso-animation').tipso('hide');
 		 storage.setItem('xlName_AgursData','');
 		 // 重新加载表格数据
-		 loadTableDate(null,true);
+		 loadTableDate(null, true);
 	});
 	/** 搜索按钮事件 */
@@ -109,6 +122,7 @@
 				}
 			}
 		});
+
 		return params;
 	}
@@ -132,10 +146,12 @@
 		params['direction'] = 'ASC';
 		// 记录当前页数
 		params['page'] = page;
+		params['cgsbm_in'] = cgsbm.join();
 		// 弹出正在加载层
 		var i = layer.load(2);
 		// 异步请求获取表格数据
 		$.get('/station',params,function(result){
+			debugger
 			var data = {page: page, list: result.content};
 			// 把数据填充到模版中
 			var tbodyHtml = template('station_datatable_template', data);
@@ -35,12 +35,14 @@
 								<th width="6%">序号</th>
 								<th width="12%">站点名称</th>
 								<th width="12%">站点编码</th>
+								<th width="8%">所属公司</th>
+								<th width="9%">所属分公司</th>
 								<th width="12%">途经线路</th>
 								<th width="12%">行业编码</th>
 								<th width="12%">东西向</th>
 								<th width="12%">南北向</th>
-								<th width="12%">道路编码</th>
-								<th width="12%">地址</th>
+								<!--<th width="12%">道路编码</th>
+								<th width="12%">地址</th>-->
 								<th width="10%">操作</th>
 							</tr>
 							<tr role="row" class="filter">
@@ -52,6 +54,12 @@
 									<input type="text" class="form-control form-filter input-sm" id="stationCode" name="stationCode_like">
 								</td>
 								<td>
+									<select name="company_eq" class="form-control" id="companySelect"></select>
+								</td>
+								<td>
+									<select name="brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select>
+								</td>
+								<td>
 									<input type="text" class="form-control form-filter input-sm" id="passLines" name="passLines_like">
 								</td>
 								<td>
@@ -71,12 +79,12 @@
 										<option value="1">北->南</option>
 									</select>
 								</td>
-								<td>
+								<!--<td>
 									 <input type="text" class="form-control form-filter input-sm" id="roadCoding" name="roadCoding_eq">
 								</td>
 								<td>
 									 <input type="text" class="form-control form-filter input-sm" id="address" name="address_eq">
-								</td>
+								</td>-->
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
 										<i class="fa fa-search"></i> 搜索
@@ -7,7 +7,7 @@
         <div style="display: flex;justify-content:center;align-items: center;height: 603px;">
             <video id="dvr" style="width: 100%;height: 100%"/>
         </div>
-        <div class="uk-grid" style="margin-left: 0px; margin-top: 20px;">
+        <div class="uk-grid" style="margin-left: 0px; margin-top: 20px;" id="ruiming">
             <div class="uk-width uk-width-dvr">
                 <div class="uk-panel uk-panel-box uk-panel-box-dvr uk-width-dvr-checked">
                     <span data-channel="1">ADAS</span>
@@ -54,12 +54,59 @@
                 </div>
             </div>
         </div>
+        <div class="uk-grid" style="margin-left: 0px; margin-top: 20px; display: none;" id="tuohua">
+            <div class="uk-width uk-width-dvr">
+                <div class="uk-panel uk-panel-box uk-panel-box-dvr uk-width-dvr-checked">
+                    <span data-channel="2-1">ADAS</span>
+                </div>
+            </div>
+            <div class="uk-width uk-width-dvr">
+                <div class="uk-panel uk-panel-box uk-panel-box-dvr">
+                    <span data-channel="2-2">DSM</span>
+                </div>
+            </div>
+            <div class="uk-width uk-width-dvr">
+                <div class="uk-panel uk-panel-box uk-panel-box-dvr">
+                    <span data-channel="1-1">中门</span>
+                </div>
+            </div>
+            <div class="uk-width uk-width-dvr">
+                <div class="uk-panel uk-panel-box uk-panel-box-dvr">
+                    <span data-channel="1-3">车前</span>
+                </div>
+            </div>
+            <div class="uk-width uk-width-dvr">
+                <div class="uk-panel uk-panel-box uk-panel-box-dvr">
+                    <span data-channel="1-4">司机</span>
+                </div>
+            </div>
+            <div class="uk-width uk-width-dvr">
+                <div class="uk-panel uk-panel-box uk-panel-box-dvr">
+                    <span data-channel="1-5">前门</span>
+                </div>
+            </div>
+            <div class="uk-width uk-width-dvr">
+                <div class="uk-panel uk-panel-box uk-panel-box-dvr">
+                    <span data-channel="1-6">前车厢</span>
+                </div>
+            </div>
+            <div class="uk-width uk-width-dvr">
+                <div class="uk-panel uk-panel-box uk-panel-box-dvr">
+                    <span data-channel="1-7">后车厢</span>
+                </div>
+            </div>
+            <div class="uk-width uk-width-dvr">
+                <div class="uk-panel uk-panel-box uk-panel-box-dvr">
+                    <span data-channel="1-8">360</span>
+                </div>
+            </div>
+        </div>
     </div>
     <script>
         (function() {
             var player, requesting = false, info;
             $('.uk-panel-box-dvr span').on('click', function() {
-                var channel = $(this).data('channel');
+                var channel = $(this).data('channel') + '', param = {sim: info.sim, channel: channel};
                 if (requesting) {
                     layer.msg('正在请求播放地址,请等待')
                     return;
@@ -67,7 +114,12 @@
                 requesting = true;
                 $('.uk-width-dvr-checked').removeClass('uk-width-dvr-checked');
                 $(this).parent().addClass('uk-width-dvr-checked');
-                $.post('/dvr/jt1078', {sim: info.sim, channel: channel}, function(res) {
+                if (channel.indexOf('-') > -1) {
+                    var no = channel.split('-')[0], channelNum = channel.split('-')[1];
+                    param.sim = no === '1' ? info.sim : info.sim2;
+                    param.channel = channelNum;
+                }
+                $.post('/dvr/jt1078', param, function(res) {
                     requesting = false;
                     if (res.status == 'SUCCESS') {
                         if (player) {
@@ -90,7 +142,11 @@
             $('#dvr-modal').on('init', function(e, data) {
                 info = data;
                 requesting = true;
-                $.post('/dvr/jt1078', {sim: info.sim, channel: 1}, function(res) {
+                if (info.sim2) {
+                    $('#ruiming').css('display', 'none');
+                    $('#tuohua').css('display', 'block');
+                }
+                $.post('/dvr/jt1078', {sim: info.sim2 ? info.sim2 : info.sim, channel: 1}, function(res) {
                     requesting = false;
                     if (res.status == 'SUCCESS') {
                        player = videojs('dvr', {sources: [{src: res.data['hls']}], autoplay: true});
@@ -70,7 +70,7 @@
             {{if expectStopTime!=null}}
             <a href="javascript:;" style="color: #07D;margin-right: 7px;">预计 {{expectStopTime}} 分钟到达终点</a>
             {{/if}}
-            <a href="javascript:;" style="float: left;" onclick="javascript:gb_map_dvr.openDvr({sim: '{{sim}}'})">DVR</a>
+            <a href="javascript:;" style="float: left;" onclick="javascript:gb_map_dvr.openDvr({nbbm: '{{nbbm}}', sim: '{{sim}}', sim2: '{{sim2}}'})">DVR</a>
             {{if dvrcode != null}}<a href="javascript:void(0)" style="margin-left: 50px;" >拨打电话</a>{{/if}}
             <a href="javascript:;" style="float: right;" onclick="javascript:gb_map_play_back.initParams({deviceId: '{{deviceId}}', nbbm: '{{nbbm}}'});">轨迹回放</a>
         </div>