线路总数固定84

ljq
1 parent 9c9f8a96
Showing 3 changed files with 36 additions and 9 deletions
src/main/java/com/bsth/server_rs/number/NumberService.java
src/main/java/com/bsth/util/ConfigUtil.java
src/main/resources/xlnum.properties
 package com.bsth.server_rs.number;
-import com.bsth.Application;
 import com.bsth.server_rs.bigdata.BigdataService;
 import com.bsth.server_rs.gps.GpsRestService;
 import com.bsth.server_rs.gps.entity.GpsEntity;
+import com.bsth.util.ConfigUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import javax.ws.rs.GET;
@@ -16,12 +15,11 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 @Component
 @Path("/number")
 @Produces({MediaType.APPLICATION_JSON})
-public class NumberService implements CommandLineRunner{
+public class NumberService {
     @Autowired
     GpsRestService gpsRestService;
@@ -41,7 +39,10 @@ public class NumberService implements CommandLineRunner{
     @GET
     @Path("/xlnum")
     public Map lxnum() {
-        return XlThread.pule();
+        Map<String,Integer> map = new HashMap<>();
+        Integer xlnum = Integer.parseInt(ConfigUtil.getProperty("xlnum"));
+        map.put("xlnum",xlnum);
+        return map;
     }
     /**
@@ -124,8 +125,8 @@ public class NumberService implements CommandLineRunner{
     }
-    @Override
+  /*  @Override
     public void run(String... strings) throws Exception {
         Application.mainServices.scheduleWithFixedDelay(xlThread, 10, 60 * 60, TimeUnit.SECONDS);//查询线路总数
-    }
+    }*/
 }
 package com.bsth.util;
-public class ConfigUtil {
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Properties;
+public class ConfigUtil {
+	private final static Logger log = LoggerFactory.getLogger(ConfigUtil.class);
+	private static Properties prop = new Properties();
 	static Tools tools;
-	
+
 	static{
 		tools = new Tools("application.properties");
 		String active = tools.getValue("spring.profiles.active");
 		tools = new Tools("application-"+active+".properties");
+		tools = new Tools("application-"+active+".properties");
+		load();
 	}
 	public static String get(String key){
 		return tools.getValue(key);
 	}
+	/**
+	 * 从全局配置文件从获取数据
+	 * @param key 键
+	 * @return
+	 */
+	public static String getProperty(String key) {
+		return prop.getProperty(key);
+	}
+	public static void load() {
+		try {
+			prop.load(ConfigUtil.class.getResourceAsStream("/xlnum.properties"));
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			log.error("加载lxnum.properties配置文件失败，请检查。。。", e);
+		}
+	}
 }
+xlnum= 84
 \ No newline at end of file