Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

徐烜
2 parents 116c8c44 047e4802
Showing 2 changed files with 74 additions and 74 deletions
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/service/realcontrol/dto/ScheduleExecRate.java
@@ -50,8 +50,8 @@ public class ArrivalData_GPS implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
-		logger.info("ArrivalData_GPS,100,10 @11-10");
-		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 100, 10, TimeUnit.SECONDS);
+		logger.info("ArrivalData_GPS,30,10");
+		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 40, 10, TimeUnit.SECONDS);
 	}
 	@Component
-package com.bsth.service.realcontrol.dto;
-
-/**
- * 班次执行率DTO
- * Created by panzhao on 2016/11/14.
- */
-public class ScheduleExecRate {
-
-    private long id;
-    private String dfsj;
-    private String fcsjActual;
-    private String zdsj;
-    private String zdsjActual;
-    private int status;
-    private String lineCode;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getDfsj() {
-        return dfsj;
-    }
-
-    public void setDfsj(String dfsj) {
-        this.dfsj = dfsj;
-    }
-
-    public String getFcsjActual() {
-        return fcsjActual;
-    }
-
-    public void setFcsjActual(String fcsjActual) {
-        this.fcsjActual = fcsjActual;
-    }
-
-    public String getZdsj() {
-        return zdsj;
-    }
-
-    public void setZdsj(String zdsj) {
-        this.zdsj = zdsj;
-    }
-
-    public String getZdsjActual() {
-        return zdsjActual;
-    }
-
-    public void setZdsjActual(String zdsjActual) {
-        this.zdsjActual = zdsjActual;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-}
+package com.bsth.service.realcontrol.dto;
+
+/**
+ * 班次执行率DTO
+ * Created by panzhao on 2016/11/14.
+ */
+public class ScheduleExecRate {
+
+    private long id;
+    private String dfsj;
+    private String fcsjActual;
+    private String zdsj;
+    private String zdsjActual;
+    private int status;
+    private String lineCode;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getDfsj() {
+        return dfsj;
+    }
+
+    public void setDfsj(String dfsj) {
+        this.dfsj = dfsj;
+    }
+
+    public String getFcsjActual() {
+        return fcsjActual;
+    }
+
+    public void setFcsjActual(String fcsjActual) {
+        this.fcsjActual = fcsjActual;
+    }
+
+    public String getZdsj() {
+        return zdsj;
+    }
+
+    public void setZdsj(String zdsj) {
+        this.zdsj = zdsj;
+    }
+
+    public String getZdsjActual() {
+        return zdsjActual;
+    }
+
+    public void setZdsjActual(String zdsjActual) {
+        this.zdsjActual = zdsjActual;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+}