代码修改

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/BackConfigMain.java

@@ -7,13 +7,14 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
 @Log4j2
 @SpringBootApplication
-//@EnableDiscoveryClient
+@EnableAsync
 @MapperScan("com.gyee.backconfig.mapper")
 public class BackConfigMain {
 

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProEconTestingPointController.java

@@ -5,15 +5,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.CacheContext;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProEconTestingPoint;
+import com.gyee.backconfig.service.auto.AsysncGeneratePointService;
 import com.gyee.backconfig.service.auto.IProEconTestingPointService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -35,6 +36,9 @@ public class ProEconTestingPointController {
 
     @Autowired
     private CacheContext cacheContext;
+
+    @Autowired
+    private AsysncGeneratePointService asysncTestService;
     /**
      * 逻辑测点list
      * @param id
@@ -105,7 +109,7 @@ public class ProEconTestingPointController {
 
     /**
      * 测点生成器
-     * @param points 测点，多条逗号隔开 默认空：全部
+     * @param points 测点，数组 默认空：全部
      * @param station 场站 默认空（全场）
      * @param type fj:风机测点；fc:风场测点；sbs:变电所测点；ws:气象站测点；sq:方正测点 默认空：全部
      * @return
@@ -115,8 +119,9 @@ public class ProEconTestingPointController {
     public R generatePoint(@RequestParam(value = "points", required = false) String[] points,
                            @RequestParam(value = "station", required = false) String station,
                            @RequestParam(value = "type", required = false) String type) {
+
         try {
-            proEconTestingPointService.generatePoint(station, points, type);
+            asysncTestService.generatePoint(station, points, type);
         } catch (Exception e) {
             e.printStackTrace();
             return R.error();
@@ -124,6 +129,24 @@ public class ProEconTestingPointController {
         return R.ok().data(true);
     }
 
+    /**
+     * 测点分类列表
+     * @param type fj:风机测点；fc:风场测点；sbs:变电所测点；ws:气象站测点；sq:方正测点 默认空：全部
+     * @return
+     */
+    @PostMapping(value = "/type-point-list")
+    @ApiOperation(value = "测点分类列表", notes = "测点分类列表")
+    public R generateTypePointList( @RequestParam(value = "type", required = false) String type) {
+        List<ProEconTestingPoint>  list = new ArrayList<>();
+        try {
+            list = proEconTestingPointService.generateTypePointList(type);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error();
+        }
+        return R.ok().data(list);
+    }
+
 
 
     @PostMapping(value = "/generateSubStationPoint")
@@ -166,4 +189,6 @@ public class ProEconTestingPointController {
         }
         return R.ok().data(true);
     }
+
+
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/AsysncGeneratePointService.java

@@ -0,0 +1,19 @@
+package com.gyee.backconfig.service.auto;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AsysncGeneratePointService {
+
+
+
+    @Autowired
+    private IProEconTestingPointService proEconTestingPointService;
+
+    @Async
+    public  void generatePoint(String station,String[] points,String type){
+        proEconTestingPointService.generatePoint(station,points,type);
+    }
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProEconTestingPointService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gyee.backconfig.model.auto.ProEconTestingPoint;
 
+import java.util.List;
+
 /**
  * <p>
  * 逻辑测点 服务类
@@ -24,5 +26,5 @@ public interface IProEconTestingPointService extends IService<ProEconTestingPoin
 
      IPage<ProEconTestingPoint> list (String id,String nemCode, String name,String model,String uniformCode, String isDisplay,String pageNum, String pageSize);
 
-
+     List<ProEconTestingPoint> generateTypePointList(String type);
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProEconTestingPointServiceImpl.java

@@ -58,7 +58,6 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
         List<ProBasicEquipmentPoint> equipmentPoints =  new ArrayList<>();
         List<ProBasicPowerstationPoint> powerstationPoints = new ArrayList<>();
 
-
         switch (type){
             case "fj":
                 equipmentPoints = initalFj(station, setpoints);
@@ -87,9 +86,6 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                 generateSquareStationPoint(station, setpoints);
                 break;
         }
-
-
-
     }
 
     @Override
@@ -116,6 +112,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
     }
 
+
     @Override
     public IPage<ProEconTestingPoint> list(String id, String nemCode, String name, String model, String uniformCode, String isDisplay, String pageNum, String pageSize) {
         QueryWrapper<ProEconTestingPoint> qw = new QueryWrapper<>();
@@ -145,6 +142,38 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
     }
 
 
+
+
+    @Override
+    public List<ProEconTestingPoint> generateTypePointList(String type) {
+        List<ProEconTestingPoint> list = new ArrayList<>();
+        switch (type) {
+            case "fj":
+                list = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("gf") ||  i.getTypeId().equals("fj") || i.getTypeId().equals("fjjsfw")  || i.getTypeId().equals("gfjsfw")).collect(Collectors.toList());
+                break;
+            case "fc":
+                list = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals(FCJSFW) || i.getTypeId().equals(GCJSFW)).collect(Collectors.toList());
+                break;
+            case "sbs":
+                list = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("fggl") || i.getTypeId().equals("agc") || i.getTypeId().equals("agcjsfw") ).collect(Collectors.toList());
+                break;
+            case "ws":
+                list = CacheContext.tpls.stream().filter(i ->  i.getTypeId().equals("cft") || i.getTypeId().equals("qxz")).collect(Collectors.toList());
+                break;
+            case "sq":
+                list= CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("zq")).collect(Collectors.toList());
+                break;
+            default:
+                list= CacheContext.tpls;
+                break;
+        }
+
+        return list;
+    }
+
+
+
+
     /**
      * 阵区测点
      * @param station