update...

潘钊
1 parent 3f637064
Showing 6 changed files with 102 additions and 18 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/security/WebSecurityConfig.java
@@ -21,6 +21,9 @@ public class Constants {
 	public static final String LOGIN_FAILURE = "/user/loginFailure";
 	public static final String CAPTCHA = "/captcha.jpg";
  
+	//对外的营运数据接口
+	public static final String SERVICE_INTERFACE = "/companyService/**";
+
 	/**
 	 * 线调部分子页面不做拦截，便于浏览器缓存
 	 */
-//package com.bsth.controller.realcontrol;
-//
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-///**
-// * 对外的营运数据接口，主要输出当日的数据
-// * Created by panzhao on 2017/3/15.
-// */
-//@RestController
-//@RequestMapping("/companyService")
-//public class ServiceDataInterface {
-//}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 对外的营运数据接口，主要输出当日的数据
+ * Created by panzhao on 2017/3/15.
+ */
+@RestController
+@RequestMapping("/companyService")
+public class ServiceDataInterface {
+
+    private final static String SECRE_KEY = "dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki";
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @RequestMapping("/getCurrentDayPlan")
+    public List<ScheduleRealInfo> getCurrentDayPlan(
+            @RequestParam String companyId,
+            @RequestParam String workId,
+            @RequestParam String secretKey) {
+
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getGsBm() != null
+                    && sch.getGsBm().equals(companyId)
+                    && sch.getjGh().equals(workId)) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+
+    @RequestMapping("/returnCCInfo")
+    public List<ScheduleRealInfo> returnCCInfo(@RequestParam String companyId, @RequestParam String secretKey){
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+
+            if (sch.getBcType().equals("out")
+                    && sch.getGsBm() != null
+                    && sch.getGsBm().equals(companyId)) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+
+    @RequestMapping("/returnJCInfo")
+    public List<ScheduleRealInfo> returnJCInfo(@RequestParam String companyId, @RequestParam String secretKey){
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+
+        List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>();
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getBcType().equals("in")
+                    && sch.getGsBm() != null
+                    && sch.getGsBm().equals(companyId)) {
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
+}
@@ -378,9 +378,11 @@ public class DayOfSchedule implements CommandLineRunner {
                     sch.setZdsj(fmtHHmm.print(fmtHHmm.parseMillis(sch.getFcsj()) + (sch.getBcsj() * 60 * 1000)));
                     sch.setLate(false);
                 }
+
+                sch.setJhlcOrig(sch.getJhlc());
                 //计划里程为0，设置NULL
-                if (sch.getJhlc() != null && sch.getJhlc() == 0)
-                    sch.setJhlc(null);
+                //if (sch.getJhlc() != null && sch.getJhlc() == 0)
+                //    sch.setJhlc(null);
             }
         } catch (Exception e) {
             logger.error("", e);
@@ -88,7 +88,10 @@ public class ScheduleRealInfo {
 	/** 计划里程 */
 	private Double jhlc;
  
-	/** 实际里程 */
+	/** 原始计划里程 （原计调的数据） */
+	private Double jhlcOrig;
+
+	/** 实际里程  这个字段被废弃*/
 	private Double realMileage;
  
 	/** 实际里程 */
@@ -845,4 +848,12 @@ public class ScheduleRealInfo {
 	public void setRealMileage(Double realMileage) {
 		this.realMileage = realMileage;
 	}
+
+	public Double getJhlcOrig() {
+		return jhlcOrig;
+	}
+
+	public void setJhlcOrig(Double jhlcOrig) {
+		this.jhlcOrig = jhlcOrig;
+	}
 }
@@ -16,7 +16,7 @@ public abstract class BaseFilter implements Filter {
 	/**
 	 * 白名单
 	 */
-	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA,
+	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
 			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS };
  
 	@Override
@@ -36,7 +36,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     public void configure(WebSecurity web) throws Exception {
         // 白名单
         web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
-                Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS);
+                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS);
     }
  
     @Override