1.

王通
1 parent 5fdd2dd4
Showing 6 changed files with 202 additions and 183 deletions
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/common/SystemParamKeys.java
src/main/java/com/bsth/server_rs/base_info/car/buffer/CarBufferData.java
src/main/java/com/bsth/server_rs/gps/buffer/GpsRefreshThread.java
src/main/java/com/bsth/service/impl/SystemParamServiceImpl.java
src/main/resources/application.properties
@@ -16,6 +16,7 @@ import com.bsth.server_rs.destroy.DestroyDetailRestService;
 import com.bsth.server_rs.directive.DirectiveRestService;
 import com.bsth.server_rs.dks.BxRestService;
 import com.bsth.server_rs.dks.DksRestService;
+import com.bsth.server_rs.dks.ExternalRestService;
 import com.bsth.server_rs.electric.ElectricService;
 import com.bsth.server_rs.exception.AesExceptionMapper;
 import com.bsth.server_rs.gps.GpsRestService;
@@ -143,6 +144,9 @@ public class CXFConfig {
     @Autowired
     private BxRestService bxRestService;
+    @Autowired
+    private ExternalRestService externalRestService;
+
     @Bean
     public Server rsServer() {
         JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean();
@@ -172,7 +176,8 @@ public class CXFConfig {
                 dksRestService,
                 xxfbRestService,
                 manHoursRestService,
-                bxRestService));
+                bxRestService,
+                externalRestService));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
         //endpoint.setFeatures(Arrays.asList(new Swagger2Feature()));
         endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN());
@@ -14,4 +14,6 @@ public class SystemParamKeys {
     public static final String LIMIT_LINES = "limit.lines";
     public static final String LIMIT_DEVICES = "limit.devices";
+
+    public static final String LIMIT_DEVICES_EXTERNAL = "limit.devices.%s";
 }
