添加晋能数据权限过滤

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

@@ -0,0 +1,74 @@
+package com.gyee.runeconomy.controller;
+
+import com.gyee.common.model.StringUtils;
+import com.gyee.runeconomy.dto.R;
+import com.gyee.runeconomy.dto.ResultMsg;
+import com.gyee.runeconomy.model.vo.TokenVo;
+import com.gyee.runeconomy.service.TokenService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping("/auth")
+@Api(value = "权限管理", tags = "权限管理")
+public class AuthController {
+
+
+    @Resource
+    private TokenService tokenService;
+
+    @PostMapping("/login")
+    @ResponseBody
+    @ApiOperation(value = "使用账号密码登录")
+    public R login(@RequestBody  TokenVo tokenVo) {
+
+        if (StringUtils.notEmp(tokenVo)) {
+
+            if (!tokenService.sessionMap.containsKey(tokenVo.getToken())) {
+                tokenService.sessionMap.put(tokenVo.getToken(), tokenVo);
+            }
+        }
+
+        return R.data(ResultMsg.ok("ok"));
+    }
+
+    @PostMapping("/logout")
+    @ApiOperation(value = "登出系统")
+    @ResponseBody
+    public R logout(@RequestBody  TokenVo tokenVo) {
+        if (StringUtils.notEmp(tokenVo)) {
+
+            if (tokenService.sessionMap.containsKey(tokenVo.getToken())) {
+                tokenService.sessionMap.remove(tokenVo.getToken());
+            }
+
+            if (tokenService.sessionWtMap.containsKey(tokenVo.getToken())) {
+                tokenService.sessionWtMap.remove(tokenVo.getToken());
+            }
+            if (tokenService.sessionWpMap.containsKey(tokenVo.getToken())) {
+                tokenService.sessionWpMap.remove(tokenVo.getToken());
+
+            }
+            if (tokenService.sessionSubMap.containsKey(tokenVo.getToken())) {
+                tokenService.sessionSubMap.remove(tokenVo.getToken());
+
+            }
+            if (tokenService.sessionWeMap.containsKey(tokenVo.getToken())) {
+                tokenService.sessionWeMap.remove(tokenVo.getToken());
+
+            }
+
+        }
+
+        return R.data(ResultMsg.ok("ok"));
+    }
+
+
+}

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

@@ -12,6 +12,7 @@ import com.gyee.runeconomy.model.auto.ProBasicCompany;
 import com.gyee.runeconomy.model.auto.ProBasicEquipmentPoint;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
 import com.gyee.runeconomy.model.auto.ProBasicSubStation;
