bug调整

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProBasicFeasibilityStudyController.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-10-18
+ */
+@RestController
+@RequestMapping("//pro-basic-feasibility-study")
+public class ProBasicFeasibilityStudyController {
+
+}

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

@@ -6,7 +6,7 @@ package com.gyee.runeconomy.controller.monitor;/*
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
-import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay5;
 import com.gyee.runeconomy.service.monitor.StationMonitorService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -56,7 +56,7 @@ public class StationMonitorController {
     @ApiOperation(value = "场站每日电量", notes = "场站每日电量")
     public R hisdata(@RequestParam(value = "wpid", required = true) String wpid) throws Exception {
 
-        List<ProEconPowerstationInfoDay1> resultList = stationMonitorService.hisdata(wpid);
+        List<ProEconPowerstationInfoDay5> resultList = stationMonitorService.hisdata(wpid);
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
         } else {

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProBasicFeasibilityStudyMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicFeasibilityStudy;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 可研电量表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-10-18
+ */
+public interface ProBasicFeasibilityStudyMapper extends BaseMapper<ProBasicFeasibilityStudy> {
+
+}

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

@@ -0,0 +1,89 @@
+package com.gyee.runeconomy.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 可研电量表
+ * </p>
+ *
+ * @author wang
+ * @since 2023-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicFeasibilityStudy extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 工程编号
+     */
+    private String projectId;
+
+    /**
+     * 可研发电量
+     */
+    private Double generatingCapacity;
+
+    /**
+     * 可研停运小时
+     */
+    private Double outageHours;
+
+    /**
+     * 年
+     */
+    private String year;
+
+    /**
+     * 月
+     */
+    private String month;
+
+    /**
+     * 场站编号（冗余）
+     */
+    private String windpowerstationId;
+
+    /**
+     * 创建者
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updater;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 是否删除
+     */
+    private Integer deleted;
+
+    /**
+     * 租户编号
+     */
+    private Long tenantId;
+
+
+}

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

@@ -4,10 +4,8 @@ import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.SortUtils;
 import com.gyee.runeconomy.dto.CoulometricVo;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
-import com.gyee.runeconomy.model.auto.ProBasicProjectPlan;
-import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
-import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay5;
+import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.service.auto.IProBasicFeasibilityStudyService;
 import com.gyee.runeconomy.service.auto.IProBasicProjectPlanService;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay5Service;
