潘钊 / bsth_control · Commits

Commit 5e06f5ef491dc9be8cf7294c176847ee6f4824b8

Authored by 李强
1 parent 93949cdf
build: skipped

bsthlq <2519941818@qq.com> 线路文件BUG修复

Inline Side-by-side
Showing 2 changed files with 7 additions and 7 deletions
src/main/java/com/bsth/repository/SectionRouteRepository.java
  View file @5e06f5e
@@ -159,7 +159,7 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int @@ -159,7 +159,7 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
159 */ 159 */
160 @Query(value = "SELECT " + 160 @Query(value = "SELECT " +
161 "c.directions," + 161 "c.directions," +
162 - "ST_AsText(s.bsection_vector) as bsection_vector," + 162 + "ST_AsText(s.gsection_vector) as gsection_vector," +
163 "s.speed_limit," + 163 "s.speed_limit," +
164 "s.section_name " + 164 "s.section_name " +
165 " FROM bsth_c_sectionroute c " + 165 " FROM bsth_c_sectionroute c " +
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
  View file @5e06f5e
@@ -541,8 +541,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -541,8 +541,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
541 // 相对路径 541 // 相对路径
542 String remotePath = FTPParamMap.get("remotePath").toString(); 542 String remotePath = FTPParamMap.get("remotePath").toString();
543 /** 如果已存在相同行单文件名则先删除 */ 543 /** 如果已存在相同行单文件名则先删除 */
544 - clientUtils.deleteFtpFile(url, port, username, password, remotePath, odlGzFileName);  
545 - clientUtils.deleteFtpFile(url, port, username, password, remotePath, textFileName); 544 + //clientUtils.deleteFtpFile(url, port, username, password, remotePath, odlGzFileName);
  545 + //clientUtils.deleteFtpFile(url, port, username, password, remotePath, textFileName);
546 String textStr = ""; 546 String textStr = "";
547 boolean tempTag = ishxType(objects); 547 boolean tempTag = ishxType(objects);
548 548
@@ -713,7 +713,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -713,7 +713,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
713 sleepStr = "\t" + String.valueOf(dsleepStr); 713 sleepStr = "\t" + String.valueOf(dsleepStr);
714 }else if(sobje.size()>1){ 714 }else if(sobje.size()>1){
715 for(int j =0;j<sobje.size();j++) { 715 for(int j =0;j<sobje.size();j++) {
716 - int dsleepStrt = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(j)[2].toString()); 716 + double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString());
717 String pointsStr = sobje.get(j)[1]==null || sobje.get(j)[1].equals("") ? null : sobje.get(j)[1].toString(); 717 String pointsStr = sobje.get(j)[1]==null || sobje.get(j)[1].equals("") ? null : sobje.get(j)[1].toString();
718 pointsStr = pointsStr.substring(11, pointsStr.length()-1); 718 pointsStr = pointsStr.substring(11, pointsStr.length()-1);
719 List<Point> ps = new ArrayList<>(); 719 List<Point> ps = new ArrayList<>();
@@ -724,7 +724,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -724,7 +724,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
724 ps.add(temp); 724 ps.add(temp);
725 } 725 }
726 if(GeoUtils.isInSection(ps, point)) { 726 if(GeoUtils.isInSection(ps, point)) {
727 - sleepStr = "\t" + String.valueOf(dsleepStrt); 727 + sleepStr = "\t" + String.valueOf((int)dsleepStrt);
728 break; 728 break;
729 } 729 }
730 } 730 }
@@ -799,7 +799,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -799,7 +799,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
799 sleepStr = "\t" + String.valueOf(dsleepStr); 799 sleepStr = "\t" + String.valueOf(dsleepStr);
800 }else if(sobje.size()>1){ 800 }else if(sobje.size()>1){
801 for(int j =0;j<sobje.size();j++) { 801 for(int j =0;j<sobje.size();j++) {
802 - int dsleepStrt = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(j)[2].toString()); 802 + double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString());
803 String pointsStr = sobje.get(j)[1]==null || sobje.get(j)[1].equals("") ? null : sobje.get(j)[1].toString(); 803 String pointsStr = sobje.get(j)[1]==null || sobje.get(j)[1].equals("") ? null : sobje.get(j)[1].toString();
804 pointsStr = pointsStr.substring(11, pointsStr.length()-1); 804 pointsStr = pointsStr.substring(11, pointsStr.length()-1);
805 List<Point> ps = new ArrayList<>(); 805 List<Point> ps = new ArrayList<>();
@@ -810,7 +810,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -810,7 +810,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
810 ps.add(temp); 810 ps.add(temp);
811 } 811 }
812 if(GeoUtils.isInSection(ps, point)) { 812 if(GeoUtils.isInSection(ps, point)) {
813 - sleepStr = "\t" + String.valueOf(dsleepStrt); 813 + sleepStr = "\t" + String.valueOf((int)dsleepStrt);
814 break; 814 break;
815 } 815 }
816 } 816 }