潘钊 / bsth_control · Commits

Commit cabf0038d626121efe56a1e748d611bf0560518b

Authored by 潘钊
2 parents 5a29b12e 052191d2
build: skipped

Merge branch 'minhang' into pudong

Inline Side-by-side
Showing 12 changed files with 51 additions and 25 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 12 of 21 files are displayed.

src/main/java/com/bsth/data/LineConfigData.java
  View file @cabf003
... ... @@ -77,7 +77,7 @@ public class LineConfigData implements CommandLineRunner {
77 77 public long applyIn(ScheduleRealInfo sch, Long timestamp){
78 78 LineConfig config = lineConfMap.get(sch.getXlBm());
79 79 int diff = sch.getXlDir().equals("0")?config.getUpInDiff():config.getDownInDiff();
80   - return timestamp - (diff * 1000);
  80 + return timestamp + (diff * 1000);
81 81 }
82 82  
83 83 @Component
... ...
src/main/java/com/bsth/data/gpsdata/arrival/handlers/AbnormalStateHandle.java
  View file @cabf003
... ... @@ -65,8 +65,8 @@ public class AbnormalStateHandle extends SignalHandle{
65 65 * @return
66 66 */
67 67 public boolean outOfBounds(GpsEntity gps){
68   - //场内的车不处理
69   - if(gps.getInstation() == 2){
  68 + //只处理电子围栏外的车
  69 + if(gps.getInstation() != 0){
70 70 return false;
71 71 }
72 72  
... ...
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
  View file @cabf003
... ... @@ -239,9 +239,14 @@ public class InOutStationSignalHandle extends SignalHandle{
239 239 long t2 = gps.getTimestamp();
240 240 long c = sch.getDfsjT();
241 241  
242   - if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
  242 + /*if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
  243 + return true;
  244 + }*/
  245 + int threshold = 1000 * 60 * 5;
  246 + if(Math.abs(t2 - c) < threshold && c - t1 > threshold){
243 247 return true;
244 248 }
  249 + //if(Math.abs(t2 - c) < 1000 * 60 * 5 && c - t1 > 1000 * 60 * 5)
245 250 return false;
246 251 }
247 252  
... ... @@ -255,7 +260,7 @@ public class InOutStationSignalHandle extends SignalHandle{
255 260 if (config != null && config.getOutConfig() == 2) {
256 261 //出站既出场
257 262 ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
258   - if (schPrev != null && schPrev.getBcType().equals("out")
  263 + if (schPrev != null && schPrev.getBcType().equals("out") && (schPrev.getBcsj()==0 || schPrev.getJhlcOrig().equals(0))
259 264 && (!limitPark || park.equals(schPrev.getQdzCode()))) {
260 265  
261 266 schPrev.setFcsjActualAll(sch.getFcsjActualTime());
... ... @@ -447,7 +452,7 @@ public class InOutStationSignalHandle extends SignalHandle{
447 452 boolean limitPark = StringUtils.isNotEmpty(park);
448 453  
449 454  
450   - if (next.getBcType().equals("in") && config.getOutConfig() == 2
  455 + if (next.getBcType().equals("in") && config.getOutConfig() == 2 && (next.getBcsj()==0 || next.getJhlcOrig().equals(0))
451 456 && (!limitPark || park.equals(next.getZdzCode()))) {
452 457  
453 458 next.setFcsjActualAll(sch.getZdsjActualTime());
... ...
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
  View file @cabf003
... ... @@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
60 60 for (String nbbm : keys) {
61 61 Collections.sort(listMap.get(nbbm), comp);
62 62 threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
63   - /*if(nbbm.equals("W9H-088"))
  63 + /*if(nbbm.equals("W09-164"))
64 64 new RecoveryThread(listMap.get(nbbm), count).run();*/
65 65 /*if(lineId.equals("60028"))
66 66 new RecoveryThread(listMap.get(lineId), count).run();*/
... ... @@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
84 84 Calendar calendar = Calendar.getInstance();
85 85 int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
86 86  
87   - String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=207";// + dayOfYear;
  87 + String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=241";// + dayOfYear;
88 88 JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
89 89  
90 90 List<GpsEntity> list =
... ... @@ -153,7 +153,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
153 153 boolean task;
154 154 for (GpsEntity gps : list) {
155 155 try {
156   - /*if(gps.getTimestamp() >= 1500942270000L){
  156 + /*if(gps.getTimestamp() >= 1503960000000L){
157 157 System.out.println("debugger...");
158 158 }*/
159 159 //是否有任务
... ...
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @cabf003
... ... @@ -573,7 +573,7 @@ public class DayOfSchedule {
573 573 continue;
574 574  
575 575 //出站既出场，忽略出场班次
576   - if (outConfig == 2 && temp.getBcType().equals("out")
  576 + if (outConfig == 2 && temp.getBcType().equals("out") && (temp.getBcsj()==0 || temp.getJhlcOrig().equals(0))
577 577 && (!limitPark || park.equals(temp.getQdzCode())))
578 578 continue;
579 579  
... ...
src/main/java/com/bsth/data/schedule/ScheduleComparator.java
  View file @cabf003
... ... @@ -3,6 +3,8 @@ package com.bsth.data.schedule;
3 3 import com.bsth.entity.realcontrol.ScheduleRealInfo;
4 4  
5 5 import java.util.Comparator;
  6 +import java.util.HashMap;
  7 +import java.util.Map;
6 8  
7 9 /**
8 10 *
... ... @@ -20,20 +22,38 @@ public class ScheduleComparator {
20 22 return s1.getFcno() - s2.getFcno();
21 23 }
22 24 }*/
  25 +
  26 + static Map<String, Integer> bcTypeOrderMap = new HashMap<>();
  27 +
  28 + static{
  29 + bcTypeOrderMap.put("out", 0);
  30 + bcTypeOrderMap.put("normal", 1);
  31 + bcTypeOrderMap.put("region", 2);
  32 + bcTypeOrderMap.put("major", 3);
  33 + bcTypeOrderMap.put("venting", 4);
  34 + bcTypeOrderMap.put("ldks", 5);
  35 + bcTypeOrderMap.put("in", 6);
  36 + }
23 37  
24 38 public static class FCSJ implements Comparator<ScheduleRealInfo>{
25 39  
26 40 @Override
27 41 public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
28   - return (int) (s1.getFcsjT() - s2.getFcsjT());
  42 + int diff = (int) (s1.getFcsjT() - s2.getFcsjT());
  43 + return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
29 44 }
30 45 }
31 46  
  47 + private static int typeOrder(String bcType){
  48 + return bcTypeOrderMap.get(bcType)!=null?bcTypeOrderMap.get(bcType):0;
  49 + }
  50 +
32 51 public static class DFSJ implements Comparator<ScheduleRealInfo>{
33 52  
34 53 @Override
35 54 public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
36   - return (int) (s1.getDfsjT() - s2.getDfsjT());
  55 + int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
  56 + return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
37 57 }
38 58 }
39 59 }
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @cabf003
... ... @@ -4077,8 +4077,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4077 4077 Long zdsjActual_=Long.parseLong(zdsjActual_s[0])*60+Long.parseLong(zdsjActual_s[1]);
4078 4078 if((zdsj_-zdsjActual_)>0){
4079 4079 zdsjk =String.valueOf(zdsj_-zdsjActual_);
4080   - }
4081   - if(((zdsj_-zdsjActual_)<0)){
  4080 + }else{
4082 4081 zdsjm =String.valueOf(zdsjActual_-zdsj_);
4083 4082 }
4084 4083 }
... ... @@ -4105,8 +4104,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4105 4104 Long fcsjActural_=Long.parseLong(fcsjActural_s[0])*60+Long.parseLong(fcsjActural_s[1]);
4106 4105 if((zdsj_-fcsjActural_)>0){
4107 4106 fcsjk =String.valueOf(zdsj_-fcsjActural_);
4108   - }
4109   - if((zdsj_-fcsjActural_)<0){
  4107 + }else{
4110 4108 fcsjm =String.valueOf(fcsjActural_-zdsj_);
4111 4109 }
4112 4110 }
... ... @@ -4671,8 +4669,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4671 4669 mr.setSjyygl(rs.getDouble("sjyygl"));
4672 4670 mr.setSjksgl(rs.getDouble("sjksgl"));
4673 4671 mr.setZgl(rs.getDouble("zyygl"));
4674   - mr.setZddfgl(rs.getDouble("sddfgl"));
4675   - mr.setSddfgl(rs.getDouble("zddfgl"));
  4672 + mr.setZddfgl(rs.getDouble("zddfgl"));
  4673 + mr.setSddfgl(rs.getDouble("sddfgl"));
4676 4674 mr.setWqwxhgl(rs.getDouble("wqwxhgl"));
4677 4675 mr.setBfwxhgl(rs.getDouble("bfwxhgl"));
4678 4676 mr.setPygl(rs.getDouble("pygl"));
... ... @@ -4765,8 +4763,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4765 4763 sReport.setSjyybc(rs.getInt("sjyybc"));
4766 4764 sReport.setSjksbc(rs.getInt("sjksbc"));
4767 4765 sReport.setZbc(rs.getInt("zyybc"));
4768   - sReport.setZddfbc(rs.getInt("sddfbc"));
4769   - sReport.setSddfbc(rs.getInt("zddfbc"));
  4766 + sReport.setZddfbc(rs.getInt("zddfbc"));
  4767 + sReport.setSddfbc(rs.getInt("sddfbc"));
4770 4768 sReport.setWqwxhbc(rs.getInt("wqwxhbc"));
4771 4769 sReport.setBfwxhbc(rs.getInt("bfwxhbc"));
4772 4770 sReport.setPybc(rs.getInt("pybc"));
... ...
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
  View file @cabf003
... ... @@ -124,7 +124,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
124 124 // poi读
125 125 String cellContent = PoiUtils.getStringValueFromCell(
126 126 poi_sheet.getRow(i).getCell(j)
127   - );
  127 + ).replaceAll("\\s*", "");
128 128 // jxl写
129 129 sheet1.addCell(new Label(j, i, cellContent));
130 130 }
... ...
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
  View file @cabf003
... ... @@ -278,6 +278,9 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
278 278 Date start2 = new Date();
279 279 ScheduleResults_output scheduleResults_output = loopRuleOutput(schedulePlan, lpInfoResults_output);
280 280 Date end2 = new Date();
  281 +
  282 + logger.info("规则计算结果={}", scheduleResults_output.showGuideboardDesc1());
  283 +
281 284 // 3、计划输出
282 285 Date start3 = new Date();
283 286 PlanResult planResult = planResultOutput(schedulePlan, scheduleResults_output, ttInfoResults_output);
... ...
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
  View file @cabf003
... ... @@ -251,7 +251,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
251 251 for (int i = 1; i < rowNums; i++) { // 从第2行开始验证数据
252 252 Row row = sheet.getRow(i);
253 253 for (int j = 1; j < colNums; j++) { // 从第2列开始
254   - String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(row.getCell(j))); // trimToEmpty
  254 + String bcell_con = StringUtils.trimToEmpty(PoiUtils.getStringValueFromCell(row.getCell(j))).replaceAll("\\s*", ""); // trimToEmpty
255 255 if (StringUtils.isNotEmpty(bcell_con)) {
256 256 Matcher m1 = p1.matcher(bcell_con.trim());
257 257 Matcher m2 = p2.matcher(bcell_con.trim());
... ...
src/main/java/com/bsth/service/schedule/rules/ttinfo/TTInfo_input.java
  View file @cabf003
... ... @@ -44,7 +44,7 @@ public class TTInfo_input implements Comparable&lt;TTInfo_input&gt; {
44 44 this.ttInfoId = String.valueOf(ttInfo.getId());
45 45 this.xlId = String.valueOf(ttInfo.getXl().getId());
46 46 String[] days = ttInfo.getRule_days().split(",");
47   - System.out.println(days.length);
  47 +// System.out.println(days.length);
48 48 for (int i = 0; i < 7; i++) {
49 49 if ("1".equals(days[i])) {
50 50 weekdays.add(true);
... ...
src/main/java/com/bsth/service/schedule/rules/validate/ValidRepeatBcFunction.java
  View file @cabf003
... ... @@ -47,14 +47,14 @@ public class ValidRepeatBcFunction implements AccumulateFunction {
47 47  
48 48 @Override
49 49 public Serializable createContext() {
50   - System.out.println("create");
  50 +// System.out.println("create");
51 51 return new RepeatBcInfo();
52 52 }
53 53  
54 54 @Override
55 55 public void init(Serializable serializable) throws Exception {
56 56 // TODO：
57   - System.out.println("init");
  57 +// System.out.println("init");
58 58 }
59 59  
60 60 @Override
... ...