首页代码提交，性能等级评估代码提交

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

@@ -50,10 +50,11 @@ public class ProEconEquipmentInfoDayTopController {
             @RequestParam(value = "windpowerstationId", required = false) String windpowerstationId,
             @RequestParam(value = "types", required = true) Integer types,
             @RequestParam(value = "staType", required = true) String staType,
+            @RequestParam(value = "date", required = true) String date,
             @RequestParam(value = "pageNum", required = true) Integer pageNum,
             @RequestParam(value = "pageSize", required = true) Integer pageSize){
 
-        List<ProEconEquipmentInfoDayTop> list = proEconEquipmentInfoDayTopService.getEquipmentInfoDayTopList(companyId, windpowerstationId, types, staType,pageNum,pageSize);
+        List<ProEconEquipmentInfoDayTop> list = proEconEquipmentInfoDayTopService.getEquipmentInfoDayTopList(companyId, windpowerstationId, types, staType,date,pageNum,pageSize);
         if (null != list) {
             return R.data(ResultMsg.ok(list));
         } else {

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

@@ -18,7 +18,7 @@ public interface IProEconEquipmentInfoDayTopService extends IService<ProEconEqui
 
 
     /** 管理列表*/
-    List<ProEconEquipmentInfoDayTop> getEquipmentInfoDayTopList(String companyId, String windpowerstationId, Integer types, String staType,Integer pageNum,Integer pageSize);
+    List<ProEconEquipmentInfoDayTop> getEquipmentInfoDayTopList(String companyId, String windpowerstationId, Integer types, String staType,String date,Integer pageNum,Integer pageSize);
 
 
     /** 历史数据 */

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

@@ -41,7 +41,7 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
     @Resource
     private ProEconEquipmentInfoDayTopMapper proEconEquipmentInfoDayTopMapper;
     @Override
-    public List<ProEconEquipmentInfoDayTop> getEquipmentInfoDayTopList(String companyId, String windpowerstationId, Integer types, String staType,Integer pageNum,Integer pageSize) {
+    public List<ProEconEquipmentInfoDayTop> getEquipmentInfoDayTopList(String companyId, String windpowerstationId, Integer types, String staType,String date,Integer pageNum,Integer pageSize) {
 
         QueryWrapper<ProEconEquipmentInfoDayTop> qw = new QueryWrapper<>();
         Page<ProEconEquipmentInfoDayTop> page = new Page<>(pageNum, pageSize);
@@ -50,6 +50,20 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
         int currentMonth = calendar.get(Calendar.MONTH) + 1;
         Year currentYear = Year.now();
 
+        String str1 = null;
+        String str = date;
+        str1 = str.substring(0, 4);
+//        int index = str.indexOf("-");
+//        String result = str.substring(index + 1);
+
+        int index = str.indexOf("-");
+        String result;
+        if (index != -1 && index + 1 < str.length() && str.charAt(index + 1) == '0') {
+            result = str.substring(index + 2);
+        } else {
+            result = str.substring(index + 1);
+        }
+
         List<String> wpids = new ArrayList<>();
 
         HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
@@ -78,16 +92,17 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
 //            qw.lambda().eq(ProEconEquipmentInfoDayTop::getRecordDate, DateUtils.parseDate(date));
 //        }
         if (null != types && types.equals(1)) {
-            qw.lambda().eq(ProEconEquipmentInfoDayTop::getRecordDate, today);
+            qw.lambda().eq(ProEconEquipmentInfoDayTop::getRecordDate, DateUtils.parseDate(date));
             qw.lambda().eq(ProEconEquipmentInfoDayTop::getTypes, 1);
         }
         if (null != types && types.equals(2)) {
-            qw.lambda().eq(ProEconEquipmentInfoDayTop::getMonth, currentMonth);
-            qw.lambda().eq(ProEconEquipmentInfoDayTop::getYear, currentYear);
-            qw.lambda().eq(ProEconEquipmentInfoDayTop::getTypes, 2);
+
+            qw.lambda().eq(ProEconEquipmentInfoDayTop::getMonth, Integer.valueOf(result));
+            qw.lambda().eq(ProEconEquipmentInfoDayTop::getYear, Integer.valueOf(str1));
+            qw.lambda().eq(ProEconEquipmentInfoDayTop::getTypes,2);
         }
         if (null != types && types.equals(3)) {
-            qw.lambda().eq(ProEconEquipmentInfoDayTop::getYear, currentYear);
+            qw.lambda().eq(ProEconEquipmentInfoDayTop::getYear, Integer.valueOf(str1));
             qw.lambda().eq(ProEconEquipmentInfoDayTop::getTypes, 3);
         }
 

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

@@ -564,11 +564,13 @@ public class MonitorService {
                 }else if (wpId.contains(FD)){
                     //实时功率
                     ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
-                    sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble() + (fdlr * 1000);
+                    sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble()+ (fdlr * 1000);
+                    sjgl = sjgl/1000;
                 }else if (wpId.contains(GF)) {
                     //实时功率
                     ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
                     sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble() + (gflr * 1000);
+                    sjgl = sjgl/1000;
                 }
 
 
@@ -624,10 +626,12 @@ public class MonitorService {
                 if (wpId.contains(FD)) {
                     ProBasicPowerstationPoint fdsjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
                     fdsjgl = edosUtil.getRealData(fdsjglvalue).getPointValueInDouble()+ (fdlr * 1000);
+                    fdsjgl = fdsjgl/1000;
                 }
                 if (wpId.contains(GF)) {
                     ProBasicPowerstationPoint gfsjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
                     gfsjgl = edosUtil.getRealData(gfsjglvalue).getPointValueInDouble()+ (gflr * 1000);
+                    gfsjgl = gfsjgl/1000;
                 }
 
                 for (ProBasicPowerstation wp : wplist) {
@@ -2067,6 +2071,10 @@ public class MonitorService {
             vo.setValue1(0.0); //实际功率
             vo.setValue2(0.0); //风电实际功率
             vo.setValue3(0.0); //光伏实际功率
+            vo.setValue4(0.0); //实时风速
+            vo.setValue5(0.0); //理论功率
+            vo.setValue6(0.0); //平均光照度
+            vo.setValue7(0.0); //风能利用率
             vo.setHours(i);  //时间戳
             vo.setName(wpId);
             vos.add(vo);
@@ -2104,6 +2112,50 @@ public class MonitorService {
                 }
             }
         }
+
+        ProBasicPowerstationPoint ssfs = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSPJFS);
+        ProBasicPowerstationPoint llgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.TPOINT_WP_YCGL); //预测功率
+//        ProBasicPowerstationPoint sjgl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
+        ProBasicPowerstationPoint gzzs = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.RPJGZD);
+        ProBasicPowerstationPoint fnlyl = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.FNLYL);
+
+        if (uniformCode.contains("SSPJFS")) {
+
+            List<PointData> ssfsls = edosUtil.getHistoryDatasSnap(ssfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600L);
+            double temp4 = 0;
+            for (int i = 0; i < ssfsls.size(); i++) {
+                temp4 = ssfsls.get(i).getPointValueInDouble();
+                vos.get(i).setValue4(StringUtils.round(temp4, 2));
+            }
+        }
+
+        if (uniformCode.contains("SSZLLGL")) {
+            List<PointData> llglls = edosUtil.getHistoryDatasSnap(llgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600L);
+            double temp5 = 0;
+            for (int i = 0; i < llglls.size(); i++) {
+                temp5 = llglls.get(i).getPointValueInDouble();
+                vos.get(i).setValue5(StringUtils.round(temp5 / 1000, 2));
+            }
+        }
+
+
+        if (uniformCode.contains("RPJGZD")) {
+            List<PointData> gzzsls = edosUtil.getHistoryDatasSnap(gzzs, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600L);
+            double temp6 = 0;
+            for (int i = 0; i < gzzsls.size(); i++) {
+                temp6 = gzzsls.get(i).getPointValueInDouble();
+                vos.get(i).setValue6(StringUtils.round(temp6 / 1000, 2));
+            }
+        }
+        if (uniformCode.contains("FNLYL")) {
+            List<PointData> fnlylls = edosUtil.getHistoryDatasSnap(fnlyl, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600L);
+            double temp7 = 0;
+            for (int i = 0; i < fnlylls.size(); i++) {
+                temp7 = fnlylls.get(i).getPointValueInDouble();
+                vos.get(i).setValue7(StringUtils.round(temp7, 2));
+            }
+        }
+
         return vos;
     }
 }