Commit 5246455bc6a20e526792f4261b8742f780c72d1c

Authored by yiming
1 parent 222feac8

加个count计数 去除kafka推送

src/main/java/com/example/demo/model/TJRL.java
@@ -47,7 +47,7 @@ public class TJRL implements Cloneable { @@ -47,7 +47,7 @@ public class TJRL implements Cloneable {
47 private String ACTUAL_START_TIME;// VARCHAR2(100) Y 实际发车时间 47 private String ACTUAL_START_TIME;// VARCHAR2(100) Y 实际发车时间
48 private String ACTUAL_ARRIVE_TIME;// VARCHAR2(100) Y 实际到达时间实际到达时间 48 private String ACTUAL_ARRIVE_TIME;// VARCHAR2(100) Y 实际到达时间实际到达时间
49 private String TRAD_ID; 49 private String TRAD_ID;
50 - 50 + private String COUNT;//计数器
51 public TJRL(){ 51 public TJRL(){
52 52
53 } 53 }
@@ -379,6 +379,14 @@ public class TJRL implements Cloneable { @@ -379,6 +379,14 @@ public class TJRL implements Cloneable {
379 this.TRAD_ID = TRAD_ID; 379 this.TRAD_ID = TRAD_ID;
380 } 380 }
381 381
  382 + public String getCOUNT() {
  383 + return COUNT;
  384 + }
  385 +
  386 + public void setCOUNT(String COUNT) {
  387 + this.COUNT = COUNT;
  388 + }
  389 +
382 @Override 390 @Override
383 public Object clone() throws CloneNotSupportedException { 391 public Object clone() throws CloneNotSupportedException {
384 return super.clone(); 392 return super.clone();
src/main/java/com/example/demo/service/Analysis.java
@@ -86,7 +86,7 @@ public class Analysis { @@ -86,7 +86,7 @@ public class Analysis {
86 } catch (ParseException e) { 86 } catch (ParseException e) {
87 e.printStackTrace(); 87 e.printStackTrace();
88 } 88 }
89 - //map.put("COUNT", text.substring(114, 120)); //交易计数器,BCD编码 89 + tjrl.setCOUNT(text.substring(114, 120));//交易计数器,BCD编码
90 tjrl.setTJRLORGAMT(text.substring(120, 124));//交易原始金额Orignal Txn Amount 90 tjrl.setTJRLORGAMT(text.substring(120, 124));//交易原始金额Orignal Txn Amount
91 //map.put("CARDSPEC", text.substring(124, 126)); //卡规范,BCD编码 01—建设部卡 02—交通部卡 03-交通部二维码 91 //map.put("CARDSPEC", text.substring(124, 126)); //卡规范,BCD编码 01—建设部卡 02—交通部卡 03-交通部二维码
92 String TAC=text.substring(126, 134);//HEX格式,交易认证码,BCD编码 92 String TAC=text.substring(126, 134);//HEX格式,交易认证码,BCD编码
src/main/java/com/example/demo/service/Contrast.java
@@ -301,7 +301,7 @@ public class Contrast { @@ -301,7 +301,7 @@ public class Contrast {
301 }); 301 });
302 } 302 }
303 303
304 - List<List<TJRLDB>> subList2 = getSubList(500, allData); 304 + /*List<List<TJRLDB>> subList2 = getSubList(500, allData);
305 if(!subList2.isEmpty()){ 305 if(!subList2.isEmpty()){
306 subList2.forEach(data->{ 306 subList2.forEach(data->{
307 if (!data.isEmpty()) { 307 if (!data.isEmpty()) {
@@ -327,7 +327,7 @@ public class Contrast { @@ -327,7 +327,7 @@ public class Contrast {
327 }); 327 });
328 } 328 }
329 }); 329 });
330 - } 330 + }*/
331 //如果是上次遗留的数据不管这是是否匹配到都清空 331 //如果是上次遗留的数据不管这是是否匹配到都清空
332 if(isOld){ 332 if(isOld){
333 oldData.clear(); 333 oldData.clear();
src/main/resources/mapping/db1/Site-mapper1.xml
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 BUS_PLATE, ROAD_CODE, DEPART_NAME,DEPART_CODE, DEPART_ACTUAL_TIME, 14 BUS_PLATE, ROAD_CODE, DEPART_NAME,DEPART_CODE, DEPART_ACTUAL_TIME,
15 REACH_NAME,REACH_CODE,REACH_ACTUAL_TIME, 15 REACH_NAME,REACH_CODE,REACH_ACTUAL_TIME,
16 LEVELS_FLAG,LEVELS1, LEVELS_NAME1, LEVELS1_CODE,LEVELS2, LEVELS_NAME2,LEVELS2_CODE,MARK,TRAD_ID, 16 LEVELS_FLAG,LEVELS1, LEVELS_NAME1, LEVELS1_CODE,LEVELS2, LEVELS_NAME2,LEVELS2_CODE,MARK,TRAD_ID,
17 - GPS_DATE_TIME1,GPS_DATE_TIME2,B_STATION_ID,PLAN_START_TIME,PLAN_ARRIVE_TIME,ACTUAL_START_TIME,ACTUAL_ARRIVE_TIME 17 + GPS_DATE_TIME1,GPS_DATE_TIME2,B_STATION_ID,PLAN_START_TIME,PLAN_ARRIVE_TIME,ACTUAL_START_TIME,ACTUAL_ARRIVE_TIME,COUNT
18 ) 18 )
19 VALUES 19 VALUES
20 <foreach collection="list" item="em" index="index" separator=","> 20 <foreach collection="list" item="em" index="index" separator=",">
@@ -25,7 +25,8 @@ @@ -25,7 +25,8 @@
25 #{em.BUS_PLATE}, #{em.ROAD_CODE}, #{em.DEPART_NAME},#{em.DEPART_CODE}, #{em.DEPART_ACTUAL_TIME}, 25 #{em.BUS_PLATE}, #{em.ROAD_CODE}, #{em.DEPART_NAME},#{em.DEPART_CODE}, #{em.DEPART_ACTUAL_TIME},
26 #{em.REACH_NAME},#{em.REACH_CODE},#{em.REACH_ACTUAL_TIME}, 26 #{em.REACH_NAME},#{em.REACH_CODE},#{em.REACH_ACTUAL_TIME},
27 #{em.LEVELS_FLAG},#{em.LEVELS1}, #{em.LEVELS_NAME1}, #{em.LEVELS1_CODE},#{em.LEVELS2}, #{em.LEVELS_NAME2}, #{em.LEVELS2_CODE}, #{em.MARK},#{em.TRAD_ID}, 27 #{em.LEVELS_FLAG},#{em.LEVELS1}, #{em.LEVELS_NAME1}, #{em.LEVELS1_CODE},#{em.LEVELS2}, #{em.LEVELS_NAME2}, #{em.LEVELS2_CODE}, #{em.MARK},#{em.TRAD_ID},
28 - #{em.GPS_DATE_TIME1},#{em.GPS_DATE_TIME2},#{em.B_STATION_ID},#{em.PLAN_START_TIME},#{em.PLAN_ARRIVE_TIME},#{em.ACTUAL_START_TIME},#{em.ACTUAL_ARRIVE_TIME}) 28 + #{em.GPS_DATE_TIME1},#{em.GPS_DATE_TIME2},#{em.B_STATION_ID},#{em.PLAN_START_TIME},#{em.PLAN_ARRIVE_TIME},#{em.ACTUAL_START_TIME},#{em.ACTUAL_ARRIVE_TIME},
  29 + #{em.COUNT})
29 </foreach> 30 </foreach>
30 </insert> 31 </insert>
31 32