@@ -30,6 +28,8 @@ public class StudyElectricityService {
     @Resource
     private IProBasicProjectPlanService proBasicProjectPlanService;
 
+    @Resource
+    private IProBasicFeasibilityStudyService proBasicFeasibilityStudyService;
 
     public Map<String, Object> studyelectricity(String wpId) throws Exception {
 
@@ -64,12 +64,19 @@ public class StudyElectricityService {
             for (ProBasicPowerstation wpls : wplsG) {
 
                 //计划电量-循环所有场站当前月集合
-                List<ProBasicProjectPlan> currentls = proBasicProjectPlanService.getmonthList(String.valueOf(day));
+                List<ProBasicProjectPlan> currentjhls = proBasicProjectPlanService.getmonthList(String.valueOf(day));
 
                 //当前场站循环当前月
-                List<ProBasicProjectPlan> currentjh = currentls.stream().filter(wp -> wp.getWindpowerstationId().equals(wpls.getId())).collect(Collectors.toList());
+                List<ProBasicProjectPlan> currentjh = currentjhls.stream().filter(wp -> wp.getWindpowerstationId().equals(wpls.getId())).collect(Collectors.toList());
                 byjhdlsum = currentjh.stream().mapToDouble(ProBasicProjectPlan::getGeneratingCapacity).sum(); //本月计划电量合
 
+                //计划电量-循环所有场站当前月集合
+                List<ProBasicFeasibilityStudy> currentkyls = proBasicFeasibilityStudyService.getmonthList(String.valueOf(day));
+
+                //当前场站循环当前月
+                List<ProBasicFeasibilityStudy> currentky = currentkyls.stream().filter(wp -> wp.getWindpowerstationId().equals(wpls.getId())).collect(Collectors.toList());
+                bykydlhjsum = currentky.stream().mapToDouble(ProBasicFeasibilityStudy::getGeneratingCapacity).sum(); //本月计划电量合
+
 
                 //当前场站循环月实际电量
                 List<ProEconPowerstationInfoDay5> sjdlls = proEconPowerstationInfoDay5Service.getmax(wpls.getId(), firstDayZeroHour);
@@ -77,11 +84,6 @@ public class StudyElectricityService {
                     bysjdlhjsum = sjdlls.get(0).getYfdldb().doubleValue();
                 }
 
-                //当前场站循环月日照强度
-                List<ProEconPowerstationInfoDay1> rzqdls = proEconPowerstationInfoDay1Service.getmax(wpls.getId(), firstDayZeroHour);
-                if (!rzqdls.isEmpty() && rzqdls != null) {
-                    bykydlhjsum = rzqdls.get(0).getYpjfs().doubleValue();
-                }
             }
 
 
@@ -94,6 +96,8 @@ public class StudyElectricityService {
             vo.setSjdl(StringUtils.round(bysjdlhjsum / 10000, 2));
             //添加完成情况
             vo.setWcqk(StringUtils.round(((bysjdlhjsum / 10000) / byjhdlsum) * 100, 0));
+            //添加可研电量
+            vo.setRzqd(StringUtils.round(bykydlhjsum,2));
             vos.add(vo);
 
             SortUtils.sort(vos, "hours", SortUtils.ASC);

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.runeconomy.model.auto.ProBasicFeasibilityStudy;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 可研电量表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-10-18
+ */
+public interface IProBasicFeasibilityStudyService extends IService<ProBasicFeasibilityStudy> {
+
+    List<ProBasicFeasibilityStudy> getmonthList(String month);
+
+}

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

@@ -0,0 +1,37 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import com.gyee.runeconomy.mapper.auto.ProBasicFeasibilityStudyMapper;
+import com.gyee.runeconomy.model.auto.ProBasicFeasibilityStudy;
+import com.gyee.runeconomy.service.auto.IProBasicFeasibilityStudyService;
+import org.springframework.stereotype.Service;
+
+import java.util.Calendar;
+import java.util.List;
+
+/**
+ * <p>
+ * 可研电量表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-10-18
+ */
+@Service
+public class ProBasicFeasibilityStudyServiceImpl extends ServiceImpl<ProBasicFeasibilityStudyMapper, ProBasicFeasibilityStudy> implements IProBasicFeasibilityStudyService {
+
+    @Override
+    public List<ProBasicFeasibilityStudy> getmonthList(String month) {
+        QueryWrapper<ProBasicFeasibilityStudy> qw = new QueryWrapper<>();
+        Calendar cal = Calendar.getInstance();
+        int currentyear = cal.get(Calendar.YEAR);
+        if (StringUtils.isNotEmpty(month)) {
+            qw.eq("month", month);
+            qw.like("year", currentyear);
+        }
+        List<ProBasicFeasibilityStudy> list = baseMapper.selectList(qw);
+        return list;
+    }
+}

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

@@ -10,7 +10,6 @@ import com.gyee.common.util.DateUtils;
 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.ProEconPowerstationInfoDay1;
 import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay5;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay5Service;
@@ -235,7 +234,7 @@ public class StationMonitorService {
         if (proBasicPowerstation.getWindType().equals("-1")) {
             zjrl = BigDecimal.valueOf(proBasicPowerstation.getJrwindCapacity() / 1000);
         } else if (proBasicPowerstation.getWindType().equals("-2")) {
-            zjrl = BigDecimal.valueOf(proBasicPowerstation.getJrCapacity());
+            zjrl = BigDecimal.valueOf(proBasicPowerstation.getJrCapacity() / 1000);
         }
         resultMap.put("ylyxs", yfdl1.add(BigDecimal.valueOf(rfdl)).divide(zjrl ,2, RoundingMode.HALF_UP));
 //        resultMap.put("nlyxs", realData.get(27).getPointValueInDouble());
@@ -308,12 +307,12 @@ public class StationMonitorService {
         return resultMap;
     }
 
-    public List<ProEconPowerstationInfoDay1> hisdata(String wpid) {
+    public List<ProEconPowerstationInfoDay5> hisdata(String wpid) {
 
-        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-        qw.lambda().le(ProEconPowerstationInfoDay1::getRecordDate, DateUtils.today()).ge(ProEconPowerstationInfoDay1::getRecordDate, DateUtils.getMonthFirst(DateUtils.today()));
-        qw.lambda().eq(ProEconPowerstationInfoDay1::getForeignKeyId, wpid).orderByAsc(ProEconPowerstationInfoDay1::getRecordDate);
-        List<ProEconPowerstationInfoDay1> list = proEconPowerstationInfoDay1Service.list(qw);
+        QueryWrapper<ProEconPowerstationInfoDay5> qw = new QueryWrapper<>();
+        qw.lambda().le(ProEconPowerstationInfoDay5::getRecordDate, DateUtils.today()).ge(ProEconPowerstationInfoDay5::getRecordDate, DateUtils.getMonthFirst(DateUtils.today()));
+        qw.lambda().eq(ProEconPowerstationInfoDay5::getForeignKeyId, wpid).orderByAsc(ProEconPowerstationInfoDay5::getRecordDate);
+        List<ProEconPowerstationInfoDay5> list = proEconPowerstationInfoDay5Service.list(qw);
         return list;
     }
 }