潘钊 / bsth_control · Commits

Commit f0ba11bb7c4a760d6b21d16de3cabc693b71d183

Authored by 游瑞烽
1 parent a96679ef
build: skipped

update

Inline Side-by-side
Showing 3 changed files with 3 additions and 3 deletions
src/main/java/com/bsth/service/impl/LineServiceImpl.java
  View file @f0ba11b
@@ -166,7 +166,7 @@ public class LineServiceImpl extends BaseServiceImpl<Line, Integer> implements L @@ -166,7 +166,7 @@ public class LineServiceImpl extends BaseServiceImpl<Line, Integer> implements L
166 @Override 166 @Override
167 public Map<String, Object> getLineMatchStationIsUpdate(Integer id){ 167 public Map<String, Object> getLineMatchStationIsUpdate(Integer id){
168 Map<String, Object> map = new HashMap<>(); 168 Map<String, Object> map = new HashMap<>();
169 - Line l = repository.findOne(id); 169 + Line l = repository.findById(id).get();
170 Connection conn = null; 170 Connection conn = null;
171 PreparedStatement ps = null; 171 PreparedStatement ps = null;
172 ResultSet rs = null; 172 ResultSet rs = null;
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
  View file @f0ba11b
@@ -1648,7 +1648,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -1648,7 +1648,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
1648 } else if(stations.get(1).getStationName().indexOf(stationMDs.get(1).getStationName()) != -1 && stations.get(2).getStationName().indexOf(stationMDs.get(2).getStationName()) != -1 && stations.get(3).getStationName().indexOf(stationMDs.get(3).getStationName()) != -1 ){ 1648 } else if(stations.get(1).getStationName().indexOf(stationMDs.get(1).getStationName()) != -1 && stations.get(2).getStationName().indexOf(stationMDs.get(2).getStationName()) != -1 && stations.get(3).getStationName().indexOf(stationMDs.get(3).getStationName()) != -1 ){
1649 matchCode(stations,stationMDs,listMactah); 1649 matchCode(stations,stationMDs,listMactah);
1650 } 1650 }
1651 - repository.save(listMactah); 1651 + repository.saveAll(listMactah);
1652 } 1652 }
1653 return listMactah; 1653 return listMactah;
1654 } 1654 }
src/main/resources/static/pages/base/stationroute/css/bmap_base.css
  View file @f0ba11b
@@ -32,7 +32,7 @@ html,body{ @@ -32,7 +32,7 @@ html,body{
32 z-index: 99; 32 z-index: 99;
33 height: 41px; 33 height: 41px;
34 top: 30px; 34 top: 30px;
35 - margin-left: 640px; 35 + margin-left: 680px;
36 background: #ff2949; 36 background: #ff2949;
37 /*box-shadow: 5px 1px 5px rgba(90, 90, 90, 0.48);*/ 37 /*box-shadow: 5px 1px 5px rgba(90, 90, 90, 0.48);*/
38 } 38 }