1.大邑迁移

王通
1 parent ee678e33
Showing 12 changed files with 130 additions and 129 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/redis/ElecRedisService.java
src/main/java/com/bsth/redis/OilRedisService.java
src/main/java/com/bsth/redis/PlanScheduleRedisService.java
src/main/java/com/bsth/redis/ScheduleRedisService.java
src/main/java/com/bsth/server_rs/directive/DirectiveRestService.java
src/main/java/com/bsth/server_rs/gps/buffer/GpsRefreshThread.java
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
src/main/java/com/bsth/server_rs/schedule/real/thread/ExecSchDataRefreshThread.java
src/main/java/com/bsth/server_rs/schedule/real/thread/SchInOutDataRefreshThread.java
src/main/java/com/bsth/server_ws/util/ControlHttpUtils.java
src/main/java/com/bsth/util/AppProperties.java
 package com.bsth;
-import com.bsth.util.AppProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
-import org.springframework.core.env.ConfigurableEnvironment;
-import java.io.IOException;
-import java.io.InputStream;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.util.List;
-import java.util.Properties;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -41,29 +33,7 @@ public class Application extends SpringBootServletInitializer {
         }
         if (normal) {
-			loadProperties();
 			SpringApplication.run(Application.class, args);
         }
 	}
-
-	private static void loadProperties() {
-		Properties prop = new Properties();
-		try (InputStream input = Application.class.getClassLoader().getResourceAsStream("application.properties")) {
-			prop.load(input);
-			String activeProfile = prop.getProperty("spring.profiles.active", "");
-			String cacheDays = prop.getProperty("cache.days", "15");
-			InputStream input1 = Application.class.getClassLoader().getResourceAsStream(String.format("application-%s.properties", activeProfile));
-			prop.load(input1);
-			String controlUrl = prop.getProperty("http.control.service_data_url", "");
-			String secretKey = prop.getProperty("http.control.secret.key", "");
-			String gpsUrl = prop.getProperty("http.gps.real.url", "");
-
-			AppProperties.setCacheDays(Integer.parseInt(cacheDays));
-			AppProperties.setControlUrl(controlUrl);
-			AppProperties.setSecretKey(secretKey);
-			AppProperties.setGpsUrl(gpsUrl);
-		} catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
 }
 \ No newline at end of file
