页面接口修改

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

@@ -38,7 +38,7 @@ public class ProBasicWeatherStationController {
     public R queryAll() throws Exception {
 
         HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
-        List<ProBasicWeatherStation> wslist = tokenService.getWswpls(request);
+        List<ProBasicWeatherStation> wslist = tokenService.getWeawpls(request);
 
         if (StringUtils.isNotNull(wslist)) {
             return R.data(ResultMsg.ok(wslist));

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

@@ -9,13 +9,17 @@ 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.ProBasicProject;
+import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
 import com.gyee.runeconomy.util.MathUtil;
 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.*;
 
 @Service
@@ -24,6 +28,8 @@ public class ForecastService {
     @Resource
     private IEdosUtil edosUtil;
     @Resource
+    private TokenService tokenService;
+    @Resource
     private IProBasicPowerstationPointService proBasicPowerstationPointService;
 
     public Map<String, Object> getcockpit(String wpId, String beginDate, String endDate) throws Exception {
@@ -454,12 +460,16 @@ public class ForecastService {
         Date currentDate = new Date();
         String wpId = null;
 
-
-        List<ProBasicProject> pjls = CacheContext.pjls;
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        List<ProBasicProject> pjls = tokenService.gePjls(request);
+//        List<ProBasicProject> pjls = CacheContext.pjls;
 
         List<ProBasicProject> pjllist = null;
 
-        List<ProBasicPowerstation> wplLs = CacheContext.wpls;
+//        List<ProBasicPowerstation> wplLs = CacheContext.wpls;
+
+        List<ProBasicPowerstation> wplLs = tokenService.getWpls(request);
+
         SortUtils.sort(wplLs, "orderNum", SortUtils.ASC);
 
         List<ForecastVo> vos = null;

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

@@ -27,7 +27,7 @@ public class TokenService {
 
     public static Map<String, List<ProBasicWeatherStation>> sessionWsMap = new ConcurrentHashMap<>();
     public static Map<String, List<ProBasicWeatherStation>> sessionWeMap = new ConcurrentHashMap<>();
-
+    public static Map<String, List<ProBasicProject>> sessionPjMap = new ConcurrentHashMap<>();
     public static Map<String, TokenVo> sessionMap = new ConcurrentHashMap<>();
 
 
@@ -166,9 +166,7 @@ public class TokenService {
                             }
                         }
 
-                    } else if (depId.equals("0")) {
-                        wplist = sessionWpMap.get(token);
-                    } else if (depId.equals("0")) {
+                    }  else if (depId.equals("0")) {
                         List<ProBasicPowerstation> wpls = CacheContext.wpls;
                         for (ProBasicPowerstation wp : wpls) {
                             ProBasicPowerstation newWp = new ProBasicPowerstation();
@@ -348,77 +346,82 @@ public class TokenService {
     }
 
 
-    public List<ProBasicWeatherStation> getWswpls(HttpServletRequest request) {
+    public List<ProBasicProject> gePjls(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 (!sessionWsMap.containsKey(token)) {
+        List<ProBasicProject> pjlist = new ArrayList<>();
+        if (StringUtils.notEmp(token) && StringUtils.notEmp(token)) {
+            if (sessionMap.containsKey(token) && !sessionPjMap.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 subStation : CacheContext.weawpls) {
-                            if (subStation.getWindpowerstationId().equals(depId)) {
-                                ProBasicWeatherStation newSub = new ProBasicWeatherStation();
-                                BeanUtil.copyProperties(subStation, newSub);
-                                wplist.add(newSub);
-                            }
+                    if (CacheContext.wppromap.containsKey(depId)) {
+
+                        List<ProBasicProject> pjls = CacheContext.wppromap.get(depId);
+                        for(ProBasicProject pj:pjls)
+                        {
+                            ProBasicProject newpj = new ProBasicProject();
+                            BeanUtil.copyProperties(pj, newpj);
+                            pjlist.add(newpj);
                         }
                     } else if (CacheContext.cpwpmap.containsKey(depId)) {
                         List<ProBasicPowerstation> wpls = CacheContext.cpwpmap.get(depId);
-
                         for (ProBasicPowerstation wp : wpls) {
-                            for (ProBasicWeatherStation subStation : CacheContext.weawpls) {
-                                if (subStation.getWindpowerstationId().equals(wp.getId())) {
-                                    ProBasicWeatherStation newSub = new ProBasicWeatherStation();
-                                    BeanUtil.copyProperties(subStation, newSub);
-                                    wplist.add(newSub);
-                                    break;
-                                }
+                            List<ProBasicProject> pjls = CacheContext.wppromap.get(wp.getId());
+                            for(ProBasicProject pj:pjls)
+                            {
+                                ProBasicProject newpj = new ProBasicProject();
+                                BeanUtil.copyProperties(pj, newpj);
+                                pjlist.add(newpj);
                             }
                         }
+
                     } 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 subStation : CacheContext.weawpls) {
-                                    if (subStation.getWindpowerstationId().equals(wp.getId())) {
-                                        ProBasicWeatherStation newSub = new ProBasicWeatherStation();
-                                        BeanUtil.copyProperties(subStation, newSub);
-                                        wplist.add(newSub);
-                                        break;
-                                    }
+                                List<ProBasicProject> pjls = CacheContext.wppromap.get(wp.getId());
+                                for(ProBasicProject pj:pjls)
+                                {
+                                    ProBasicProject newpj = new ProBasicProject();
+                                    BeanUtil.copyProperties(pj, newpj);
+                                    pjlist.add(newpj);
                                 }
 
                             }
                         }
-                    } else if (depId.equals("0")) {
-                        for (ProBasicWeatherStation subStation : CacheContext.weawpls) {
-                            ProBasicWeatherStation newSub = new ProBasicWeatherStation();
-                            BeanUtil.copyProperties(subStation, newSub);
-                            wplist.add(newSub);
+
+                    }else if (depId.equals("0")) {
+                        List<ProBasicPowerstation> wpls = CacheContext.wpls;
+                        for (ProBasicPowerstation wp : wpls) {
+                            List<ProBasicProject> pjls = CacheContext.wppromap.get(wp.getId());
+                            for(ProBasicProject pj:pjls)
+                            {
+                                ProBasicProject newpj = new ProBasicProject();
+                                BeanUtil.copyProperties(pj, newpj);
+                                pjlist.add(newpj);
+                            }
                         }
 
                     }
                 }
-                sessionWsMap.put(token, wplist);
-            } else if (sessionMap.containsKey(token) && sessionWsMap.containsKey(token)) {
-                wplist = sessionWsMap.get(token);
-
+                sessionPjMap.put(token, pjlist);
+            } else if (sessionPjMap.containsKey(token) && sessionPjMap.containsKey(token)) {
+                pjlist = sessionPjMap.get(token);
             }
+
         } else {
-            for (ProBasicWeatherStation subStation : CacheContext.weawpls) {
-                ProBasicWeatherStation newSub = new ProBasicWeatherStation();
-                BeanUtil.copyProperties(subStation, newSub);
-                wplist.add(newSub);
+            List<ProBasicProject> pjls = CacheContext.pjls;
+            for (ProBasicProject wp : pjls) {
+                ProBasicProject newWp = new ProBasicProject();
+                BeanUtil.copyProperties(wp, newWp);
+                pjlist.add(newWp);
             }
         }
-        return wplist;
+        return pjlist;
     }
 }

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

@@ -30,8 +30,9 @@ public class WpwindDayInfoService {
         if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recorddate)) {
 
             QueryWrapper<ProEconWpwindDayInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("windpowerstation_id", wpId)
-                    .eq("record_date", DateUtils.truncate(recorddate));
+            queryWrapper.eq("weather_id", wpId)
+                    .le("record_date", DateUtils.truncate(recorddate))
+                    .ge("record_date", DateUtils.truncate(recorddate));
             list = proEconWpwindDayInfoService.list(queryWrapper);
 //                    .stream().filter(i->
 //                    i.getWindpowerstationId().equals(wpId)

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

@@ -757,17 +757,9 @@ public class SingleAnalysisService {
         vo.setGlyzxxs(0.0);
         if (StringUtils.notEmp(wtId) && StringUtils.notEmp(recordDate) && CacheContext.wtmap.containsKey(wtId)) {
 
+
             ProBasicEquipment wt = CacheContext.wtmap.get(wtId);
             vo.setWindPowerStationId(wt.getWindpowerstationId());
-
-            Map<String, ProEconInOrOutSpeedTotal> iostmap = queryInOrOutSpeedTotalByWt(wtId, recordDate);
-            Map<String, ProEconEquipmentInfoDay1> eqday1map = queryEquipmentInfoDay1ByWt(wtId, recordDate);
-            Map<String, ProEconEquipmentInfoDay2> eqday2map = queryEquipmentInfoDay2ByWt(wtId, recordDate);
-            Map<String, ProEconEquipmentInfoDay4> eqday4map = queryEquipmentInfoDay4ByWt(wtId, recordDate);
-            Map<String, ProEconPowerstationInfoDay5> pwday5map = queryPowerstationInfoDay5(wt.getWindpowerstationId(), recordDate);
-            String wpId = CacheContext.wtmap.get(wtId).getWindpowerstationId();
-
-
             ProBasicPowerstation wp = CacheContext.wpmap.get(wt.getWindpowerstationId());
 
 
@@ -781,6 +773,21 @@ public class SingleAnalysisService {
 
             vo.setWindturbineid(wt.getId());
 
+            Map<String, ProEconInOrOutSpeedTotal> iostmap = queryInOrOutSpeedTotalByWt(wtId, recordDate);
+            Map<String, ProEconEquipmentInfoDay1> eqday1map = queryEquipmentInfoDay1ByWt(wtId, recordDate);
+            Map<String, ProEconEquipmentInfoDay2> eqday2map = queryEquipmentInfoDay2ByWt(wtId, recordDate);
+            Map<String, ProEconEquipmentInfoDay4> eqday4map = queryEquipmentInfoDay4ByWt(wtId, recordDate);
+            Map<String, ProEconPowerstationInfoDay5> pwday5map = queryPowerstationInfoDay5(wt.getWindpowerstationId(), recordDate);
+            String wpId = CacheContext.wtmap.get(wtId).getWindpowerstationId();
+
+
+            if(iostmap.isEmpty() && eqday1map.isEmpty()  && eqday2map.isEmpty()  && pwday5map.isEmpty()  && pwday5map.isEmpty())
+            {
+                return vo;
+            }
+
+
+
             if (pwday5map.containsKey(wpId)) {
                 ProEconPowerstationInfoDay5 day5 = pwday5map.get(wpId);
                 double swdl = day5.getYswdldb().doubleValue();//风场上网电量合计
@@ -1087,8 +1094,35 @@ public class SingleAnalysisService {
 
         SingleAnalysisVo vo = new SingleAnalysisVo();
 
+        vo.setWindturbineName(vo1.getWindturbineName());
+        vo.setWindturbineid(vo1.getWindturbineid());
+        vo.setWindPowerStationName(vo1.getWindPowerStationName());
+        vo.setWindPowerStationId(vo1.getWindPowerStationId());
+
+        vo.setFdl(0.0);
+        vo.setYxxs(0.0);
+        vo.setGzxs(0.0);
+        vo.setJxxs(0.0);
+        vo.setTjxs(0.0);
+        vo.setZdxs(0.0);
+        vo.setRlxs(0.0);
+        vo.setFs(0.0);
+        vo.setSbklyl(0.0);
+        vo.setDxklyxs(0.0);
+        vo.setLyxs(0.0);
+        vo.setYxfss(0.0);
 
-        if (StringUtils.notEmp(vo1) && StringUtils.notEmp(vo2)) {
+        vo.setGzss(0.0);
+        vo.setJxss(0.0);
+        vo.setXdss(0.0);
+        vo.setXnss(0.0);
+        vo.setSlss(0.0);
+        vo.setXfqr(0.0);
+        vo.setXfqrhgl(0.0);
+        vo.setJfpl(0.0);
+        vo.setLlfdl(0.0);
+        vo.setGlyzxxs(0.0);
+        if (StringUtils.notEmp(vo1) && StringUtils.notEmp(vo2) &&  vo2.getFdl()!=0 &&  vo2.getFs()!=0) {
 
             vo.setWindturbineName(vo1.getWindturbineName());
             vo.setWindturbineid(vo1.getWindturbineid());
@@ -1229,6 +1263,7 @@ public class SingleAnalysisService {
             vo.setLyxs(StringUtils.round(lyxs, 2));
             vo.setYxfss(StringUtils.round(yxfss, 2));
 
+
             if (vo2.getGlyzxxs() != 0) {
                 glyzxxs = new BigDecimal(vo1.getGlyzxxs()).divide(new BigDecimal(vo2.getGlyzxxs()), 2, RoundingMode.HALF_UP).subtract(new BigDecimal(1)).multiply(new BigDecimal(100)).doubleValue();//风机平均功率一致性系数
 

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

@@ -106,14 +106,16 @@ 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()
+        List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
+        Map<String, Integer> station = wpls
                 .stream().collect(Collectors.toMap(ProBasicPowerstation::getId, ProBasicPowerstation::getOrderNum));
 
         List<String> wpids = new ArrayList<>();
         //场站模糊查询
-        if (StringUtils.isNotEmpty(companyId)) {
-            List<ProBasicPowerstation> wplist = wplsToken.stream().filter(wp -> wp.getRegionId().equals(companyId) || wp.getCompanyId().equals(companyId)).collect(Collectors.toList());
+        if (StringUtils.isNotEmpty(companyId) && CacheContext.cpwpmap.containsKey(companyId)) {
+           // List<ProBasicPowerstation> wplist = wplsToken.stream().filter(wp -> wp.getRegionId().equals(companyId) || wp.getCompanyId().equals(companyId)).collect(Collectors.toList());
+
+            List<ProBasicPowerstation> wplist=CacheContext.cpwpmap.get(companyId);
             wpids = wplist.stream().map(ProBasicPowerstation::getId).collect(Collectors.toList());
 
         }
@@ -123,12 +125,14 @@ public class ThreeRateService {
 
         List<QxjslDTO> resultList = new ArrayList<>();
         QueryWrapper<ProEconFaultLiminatedefects> qw = new QueryWrapper<>();
-        qw.select("windpowerstation_id,sum(fault_count) faultcount,sum(right_count) rightcount");
+        qw.select(" windpowerstation_id,sum(fault_count) faultcount,sum(right_count) rightcount ");
+        qw.in("windpowerstation_id",wpids);
         qw.ge("date_time", DateUtils.parseDate(beginDate)).le("date_time", DateUtils.parseDate(endDate));
-        if (wpids.size() > 0) {
-            qw.lambda().in(ProEconFaultLiminatedefects::getWindpowerstationId, wpids);
 
-        }
+//        if (wpids.size() > 0) {
+//            qw.lambda().in(ProEconFaultLiminatedefects::getWindpowerstationId, wpids);
+//
+//        }
 
         qw.groupBy("windpowerstation_id");
         List<ProEconFaultLiminatedefects> faulteliminatedefectsList = proEconFaultLiminatedefectsService.list(qw);