Commit 4c2664291acaa6744cb576e71b7585c18f46d831

Authored by ljq
1 parent e7fe9d5a

路单

src/main/java/com/bsth/data/zndd/voice/GJC.java
@@ -16,9 +16,9 @@ public enum GJC { @@ -16,9 +16,9 @@ public enum GJC {
16 CC(7, "出场"), 16 CC(7, "出场"),
17 KQ(8, "开启"), 17 KQ(8, "开启"),
18 GB(9, "关闭"), 18 GB(9, "关闭"),
19 - ge(10, "个"), 19 + ge(10, "个"),
20 dao(11, "到"), 20 dao(11, "到"),
21 - de(12, "的"); 21 + de(12, "的班次");
22 22
23 private int code; 23 private int code;
24 private String description; 24 private String description;
src/main/java/com/bsth/data/zndd/voice/UploadVideoServlet.java
1 package com.bsth.data.zndd.voice; 1 package com.bsth.data.zndd.voice;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 -import com.bsth.data.BasicData;  
5 import com.bsth.data.zndd.baidu.speech.restapi.asrdemo.AsrMain; 4 import com.bsth.data.zndd.baidu.speech.restapi.asrdemo.AsrMain;
6 import com.bsth.entity.StationRoute; 5 import com.bsth.entity.StationRoute;
7 import com.bsth.entity.sys.SysUser; 6 import com.bsth.entity.sys.SysUser;
@@ -124,7 +123,7 @@ public class UploadVideoServlet extends HttpServlet { @@ -124,7 +123,7 @@ public class UploadVideoServlet extends HttpServlet {
124 String text = textList.get(0).toString(); 123 String text = textList.get(0).toString();
125 //text="新增出厂班次"; 124 //text="新增出厂班次";
126 //text="帮我添加一个鸿音路南芦公路到临港大道枢纽站的班次"; 125 //text="帮我添加一个鸿音路南芦公路到临港大道枢纽站的班次";
127 - if(isSimilarity(ZL.zdzdbc,text,null)){//帮我添加一个xx到xx站的班次(帮我添加一个鸿音路南芦公路到临港大道枢纽站的班次) 126 + /*if(isSimilarity(ZL.zdzdbc,text,null)){//帮我添加一个xx到xx站的班次(帮我添加一个鸿音路南芦公路到临港大道枢纽站的班次)
128 String[] ks = text.replace(",","").split("到"); 127 String[] ks = text.replace(",","").split("到");
129 if(ks[0].split("个").length==1){ 128 if(ks[0].split("个").length==1){
130 writer.write(text+"_识别失败"+",999"); 129 writer.write(text+"_识别失败"+",999");
@@ -137,9 +136,9 @@ public class UploadVideoServlet extends HttpServlet { @@ -137,9 +136,9 @@ public class UploadVideoServlet extends HttpServlet {
137 String Station1= ks[0].split("个")[1]; 136 String Station1= ks[0].split("个")[1];
138 String Station2= ks[1].split("的")[0]; 137 String Station2= ks[1].split("的")[0];
139 138
140 - /* String fcsj = null;//线路名,上下行,发车时间 139 + *//* String fcsj = null;//线路名,上下行,发车时间
141 //发车时间 140 //发车时间
142 - fcsj = extractTimes(text);*/ 141 + fcsj = extractTimes(text);*//*
143 //线路名称 - 线路编码和名称对照 142 //线路名称 - 线路编码和名称对照
144 143
145 Map<String, Object> param = new HashMap<>(); 144 Map<String, Object> param = new HashMap<>();
@@ -163,7 +162,7 @@ public class UploadVideoServlet extends HttpServlet { @@ -163,7 +162,7 @@ public class UploadVideoServlet extends HttpServlet {
163 } 162 }
164 writer.write(text +",1,"+m.get("stationcode1")+","+m.get("stationcode2")+","+0); 163 writer.write(text +",1,"+m.get("stationcode1")+","+m.get("stationcode2")+","+0);
165 return; 164 return;
166 - } 165 + }*/
167 if(isSimilarity(ZL.LJCCBC,text,null)){//添加出厂班次 166 if(isSimilarity(ZL.LJCCBC,text,null)){//添加出厂班次
168 writer.write(text+"_"+ZL.LJCCBC.getDescription()+",2"); 167 writer.write(text+"_"+ZL.LJCCBC.getDescription()+",2");
169 return; 168 return;
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -1214,6 +1214,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1214,6 +1214,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1214 s.setJhlc(0.0); 1214 s.setJhlc(0.0);
1215 } 1215 }
1216 1216
  1217 + if (s.getZdsjActual() == null || s.getZdsjActual().isEmpty()){
  1218 + s.setJhlc(0.0);
  1219 + }
  1220 +
1217 if (s.isDestroy()) { 1221 if (s.isDestroy()) {
1218 s.setFcsjActual(""); 1222 s.setFcsjActual("");
1219 s.setZdsjActual(""); 1223 s.setZdsjActual("");