添加晋能数据权限过滤

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/bmk/BenchmarkingController.java

@@ -79,6 +79,19 @@ public class BenchmarkingController {
         }
     }
 
+    @GetMapping(value = "/wtByWplist")
+    @ApiOperation(value = "设备列表", notes = "设备列表")
+    public R wtByWplist(@RequestParam(value = "wpId", required = true) String wpId) {
+
+        List<ProBasicEquipment> resultList = benchmarkingService.wtByWplist(wpId);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.data(ResultMsg.ok(resultList));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
+
     @GetMapping(value = "/pjByWplist")
     @ApiOperation(value = "项目列表", notes = "项目列表")
     public R pjByWplist(@RequestParam(value = "wpids", required = true) String wpids)  {

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/init/CacheContext.java

@@ -160,21 +160,21 @@ public class CacheContext implements CommandLineRunner {
         logger.info("缓存开始------------------------------------------------------------");
 
 
-        bnls = proBasicBranchService.list();
-        bnls.stream().forEach(bn->{
-            String bnString = redisService.get(bn.getId());
-            Map<String, ProBasicEquipmentPoint> stringWindturbinetestingpointnewMap = JSONObject.parseObject(bnString, new TypeReference<Map<String, ProBasicEquipmentPoint>>() {
-            });
-            bnAimap.put(bn.getId(),stringWindturbinetestingpointnewMap);
-
-            if (wtbnmap.containsKey(bn.getInteverId())){
-                wtbnmap.get(bn.getInteverId()).add(bn);
-            }else {
-                List<ProBasicBranch> bns = new ArrayList<>();
-                bns.add(bn);
-                wtbnmap.put(bn.getInteverId(),bns);
-            }
-        });
+//        bnls = proBasicBranchService.list();
+//        bnls.stream().forEach(bn->{
+//            String bnString = redisService.get(bn.getId());
+//            Map<String, ProBasicEquipmentPoint> stringWindturbinetestingpointnewMap = JSONObject.parseObject(bnString, new TypeReference<Map<String, ProBasicEquipmentPoint>>() {
+//            });
+//            bnAimap.put(bn.getId(),stringWindturbinetestingpointnewMap);
+//
+//            if (wtbnmap.containsKey(bn.getInteverId())){
+//                wtbnmap.get(bn.getInteverId()).add(bn);
+//            }else {
+//                List<ProBasicBranch> bns = new ArrayList<>();
+//                bns.add(bn);
+//                wtbnmap.put(bn.getInteverId(),bns);
+//            }
+//        });
 
         equipmentmodels = proEconEquipmentmodelService.list();
         equipmentmodels.stream().forEach(e->{

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/TokenService.java

@@ -1,5 +1,6 @@
 package com.gyee.runeconomy.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.gyee.common.model.StringUtils;
 import com.gyee.health.util.DateUtils;
 import com.gyee.runeconomy.init.CacheContext;
@@ -79,14 +80,44 @@ public class TokenService {
                     String depId = depls.get(0);
 
                     if (CacheContext.wpwtmap.containsKey(depId)) {
-                        wtlist.addAll(CacheContext.wpwtmap.get(depId));
+
+                        List<ProBasicEquipment> wtls=CacheContext.wpwtmap.get(depId);
+                        for(ProBasicEquipment wt:wtls)
+                        {
+                            ProBasicEquipment newWt=  new ProBasicEquipment();
+                            BeanUtil.copyProperties( wt,newWt);
+                            wtlist.add(newWt);
+                        }
+
                     } else if (CacheContext.cmwtlsmap.containsKey(depId)) {
-                        wtlist.addAll(CacheContext.cmwtlsmap.get(depId));
+
+                        List<ProBasicEquipment> wtls=CacheContext.cmwtlsmap.get(depId);
+                        for(ProBasicEquipment wt:wtls)
+                        {
+                            ProBasicEquipment newWt=  new ProBasicEquipment();
+                            BeanUtil.copyProperties( wt,newWt);
+                            wtlist.add(newWt);
+                        }
+
                     } else if (CacheContext.rgwtlsmap.containsKey(depId)) {
-                        wtlist.addAll(CacheContext.rgwtlsmap.get(depId));
+
+                        List<ProBasicEquipment> wtls=CacheContext.rgwtlsmap.get(depId);
+                        for(ProBasicEquipment wt:wtls)
+                        {
+                            ProBasicEquipment newWt=  new ProBasicEquipment();
+                            BeanUtil.copyProperties( wt,newWt);
+                            wtlist.add(newWt);
+                        }
+
                     }else  if(depId.equals("0"))
                     {
-                        wtlist.addAll(CacheContext.wtls);
+                        for(ProBasicEquipment wt:CacheContext.wtls)
+                        {
+                            ProBasicEquipment newWt=  new ProBasicEquipment();
+                            BeanUtil.copyProperties( wt,newWt);
+                            wtlist.add(newWt);
+                        }
+
                     }
                 }
                 sessionWtMap.put(token,wtlist);
@@ -96,7 +127,12 @@ public class TokenService {
             }
         }else
         {
-            wtlist.addAll(CacheContext.wtls);
+            for(ProBasicEquipment wt:CacheContext.wtls)
+            {
+                ProBasicEquipment newWt=  new ProBasicEquipment();
+                BeanUtil.copyProperties( wt,newWt);
+                wtlist.add(newWt);
+            }
 
         }
         return wtlist;
@@ -120,23 +156,48 @@ public class TokenService {
 
                     if(CacheContext.wpmap.containsKey(depId))
                     {
-                        wplist.add(CacheContext.wpmap.get(depId));
+
+                        ProBasicPowerstation wp= CacheContext.wpmap.get(depId);
+                        ProBasicPowerstation newWp=  new ProBasicPowerstation();
+                        BeanUtil.copyProperties(wp, newWp);
+                        wplist.add(newWp);
                     }else  if(CacheContext.cpwpmap.containsKey(depId))
                     {
-                        wplist.addAll(CacheContext.cpwpmap.get(depId));
+                        List<ProBasicPowerstation> wpls=CacheContext.cpwpmap.get(depId);
+                        for(ProBasicPowerstation wp:wpls)
+                        {
+                            ProBasicPowerstation newWp=  new ProBasicPowerstation();
+                            BeanUtil.copyProperties(wp, newWp);
+                            wplist.add(newWp);
+                        }
+
                     }else  if(CacheContext.rgmap.containsKey(depId))
                     {
                         List<ProBasicCompany> rgcpls= CacheContext.rgcpmap.get(depId);
                         for(ProBasicCompany cp:rgcpls)
                         {
-                            wplist.addAll(CacheContext.cpwpmap.get(cp.getId()));
+                            List<ProBasicPowerstation> wpls=CacheContext.cpwpmap.get(cp.getId());
+                            for(ProBasicPowerstation wp:wpls)
+                            {
+                                ProBasicPowerstation newWp=  new ProBasicPowerstation();
+                                BeanUtil.copyProperties(wp, newWp);
+                                wplist.add(newWp);
+                            }
                         }
+
                     }else if(depId.equals("0"))
                     {
                         wplist=sessionWpMap.get(token);
                     }else if(depId.equals("0"))
                     {
-                        wplist.addAll(CacheContext.wpls);
+                        List<ProBasicPowerstation> wpls=CacheContext.wpls;
+                        for(ProBasicPowerstation wp:wpls)
+                        {
+                            ProBasicPowerstation newWp=  new ProBasicPowerstation();
+                            BeanUtil.copyProperties(wp, newWp);
+                            wplist.add(newWp);
+                        }
+
                     }
                 }
                 sessionWpMap.put(token,wplist);
@@ -147,7 +208,13 @@ public class TokenService {
 
         }else
         {
-            wplist.addAll(CacheContext.wpls);
+            List<ProBasicPowerstation> wpls=CacheContext.wpls;
+            for(ProBasicPowerstation wp:wpls)
+            {
+                ProBasicPowerstation newWp=  new ProBasicPowerstation();
+                BeanUtil.copyProperties(wp, newWp);
+                wplist.add(newWp);
+            }
         }
         return wplist;
     }
@@ -173,7 +240,9 @@ public class TokenService {
                         {
                             if(subStation.getWindpowerstationId().equals(depId))
                             {
-                                wplist.add(subStation);
+                                ProBasicSubStation newSub=  new ProBasicSubStation();
+                                BeanUtil.copyProperties(subStation, newSub);
+                                wplist.add(newSub);
                             }
                         }
                     }else  if(CacheContext.cpwpmap.containsKey(depId))
@@ -186,7 +255,9 @@ public class TokenService {
                             {
                                 if(subStation.getWindpowerstationId().equals(wp.getId()))
                                 {
-                                    wplist.add(subStation);
+                                    ProBasicSubStation newSub=  new ProBasicSubStation();
+                                    BeanUtil.copyProperties(subStation, newSub);
+                                    wplist.add(newSub);
                                     break;
                                 }
                             }
@@ -204,7 +275,9 @@ public class TokenService {
                                 {
                                     if(subStation.getWindpowerstationId().equals(wp.getId()))
                                     {
-                                        wplist.add(subStation);
+                                        ProBasicSubStation newSub=  new ProBasicSubStation();
+                                        BeanUtil.copyProperties(subStation, newSub);
+                                        wplist.add(newSub);
                                         break;
                                     }
                                 }
@@ -213,7 +286,13 @@ public class TokenService {
                         }
                     }else if(depId.equals("0"))
                     {
-                        wplist.addAll(CacheContext.subwpls);
+                        for(ProBasicSubStation subStation:CacheContext.subwpls)
+                        {
+                            ProBasicSubStation newSub=  new ProBasicSubStation();
+                            BeanUtil.copyProperties(subStation, newSub);
+                            wplist.add(newSub);
+                        }
+
                     }
                 }
                 sessionSubMap.put(token,wplist);
@@ -224,7 +303,12 @@ public class TokenService {
             }
         }else
         {
-            wplist.addAll(CacheContext.subwpls);
+            for(ProBasicSubStation subStation:CacheContext.subwpls)
+            {
+                ProBasicSubStation newSub=  new ProBasicSubStation();
+                BeanUtil.copyProperties(subStation, newSub);
+                wplist.add(newSub);
+            }
         }
         return wplist;
     }
@@ -252,7 +336,10 @@ public class TokenService {
                         {
                             if(weatherStation.getWindpowerstationId().equals(depId))
                             {
-                                wplist.add(weatherStation);
+
+                                ProBasicWeatherStation newWeb=  new ProBasicWeatherStation();
+                                BeanUtil.copyProperties(weatherStation, newWeb);
+                                wplist.add(newWeb);
                             }
                         }
 
@@ -266,7 +353,9 @@ public class TokenService {
                             {
                                 if(weatherStation.getWindpowerstationId().equals(wp.getId()))
                                 {
-                                    wplist.add(weatherStation);
+                                    ProBasicWeatherStation newWeb=  new ProBasicWeatherStation();
+                                    BeanUtil.copyProperties(weatherStation, newWeb);
+                                    wplist.add(newWeb);
                                     break;
                                 }
                             }
@@ -285,7 +374,9 @@ public class TokenService {
                                 {
                                     if(weatherStation.getWindpowerstationId().equals(wp.getId()))
                                     {
-                                        wplist.add(weatherStation);
+                                        ProBasicWeatherStation newWeb=  new ProBasicWeatherStation();
+                                        BeanUtil.copyProperties(weatherStation, newWeb);
+                                        wplist.add(newWeb);
                                         break;
                                     }
                                 }
@@ -295,7 +386,12 @@ public class TokenService {
 
                     }else if(depId.equals("0"))
                     {
-                        wplist.addAll(CacheContext.weawpls);
+                        for(ProBasicWeatherStation weatherStation:CacheContext.weawpls)
+                        {
+                            ProBasicWeatherStation newWeb=  new ProBasicWeatherStation();
+                            BeanUtil.copyProperties(weatherStation, newWeb);
+                            wplist.add(newWeb);
+                        }
                     }
                 }
                 sessionWeMap.put(token,wplist);
@@ -306,8 +402,13 @@ public class TokenService {
 
         }else
         {
+            for(ProBasicWeatherStation weatherStation:CacheContext.weawpls)
+            {
+                ProBasicWeatherStation newWeb=  new ProBasicWeatherStation();
+                BeanUtil.copyProperties(weatherStation, newWeb);
+                wplist.add(newWeb);
+            }
 
-            wplist.addAll(CacheContext.weawpls);
 
         }
         return wplist;

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -104,6 +104,15 @@ public class BenchmarkingService {
 
     }
 
+    public List<ProBasicEquipment> wtByWplist(String wpid) {
+
+        List<ProBasicEquipment> wtls=new ArrayList<>();
+        if(StringUtils.notEmp(wpid) && CacheContext.wpwtmap.containsKey(wpid))
+        {
+            wtls=CacheContext.wpwtmap.get(wpid);
+        }
+        return wtls;
+    }
     public List<ProBasicProject> pjByWplist(String wpids) {
         return CacheContext.pjls.stream().filter(pj->wpids.contains(pj.getWindpowerstationId())).collect(Collectors.toList());
     }