Commit a547fd676780bed27c82b9fd69fb5ab9442a2ff0
1 parent
b00aef0a
update...
Showing
7 changed files
with
25 additions
and
12 deletions
src/main/java/com/bsth/StartCommand.java
| ... | ... | @@ -61,7 +61,7 @@ public class StartCommand implements CommandLineRunner { |
| 61 | 61 | sexec.scheduleWithFixedDelay(refreshScheduleCacheThread, 60, 60 * 2, TimeUnit.SECONDS); |
| 62 | 62 | |
| 63 | 63 | //gps socket client |
| 64 | - clientApp.init(); | |
| 64 | + //clientApp.init(); | |
| 65 | 65 | //gps 数据处理 |
| 66 | 66 | dataMainProcessor.start(); |
| 67 | 67 | ... | ... |
src/main/java/com/bsth/data/geo/loader/util/GeoCalculator.java
| ... | ... | @@ -37,7 +37,7 @@ public class GeoCalculator { |
| 37 | 37 | if (isLoop(stations) && stations.get(0).getUpDown() == 1) |
| 38 | 38 | return null;//单环线下行 |
| 39 | 39 | |
| 40 | - /*if(stations.get(0).getLineCode().equals("10507") && stations.get(0).getUpDown()==1) | |
| 40 | + /*if(stations.get(0).getLineCode().equals("10904") && stations.get(0).getUpDown()==0) | |
| 41 | 41 | System.out.println("aaa");*/ |
| 42 | 42 | |
| 43 | 43 | //sort |
| ... | ... | @@ -75,7 +75,7 @@ public class GeoCalculator { |
| 75 | 75 | if (pi > ci) |
| 76 | 76 | continue; |
| 77 | 77 | |
| 78 | - if (ci - pi < 2) | |
| 78 | + if (ci - pi < 1) | |
| 79 | 79 | s.setPaths(null); |
| 80 | 80 | else |
| 81 | 81 | s.setPaths(new CopyOnWriteArrayList(subList(seCds, pi, ci + 1))); | ... | ... |
src/main/java/com/bsth/util/geo/GeoUtils.java
| ... | ... | @@ -131,7 +131,7 @@ public class GeoUtils { |
| 131 | 131 | if (d1 < 2 || d2 < 2) |
| 132 | 132 | return true; |
| 133 | 133 | else |
| 134 | - return Math.abs(d1 + d2 - getDistance(s, e)) < 5; | |
| 134 | + return Math.abs(d1 + d2 - getDistance(s, e)) < 0.5; | |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | static Logger logger = LoggerFactory.getLogger(GeoUtils.class); | ... | ... |
src/main/resources/static/assets/css/main.css
| ... | ... | @@ -363,4 +363,10 @@ g.gps-wrap rect.twinkle[updown="1"] { |
| 363 | 363 | stroke: #c94f21; |
| 364 | 364 | fill: #c94f21; |
| 365 | 365 | } |
| 366 | -} | |
| 367 | 366 | \ No newline at end of file |
| 367 | +} | |
| 368 | + | |
| 369 | +li.nav-item.disabled > a.nav-link, | |
| 370 | +li.nav-item.disabled i.material-icons { | |
| 371 | + color: #cacaca; | |
| 372 | + cursor: no-drop; | |
| 373 | +} | ... | ... |
src/main/resources/static/index.html
| ... | ... | @@ -50,7 +50,7 @@ |
| 50 | 50 | <li class="nav-item "> |
| 51 | 51 | <a class="nav-link" title="实时信息发布预览" href="/pages/real/main.html"> |
| 52 | 52 | <i class="material-icons">voicemail</i> |
| 53 | - <p>实时发布</p> | |
| 53 | + <p>实时预览</p> | |
| 54 | 54 | </a> |
| 55 | 55 | </li> |
| 56 | 56 | <li class="nav-item "> |
| ... | ... | @@ -58,13 +58,20 @@ |
| 58 | 58 | <i class="material-icons">info</i> |
| 59 | 59 | <p>信息发布接口测试</p> |
| 60 | 60 | </a> |
| 61 | - </li><!-- | |
| 62 | - <li class="nav-item "> | |
| 63 | - <a class="nav-link" href="../examples/maps.html"> | |
| 61 | + </li> | |
| 62 | + | |
| 63 | + <li class="nav-item disabled"> | |
| 64 | + <a class="nav-link" > | |
| 65 | + <i class="material-icons">history</i> | |
| 66 | + <p>历史发布查询</p> | |
| 67 | + </a> | |
| 68 | + </li> | |
| 69 | + <li class="nav-item disabled"> | |
| 70 | + <a class="nav-link" > | |
| 64 | 71 | <i class="material-icons">bar_chart</i> |
| 65 | 72 | <p>统计分析</p> |
| 66 | 73 | </a> |
| 67 | - </li>--> | |
| 74 | + </li> | |
| 68 | 75 | </ul> |
| 69 | 76 | </div> |
| 70 | 77 | </div> | ... | ... |
src/main/resources/static/pages/home.html
src/main/resources/static/pages/interface_test/iTest.html
| ... | ... | @@ -60,7 +60,7 @@ |
| 60 | 60 | <div class="col-md-2 field" style="margin-top: 5px;"> |
| 61 | 61 | <div class="form-group"> |
| 62 | 62 | <label class="bmd-label-floating">时间（t）</label> |
| 63 | - <input type="text" name="t" class="form-control" value=""> | |
| 63 | + <input type="text" name="t" class="form-control" value="" placeholder="暂时没校验时间"> | |
| 64 | 64 | </div> |
| 65 | 65 | </div> |
| 66 | 66 | <div class="col-md-1"> | ... | ... |