+import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.util.DateUtils;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import io.swagger.annotations.ApiOperation;
@@ -19,8 +20,11 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -29,7 +33,8 @@ public class CommonController {
     @Resource
     private IEdosUtil edosUtil;
 
-
+    @Resource
+    private TokenService tokenService;
     /**
      * 查询公司
      *
@@ -96,7 +101,8 @@ public class CommonController {
 
         Map<String, ProBasicPowerstationPoint> powerstationPointMap = wppointmap.get(wpid);
         Map<String, ProBasicPowerstationPoint> substationPointMap =new HashMap<>();
-                List<ProBasicSubStation>  subwpls=CacheContext.subwpls;
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicSubStation> subwpls = tokenService.getSubwpls(request);
         for(ProBasicSubStation sub:subwpls)
         {
             if(sub.getWindpowerstationId().equals(wpid))

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 用户信息表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-25
+ */
+@RestController
+@RequestMapping("//sys-user")
+public class SysUserController {
+
+}

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

@@ -27,53 +27,56 @@ import java.util.stream.Collectors;
 public class CacheContext implements CommandLineRunner {
     Logger logger = LoggerFactory.getLogger(CacheContext.class);
 
-    private final String QS = "0";
+    public final String QS = "0";
 
     @Resource
-    private IProBasicEquipmentService proBasicEquipmentService;
+    public IProBasicEquipmentService proBasicEquipmentService;
     @Resource
-    private IProBasicLineService proBasicLineService;
+    public IProBasicLineService proBasicLineService;
     @Resource
-    private IProBasicProjectService proBasicProjectService;
+    public IProBasicProjectService proBasicProjectService;
 
     @Resource
-    private IProBasicPowerstationService proBasicWindpowerstationService;
+    public IProBasicPowerstationService proBasicWindpowerstationService;
     @Resource
-    private IProBasicMeterPointService proBasicMeterPointService;
+    public IProBasicMeterPointService proBasicMeterPointService;
     @Resource
-    private IProEconEquipmentmodelService proEconEquipmentmodelService;
+    public IProEconEquipmentmodelService proEconEquipmentmodelService;
 
     @Resource
-    private IProBasicWindturbinePowerService proBasicWindturbinePowerService;
+    public IProBasicWindturbinePowerService proBasicWindturbinePowerService;
     @Resource
-    private RedisService redisService;
+    public RedisService redisService;
     @Resource
-    private IProBasicModelPowerService proBasicModelPowerService;
+    public IProBasicModelPowerService proBasicModelPowerService;
     @Resource
-    private IProBasicSubStationService proBasicSubStationService;
+    public IProBasicSubStationService proBasicSubStationService;
     @Resource
-    private IProBasicWeatherStationService proBasicWeatherStationService;
+    public IProBasicWeatherStationService proBasicWeatherStationService;
     @Resource
-    private IProBasicSquareService proBasicSquareService;
+    public IProBasicSquareService proBasicSquareService;
     @Resource
-    private IProBasicCompanyService proBasicCompanyService;
+    public IProBasicCompanyService proBasicCompanyService;
     @Resource
-    private IProBasicRegionService proBasicRegionService;
+    public IProBasicRegionService proBasicRegionService;
     @Resource
-    private IProBasicEnergyGroupService proBasicEnergyGroupService;
+    public IProBasicEnergyGroupService proBasicEnergyGroupService;
     @Resource
-    private IProBasicBranchService proBasicBranchService;
+    public IProBasicBranchService proBasicBranchService;
     @Resource
-    private TheoreticalPowerService theoreticalPowerService;
+    public TheoreticalPowerService theoreticalPowerService;
 
     @Resource
-    private IProBasicModelPowerRdService proBasicModelPowerRdService;
+    public IProBasicModelPowerRdService proBasicModelPowerRdService;
 
     @Resource
-    private IProBasicPowerstationPointService proBasicPowerstationPointService;
+    public IProBasicPowerstationPointService proBasicPowerstationPointService;
 
     @Resource
-    private IProBasicEquipmentPointService proBasicEquipmentPointService;
+    public IProBasicEquipmentPointService proBasicEquipmentPointService;
+
+
+
     public static List<ProBasicBranch> bnls = new ArrayList<>();
     public static List<ProBasicEquipment> wtls = new ArrayList<>();
     public static List<ProBasicProject> pjls = new ArrayList<>();
@@ -151,26 +154,27 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String, Map<Double,ProEconWtPowerCurveFitting>> curveFittingPowerMap = new HashMap<>(); //自算，最优功率
     public static Map<String,List<ProBasicStatusPoint>> statusMap = new HashMap<>();
 
+
     @Override
     public void run(String... args) throws Exception {
         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/mapper/auto/SysUserMapper.java

@@ -0,0 +1,22 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.runeconomy.model.auto.SysUser;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户信息表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-25
+ */
+public interface SysUserMapper extends BaseMapper<SysUser> {
+
+    @Select("SELECT d.nem_code FROM system_dept as d,system_users as u where u.dept_id=d.id and u.id=#{userId} ")
+    public List<String> getUserByuserId(@Param(value = "userId") Long userId);
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/SysUser.java

@@ -0,0 +1,118 @@
+package com.gyee.runeconomy.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 用户信息表
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysUser extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户类型（00系统用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+    /**
+     * 头像地址
+     */
+    private String avatar;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private LocalDateTime loginDate;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/vo/TokenVo.java

@@ -0,0 +1,14 @@
+package com.gyee.runeconomy.model.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TokenVo {
+
+    private String token;
+    private  String userId;
+}

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

@@ -0,0 +1,277 @@
+package com.gyee.runeconomy.service;
+
+import com.gyee.common.model.StringUtils;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.model.vo.TokenVo;
+import com.gyee.runeconomy.service.auto.ISysUserService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Service
+public class TokenService {
+    @Resource
+    private ISysUserService sysUserService;
+
+
+    public static Map<String, List<ProBasicEquipment>> sessionWtMap = new ConcurrentHashMap<>();
+    public static Map<String, List<ProBasicPowerstation>> sessionWpMap = new ConcurrentHashMap<>();
+    public static Map<String,  List<ProBasicSubStation> > sessionSubMap = new ConcurrentHashMap<>();
+    public static Map<String, List<ProBasicWeatherStation>> sessionWeMap = new ConcurrentHashMap<>();
+
+    public static Map<String, TokenVo> sessionMap=  new ConcurrentHashMap<>();
+    public  List<ProBasicEquipment>  getWtls(HttpServletRequest request ) {
+
+        String token = request.getHeader("token");
+        String userId = request.getHeader("userId");
+
+        List<ProBasicEquipment> wtlist = new ArrayList<>();
+        if (StringUtils.notEmp(token) && StringUtils.notEmp(userId))
+        {
+            if (sessionMap.containsKey(token) && !sessionWtMap.containsKey(token)) {
+
+                List<String> depls = sysUserService.getUserByuserId(Long.valueOf(userId));
+                if (!depls.isEmpty()) {
+                    String depId = depls.get(0);
+
+                    if (CacheContext.wpwtmap.containsKey(depId)) {
+                        wtlist.addAll(CacheContext.wpwtmap.get(depId));
+                    } else if (CacheContext.cmwtlsmap.containsKey(depId)) {
+                        wtlist.addAll(CacheContext.cmwtlsmap.get(depId));
+                    } else if (CacheContext.rgwtlsmap.containsKey(depId)) {
+                        wtlist.addAll(CacheContext.rgwtlsmap.get(depId));
+                    }else  if(depId.equals("0"))
+                    {
+                        wtlist.addAll(CacheContext.wtls);
+                    }
+                }
+                sessionWtMap.put(token,wtlist);
+            } else if (sessionMap.containsKey(token) && sessionWtMap.containsKey(token))
+            {
+                wtlist =sessionWtMap.get(token);
+            }
+        }else
+        {
+            wtlist.addAll(CacheContext.wtls);
+
+        }
+        return wtlist;
+    }
+
+    public  List<ProBasicPowerstation>  getWpls(HttpServletRequest request )
+    {
+        String token = request.getHeader("token");
+        String userId = request.getHeader("userId");
+
+        List<ProBasicPowerstation> wplist=new ArrayList<>();
+        if(StringUtils.notEmp(token)  && StringUtils.notEmp(token))
+        {
+            if(sessionMap.containsKey(token) && !sessionWpMap.containsKey(token))
+            {
+
+                List<String> depls= sysUserService.getUserByuserId(Long.valueOf(userId));
+                if(!depls.isEmpty())
+                {
+                    String depId=depls.get(0);
+
+                    if(CacheContext.wpmap.containsKey(depId))
+                    {
+                        wplist.add(CacheContext.wpmap.get(depId));
+                    }else  if(CacheContext.cpwpmap.containsKey(depId))
+                    {
+                        wplist.addAll(CacheContext.cpwpmap.get(depId));
+                    }else  if(CacheContext.rgmap.containsKey(depId))
+                    {
+                        List<ProBasicCompany> rgcpls= CacheContext.rgcpmap.get(depId);
+                        for(ProBasicCompany cp:rgcpls)
+                        {
+                            wplist.addAll(CacheContext.cpwpmap.get(cp.getId()));
+                        }
+                    }else if(depId.equals("0"))
+                    {
+                        wplist=sessionWpMap.get(token);
+                    }else if(depId.equals("0"))
+                    {
+                        wplist.addAll(CacheContext.wpls);
+                    }
+                }
+                sessionWpMap.put(token,wplist);
+            }else if (sessionMap.containsKey(token) && sessionWpMap.containsKey(token))
+            {
+                wplist=sessionWpMap.get(token);
+            }
+
+        }else
+        {
+            wplist.addAll(CacheContext.wpls);
+        }
+        return wplist;
+    }
+
+    public  List<ProBasicSubStation>  getSubwpls(HttpServletRequest request )
+    {
+        String token = request.getHeader("token");
+        String userId = request.getHeader("userId");
+        List<ProBasicSubStation> wplist=new ArrayList<>();
+        if(StringUtils.notEmp(token) && StringUtils.notEmp(userId))
+        {
+            if(!sessionSubMap.containsKey(token))
+            {
+
+                List<String> depls= sysUserService.getUserByuserId(Long.valueOf(userId));
+                if(!depls.isEmpty())
+                {
+                    String depId=depls.get(0);
+
+                    if(CacheContext.wpmap.containsKey(depId))
+                    {
+                        for(ProBasicSubStation subStation:CacheContext.subwpls)
+                        {
+                            if(subStation.getWindpowerstationId().equals(depId))
+                            {
+                                wplist.add(subStation);
+                            }
+                        }
+                    }else  if(CacheContext.cpwpmap.containsKey(depId))
+                    {
+                        List<ProBasicPowerstation> wpls=CacheContext.cpwpmap.get(depId);
+
+                        for(ProBasicPowerstation wp:wpls)
+                        {
+                            for(ProBasicSubStation subStation:CacheContext.subwpls)
+                            {
+                                if(subStation.getWindpowerstationId().equals(wp.getId()))
+                                {
+                                    wplist.add(subStation);
+                                    break;
+                                }
+                            }
+                        }
+                    }else  if(CacheContext.rgmap.containsKey(depId))
+                    {
+                        List<ProBasicCompany> rgcpls= CacheContext.rgcpmap.get(depId);
+                        for(ProBasicCompany cp:rgcpls)
+                        {
+                            List<ProBasicPowerstation> wpls=CacheContext.cpwpmap.get(cp.getId());
+
+                            for(ProBasicPowerstation wp:wpls)
+                            {
+                                for(ProBasicSubStation subStation:CacheContext.subwpls)
+                                {
+                                    if(subStation.getWindpowerstationId().equals(wp.getId()))
+                                    {
+                                        wplist.add(subStation);
+                                        break;
+                                    }
+                                }
+
+                            }
+                        }
+                    }else if(depId.equals("0"))
+                    {
+                        wplist.addAll(CacheContext.subwpls);
+                    }
+                }
+                sessionSubMap.put(token,wplist);
+            }else  if (sessionMap.containsKey(token) && sessionSubMap.containsKey(token))
+            {
+                wplist=sessionSubMap.get(token);
+
+            }
+        }else
+        {
+            wplist.addAll(CacheContext.subwpls);
+        }
+        return wplist;
+    }
+
+
+    public   List<ProBasicWeatherStation>  getWeawpls (HttpServletRequest request )
+    {
+        String token = request.getHeader("token");
+        String userId = request.getHeader("userId");
+
+        List<ProBasicWeatherStation> wplist=new ArrayList<>();
+        if(StringUtils.notEmp(token) && StringUtils.notEmp(userId))
+        {
+            if(!sessionWeMap.containsKey(token))
+            {
+
+                List<String> depls= sysUserService.getUserByuserId(Long.valueOf(userId));
+                if(!depls.isEmpty())
+                {
+                    String depId=depls.get(0);
+
+                    if(CacheContext.wpmap.containsKey(depId))
+                    {
+                        for(ProBasicWeatherStation weatherStation:CacheContext.weawpls)
+                        {
+                            if(weatherStation.getWindpowerstationId().equals(depId))
+                            {
+                                wplist.add(weatherStation);
+                            }
+                        }
+
+                    }else  if(CacheContext.cpwpmap.containsKey(depId))
+                    {
+                        List<ProBasicPowerstation> wpls=CacheContext.cpwpmap.get(depId);
+
+                        for(ProBasicPowerstation wp:wpls)
+                        {
+                            for(ProBasicWeatherStation weatherStation:CacheContext.weawpls)
+                            {
+                                if(weatherStation.getWindpowerstationId().equals(wp.getId()))
+                                {
+                                    wplist.add(weatherStation);
+                                    break;
+                                }
+                            }
+
+                        }
+                    }else  if(CacheContext.rgmap.containsKey(depId))
+                    {
+                        List<ProBasicCompany> rgcpls= CacheContext.rgcpmap.get(depId);
+                        for(ProBasicCompany cp:rgcpls)
+                        {
+                            List<ProBasicPowerstation> wpls=CacheContext.cpwpmap.get(cp.getId());
+
+                            for(ProBasicPowerstation wp:wpls)
+                            {
+                                for(ProBasicWeatherStation weatherStation:CacheContext.weawpls)
+                                {
+                                    if(weatherStation.getWindpowerstationId().equals(wp.getId()))
+                                    {
+                                        wplist.add(weatherStation);
+                                        break;
+                                    }
+                                }
+
+                            }
+                        }
+
+                    }else if(depId.equals("0"))
+                    {
+                        wplist.addAll(CacheContext.weawpls);
+                    }
+                }
+                sessionWeMap.put(token,wplist);
+            }else  if (sessionMap.containsKey(token) && sessionWeMap.containsKey(token))
+            {
+                wplist=sessionWeMap.get(token);
+            }
+
+        }else
+        {
+
+            wplist.addAll(CacheContext.weawpls);
+
+        }
+        return wplist;
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.runeconomy.model.auto.SysUser;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户信息表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-25
+ */
+public interface ISysUserService extends IService<SysUser> {
+
+    public List<String> getUserByuserId(Long userId);
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProBasicEquipmentServiceImpl.java

@@ -1,14 +1,18 @@
 package com.gyee.runeconomy.service.auto.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.SortUtils;
-import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.ProBasicEquipment;
 import com.gyee.runeconomy.mapper.auto.ProBasicEquipmentMapper;
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
+import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.service.auto.IProBasicEquipmentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -22,14 +26,15 @@ import java.util.stream.Collectors;
  */
 @Service
 public class ProBasicEquipmentServiceImpl extends ServiceImpl<ProBasicEquipmentMapper, ProBasicEquipment> implements IProBasicEquipmentService {
-
-
+    @Resource
+    private TokenService tokenService;
     @Override
     public List<ProBasicEquipment> getProBasicEquipmentList(String companyId, String windpowerstationIds, String projectIds, String lineIds,String  type) {
 
-
-        List<ProBasicEquipment> list = CacheContext.wtls;
-
+//
+//        List<ProBasicEquipment> list = CacheContext.wtls;
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicEquipment> list = tokenService.getWtls(request);
         if (StringUtils.isNotEmpty(type) && !type.equals("0")){
             String finalType  =  type.equals("-1") ? "_FDC" : "_GDC";
             list = list.stream().filter(eq-> eq.getWindpowerstationId().indexOf(finalType) >= 0).collect(Collectors.toList());
@@ -62,6 +67,8 @@ public class ProBasicEquipmentServiceImpl extends ServiceImpl<ProBasicEquipmentM
 
     @Override
     public List<ProBasicEquipment> getProBasicEquipmentList(String wpid) {
-        return CacheContext.wtls.stream().filter(i->i.getWindpowerstationId().equals(wpid)).collect(Collectors.toList());
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicEquipment> list = tokenService.getWtls(request);
+        return list.stream().filter(i->i.getWindpowerstationId().equals(wpid)).collect(Collectors.toList());
     }
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconEquipmentInfoDayTopServiceImpl.java

@@ -8,10 +8,15 @@ import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
 import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDayTop;
 import com.gyee.runeconomy.mapper.auto.ProEconEquipmentInfoDayTopMapper;
+import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDayTopService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -29,6 +34,9 @@ import java.util.stream.Collectors;
 @Service
 public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEquipmentInfoDayTopMapper, ProEconEquipmentInfoDayTop> implements IProEconEquipmentInfoDayTopService {
 
+
+    @Resource
+    private TokenService tokenService;
     @Override
     public List<ProEconEquipmentInfoDayTop> getEquipmentInfoDayTopList(String companyId, String windpowerstationId, Integer types, String staType, String date) {
 
@@ -36,10 +44,12 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
 
 
         List<String> wpids = new ArrayList<>();
-        List<ProBasicPowerstation> wplist = CacheContext.wpls;
+ 
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicPowerstation> wplist = tokenService.getWpls(request);
         //场站模糊查询
         if (StringUtils.isNotEmpty(companyId)) {
-            wplist = CacheContext.wpls.stream().filter(wp -> wp.getRegionId().equals(companyId) || wp.getCompanyId().equals(companyId)).collect(Collectors.toList());
+            wplist = wplist.stream().filter(wp -> wp.getRegionId().equals(companyId) || wp.getCompanyId().equals(companyId)).collect(Collectors.toList());
         }
 
         if (StringUtils.isNotEmpty(staType) && !staType.equals("0")) {

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/SysUserServiceImpl.java

@@ -0,0 +1,38 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import com.gyee.runeconomy.mapper.auto.SysUserMapper;
+import com.gyee.runeconomy.model.auto.SysUser;
+import com.gyee.runeconomy.service.auto.ISysUserService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户信息表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-07-25
+ */
+@Service
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
+
+    @Resource
+    private SysUserMapper sysUserMapper;
+    public List<String> getUserByuserId(Long userId) {
+
+        List<String> list =new ArrayList<>();
+        if(StringUtils.notEmp(userId) )
+        {
+
+            list = sysUserMapper.getUserByuserId(userId);
+        }
+
+        return list;
+    }
+}

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

@@ -12,10 +12,14 @@ import com.gyee.common.vo.benchmark.FjjxbmxVo;
 import com.gyee.common.vo.benchmark.WxsslVo;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDay1Service;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
@@ -31,7 +35,8 @@ public class BenchmarkingService {
     private  final String TYPE_LINE = "line";
     private  final String TYPE_WINDTURBINE = "windturbine";
 
-
+    @Resource
+    private TokenService tokenService;
     @Resource
     private IProEconEquipmentInfoDay1Service proEconEquipmentInfoDay1Service;
 
@@ -60,8 +65,9 @@ public class BenchmarkingService {
     }
     public List<ProBasicPowerstation> wpByCplist(String companyids,String  type) {
 
-
-        List<ProBasicPowerstation> list = CacheContext.wpls;
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicPowerstation> list = tokenService.getWpls(request);
+//        List<ProBasicPowerstation> list = CacheContext.wpls;
 
         if (StringUtils.isNotEmpty(type) && !type.equals("0")){
             String finalType  =  type.equals("-1") ? "_FDC" : "_GDC";
@@ -371,7 +377,8 @@ public class BenchmarkingService {
 
     public List<WxsslVo> wxssl(String companys, String type, String wpids, String projectids, String lineids, String beginDate, String endDate, String target, String sort)  {
         List<WxsslVo> resultList = new ArrayList<>();
-        List<ProBasicPowerstation> wpls = CacheContext.wpls;
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
         QueryWrapper<ProEconEquipmentInfoDay1> qw = new QueryWrapper<>();
         StringBuilder sb = new StringBuilder();
 
@@ -712,8 +719,9 @@ public class BenchmarkingService {
      * @return
      */
     private List<WxsslVo> getWxsslSortVos(QueryWrapper<ProEconEquipmentInfoDay1> qw, List<WxsslVo> resultList, String type) {
-
-        Map<String,Integer> station =  CacheContext.wpls
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
+        Map<String,Integer> station =  wpls
                 .stream().collect(Collectors.toMap(ProBasicPowerstation::getId,ProBasicPowerstation::getOrderNum));
 
         List<ProEconEquipmentInfoDay1> list = proEconEquipmentInfoDay1Service.list(qw);

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

@@ -10,10 +10,14 @@ import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
 import com.gyee.runeconomy.model.auto.ProBasicSubStation;
+import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -24,11 +28,15 @@ public class AgcService {
     @Resource
     private IEdosUtil edosUtil;
 
-
+    @Resource
+    private TokenService tokenService;
     public List<AgcVo> monitor(String company, String type) {
 
         List<AgcVo> resultList = new ArrayList<>();
-        List<ProBasicSubStation> subwpls = CacheContext.subwpls;
+
+
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicSubStation> subwpls = tokenService.getSubwpls(request);
         Map<String, ProBasicPowerstation> wpmap = CacheContext.wpmap;
         Map<String, Map<String, ProBasicPowerstationPoint>> subwppointmap = CacheContext.subwppointmap;
         if (company.endsWith("ZGS")) {

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

@@ -11,11 +11,15 @@ import com.gyee.common.util.DoubleUtils;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
 import com.gyee.runeconomy.model.auto.ProBasicWeatherStation;
+import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.util.StringUtils;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -27,12 +31,14 @@ public class AnemometerTowerService {
     @Resource
     private IEdosUtil edosUtil;
 
-
+    @Resource
+    private TokenService tokenService;
     public Map<String,Double> info(String weatherid) throws Exception {
 
         Map<String,Double> resultMap = new HashMap<>();
 
-        List<ProBasicWeatherStation> weawpls = CacheContext.weawpls;
+
+
         Map<String, Map<String, ProBasicPowerstationPoint>> weatherwppointmap = CacheContext.weatherwppointmap;
         List<String> weapoints = new ArrayList<>();
         Map<String, ProBasicPowerstationPoint> powerstationPointMap = weatherwppointmap.get(weatherid);
@@ -80,7 +86,10 @@ public class AnemometerTowerService {
     }
 
     public List<ProBasicWeatherStation> towerByWp(String wpid) {
-        List<ProBasicWeatherStation> weawpls = CacheContext.weawpls;
+
+
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicWeatherStation> weawpls = tokenService.getWeawpls(request);
         return weawpls.stream().filter(wea->wea.getWindpowerstationId().equals(wpid)).collect(Collectors.toList());
     }
 }

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

@@ -8,12 +8,16 @@ import com.gyee.common.model.PointData;
 import com.gyee.common.vo.monitor.CompreVo;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.service.auto.IProEconTestingPointService;
 import com.gyee.runeconomy.util.StringUtils;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -26,7 +30,8 @@ public class ComprehensiveService {
     private IProEconTestingPointService proEconTestingPointService;
     @Resource
     private IEdosUtil edosUtil;
-
+    @Resource
+    private TokenService tokenService;
 
     public List<ProEconTestingPoint> targets(String type) {
         QueryWrapper<ProEconTestingPoint> qw = new QueryWrapper<>();
@@ -64,7 +69,8 @@ public class ComprehensiveService {
     public List<CompreVo> listing(String company, String type, String targets) {
 
         List<CompreVo> resultList = new ArrayList<>();
-        List<ProBasicPowerstation> wpls = CacheContext.wpls;
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
         Map<String, Map<String, ProBasicPowerstationPoint>> wppointmap = CacheContext.wppointmap;
         if (company.endsWith("ZGS")) {
             wpls = wpls.stream().filter(wp -> wp.getCompanyId().equals(company)).collect(Collectors.toList());

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

@@ -14,11 +14,15 @@ import com.gyee.common.vo.monitor.MatrixProVo;
 import com.gyee.common.vo.monitor.MatrixVo;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.util.StringUtils;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -28,9 +32,12 @@ import java.util.stream.Collectors;
 public class MatrixService {
     @Resource
     private IEdosUtil edosUtil;
-
+    @Resource
+    private TokenService tokenService;
     public Map<String, Object> matrixMX(String company, String type) throws Exception {
-        List<ProBasicPowerstation> wpls = CacheContext.wpls;
+
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
 
         Map<String, Double> modelpower = CacheContext.modelpower;
 
@@ -48,7 +55,8 @@ public class MatrixService {
         Map<String, List<ProBasicEquipment>> wpwtmap = CacheContext.wpwtmap;
         Map<String, Map<String, ProBasicPowerstationPoint>> subwppointmap = CacheContext.subwppointmap;
 
-        List<ProBasicSubStation> subwpls = CacheContext.subwpls;
+
+        List<ProBasicSubStation> subwpls = tokenService.getSubwpls(request);
 
         List<MatrixPowerVo> powerVos = new ArrayList<>();
         AtomicInteger jrts = new AtomicInteger();
@@ -274,7 +282,8 @@ public class MatrixService {
 
     public Map<String, Object> basic(String company, String type) {
 
-        List<ProBasicPowerstation> wpls = CacheContext.wpls;
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
 
 
         if (company.endsWith("ZGS")) {
@@ -291,7 +300,8 @@ public class MatrixService {
         Map<String, List<ProBasicEquipment>> wpwtmap = CacheContext.wpwtmap;
         Map<String, Map<String, ProBasicPowerstationPoint>> subwppointmap = CacheContext.subwppointmap;
 
-        List<ProBasicSubStation> subwpls = CacheContext.subwpls;
+
+        List<ProBasicSubStation> subwpls = tokenService.getSubwpls(request);
 
         List<MatrixPowerVo> powerVos = new ArrayList<>();
         AtomicInteger jrts = new AtomicInteger();
@@ -467,7 +477,8 @@ public class MatrixService {
         Map<String, Map<String, ProBasicPowerstationPoint>> wppointmap = CacheContext.wppointmap;
         Map<String, ProBasicPowerstation> wpmap = CacheContext.wpmap;
         Map<String, Map<String, ProBasicPowerstationPoint>> subwppointmap = CacheContext.subwppointmap;
-        List<ProBasicSubStation> subwpls = CacheContext.subwpls;
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicSubStation> subwpls = tokenService.getSubwpls(request);
         Map<String, ProBasicPowerstationPoint> pointMap = wppointmap.get(wpid);
         ProBasicPowerstation powerstation = wpmap.get(wpid);
         List<String> wpPoints = new ArrayList<>();

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

@@ -12,6 +12,7 @@ import com.gyee.runeconomy.dto.PowercurveVo;
 import com.gyee.runeconomy.dto.ProjectplanVo;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.service.auto.*;
 import com.gyee.runeconomy.util.MathUtil;
 import com.gyee.runeconomy.util.StringUtils;
@@ -19,8 +20,11 @@ import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -47,7 +51,8 @@ public class MonitorService {
     @Resource
     private IEdosUtil edosUtil;
     Map<String, Object> map = new HashMap<>();
-
+    @Resource
+    private TokenService tokenService;
 
     public Map getcockpit(String wpId) throws Exception {
 
@@ -57,7 +62,10 @@ public class MonitorService {
             if (CacheContext.wpmapls.containsKey(wpId)) {
                 wplist = CacheContext.wpmapls.get(wpId);
             }
-            for (ProBasicPowerstation wp : CacheContext.wpls) {
+            HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+            List<ProBasicPowerstation> wplsToken = tokenService.getWpls(request);
+
+            for (ProBasicPowerstation wp : wplsToken) {
                 if (wpId.contains(FD)) {
                     if (wp.getId().endsWith("FDC_STA")) {
                         wplist.add(wp);
@@ -112,11 +120,11 @@ public class MonitorService {
 
             /**********************************************首页场站所有风场信息展示统计**********************************************************/
 
-            List<ProBasicPowerstation> wpls1 = CacheContext.wpls;
+
 
             Map<String, Object> station = new LinkedHashMap<>();
-            if (!wpls1.isEmpty()) {
-                for (ProBasicPowerstation wp : wpls1) {
+            if (!wplsToken.isEmpty()) {
+                for (ProBasicPowerstation wp : wplsToken) {
                     Map<String, Object> xx = new LinkedHashMap<>();
                     String id = wp.getId();
                     if (CacheContext.wpmap.containsKey(id) && id.endsWith("FDC_STA")) {
@@ -486,7 +494,9 @@ public class MonitorService {
                     zjrl += wp.getJrCapacity() + wp.getJrwindCapacity();
                 }
             } else {
-                for (ProBasicPowerstation wp : CacheContext.wpls) {
+
+
+                for (ProBasicPowerstation wp : wplsToken) {
                     if (wpId.equals(wp.getId())) {
                         zjrl += wp.getJrCapacity() + wp.getJrwindCapacity();
                     }
@@ -1389,7 +1399,9 @@ public class MonitorService {
             if (CacheContext.wpmapls.containsKey(wpId)) {
                 wplist = CacheContext.wpmapls.get(wpId);
             }
-            for (ProBasicPowerstation wp : CacheContext.wpls) {
+            HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+            List<ProBasicPowerstation> wplsToken = tokenService.getWpls(request);
+            for (ProBasicPowerstation wp : wplsToken) {
                 if (wpId.contains(FD)) {
                     if (wp.getId().endsWith("FDC_STA")) {
                         wplist.add(wp);
@@ -1417,7 +1429,7 @@ public class MonitorService {
                 }
             }
 
-            for (ProBasicPowerstation wp : CacheContext.wpls) {
+            for (ProBasicPowerstation wp : wplsToken) {
                 if (wpId.equals(wp.getId())) {
                     zjrl += wp.getJrCapacity() + wp.getJrwindCapacity();
                 }
@@ -1538,7 +1550,9 @@ public class MonitorService {
             if (CacheContext.wpmapls.containsKey(wpId)) {
                 wplist = CacheContext.wpmapls.get(wpId);
             }
-            for (ProBasicPowerstation wp : CacheContext.wpls) {
+            HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+            List<ProBasicPowerstation> wplsToken = tokenService.getWpls(request);
+            for (ProBasicPowerstation wp : wplsToken) {
                 if (wpId.contains(FD)) {
                     if (wp.getId().endsWith("FDC_STA")) {
                         wplist.add(wp);
@@ -1730,7 +1744,9 @@ public class MonitorService {
             if (CacheContext.wpmapls.containsKey(wpId)) {
                 wplist = CacheContext.wpmapls.get(wpId);
             }
-            for (ProBasicPowerstation wp : CacheContext.wpls) {
+            HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+            List<ProBasicPowerstation> wplsToken = tokenService.getWpls(request);
+            for (ProBasicPowerstation wp : wplsToken) {
                 if (wpId.contains(FD)) {
                     if (wp.getId().endsWith("FDC_STA")) {
                         wplist.add(wp);
@@ -1746,7 +1762,7 @@ public class MonitorService {
             List<ProBasicPowerstation> rglist = new ArrayList<>();
             List<ProBasicRegion> rgls = CacheContext.rgls;
 
-            for (ProBasicPowerstation wp1 : CacheContext.wpls) {
+            for (ProBasicPowerstation wp1 : wplsToken) {
                 for (ProBasicRegion rg : rgls) {
                     if (wpId.contains(rg.getId()) && wpId.contains(wp1.getRegionId())) {
                         rglist.add(wp1);

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

@@ -11,10 +11,14 @@ import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
 import com.gyee.runeconomy.model.auto.ProBasicSubStation;
 import com.gyee.runeconomy.model.auto.ProBasicWeatherStation;
+import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -25,13 +29,18 @@ import java.util.stream.Collectors;
 public class StatusService {
     @Resource
     private IEdosUtil edosUtil;
-
+    @Resource
+    private TokenService tokenService;
 
     public List<StatusVo> monitor(String company, String type) {
         List<StatusVo> resultList = new ArrayList<>();
-        List<ProBasicPowerstation> wpls = CacheContext.wpls;
-        List<ProBasicSubStation> subwpls = CacheContext.subwpls;
-        List<ProBasicWeatherStation> weawpls = CacheContext.weawpls;
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
+
+        List<ProBasicSubStation> subwpls = tokenService.getSubwpls(request);
+//        List<ProBasicWeatherStation> weawpls = CacheContext.weawpls;
+
+        List<ProBasicWeatherStation> weawpls = tokenService.getWeawpls(request);
         Map<String, Map<String, ProBasicPowerstationPoint>> subwppointmap = CacheContext.subwppointmap;
         Map<String, Map<String, ProBasicPowerstationPoint>> weatherwppointmap = CacheContext.weatherwppointmap;
 

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

@@ -11,14 +11,18 @@ import com.gyee.common.vo.specific.SpecificTargetVo;
 import com.gyee.common.vo.specific.SpecificTopVo;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay4Service;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay5Service;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay7Service;
 import com.gyee.runeconomy.service.bmk.BenchmarkingService;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -41,7 +45,8 @@ public class SpecificService {
     private IProEconPowerstationInfoDay7Service proEconPowerstationInfoDay7Service;
     @Resource
     private BenchmarkingService benchmarkingService;
-
+    @Resource
+    private TokenService tokenService;
 
     /**
      * 获取专题分析上面部分
@@ -398,6 +403,10 @@ public class SpecificService {
      * @param monthresultList
      */
     private void setCenterYtqInfo(String companys,String type,String yearmonth, List<SpecificCenterVo> monthresultList) {
+
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicPowerstation> wplsToken = tokenService.getWpls(request);
+        
         String yearString = yearmonth.split("-")[0];
         String year = String.valueOf(Integer.parseInt(yearString) - 1);
         String yearMonth = year+"-"+yearmonth.split("-")[1];
@@ -416,8 +425,8 @@ public class SpecificService {
             qw1.like("foreign_key_id","_GDC_");
         }
         if (companys.endsWith("ZGS")){
-            qw.in("foreign_key_id",CacheContext.wpls.stream().filter(wp->wp.getCompanyId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
-            qw1.in("foreign_key_id",CacheContext.wpls.stream().filter(wp->wp.getCompanyId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
+            qw.in("foreign_key_id",wplsToken.stream().filter(wp->wp.getCompanyId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
+            qw1.in("foreign_key_id",wplsToken.stream().filter(wp->wp.getCompanyId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
         }
         qw.eq("to_char(record_date,'yyyy-MM')",yearMonth);
         qw1.eq("to_char(record_date,'yyyy-MM')",yearMonth);
@@ -482,6 +491,9 @@ public class SpecificService {
      * @param yearresultList
      */
     private void setCenterNtqInfo(String companys,String type,String yearmonth, List<SpecificCenterVo> yearresultList) throws ParseException {
+
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicPowerstation> wplsToken = tokenService.getWpls(request);
         String yearString = yearmonth.split("-")[0];
         String year = String.valueOf(Integer.parseInt(yearString) - 1);
         QueryWrapper<ProEconPowerstationInfoDay4> qw = new QueryWrapper<>();
@@ -498,8 +510,8 @@ public class SpecificService {
             qw1.like("foreign_key_id","_GDC_");
         }
         if (companys.endsWith("ZGS")){
-            qw.in("foreign_key_id",CacheContext.wpls.stream().filter(wp->wp.getCompanyId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
-            qw1.in("foreign_key_id",CacheContext.wpls.stream().filter(wp->wp.getCompanyId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
+            qw.in("foreign_key_id",wplsToken.stream().filter(wp->wp.getCompanyId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
+            qw1.in("foreign_key_id",wplsToken.stream().filter(wp->wp.getCompanyId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
         }
         qw.eq("to_char(record_date,'yyyy')",year);
         qw1.eq("to_char(record_date,'yyyy')",year);
@@ -558,6 +570,9 @@ public class SpecificService {
      * @param monthresultList
      */
     private void setCenterDyInfo(String companys,String type,String yearmonth, List<SpecificCenterVo> monthresultList) {
+
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicPowerstation> wplsToken = tokenService.getWpls(request);
         QueryWrapper<ProEconPowerstationInfoDay4> qw = new QueryWrapper<>();
         QueryWrapper<ProEconPowerstationInfoDay7> qw1 = new QueryWrapper<>();
         qw.select("foreign_key_id,max(ymtbf) ymtbf,max(ymttr) ymttr,avg(rfwjsl) yfwjsl,avg(rztzhjsl) yztzhjsl,avg(rgzxqjsl) ygzxqjsl");
@@ -573,8 +588,8 @@ public class SpecificService {
         }
 
         if (companys.endsWith("ZGS")){
-            qw.in("foreign_key_id",CacheContext.wpls.stream().filter(wp -> wp.getCompanyId().equals(companys)).map(wp -> wp.getId()).collect(Collectors.toList()));
-            qw1.in("foreign_key_id",CacheContext.wpls.stream().filter(wp -> wp.getCompanyId().equals(companys)).map(wp -> wp.getId()).collect(Collectors.toList()));
+            qw.in("foreign_key_id",wplsToken.stream().filter(wp -> wp.getCompanyId().equals(companys)).map(wp -> wp.getId()).collect(Collectors.toList()));
+            qw1.in("foreign_key_id",wplsToken.stream().filter(wp -> wp.getCompanyId().equals(companys)).map(wp -> wp.getId()).collect(Collectors.toList()));
         }
         qw.eq("to_char(record_date,'yyyy-MM')",yearmonth);
         qw1.eq("to_char(record_date,'yyyy-MM')",yearmonth);
@@ -631,6 +646,8 @@ public class SpecificService {
      */
     private void setCenterDnInfo(String companys,String type,String yearmonth, List<SpecificCenterVo> yearresultList) {
 
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicPowerstation> wplsToken = tokenService.getWpls(request);
 
         QueryWrapper<ProEconPowerstationInfoDay4> qw = new QueryWrapper<>();
         QueryWrapper<ProEconPowerstationInfoDay7> qw1 = new QueryWrapper<>();
@@ -646,8 +663,8 @@ public class SpecificService {
             qw1.like("foreign_key_id","_GDC_");
         }
         if (companys.endsWith("ZGS")){
-            qw.in("foreign_key_id",CacheContext.wpls.stream().filter(wp->wp.getCompanyId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
-            qw1.in("foreign_key_id",CacheContext.wpls.stream().filter(wp->wp.getCompanyId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
+            qw.in("foreign_key_id",wplsToken.stream().filter(wp->wp.getCompanyId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
+            qw1.in("foreign_key_id",wplsToken.stream().filter(wp->wp.getCompanyId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
         }
         qw.eq("to_char(record_date,'yyyy')",yearmonth.split("-")[0]);
         qw1.eq("to_char(record_date,'yyyy')",yearmonth.split("-")[0]);

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

@@ -11,12 +11,17 @@ import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
 import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDay5;
 import com.gyee.runeconomy.model.auto.ProEconFaultLiminatedefects;
+import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.service.auto.IProBasicPowerstationService;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDay5Service;
 import com.gyee.runeconomy.service.auto.IProEconFaultLiminatedefectsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -36,7 +41,8 @@ public class ThreeRateService {
     @Autowired
     private IProEconFaultLiminatedefectsService proEconFaultLiminatedefectsService;
 
-
+    @Resource
+    private TokenService tokenService;
     /**
      * 复位及时率
      * @param beginDate
@@ -97,14 +103,15 @@ public class ThreeRateService {
      */
     public List<QxjslDTO> getDefectsEliminatRateList(String companyId, String windpowerstationId,String beginDate, String endDate) {
 
-
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicPowerstation> wplsToken = tokenService.getWpls(request);
         Map<String, Integer> station =  proBasicPowerstationService.list()
                 .stream().collect(Collectors.toMap(ProBasicPowerstation::getId,ProBasicPowerstation::getOrderNum));
 
         List<String> wpids = new ArrayList<>();
         //场站模糊查询
         if (StringUtils.isNotEmpty(companyId)) {
-            List<ProBasicPowerstation> wplist = CacheContext.wpls.stream().filter(wp -> wp.getRegionId().equals(companyId) || wp.getCompanyId().equals(companyId)).collect(Collectors.toList());
+            List<ProBasicPowerstation> wplist =wplsToken.stream().filter(wp -> wp.getRegionId().equals(companyId) || wp.getCompanyId().equals(companyId)).collect(Collectors.toList());
             wpids = wplist.stream().map(ProBasicPowerstation::getId).collect(Collectors.toList());
 
         }

web/runeconomy-xk/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: jn
 #    active: yun
 #    active: xk
 #    active: sd