增加生产日报数据返回接口

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProEconEquipmentInfoJsController.java

@@ -2,6 +2,7 @@ package com.gyee.runeconomy.controller;
 
 
 import com.gyee.runeconomy.model.ProEconEquipmentInfoJs;
+import com.gyee.runeconomy.model.vo.ProEconEquipmentInfoJsVo;
 import com.gyee.runeconomy.model.vo.ProductionDailyReportVo;
 import com.gyee.runeconomy.service.ProEconEquipmentInfoJsService;
 import org.springframework.web.bind.annotation.*;
@@ -51,7 +52,7 @@ public class ProEconEquipmentInfoJsController {
      * 更新记录
      */
     @PutMapping
-    public boolean update(@RequestBody List<ProEconEquipmentInfoJs> jsls) {
+    public boolean update(@RequestBody List<ProEconEquipmentInfoJsVo> jsls) {
         return proEconEquipmentInfoJsService.update(jsls);
     }
 

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

@@ -0,0 +1,37 @@
+package com.gyee.runeconomy.model.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+
+/**
+ * @author wang
+ * @since 2026-01-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("pro_econ_equipment_info_js")
+public class ProEconEquipmentInfoJsVo extends Model<ProEconEquipmentInfoJsVo> {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 日期
+     */
+    private LocalDate recordDate;
+
+    /**
+     * 测点描述
+     */
+    private String meterName;
+
+    /**
+     * 测点数值
+     */
+    private Double stopCode;
+
+
+}

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

@@ -0,0 +1,51 @@
+package com.gyee.runeconomy.model.vo;
+
+import lombok.Data;
+
+@Data
+public class ProductionDailyReport {
+
+    /**
+     * 全场-本期
+     */
+    private Double all_bq;
+
+    /**
+     * 全场-月累计
+     */
+    private Double all_month;
+
+    /**
+     * 全场-年累计
+     */
+    private Double all_year;
+    /**
+     * 一期-本期
+     */
+    private Double project1_bq;
+
+    /**
+     * 一期-月累计
+     */
+    private Double project1_month;
+
+    /**
+     * 一期-年累计
+     */
+    private Double project1_year;
+
+    /**
+     * 二期-本期
+     */
+    private Double project2_bq;
+
+    /**
+     * 二期-月累计
+     */
+    private Double project2_month;
+
+    /**
+     * 二期-年累计
+     */
+    private Double project2_year;
+}

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

@@ -0,0 +1,91 @@
+package com.gyee.runeconomy.model.vo;
+
+import lombok.Data;
+
+/**
+ * 生产日报数据返回结果
+ */
+@Data
+public class ProductionDailyReportVo {
+    /**
+     * 计划发电量-bottom
+     */
+    private ProductionDailyReport fdl_plan;
+
+    /**
+     * 实际发电量-js
+     */
+    private ProductionDailyReport fdl_actual;
+
+    /**
+     * 利用小时数  利用小时=风电场发电量/风电场装机总容量
+     */
+    private ProductionDailyReport lyxss;
+
+    /**
+     * 平均风速-js
+     */
+    private ProductionDailyReport pjfs;
+
+    /**
+     * 上网电量-js
+     */
+    private ProductionDailyReport swdl;
+
+    /**
+     * 网购电量-js
+     */
+    private ProductionDailyReport wgdl;
+
+    /**
+     * 限电量Y-js
+     */
+    private ProductionDailyReport xdli;
+
+    /**
+     * 限电率Y-js  限电量/（实发电量+限电量）*100
+     */
+    private ProductionDailyReport xdlv;
+
+    /**
+     * 故障损失-js
+     */
+    private ProductionDailyReport gzss;
+
+    /**
+     * 定检维护-js
+     */
+    private ProductionDailyReport djss;
+
+    /**
+     * 受累损失-js
+     */
+    private ProductionDailyReport slss;
+
+    /**
+     * 场用电量-js
+     */
+    private ProductionDailyReport cydli;
+
+    /**
+     * 场用电率-js
+     */
+    private ProductionDailyReport cydlv;
+
+    /**
+     * 综合场用电量-js
+     */
+    private ProductionDailyReport zhcydli;
+
+    /**
+     * 综合场用电量率-js
+     */
+    private ProductionDailyReport zhcydlv;
+
+    /**
+     * 设备可利用率-js
+     */
+    private ProductionDailyReport sbklyl;
+
+
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/ProEconEquipmentInfoJsService.java

@@ -2,6 +2,7 @@ package com.gyee.runeconomy.service;
 
 import com.gyee.runeconomy.model.ProEconEquipmentInfoJs;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.runeconomy.model.vo.ProEconEquipmentInfoJsVo;
 import com.gyee.runeconomy.model.vo.ProductionDailyReportVo;
 
 import java.util.List;
@@ -19,7 +20,7 @@ public interface ProEconEquipmentInfoJsService extends IService<ProEconEquipment
 
     List<ProEconEquipmentInfoJs>  query(Map<String, List<String>> name);
 
-    boolean update(List<ProEconEquipmentInfoJs> jsls);
+    boolean update(List<ProEconEquipmentInfoJsVo> jsls);
 
     ProductionDailyReportVo queryAll(String date) throws Exception;
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/impl/ProEconEquipmentInfoJsServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.model.PointData;
 import com.gyee.runeconomy.model.ProEconEquipmentInfoJs;
 import com.gyee.runeconomy.mapper.ProEconEquipmentInfoJsMapper;
+import com.gyee.runeconomy.model.vo.ProEconEquipmentInfoJsVo;
 import com.gyee.runeconomy.model.vo.ProductionDailyReport;
 import com.gyee.runeconomy.model.vo.ProductionDailyReportVo;
 import com.gyee.runeconomy.service.ProEconEquipmentInfoJsService;
@@ -267,12 +268,12 @@ public class ProEconEquipmentInfoJsServiceImpl extends ServiceImpl<ProEconEquipm
 
 
     @Override
-    public boolean update(List<ProEconEquipmentInfoJs> jsls) {
+    public boolean update(List<ProEconEquipmentInfoJsVo> jsls) {
         if (jsls == null || jsls.isEmpty()) {
             return false;
         }
         List<String> meterNames = jsls.stream()
-                .map(ProEconEquipmentInfoJs::getMeterName)
+                .map(ProEconEquipmentInfoJsVo::getMeterName)
                 .filter(Objects::nonNull)
                 .distinct()
                 .collect(ArrayList::new, ArrayList::add, ArrayList::addAll);
@@ -287,7 +288,7 @@ public class ProEconEquipmentInfoJsServiceImpl extends ServiceImpl<ProEconEquipm
         List<ProEconEquipmentInfoJs> list = list(qw);
         if (null != list && !list.isEmpty()) {
             for (ProEconEquipmentInfoJs js1 : list) {
-                for (ProEconEquipmentInfoJs js2 : jsls) {
+                for (ProEconEquipmentInfoJsVo js2 : jsls) {
                     if (js1.getMeterName().equals(js2.getMeterName())) {
                         js1.setStopCode(js2.getStopCode());
                     }