-package com.bsth.server_rs.base_info.car.buffer;
-
-import com.bsth.Application;
-import com.bsth.server_rs.base_info.car.Car;
-import com.bsth.server_rs.base_info.dto.BusCardDto;
-import com.google.common.collect.ArrayListMultimap;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 车辆数据缓存
- * Created by panzhao on 2017/3/30.
- */
-@Component
-@Order(6)
-public class CarBufferData implements CommandLineRunner {
-
-    private static List<Car> data;
-    private static Map<String, Car> idMap;
-    private static ArrayListMultimap<String, Car> companyListMap;
-
-    /**
-     * 待入库的bus car
-     */
-    public static LinkedList<Car> pstList = new LinkedList<>();
-
-    @Autowired
-    CarRefreshThread carRefreshThread;
-
-    public static List<Car> findAll(){
-        return data;
-    }
-
-    public static Car findOne(String nbbm){
-        return idMap.get(nbbm);
-    }
-
-    public static List<Car> findByCompany(String company){
-        return companyListMap.get(company);
-    }
-
-    public static void replaceAll(List<Car> newData){
-        data = newData;
-        Map<String, Car> idMapCopy = new HashMap<>();
-        ArrayListMultimap<String, Car> listMap = ArrayListMultimap.create();
-
-        for(Car car : data){
-            idMapCopy.put(car.getNbbm(), car);
-            listMap.put(car.getCompanyCode(), car);
-        }
-        idMap = idMapCopy;
-
-        companyListMap = listMap;
-    }
-
-    @Override
-    public void run(String... strings) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(carRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
-    }
-
-    public static Map<String, Object> multiSaveCards(List<BusCardDto> list) {
-        int success=0,error=0;
-        //返回写入成功的卡数据
-        List<BusCardDto> rsList = new ArrayList<>();
-
-        Car c;
-        for(BusCardDto bcd : list){
-            c = idMap.get(bcd.getNbbm());
-            if(c == null)
-                error ++;
-            else{
-                c.setIdRfid(bcd.getIdCard());
-                c.setTagRfid(bcd.getTagCard());
-                c.setRemark(bcd.getRemark());
-                success ++;
-
-                pstList.add(c);
-                rsList.add(bcd);
-            }
-        }
-
-        Map<String, Object> rs = new HashMap<>();
-        rs.put("success", success);
-        rs.put("successList", rsList);
-        rs.put("error", error);
-        return rs;
-    }
-}
+package com.bsth.server_rs.base_info.car.buffer;
+
+import com.bsth.Application;
+import com.bsth.server_rs.base_info.car.Car;
+import com.bsth.server_rs.base_info.dto.BusCardDto;
+import com.google.common.collect.ArrayListMultimap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 车辆数据缓存
+ * Created by panzhao on 2017/3/30.
+ */
+@Component
+@Order(6)
+public class CarBufferData implements CommandLineRunner {
+
+    private static List<Car> data;
+    private static Map<String, Car> idMap;
+    private static Map<String, Car> device2car;
+    private static ArrayListMultimap<String, Car> companyListMap;
+
+    /**
+     * 待入库的bus car
+     */
+    public static LinkedList<Car> pstList = new LinkedList<>();
+
+    @Autowired
+    CarRefreshThread carRefreshThread;
+
+    public static List<Car> findAll(){
+        return data;
+    }
+
+    public static Car findOne(String nbbm){
+        return idMap.get(nbbm);
+    }
+
+    public static Car findOneByDevice(String device){
+        return device2car.get(device);
+    }
+
+    public static List<Car> findByCompany(String company){
+        return companyListMap.get(company);
+    }
+
+    public static void replaceAll(List<Car> newData){
+        data = newData;
+        Map<String, Car> idMapCopy = new HashMap<>();
+        Map<String, Car> device2carCopy = new HashMap<>();
+        ArrayListMultimap<String, Car> listMap = ArrayListMultimap.create();
+
+        for(Car car : data){
+            idMapCopy.put(car.getNbbm(), car);
+            device2carCopy.put(car.getEquipmentCode(), car);
+            listMap.put(car.getCompanyCode(), car);
+        }
+        idMap = idMapCopy;
+        device2car = device2carCopy;
+        companyListMap = listMap;
+    }
+
+    @Override
+    public void run(String... strings) throws Exception {
+        Application.mainServices.scheduleWithFixedDelay(carRefreshThread, 10, 60 * 60, TimeUnit.SECONDS);
+    }
+
+    public static Map<String, Object> multiSaveCards(List<BusCardDto> list) {
+        int success=0,error=0;
+        //返回写入成功的卡数据
+        List<BusCardDto> rsList = new ArrayList<>();
+
+        Car c;
+        for(BusCardDto bcd : list){
+            c = idMap.get(bcd.getNbbm());
+            if(c == null)
+                error ++;
+            else{
+                c.setIdRfid(bcd.getIdCard());
+                c.setTagRfid(bcd.getTagCard());
+                c.setRemark(bcd.getRemark());
+                success ++;
+
+                pstList.add(c);
+                rsList.add(bcd);
+            }
+        }
+
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("success", success);
+        rs.put("successList", rsList);
+        rs.put("error", error);
+        return rs;
+    }
+}
-package com.bsth.server_rs.gps.buffer;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.server_rs.gps.entity.GpsEntity;
-import com.bsth.util.ConfigUtil;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.List;
-
-/**
- * Created by panzhao on 2017/3/30.
- */
-@Component
-public class GpsRefreshThread extends Thread{
-
-    static String url;
-
-    static {
-        url = ConfigUtil.get("http.gps.real.url");
-    }
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public void run() {
-        try {
-            CloseableHttpClient httpClient = null;
-            List<GpsEntity> rs = null;
-            httpClient = HttpClients.createDefault();
-            //超时时间
-            RequestConfig requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(2000).setConnectionRequestTimeout(1000)
-                    .setSocketTimeout(3000).build();
-
-            HttpGet get = new HttpGet(url);
-            get.setConfig(requestConfig);
-
-            CloseableHttpResponse response = httpClient.execute(get);
-
-            HttpEntity entity = response.getEntity();
-            BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
-            StringBuffer stringBuffer = new StringBuffer();
-            String str = "";
-            while ((str = br.readLine()) != null)
-                stringBuffer.append(str);
-
-            JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
-
-            if (jsonObj != null)
-                rs = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
-
-            for(GpsEntity gps : rs){
-                GpsRealDataBuffer.put(gps);
-            }
-        }catch (Exception e){
-            logger.error("", e);
-        }
-    }
-}
+package com.bsth.server_rs.gps.buffer;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.server_rs.base_info.car.Car;
+import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
+import com.bsth.server_rs.gps.entity.GpsEntity;
+import com.bsth.util.ConfigUtil;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/3/30.
+ */
+@Component
+public class GpsRefreshThread extends Thread{
+
+    static String url;
+
+    static {
+        url = ConfigUtil.get("http.gps.real.url");
+    }
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        try {
+            CloseableHttpClient httpClient = null;
+            List<GpsEntity> rs = null;
+            httpClient = HttpClients.createDefault();
+            //超时时间
+            RequestConfig requestConfig = RequestConfig.custom()
+                    .setConnectTimeout(2000).setConnectionRequestTimeout(1000)
+                    .setSocketTimeout(3000).build();
+
+            HttpGet get = new HttpGet(url);
+            get.setConfig(requestConfig);
+
+            CloseableHttpResponse response = httpClient.execute(get);
+
+            HttpEntity entity = response.getEntity();
+            BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+            StringBuffer stringBuffer = new StringBuffer();
+            String str = "";
+            while ((str = br.readLine()) != null)
+                stringBuffer.append(str);
+
+            JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
+
+            if (jsonObj != null)
+                rs = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
+
+            for(GpsEntity gps : rs){
+                Car car = CarBufferData.findOneByDevice(gps.getDeviceId());
+                if (car != null) {
+                    gps.setNbbm(car.getNbbm());
+                }
+                GpsRealDataBuffer.put(gps);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
@@ -20,7 +20,7 @@ public class SystemParamServiceImpl implements SystemParamService {
     private Map<String, String> pairs = new HashMap<>();
-    @Scheduled(cron = "0 0/30 * * * ?")
+    @Scheduled(cron = "0 0/5 * * * ?")
     public void refresh() {
         for (SystemParam sp : systemParamRepository.findAll()) {
             pairs.put(sp.getKey(), sp.getValue());
-spring.profiles: dev,prod
-spring.profiles.active: prod
-
-spring.view.suffix=.html
-server.session-timeout=-1
-security.basic.enabled=false
-
-# \u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236\u914D\u7F6E
-# File size limit
-multipart.maxFileSize = -1
-# Total request size for a multipart/form-data
-multipart.maxRequestSize = -1
-
-server.compression.enabled=true
-server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,text/javascript,text/css,application/javascript
-
-#redis
-cache.days=15
+spring.profiles.active= prod
+
+spring.view.suffix=.html
+server.session-timeout=-1
+security.basic.enabled=false
+
+# \u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236\u914D\u7F6E
+# File size limit
+multipart.maxFileSize = -1
+# Total request size for a multipart/form-data
+multipart.maxRequestSize = -1
+
+server.compression.enabled=true
+server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,text/javascript,text/css,application/javascript
+
+#redis
+cache.days=15