@@ -38,6 +38,9 @@ public class ElecRedisService implements CommandLineRunner {
     @Autowired
     RedisUtils redisUtils;
+    @Autowired
+    private AppProperties appProperties;
+
     static Logger logger = LoggerFactory.getLogger(ElecRedisService.class);
     private final static String REDIS_KEY_PREFIX = "elec:";
@@ -156,7 +159,7 @@ public class ElecRedisService implements CommandLineRunner {
      * 和数据库同步数据
      */
     public void synchData(Integer days) {
-        int cacheDays = AppProperties.getCacheDays();
+        int cacheDays = appProperties.getCacheDays();
         if (null != days && days < cacheDays)
             cacheDays = days;
         //设置key 序列化器
@@ -38,6 +38,9 @@ public class OilRedisService implements CommandLineRunner {
     @Autowired
     RedisUtils redisUtils;
+    @Autowired
+    private AppProperties appProperties;
+
     static Logger logger = LoggerFactory.getLogger(OilRedisService.class);
     private final static String REDIS_KEY_PREFIX = "oil:";
@@ -189,7 +192,7 @@ public class OilRedisService implements CommandLineRunner {
      * 和数据库同步数据
      */
     public void synchData(Integer days) {
-        int cacheDays = AppProperties.getCacheDays();
+        int cacheDays = appProperties.getCacheDays();
         if (null != days && days < cacheDays)
             cacheDays = days;
         //设置key 序列化器
@@ -44,6 +44,9 @@ public class PlanScheduleRedisService implements CommandLineRunner {
     @Autowired
     RedisUtils redisUtils;
+    @Autowired
+    private AppProperties appProperties;
+
     static Logger logger = LoggerFactory.getLogger(PlanScheduleRedisService.class);
     private final static String REDIS_KEY_PREFIX = "plan:";
@@ -126,7 +129,7 @@ public class PlanScheduleRedisService implements CommandLineRunner {
         Application.mainServices.schedule(new Runnable() {
             @Override
             public void run() {
-                int cacheDays = AppProperties.getCacheDays();
+                int cacheDays = appProperties.getCacheDays();
                 //设置key 序列化器
                 redisTemplate.setKeySerializer(new StringRedisSerializer());
@@ -163,12 +166,15 @@ public class PlanScheduleRedisService implements CommandLineRunner {
         @Autowired
         SchedulePlanInfoRepository planInfoRepository;
+        @Autowired
+        private AppProperties appProperties;
+
         @Override
         public void run() {
             try {
                 logger.info("redis -清理计划排班");
-                int cacheDays = AppProperties.getCacheDays();
+                int cacheDays = appProperties.getCacheDays();
                 DateTime dt = new DateTime();
                 dt = dt.minusDays(cacheDays);
                 String rq = dt.toString("yyyy-MM-dd");
@@ -210,6 +210,9 @@ public class ScheduleRedisService implements CommandLineRunner {
     @Autowired
     ScheduleClearThread scheduleClearThread;
+    @Autowired
+    private AppProperties appProperties;
+
     @Override
     public void run(String... strings) throws Exception {
         //用子线程去加载，，不要阻塞
@@ -218,7 +221,7 @@ public class ScheduleRedisService implements CommandLineRunner {
             public void run() {
             	try {
             		logger.info("redis 实际排班 start...");
-	                int cacheDays = AppProperties.getCacheDays();
+	                int cacheDays = appProperties.getCacheDays();
 	                //设置key 序列化器
 	                redisTemplate.setKeySerializer(new StringRedisSerializer());
@@ -287,10 +290,13 @@ public class ScheduleRedisService implements CommandLineRunner {
         @Autowired
         ScheduleRedisService scheduleRedisService;
+        @Autowired
+        private AppProperties appProperties;
+
         @Override
         public void run() {
             try {
-                int cacheDays = AppProperties.getCacheDays();
+                int cacheDays = appProperties.getCacheDays();
                 DateTime dt = new DateTime();
                 dt = dt.minusDays(cacheDays);
                 String rq = dt.toString("yyyy-MM-dd");
@@ -6,6 +6,7 @@ import com.bsth.util.AppProperties;
 import com.bsth.util.HttpClientUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -21,13 +22,17 @@ import java.util.Map;
 @Component
 @Path("/directive")
 @Produces({MediaType.APPLICATION_JSON})
-public class DirectiveRestService {
+public class DirectiveRestService implements InitializingBean {
-    static String secretKey = AppProperties.getSecretKey();
-    static String url = AppProperties.getControlUrl() + "/send60Phrase?secretKey=" + secretKey;
+    private String secretKey;
+    private String url;
     @Autowired
     SchRealDataBuffer schRealDataBuffer;
+
+    @Autowired
+    private AppProperties appProperties;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
     @POST
@@ -54,4 +59,10 @@ public class DirectiveRestService {
             return null;
         }
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        secretKey = appProperties.getSecretKey();
+        url = appProperties.getControlUrl() + "/send60Phrase?secretKey=" + secretKey;
+    }
 }
@@ -12,6 +12,8 @@ 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.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.io.BufferedReader;
@@ -22,9 +24,12 @@ import java.util.List;
  * Created by panzhao on 2017/3/30.
  */
 @Component
-public class GpsRefreshThread extends Thread{
+public class GpsRefreshThread extends Thread implements InitializingBean {
-    static String url = AppProperties.getGpsUrl();
+    private String url;
+
+    @Autowired
+    private AppProperties appProperties;
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -63,4 +68,9 @@ public class GpsRefreshThread extends Thread{
             logger.error("", e);
         }
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        url = appProperties.getGpsUrl();
+    }
 }
@@ -56,11 +56,14 @@ public class ScheduleRealService implements InitializingBean {
     @Autowired
     private KafkaTemplate kafkaTemplate;
+    @Autowired
+    private AppProperties appProperties;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
-    static String url = AppProperties.getControlUrl();
+    private String url;
-    static String secretKey = AppProperties.getSecretKey();
+    private String secretKey;
     private volatile long timestamp;
@@ -317,65 +320,7 @@ public class ScheduleRealService implements InitializingBean {
     @Override
     public void afterPropertiesSet() throws Exception {
-        /*Application.mainServices.scheduleWithFixedDelay(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    DateTime dateTime = DateTime.now(), preDate = dateTime.minusDays(1);
-                    List<String> dates = new ArrayList<>();
-                    dates.add(dateTime.toString("yyyy-MM-dd"));
-                    dates.add(preDate.toString("yyyy-MM-dd"));
-                    if (timestamp == 0)  {
-                        timestamp = dateTime.minusHours(1).getMillis();
-                    }
-                    List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.findByDates(dates, new Date(timestamp));
-                    timestamp = dateTime.getMillis();
-
-                    Queue<ScheduleRealInfoVo> queue = new ConcurrentLinkedDeque<>();
-                    for (ScheduleRealInfo sch : scheduleRealInfos) {
-                        ScheduleRealInfoVo scheduleRealInfoVo = new ScheduleRealInfoVo();
-                        BeanUtils.copyProperties(sch, scheduleRealInfoVo);
-                        Car car = CarBufferData.findOne(scheduleRealInfoVo.getClZbh());
-                        scheduleRealInfoVo.setCarPlate(car == null ? "" : car.getCarPlate());
-                        queue.add(scheduleRealInfoVo);
-                    }
-
-                    int size = scheduleRealInfos.size();
-                    for (int i = 0, len = size % KAFKA_BATCH_SIZE == 0 ? size / KAFKA_BATCH_SIZE : size / KAFKA_BATCH_SIZE + 1;i < len;i++) {
-                        List<ScheduleRealInfoVo> scheduleRealInfoVos = new ArrayList<>();
-                        for (int j = 0; j < KAFKA_BATCH_SIZE;j++) {
-                            ScheduleRealInfoVo scheduleRealInfoVo = queue.poll();
-                            if (scheduleRealInfoVo == null) {
-                                break;
-                            }
-                            scheduleRealInfoVos.add(scheduleRealInfoVo);
-                        }
-
-                        Map<String, Object> data = new HashMap<>();
-                        data.put("datatype", "waybill");
-                        data.put("datas", scheduleRealInfoVos);
-
-                        ObjectMapper mapper = new ObjectMapper();
-                        String json = mapper.writeValueAsString(data);
-                        logger.info(json);
-                        ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send("PDGJ_JQDD", json);
-                        future.addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
-
-                            @Override
-                            public void onSuccess(SendResult<String, String> result) {
-
-                            }
-
-                            @Override
-                            public void onFailure(Throwable ex) {
-                                logger.error("kafka发送电子路单异常", ex);
-                            }
-                        });
-                    }
-                } catch (Exception e) {
-                    logger.error("kafka发电子路单调度异常", e);
-                }
-            }
-        }, 30, 240, TimeUnit.SECONDS);*/
+        url = appProperties.getControlUrl();
+        secretKey = appProperties.getSecretKey();
     }
 }
@@ -7,6 +7,7 @@ import com.bsth.util.AppProperties;
 import com.bsth.util.HttpClientUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -19,13 +20,18 @@ import java.util.Map;
  * Created by panzhao on 2017/11/9.
  */
 @Component
-public class ExecSchDataRefreshThread extends Thread{
+public class ExecSchDataRefreshThread extends Thread implements InitializingBean {
-    static String secretKey = AppProperties.getSecretKey();
-    static String url = AppProperties.getControlUrl() + "/execSchList?secretKey=" + secretKey;
+    private String secretKey;
+
+    private String url;
     @Autowired
     SchRealDataBuffer schRealDataBuffer;
+
+    @Autowired
+    private AppProperties appProperties;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
     @Override
@@ -45,4 +51,10 @@ public class ExecSchDataRefreshThread extends Thread{
             logger.error("", e);
         }
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        secretKey = appProperties.getSecretKey();
+        url = appProperties.getControlUrl() + "/execSchList?secretKey=" + secretKey;
+    }
 }
@@ -7,6 +7,7 @@ import com.bsth.util.AppProperties;
 import com.bsth.util.HttpClientUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -17,13 +18,17 @@ import java.util.List;
  * Created by panzhao on 2017/9/27.
  */
 @Component
-public class SchInOutDataRefreshThread extends Thread {
+public class SchInOutDataRefreshThread extends Thread implements InitializingBean {
-    static String secretKey = AppProperties.getSecretKey();
-    static String url = AppProperties.getControlUrl() + "/findCurrInAndOut?secretKey=" + secretKey;
+    private String secretKey;
+    private String url;
     @Autowired
     SchRealDataBuffer schRealDataBuffer;
+
+    @Autowired
+    private AppProperties appProperties;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
     @Override
@@ -40,4 +45,10 @@ public class SchInOutDataRefreshThread extends Thread {
             logger.error("", e);
         }
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        secretKey = appProperties.getSecretKey();
+        url = appProperties.getControlUrl() + "/findCurrInAndOut?secretKey=" + secretKey;
+    }
 }
@@ -11,20 +11,28 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 /**
  * Created by panzhao on 2017/3/15.
  */
-public class ControlHttpUtils {
+@Component
+public class ControlHttpUtils implements InitializingBean {
-    static Logger logger = LoggerFactory.getLogger(ControlHttpUtils.class);
+    private static Logger logger = LoggerFactory.getLogger(ControlHttpUtils.class);
-    static String url = AppProperties.getControlUrl();
+    private static String url;
-    static String secretKey = AppProperties.getSecretKey();
+    private static String secretKey;
+
+    @Autowired
+    private AppProperties appProperties;
     /**
      * 从调度系统获取班次信息
@@ -32,6 +40,9 @@ public class ControlHttpUtils {
      * @return
      */
     public static List<ScheduleRealInfo> getCurrentDayPlan(String companyId, String workId) throws IOException {
+        if (secretKey == null || url == null) {
+            return new ArrayList<>();
+        }
         CloseableHttpClient httpClient = null;
         List<ScheduleRealInfo> rs = null;
@@ -57,6 +68,9 @@ public class ControlHttpUtils {
      * @return
      */
     public static List<ScheduleRealInfo> returnJCCInfo(String companyId, String jcOrCc) throws IOException{
+        if (secretKey == null || url == null) {
+            return new ArrayList<>();
+        }
         String method = jcOrCc.equals("out")?"/returnCCInfo":"/returnJCInfo";
@@ -76,4 +90,10 @@ public class ControlHttpUtils {
         rs = JSONArray.parseArray(EntityUtils.toString(response.getEntity()), ScheduleRealInfo.class);
         return rs;
     }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        url = appProperties.getControlUrl();
+        secretKey = appProperties.getSecretKey();
+    }
 }
@@ -9,43 +9,47 @@ import org.springframework.stereotype.Component;
 @Component
 public class AppProperties {
-    private static int cacheDays;
+    private int cacheDays;
-    private static String controlUrl;
+    private String controlUrl;
-    private static String secretKey;
+    private String secretKey;
-    private static String gpsUrl;
+    private String gpsUrl;
-    public static int getCacheDays() {
+    public int getCacheDays() {
         return cacheDays;
     }
-    public static void setCacheDays(int cacheDays) {
-        AppProperties.cacheDays = cacheDays;
+    @Value("${cache.days}")
+    public void setCacheDays(int cacheDays) {
+        this.cacheDays = cacheDays;
     }
-    public static String getControlUrl() {
+    public String getControlUrl() {
         return controlUrl;
     }
-    public static void setControlUrl(String controlUrl) {
-        AppProperties.controlUrl = controlUrl;
+    @Value("${http.control.service_data_url}")
+    public void setControlUrl(String controlUrl) {
+        this.controlUrl = controlUrl;
     }
-    public static String getSecretKey() {
+    public String getSecretKey() {
         return secretKey;
     }
-    public static void setSecretKey(String secretKey) {
-        AppProperties.secretKey = secretKey;
+    @Value("${http.control.secret.key}")
+    public void setSecretKey(String secretKey) {
+        this.secretKey = secretKey;
     }
-    public static String getGpsUrl() {
+    public String getGpsUrl() {
         return gpsUrl;
     }
-    public static void setGpsUrl(String gpsUrl) {
-        AppProperties.gpsUrl = gpsUrl;
+    @Value("${http.gps.real.url}")
+    public void setGpsUrl(String gpsUrl) {
+        this.gpsUrl = gpsUrl;
     }
 }