逻辑测点缓存

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

@@ -62,6 +62,9 @@ public class CacheContext implements CommandLineRunner {
     @Autowired
     private IProBasicModelPowerService proBasicModelPowerService; //设备类型
 
+    @Autowired
+    private IProEconTestingPointService proEconTestingPointService;//逻辑测点
+
     //集团
     public static Map<String, ProBasicEnergyGroup> energymap = new HashMap<>();
     public static List<ProBasicEnergyGroup> groups = new ArrayList<>();
@@ -128,6 +131,11 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String, ProBasicModelPower> modelMap = new HashMap<>();
     public static Map<String, List<ProBasicModelPower>> pomodelMap = new HashMap<>();
 
+    //设备类型
+    public static List<ProEconTestingPoint> tpls = new ArrayList<>();
+    public static Map<String, ProEconTestingPoint> tpMap = new HashMap<>();
+
+
     @Override
     public void run(String... args) throws Exception {
         System.out.println(">>>>>>>>>>>>>>>服务启动，正在缓存数据<<<<<<<<<<<<<<");
@@ -169,6 +177,9 @@ public class CacheContext implements CommandLineRunner {
         //设备类型
         initModelPowerList();
 
+        //初始化逻辑测点
+        initProEconTestingPointList();
+
         System.out.println(">>>>>>>>>>>>>>>数据缓存完成<<<<<<<<<<<<<<");
 
     }
@@ -379,4 +390,18 @@ public class CacheContext implements CommandLineRunner {
             modelMap.put(model.getId(), model);
         });
     }
+
+
+    /**
+     * 初始化逻辑测点
+     */
+    public void initProEconTestingPointList(){
+        tpls.clear();
+        tpMap.clear();
+        tpls = proEconTestingPointService.list();
+        tpls.stream().forEach(tp -> {
+            tpMap.put(tp.getId(),tp );
+        });
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.gyee.backconfig.controller;
 
 
 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.IProEconTestingPointService;
@@ -32,7 +33,8 @@ public class ProEconTestingPointController {
     @Autowired
     private IProEconTestingPointService proEconTestingPointService;
 
-
+    @Autowired
+    private CacheContext cacheContext;
     /**
      * 逻辑测点list
      * @param id
@@ -74,6 +76,7 @@ public class ProEconTestingPointController {
 
         boolean b = proEconTestingPointService.saveOrUpdate(proEconTestingPoint);
         if (b) {
+            cacheContext.initProEconTestingPointList();
             return R.ok().data(b);
         } else {
             return R.error().data("保存失败！");
@@ -92,6 +95,7 @@ public class ProEconTestingPointController {
         String[] strings = ids.split(",");
         boolean b = proEconTestingPointService.removeByIds(Arrays.asList(strings));
         if (b) {
+            cacheContext.initProEconTestingPointList();
             return R.ok().data(b);
         } else {
             return R.error().data("删除失败！");

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

@@ -127,7 +127,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
     public List<ProBasicPowerstationPoint> initalSs(String station,String[] setpoints) {
         List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();
 
-        List<ProEconTestingPoint> ls = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("zq")).collect(Collectors.toList());
+        List<ProEconTestingPoint> ls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("zq")).collect(Collectors.toList());
         //获取场站
         for (ProBasicPowerstation postation : CacheContext.wpls) {
             if (null != station && !"".equals(station) && !station.equals(postation.getId())) {
@@ -226,8 +226,8 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
     public List<ProBasicPowerstationPoint> initalWs(String station,String[] setpoints) {
         List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();
 
-        List<ProEconTestingPoint> fcs = proEconTestingPointService.list().stream().filter(i ->  i.getTypeId().equals("cft")).collect(Collectors.toList());
-        List<ProEconTestingPoint> gcs = proEconTestingPointService.list().stream().filter(i ->  i.getTypeId().equals("qxz")).collect(Collectors.toList());
+        List<ProEconTestingPoint> fcs = CacheContext.tpls.stream().filter(i ->  i.getTypeId().equals("cft")).collect(Collectors.toList());
+        List<ProEconTestingPoint> gcs = CacheContext.tpls.stream().filter(i ->  i.getTypeId().equals("qxz")).collect(Collectors.toList());
         //获取场站
         for (ProBasicPowerstation postation : CacheContext.wpls) {
             if (null != station && !"".equals(station) && !station.equals(postation.getId())) {
@@ -335,7 +335,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
     public List<ProBasicPowerstationPoint> initalSbs(String station,String[] setpoints) {
         List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();
 
-        List<ProEconTestingPoint> ls = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("fggl") || i.getTypeId().equals("agc") || i.getTypeId().equals("agcjsfw") ).collect(Collectors.toList());
+        List<ProEconTestingPoint> ls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("fggl") || i.getTypeId().equals("agc") || i.getTypeId().equals("agcjsfw") ).collect(Collectors.toList());
         //获取场站
         for (ProBasicPowerstation postation : CacheContext.wpls) {
             if (null != station && !"".equals(station) && !station.equals(postation.getId())) {
@@ -431,9 +431,9 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
         List<ProBasicEquipmentPoint> allpoints = new ArrayList<>();
 
-        List<ProEconTestingPoint> fdls = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("fj") || i.getTypeId().equals("fjjsfw")).collect(Collectors.toList());
+        List<ProEconTestingPoint> fdls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("fj") || i.getTypeId().equals("fjjsfw")).collect(Collectors.toList());
 
-        List<ProEconTestingPoint> gfls = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("gf") || i.getTypeId().equals("gfjsfw")).collect(Collectors.toList());
+        List<ProEconTestingPoint> gfls = CacheContext.tpls.stream().filter(i -> i.getTypeId().equals("gf") || i.getTypeId().equals("gfjsfw")).collect(Collectors.toList());
 
         for (ProBasicPowerstation wp : CacheContext.wpls) {
 
@@ -594,14 +594,14 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
     public List<ProBasicPowerstationPoint> initalFc() {
 
-        List<ProEconTestingPoint> pointls = proEconTestingPointService.list().stream()
+        List<ProEconTestingPoint> pointls = CacheContext.tpls.stream()
                 .filter(i -> i.getTypeId().equals(FCJSFW) || i.getTypeId().equals(GCJSFW)).collect(Collectors.toList());
 
         pointls = pointls.stream().filter(DistinctObject.distinctByKey(p->p.getUniformCode())).collect(Collectors.toList());
 
-        List<ProEconTestingPoint> fdpointls = proEconTestingPointService.list().stream()
+        List<ProEconTestingPoint> fdpointls = CacheContext.tpls.stream()
                 .filter(i -> i.getTypeId().equals(FCJSFW)).collect(Collectors.toList());
-        List<ProEconTestingPoint> gfpointls = proEconTestingPointService.list().stream()
+        List<ProEconTestingPoint> gfpointls = CacheContext.tpls.stream()
                 .filter(i -> i.getTypeId().equals(GCJSFW)).collect(Collectors.toList());