Commit d45f6d0cab038be59069a1f4e93daa5ffc4c24a3

Authored by 王通
1 parent 05d526fb

1.zyl接口加入电量信息

src/main/java/com/bsth/CXFConfig.java
@@ -15,6 +15,7 @@ import com.bsth.server_rs.gps.GpsRestService; @@ -15,6 +15,7 @@ import com.bsth.server_rs.gps.GpsRestService;
15 import com.bsth.server_rs.schedule.SchedulePlanService; 15 import com.bsth.server_rs.schedule.SchedulePlanService;
16 import com.bsth.server_rs.schedule.ScheduleRealService; 16 import com.bsth.server_rs.schedule.ScheduleRealService;
17 import com.bsth.server_rs.schedule.ScheduleTimeService; 17 import com.bsth.server_rs.schedule.ScheduleTimeService;
  18 +import com.bsth.server_rs.schedule.WaybillService;
18 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; 19 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
19 import org.apache.cxf.Bus; 20 import org.apache.cxf.Bus;
20 import org.apache.cxf.bus.spring.SpringBus; 21 import org.apache.cxf.bus.spring.SpringBus;
@@ -58,6 +59,8 @@ public class CXFConfig { @@ -58,6 +59,8 @@ public class CXFConfig {
58 private CarparkRestService carparkRestService; 59 private CarparkRestService carparkRestService;
59 @Autowired 60 @Autowired
60 private ScheduleTimeService scheduleTimeService; 61 private ScheduleTimeService scheduleTimeService;
  62 + @Autowired
  63 + private WaybillService waybillService;
61 64
62 @Bean 65 @Bean
63 public Server rsServer() { 66 public Server rsServer() {
@@ -76,7 +79,8 @@ public class CXFConfig { @@ -76,7 +79,8 @@ public class CXFConfig {
76 directiveRestService, 79 directiveRestService,
77 ld_roadSpeedRestService, 80 ld_roadSpeedRestService,
78 carparkRestService, 81 carparkRestService,
79 - scheduleTimeService)); 82 + scheduleTimeService,
  83 + waybillService));
80 endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper())); 84 endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
81 endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN()); 85 endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN());
82 return endpoint.create(); 86 return endpoint.create();