update...

潘钊
1 parent fdf2d682
Showing 6 changed files with 151 additions and 26 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/server_rs/electric/ElectricService.java
src/main/java/com/bsth/server_rs/schedule/dto/ScheduleInOut.java
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
src/main/java/com/bsth/server_ws/electric_oil/entity/Electric.java
src/main/java/com/bsth/util/HttpClientUtils.java
@@ -8,6 +8,7 @@ import com.bsth.server_rs.base_info.section.LD_RoadSpeedRestService;
 import com.bsth.server_rs.base_info.section.LD_SectionRestService;
 import com.bsth.server_rs.base_info.station.StationRestService;
 import com.bsth.server_rs.directive.DirectiveRestService;
+import com.bsth.server_rs.electric.ElectricService;
 import com.bsth.server_rs.exception.AesExceptionMapper;
 import com.bsth.server_rs.gps.GpsRestService;
 import com.bsth.server_rs.logs.RealLogRestService;
@@ -101,6 +102,8 @@ public class CXFConfig {
     DirectiveRestService directiveRestService;
     @Autowired
     LD_RoadSpeedRestService ld_roadSpeedRestService;
+    @Autowired
+    ElectricService electricService;
     @Bean
     public Server rsServer() {
@@ -118,7 +121,8 @@ public class CXFConfig {
                 schedulePlanService,
                 realLogRestService,
                 directiveRestService,
-                ld_roadSpeedRestService));
+                ld_roadSpeedRestService,
+                electricService));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
         //endpoint.setFeatures(Arrays.asList(new Swagger2Feature()));
         endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN());
