升压站矩阵

web/runeconomy-xk/src/main/java/com/gyee/RunEconomyApplication.java

@@ -7,12 +7,15 @@ import lombok.extern.log4j.Log4j2;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.system.ApplicationHome;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
 
 import java.io.File;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 
 @Log4j2
@@ -28,6 +31,8 @@ public class RunEconomyApplication {
         String ip = InetAddress.getLocalHost().getHostAddress();
         String port = env.getProperty("server.port");
         String path = env.getProperty("server.servlet.context-path");
+        ApplicationHome home = new ApplicationHome(RunEconomyApplication.class);
+        String filePath = home.getSource().getParentFile().getAbsolutePath();
 
         createFolder();
 
@@ -37,6 +42,7 @@ public class RunEconomyApplication {
                 "网络地址: \t\thttp://" + ip + ":" + port + path + "\n\t" +
                 "API文档: \t\thttp://" + ip + ":" + port + path + "/swagger-ui.html\n" +
                 "-----------------------------------------------------------------------");
+        log.info(filePath);
 
 
     }

web/runeconomy-xk/src/main/java/com/gyee/neic_service/controller/BoostStationController.java

@@ -4,10 +4,16 @@ import com.gyee.neic_service.model.station.ShapeInfo;
 import com.gyee.neic_service.model.station.SvgFileInfo;
 import com.gyee.neic_service.model.station.SvgInfo;
 import com.gyee.neic_service.service.station.BoostStationSvc;
+import com.gyee.runeconomy.dto.R;
+import com.gyee.runeconomy.dto.ResultMsg;
+import com.gyee.runeconomy.model.auto.ProBasicSubStation;
+import com.gyee.runeconomy.service.auto.IProBasicSubStationService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -21,6 +27,8 @@ import java.util.Collection;
 public class BoostStationController {
     @Resource
     private BoostStationSvc boostStationSvc;
+    @Resource
+    private IProBasicSubStationService subStationService;
 
     /**
      * 获取所有用户自定义图形
@@ -102,8 +110,12 @@ public class BoostStationController {
      * @return
      */
     @GetMapping("/stations")
-    public Object getBoostStationStations() {
-        return boostStationSvc.getBoostStationStations();
+    public ResultMsg getBoostStationStations() {
+//        return boostStationSvc.getBoostStationStations();
+        List<ProBasicSubStation> list = subStationService.list();
+        list=list.stream().filter(l->!"SXJ_KGDL_GJYF02_SBS".equals(l.getId()) && !"SXJ_KGDL_GJYF03_SBS".equals(l.getId())).collect(Collectors.toList());
+
+        return ResultMsg.ok(list);
     }
 
 

web/runeconomy-xk/src/main/java/com/gyee/neic_service/service/station/BoostStationSvc.java

@@ -446,7 +446,7 @@ public class BoostStationSvc {
     public String getSvgFile(String id) {
         BufferedReader bufferedReader = null;
         try {
-            File file = new File(SVG_PATH + id + ".svg");
+            File file = new File("D:\\ruanjian\\sis\\web\\runeconomy-xk\\target\\shapes\\svg\\" + id + ".svg");
             if (!file.exists()) {
                 return "";
             }