1.zyl接口加入电量信息

王通
1 parent 8084303a
Showing 8 changed files with 14 additions and 99 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/server_rs/base_info/car/CarRestService.java
src/main/java/com/bsth/server_rs/base_info/line/LineRestService.java
src/main/java/com/bsth/server_rs/base_info/person/PersonRestService.java
src/main/java/com/bsth/server_rs/destroy/DestroyDetailRestService.java
src/main/java/com/bsth/server_rs/schedule/SchedulePlanService.java
src/main/java/com/bsth/server_rs/schedule/ScheduleRealService.java
src/main/java/com/bsth/server_rs/schedule/ScheduleTimeService.java
@@ -15,6 +15,7 @@ import com.bsth.server_rs.exception.AesExceptionMapper;
 import com.bsth.server_rs.gps.GpsRestService;
 import com.bsth.server_rs.schedule.SchedulePlanService;
 import com.bsth.server_rs.schedule.ScheduleRealService;
+import com.bsth.server_rs.schedule.ScheduleTimeService;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBus;
@@ -58,6 +59,8 @@ public class CXFConfig {
     private DestroyDetailRestService destroyDetailRestService;
     @Autowired
     private CarparkRestService carparkRestService;
+    @Autowired
+    private ScheduleTimeService scheduleTimeService;
     @Bean
     public Server rsServer() {
@@ -76,7 +79,8 @@ public class CXFConfig {
                 directiveRestService,
                 ld_roadSpeedRestService,
                 destroyDetailRestService,
-                carparkRestService));
+                carparkRestService,
+                scheduleTimeService));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
         endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN());
         return endpoint.create();
@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -26,6 +27,7 @@ import java.util.Map;
 /**
  * Created by panzhao on 2017/3/30.
  */
+@Component
 @Path("/vehicle")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
 public class CarRestService {
@@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -21,6 +22,7 @@ import java.util.*;
  * 线路 Rest Service
  * Created by panzhao on 2017/3/27.
  */
+@Component
 @Path("/line")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
 public class LineRestService {
@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -26,6 +27,7 @@ import java.util.Map;
 /**
  * Created by panzhao on 2017/3/28.
  */
+@Component
 @Path("/employee")
 @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
 public class PersonRestService {
-package com.bsth.server_rs.destroy;
-
-import com.bsth.entity.DestroySituation;
-import com.bsth.entity.ScheduleRealInfo;
-import com.bsth.repository.DestroySituationRepository;
-import com.bsth.repository.ScheduleRealInfoRepository;
-import com.bsth.server_rs.base_info.car.Car;
-import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author hill
- * @date
- */
-@Component
-@Path("/destroy")
-@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class DestroyDetailRestService {
-
-    @Autowired
-    private DestroySituationRepository destroySituationRepository;
-
-    @Autowired
-    private ScheduleRealInfoRepository scheduleRealInfoRepository;
-
-    private static Map<String, String> COMPANY_CODE2NAME;
-
-    static {
-        COMPANY_CODE2NAME = new HashMap<>();
-        COMPANY_CODE2NAME.put("55", "上南公司");
-        COMPANY_CODE2NAME.put("22", "金高公司");
-        COMPANY_CODE2NAME.put("05", "杨高公司");
-        COMPANY_CODE2NAME.put("26", "南汇公司");
-        COMPANY_CODE2NAME.put("05_1", "川沙分公司");
-        COMPANY_CODE2NAME.put("05_6", "周浦分公司");
-        COMPANY_CODE2NAME.put("05_2", "金桥分公司");
-        COMPANY_CODE2NAME.put("05_3", "芦潮港分公司");
-        COMPANY_CODE2NAME.put("05_5", "杨高分公司");
-        COMPANY_CODE2NAME.put("22_5", "一分公司");
-        COMPANY_CODE2NAME.put("22_1", "四分公司");
-        COMPANY_CODE2NAME.put("22_3", "三分公司");
-        COMPANY_CODE2NAME.put("22_2", "二分公司");
-        COMPANY_CODE2NAME.put("26_2", "南汇二分");
-        COMPANY_CODE2NAME.put("26_5", "南汇公司");
-        COMPANY_CODE2NAME.put("26_1", "南汇一分");
-        COMPANY_CODE2NAME.put("26_6", "南汇六分");
-        COMPANY_CODE2NAME.put("26_3", "南汇三分");
-        COMPANY_CODE2NAME.put("26_7", "南汇五分");
-        COMPANY_CODE2NAME.put("26_4", "南汇维修公司");
-        COMPANY_CODE2NAME.put("55_2", "上南三分公司");
-        COMPANY_CODE2NAME.put("55_3", "上南六分公司");
-        COMPANY_CODE2NAME.put("55_1", "上南二分公司");
-        COMPANY_CODE2NAME.put("55_4", "上南一分公司");
-    }
-
-    @GET
-    @Path("/accident/{rq}")
-    public List<Map<String, Object>> waybill(@PathParam("rq") String rq) {
-        List<Map<String, Object>> result = new ArrayList<>();
-        
-        for (DestroySituation destroySituation : destroySituationRepository.findByDateAndReason(rq, "肇事")) {
-            Map<String, Object> map = new HashMap<>();
-            String nbbm = destroySituation.getNbbm(), ids = destroySituation.getIdsStr();
-            String gsBm = destroySituation.getGsBm(), fgsBm = destroySituation.getFgsBm();
-            Car car = CarBufferData.findOne(nbbm);
-            ScheduleRealInfo scheduleRealInfo = scheduleRealInfoRepository.findOne(Long.parseLong(ids.split(",")[0]));
-
-            map.put("company", COMPANY_CODE2NAME.get(gsBm));
-            map.put("branch", COMPANY_CODE2NAME.get(gsBm + "_" + fgsBm));
-            map.put("line", destroySituation.getLineName());
-            map.put("plate", car.getCarPlate());
-            map.put("incode", nbbm);
-            map.put("driver", destroySituation.getjGh());
-            map.put("direction", scheduleRealInfo == null ? "" : (scheduleRealInfo.getQdzName() + "->" + scheduleRealInfo.getZdzName()));
-            map.put("remark", destroySituation.getRemark());
-            result.add(map);
-        }
-
-        return result;
-    }
-}
@@ -2,8 +2,6 @@ package com.bsth.server_rs.schedule;
 import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.server_rs.gps.buffer.BasicDataBuffer;
-import com.bsth.server_rs.gps.buffer.GpsRealDataBuffer;
-import com.bsth.server_rs.gps.entity.GpsEntity;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
@@ -13,7 +11,9 @@ import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
-import javax.ws.rs.*;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 package com.bsth.server_rs.schedule;
 import com.bsth.entity.ScheduleExec;
-import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.server_rs.gps.buffer.BasicDataBuffer;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 package com.bsth.server_rs.schedule;
-import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.entity.TimeTable;
 import com.bsth.entity.TimeTableDetail;
-import com.bsth.server_rs.gps.buffer.BasicDataBuffer;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;