+package com.bsth.server_rs.electric;
+
+import com.bsth.server_ws.electric_oil.entity.Electric;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+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.List;
+
+/**
+ * Created by panzhao on 2018/3/27.
+ */
+@Component
+@Path("/electric")
+@Produces({MediaType.APPLICATION_JSON})
+public class ElectricService {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @GET
+    @Path("/company/{company}/{rq}")
+    public List<Electric> list(@PathParam("company") String company, @PathParam("rq") String rq){
+        List<Electric> list = null;
+        try {
+            //从数据库查询
+            list = jdbcTemplate.query("select fgs_bm,fgs_name,gs_bm,gs_name,jdl,jdz,remarks,rq,creater_date,nbbm,jsy from bsth_c_jdl where gs_bm="+company+" and rq='"+rq+"'"
+                    , BeanPropertyRowMapper.newInstance(Electric.class));
+        }catch (Exception e){
+            logger.error("", e);
+        }
+        return list;
+    }
+}
@@ -41,7 +41,7 @@ public class ScheduleInOut implements Serializable {
     ScheduleInOut(){}
-    ScheduleInOut(ScheduleRealInfo sch){
+    public ScheduleInOut(ScheduleRealInfo sch){
         this.id = sch.getId();
         this.scheduleDateStr = sch.getScheduleDateStr();
         this.lineCode = sch.getXlBm();
 package com.bsth.server_rs.schedule.real;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.BasicData;
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.redis.ScheduleRedisService;
 import com.bsth.server_rs.base_info.line.Line;
@@ -9,20 +12,19 @@ import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
 import com.bsth.server_rs.schedule.dto.ScheduleCcInfoConfig;
 import com.bsth.server_rs.schedule.dto.ScheduleInOut;
 import com.bsth.server_rs.schedule.dto.ScheduleRealInfoDTO_JK;
+import com.bsth.util.ConfigUtil;
+import com.bsth.util.HttpClientUtils;
 import com.google.common.base.Splitter;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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.*;
 import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.net.URLEncoder;
+import java.util.*;
 /**
  * Created by panzhao on 2017/8/24.
@@ -40,6 +42,79 @@ public class ScheduleRealService {
     Logger logger = LoggerFactory.getLogger(this.getClass());
+    static String url;
+    static String secretKey;
+
+    static {
+        secretKey = ConfigUtil.get("http.control.secret.key");
+        url = ConfigUtil.get("http.control.service_data_url");// + "/execSchList?secretKey=" + secretKey;
+    }
+
+    @POST
+    @Path("tcc_tzrc")
+    public Map<String, Object> tccTzrc(String jsonStr) {
+        JSONObject rs = new JSONObject();
+        try {
+            StringBuilder sb = HttpClientUtils.post(url + "/tccHrhc?secretKey=" + secretKey, jsonStr);
+
+            rs = JSONObject.parseObject(sb.toString());
+
+            if ("SUCCESS".equals(rs.get("status"))) {
+                rs.put("list", ScheduleInOut.getMultiInstance(JSONArray.parseArray(rs.getJSONArray("list").toJSONString(), ScheduleRealInfo.class)));
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "接口服务器出现异常！");
+        }
+        return rs;
+    }
+
+    @POST
+    @Path("tcc_dftz")
+    public Map<String, Object> tccDftz(String jsonStr) {
+        JSONObject rs = new JSONObject();
+        try {
+            StringBuilder sb = HttpClientUtils.post(url + "/dftzAndDestroy?secretKey=" + secretKey, jsonStr);
+
+            rs = JSON.parseObject(sb.toString());
+
+            if ("SUCCESS".equals(rs.get("status"))) {
+                rs.put("t", new ScheduleInOut(JSON.toJavaObject(JSON.parseObject(rs.get("t").toString()), ScheduleRealInfo.class)));
+            }
+            //ScheduleInOut.getMultiInstance
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "接口服务器出现异常！");
+        }
+        return rs;
+    }
+
+    /**
+     * 获取路牌下的班次信息
+     *
+     * @param lineCode
+     * @param lpName
+     * @return
+     */
+    @GET
+    @Path("/findByLpName/{lineCode}/{lpName}")
+    public List<ScheduleRealInfo> findByLpName(@PathParam("lineCode") String lineCode, @PathParam("lpName") String lpName) {
+        List<ScheduleRealInfo> list = new ArrayList<>();
+        try {
+            if (StringUtils.isEmpty(lineCode) || StringUtils.isEmpty(lpName))
+                return list;
+
+            lpName = URLEncoder.encode(lpName, "UTF-8");
+            StringBuilder sb = HttpClientUtils.get(url + "/findByLpName?secretKey=" + secretKey + "&lineCode=" + lineCode + "&lpName=" + lpName);
+            list = JSON.parseArray(sb.toString(), ScheduleRealInfo.class);
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return list;
+    }
+
     /**
      * 获取当天指定停车场的进出场排班数据
      *
@@ -59,13 +134,14 @@ public class ScheduleRealService {
     /**
      * 获取指定日期，指定公司的人员车辆配置情况（实际排班）
+     *
      * @param company
      * @param rq
      * @return
      */
     @GET
     @Path("/ccConfig/{company}/{rq}")
-    public List<ScheduleCcInfoConfig> ccInfoConfig(@PathParam("company") String company, @PathParam("rq") String rq){
+    public List<ScheduleCcInfoConfig> ccInfoConfig(@PathParam("company") String company, @PathParam("rq") String rq) {
         List<Line> lines = LineBufferData.findByCompany(company);
         List<ScheduleCcInfoConfig> all = new ArrayList<>();
@@ -77,12 +153,13 @@ public class ScheduleRealService {
     /**
      * 根据车辆自编号获取对应执行的班次信息
+     *
      * @param nbbm
      * @return
      */
     @GET
     @Path("/exec/{nbbm}")
-    public JSONObject getExecPlan(@PathParam("nbbm") String nbbm){
+    public JSONObject getExecPlan(@PathParam("nbbm") String nbbm) {
         return schRealDataBuffer.getExecPlan(nbbm);
     }
@@ -104,7 +181,7 @@ public class ScheduleRealService {
         List<ScheduleRealInfoDTO_JK> all = new ArrayList<>();
         List<Line> lines = LineBufferData.findByCompany(company);
-        for(Line line : lines){
+        for (Line line : lines) {
             all.addAll(ScheduleRealInfoDTO_JK.getMultiInstance(redisService.read(rq, line.getLineCode())));
         }
         return all;
@@ -112,27 +189,28 @@ public class ScheduleRealService {
     /**
      * 读取指定日期的redis 数据，计算程序调用
+     *
      * @param rqs
      * @return
      */
     @GET
     @Path("/pz_vip/read/{rqs}")
-    public List<ScheduleRealInfo> read(@PathParam("rqs") String rqs){
+    public List<ScheduleRealInfo> read(@PathParam("rqs") String rqs) {
         List<ScheduleRealInfo> all = new ArrayList<>(), rs = new ArrayList<>();
         List<Line> lines = LineBufferData.findAll();
         List<String> rqArray = Splitter.on(",").splitToList(rqs);
-        for(Line line : lines){
-            for(String rq : rqArray)
+        for (Line line : lines) {
+            for (String rq : rqArray)
                 all.addAll(redisService.read(rq, line.getLineCode()));
         }
-        for(ScheduleRealInfo sch : all){
-            if(sch.getBcType().equals("in") || sch.getBcType().equals("out") || sch.getBcType().equals("ldks"))
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getBcType().equals("in") || sch.getBcType().equals("out") || sch.getBcType().equals("ldks"))
                 continue;
             //烂班，临加，有子任务的
-            if(sch.getStatus()==-1 || sch.isSflj() || (sch.getcTasks()!=null && sch.getcTasks().size() > 0))
+            if (sch.getStatus() == -1 || sch.isSflj() || (sch.getcTasks() != null && sch.getcTasks().size() > 0))
                 rs.add(sch);
         }
         return rs;
@@ -140,20 +218,21 @@ public class ScheduleRealService {
     /**
      * 读取指定日期线路的redis 数据，计算程序调用
+     *
      * @param rq
      * @return
      */
     @GET
     @Path("/pz_vip/readByRqAndLine/{rq}/{lineCode}")
-    public List<ScheduleRealInfo> readByLine(@PathParam("rq") String rq,@PathParam("lineCode") String lineCode){
+    public List<ScheduleRealInfo> readByLine(@PathParam("rq") String rq, @PathParam("lineCode") String lineCode) {
         List<ScheduleRealInfo> all = redisService.read(rq, lineCode), rs = new ArrayList<>();
-        for(ScheduleRealInfo sch : all){
-            if(sch.getBcType().equals("in") || sch.getBcType().equals("out") || sch.getBcType().equals("ldks"))
+        for (ScheduleRealInfo sch : all) {
+            if (sch.getBcType().equals("in") || sch.getBcType().equals("out") || sch.getBcType().equals("ldks"))
                 continue;
             //烂班，临加，有子任务的
-            if(sch.getStatus()==-1 || sch.isSflj() || (sch.getcTasks()!=null && sch.getcTasks().size() > 0))
+            if (sch.getStatus() == -1 || sch.isSflj() || (sch.getcTasks() != null && sch.getcTasks().size() > 0))
                 rs.add(sch);
         }
         return rs;
@@ -20,8 +20,6 @@ import java.util.List;
  */
 public class Electric {
-    private Electric(){}
-
     static DateTimeFormatter fmtyyyyMMddHHmmss = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
     static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
@@ -31,8 +31,8 @@ public class HttpClientUtils {
             HttpGet get = new HttpGet(url);
             //超时时间
             RequestConfig requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(3500).setConnectionRequestTimeout(2000)
-                    .setSocketTimeout(3500).build();
+                    .setConnectTimeout(6500).setConnectionRequestTimeout(6000)
+                    .setSocketTimeout(6500).build();
             get.setConfig(requestConfig);
             get.addHeader("Content-Encoding", "gzip");