更改数据库连接为内网

business-service-api/src/main/java/com/ho/business/constant/DeviceTypeConstant.java

@@ -71,6 +71,8 @@ public interface DeviceTypeConstant {
     //英博DC/DCMPPT
     String DCDC = "dcdc";
 
+    String MPPT ="mppt";
+
     //柴油发电机_济宁微山湖
     String CF = "cf";
 
@@ -371,6 +373,8 @@ public interface DeviceTypeConstant {
         String BMS_MIN_VOL = "bmsMinVol";
     }
 
+    //mppt 日发起始
+    String PV_DAILY_CHARGE_START = "pvDailyReleaseStart";
     //日充起始
     String DAILY_CHARGE_START = "dailyChargeStart";
     //日放起始

business-service-api/src/main/java/com/ho/business/entity/EarningsCalculateMppt.java

@@ -0,0 +1,101 @@
+package com.ho.business.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class EarningsCalculateMppt implements Serializable {
+
+    /**
+     * 主键id
+     */
+    private Integer id;
+
+    /**
+     * 分组id(与src_id)
+     */
+    private Integer groupId;
+
+    /**
+     * 所属id
+     */
+    private Integer pid;
+
+    /**
+     * 电站id
+     */
+    private Integer stationId;
+
+    /**
+     * device表中的id字段相连
+     */
+    private Integer srcId;
+
+    /**
+     * 部门id
+     */
+    private Integer deptId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 日期
+     */
+    private String day;
+
+    /**
+     * 数据类型: 0:充 1:放
+     */
+    private Integer type;
+
+    /**
+     * 收益
+     */
+    private BigDecimal digital;
+
+    /**
+     * 电量
+     */
+    private BigDecimal elec;
+
+    /**
+     * 费率类型:elec_template_sub表type
+     */
+    private String rateType;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 总充,总放  根据type判断
+     */
+    private BigDecimal total;
+
+    /**
+     * 收益
+     */
+    private BigDecimal discharge;
+
+    /**
+     * 电量
+     */
+    private BigDecimal disElec;
+
+    /**
+     * 费率类型:elec_template_sub表type
+     */
+    private String disRateType;
+
+    /**
+     * 折扣
+     */
+    private BigDecimal discount;
+}

business-service-api/src/main/java/com/ho/business/entity/Station.java

@@ -52,6 +52,9 @@ public class Station implements Serializable {
     @ApiModelProperty(value = "额定功率")
     private BigDecimal ratePower;
 
+    @ApiModelProperty(value = "额定功率(光伏mppt)")
+    private BigDecimal pvPower;
+
     @ApiModelProperty(value = "sn编号列表")
     private List<String> snList;
 

business-service-api/src/main/java/com/ho/business/entity/StationRemoteControl.java

@@ -0,0 +1,48 @@
+package com.ho.business.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ho.common.tools.constant.CommonConstant;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class StationRemoteControl implements Serializable {
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    @ApiModelProperty(value = "电站id")
+    private Integer stationId;
+
+    @ApiModelProperty(value = "电站名称")
+    private String stationName;
+
+    @ApiModelProperty(value = "远程访问ip、也可以是域名")
+    private String  ip;
+
+    @ApiModelProperty(value = "端口")
+    private String  port;
+
+    @ApiModelProperty(value = "账号")
+    private String  userName;
+
+    @ApiModelProperty(value = "密码")
+    private String  password;
+
+    @ApiModelProperty(value = "内网ip")
+    private String  intranetIp;
+
+    @ApiModelProperty(value = "ems页面类型")
+    private String type;
+
+    @JsonFormat(pattern = CommonConstant.DATE)
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @JsonFormat(pattern = CommonConstant.DATE)
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+}

business-service-api/src/main/java/com/ho/business/vo/req/StationPutReqVO.java

@@ -124,6 +124,11 @@ public class StationPutReqVO {
 
     @ApiModelProperty(value = "是否接入光伏：0代表不接,1代表接入")
     private Integer inverterFlag;
+
+    @ApiModelProperty(value = "额定功率(mppt)")
+    @Range(max = 999999999, message = "额定功率过大")
+    BigDecimal pvPower;
+
     //图片地址
     @ApiModelProperty(value = "图片地址")
     Integer logoPictureId;

business-service-api/src/main/java/com/ho/business/vo/req/StationRemoteControlPageVo.java

@@ -0,0 +1,16 @@
+package com.ho.business.vo.req;
+
+import com.ho.business.entity.StationRemoteControl;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class StationRemoteControlPageVo extends StationRemoteControl {
+
+    @ApiModelProperty(value = "第几页")
+    private Integer pageNum=1;
+
+    @ApiModelProperty(value = "分页数量")
+    private Integer pageSize=10;
+
+}

business-service-api/src/main/java/com/ho/business/vo/req/StationReqVO.java

@@ -102,6 +102,10 @@ public class StationReqVO {
     @ApiModelProperty(value = "是否接入光伏（0默认不接入 1接入）")
     private Integer inverterFlag;
 
+    @ApiModelProperty(value = "额定功率(mppt)")
+    @Range(max = 999999999, message = "额定功率过大")
+    BigDecimal pvPower;
+
     @ApiModelProperty(value = "卡号")
     private String iccId;
 

business-service-api/src/main/java/com/ho/business/vo/req/carbin/EarningsCalculateReq.java

@@ -34,6 +34,7 @@ public class EarningsCalculateReq {
     @ApiModelProperty(value = "结束时间",hidden = true)
     String endTime;
 
-
+    @ApiModelProperty(value = "多语言切换-查询字段")
+    private String lang;
 
 }

business-service-api/src/main/java/com/ho/business/vo/req/pcsStation/PcsStationReq.java

@@ -31,4 +31,7 @@ public class PcsStationReq extends StationReq {
 
     @ApiModelProperty(value = "分段类型",hidden = true)
     String stationName;
+    
+    @ApiModelProperty(value = "多语言切换-查询字段")
+    private String lang;
 }

business-service-api/src/main/java/com/ho/business/vo/resp/cabin/EarningsCalculateResp.java

@@ -88,4 +88,16 @@ public class EarningsCalculateResp {
      */
     private Integer finish;
 
+
+    @ApiModelProperty(value = "月发电量(mppt)")
+    BigDecimal monthReleaseElec;
+    @ApiModelProperty(value = "月收益(mppt)")
+    BigDecimal monthIncone;
+    @ApiModelProperty(value = "累计发电量(mppt)")
+    BigDecimal totalReleaseElec;
+    @ApiModelProperty(value = "累计收益(mppt)")
+    BigDecimal totalIncome;
+    @ApiModelProperty(value = "额定功率(mppt)")
+    BigDecimal pvPower;
+
 }

business-service-api/src/main/java/com/ho/business/vo/resp/iargeScreen/AnnualChartValue.java

@@ -36,4 +36,6 @@ public class AnnualChartValue {
     @ApiModelProperty(value = "容量")
     BigDecimal stationCapacity;
 
+    @ApiModelProperty(value = "mppt发电量")
+    BigDecimal release;
 }

business-service-api/src/main/java/com/ho/business/vo/resp/iargeScreen/AnnualPvOverviewResp.java

@@ -0,0 +1,37 @@
+package com.ho.business.vo.resp.iargeScreen;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class AnnualPvOverviewResp {
+
+    //装机容量
+    @ApiModelProperty(value = "装机容量")
+    BigDecimal capacity;
+
+    //电站总数
+    @ApiModelProperty(value = "电站总数")
+    Integer stationNumber;
+
+    @ApiModelProperty(value = "日发电量(mppt)")
+    BigDecimal dailyReleaseElec;
+
+    @ApiModelProperty(value = "年发电量(mppt)")
+    BigDecimal yearReleaseElec;
+
+    @ApiModelProperty(value = "累计发电量(mppt)")
+    BigDecimal totalReleaseElec;
+
+
+    @ApiModelProperty(value = "日收益(mppt)")
+    BigDecimal todayIncone;
+
+    @ApiModelProperty(value = "年收益(mppt)")
+    BigDecimal yearIncone;
+
+    @ApiModelProperty(value = "累计收益(mppt)")
+    BigDecimal totalIncome;
+}

business-service-api/src/main/java/com/ho/business/vo/resp/iargeScreen/Subdata.java

@@ -52,4 +52,7 @@ public class Subdata {
     //年总充（）
     @ApiModelProperty(value = "总充")
     BigDecimal charge;
+
+    @ApiModelProperty(value = "mppt总发电量")
+    BigDecimal release;
 }

business-service-api/src/main/java/com/ho/business/vo/resp/mppt/MpptActiveVo.java

@@ -0,0 +1,20 @@
+package com.ho.business.vo.resp.mppt;
+
+import com.ho.business.vo.DeviceTransfer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class MpptActiveVo {
+
+    @ApiModelProperty(value = "mppt有功功率")
+    BigDecimal pvActivePower;
+
+    @ApiModelProperty(value = "mppt总发电量")
+    BigDecimal totalRelease;
+
+    @ApiModelProperty(value = "mppt日发电量")
+    BigDecimal dailyReleaseElec;
+}

business-service-api/src/main/java/com/ho/business/vo/resp/mppt/MpptVo.java

@@ -0,0 +1,17 @@
+package com.ho.business.vo.resp.mppt;
+
+import com.ho.business.vo.DeviceTransfer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MpptVo {
+
+    @ApiModelProperty(value = "mppt有功功率")
+    DeviceTransfer pvActivePower;
+    @ApiModelProperty(value = "mppt总发电量")
+    DeviceTransfer totalRelease;
+    @ApiModelProperty(value = "mppt 日发电量-起始")
+    DeviceTransfer pvDailyReleaseStart;
+
+}

business-service-api/src/main/java/com/ho/business/vo/resp/pcsStation/PcsTotalData.java

@@ -43,4 +43,18 @@ public class PcsTotalData {
     @ApiModelProperty(value = "额定容量")
     BigDecimal rateCapacity;
 
+    //2025-11-13 储能加入mppt模块开发
+    @ApiModelProperty(value = "当前功率(mppt)")
+    BigDecimal pvCurrentPower;
+    @ApiModelProperty(value = "日发电量(mppt)")
+    BigDecimal dailyReleaseElec;
+    @ApiModelProperty(value = "日收益(mppt)")
+    BigDecimal todayIncone;
+    @ApiModelProperty(value = "总发电量(mppt)")
+    BigDecimal totalReleaseElec;
+    @ApiModelProperty(value = "总收益(mppt)")
+    BigDecimal totalIncome;
+    @ApiModelProperty(value = "额定功率(mppt)")
+    BigDecimal pvPower;
+
 }

business-service-dao/src/main/java/com/ho/business/feignclient/TdFeignClient.java

@@ -85,7 +85,7 @@ public interface TdFeignClient {
     Integer getCountData(@RequestBody TdBase tdBase);
 
     @PostMapping(value = ContextConstant.TD_CONTEXT + "device001/selectMaxValue")
-     DataResult<PointData> selectMaxValue(@RequestBody TdBaseTimeQuery query);
+    DataResult<PointData> selectMaxValue(@RequestBody TdBaseTimeQuery query);
 
     @PostMapping(value = ContextConstant.TD_CONTEXT + "device001/queryPointTableList")
     DataResult<List<StationHomeRespVo>> queryPointTableList(@RequestBody TdBaseTimeQuery query);
@@ -99,6 +99,9 @@ public interface TdFeignClient {
     @PostMapping(value = ContextConstant.TD_CONTEXT + "device001/getToDayPVCharge")
     DataResult<StationHomeRespVo> getToDayPVCharge(TdBaseTimeQuery tdBaseTimeQuery);
 
+    @PostMapping(value = ContextConstant.TD_CONTEXT + "device001/getToDayPVMpptCharge")
+    DataResult<StationHomeRespVo> getToDayPVMpptCharge(TdBaseTimeQuery tdBaseTimeQuery);
+
     //查询遥信值五遥
     @PostMapping(value = ContextConstant.TD_CONTEXT + "device001/querySignal")
     DataResult<List<PointCurveResp>> querySignal(@RequestBody TdBaseTimeQuery tdBaseTimeQuery);

business-service-dao/src/main/java/com/ho/business/feignclient/TdFeignClientFallback.java

@@ -168,6 +168,12 @@ public class TdFeignClientFallback implements TdFeignClient{
         throw new BusinessException(BaseResponseCode.FEIGN_CALL_FAIL);
     }
 
+    @Override
+    public DataResult<StationHomeRespVo> getToDayPVMpptCharge(TdBaseTimeQuery tdBaseTimeQuery) {
+        log.error("调用 [TdClient.getToDayPVCharge] 异常!");
+        throw new BusinessException(BaseResponseCode.FEIGN_CALL_FAIL);
+    }
+
     @Override
     public DataResult modifyHistoryData(TdBaseTimeQuery tdBaseTimeQuery) {
         log.error("调用 [TdClient.modifyHistoryData] 异常!");

business-service-dao/src/main/java/com/ho/business/mapper/EarningsCalculateMapper.java

@@ -17,11 +17,11 @@ import java.math.BigDecimal;
 import java.util.List;
 
 /**
-* @author xwz
-* @description 针对表【earnings_calculate】的数据库操作Mapper
-* @createDate 2023-09-26
-* @Entity com.ho.business.entity.EarningsCalculate
-*/
+ * @author xwz
+ * @description 针对表【earnings_calculate】的数据库操作Mapper
+ * @createDate 2023-09-26
+ * @Entity com.ho.business.entity.EarningsCalculate
+ */
 @Mapper
 public interface EarningsCalculateMapper {
 
@@ -48,7 +48,7 @@ public interface EarningsCalculateMapper {
      */
     List<EarningsCalculate> totalListByDay(@Param("ec") EarningsCalculateReq earningsCalculateReq);
 
-    public List<EarningsCalculateSub> queryElecTemplateSubByStationId(@Param("stationId")Integer stationId, @Param("templateType")Integer templateType,@Param("date")String date);
+    public List<EarningsCalculateSub> queryElecTemplateSubByStationId(@Param("stationId")Integer stationId, @Param("templateType")Integer templateType,@Param("date")String date,@Param("elecType")Integer elecType);
 
     public List<EarningsCalculateSub> queryElecRateTemplateSubByStationId(@Param("stationId")Integer stationId, @Param("templateType")Integer templateType,@Param("date")String date);
 

business-service-dao/src/main/java/com/ho/business/mapper/EarningsCalculateMpptMapper.java

@@ -0,0 +1,30 @@
+package com.ho.business.mapper;
+
+import com.ho.business.entity.EarningsCalculate;
+import com.ho.business.entity.EarningsCalculateMppt;
+import com.ho.business.vo.req.bigScreen.CommonBigScreenReq;
+import com.ho.business.vo.resp.InverterResp.PowerGenerateRespVO;
+import com.ho.business.vo.resp.profit.DayProfitType;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Mapper
+public interface EarningsCalculateMpptMapper {
+
+    int deleteByDay(@Param("day") String day, @Param("typeList") List<Integer> typeList);
+
+    int insertBatch(List<EarningsCalculateMppt> list);
+
+    List<PowerGenerateRespVO> countPvIncome(@Param("stationId") Integer stationId, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    BigDecimal countAllPvIncome(@Param("stationId")Integer stationId,@Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<DayProfitType> getProfit(@Param("beginTime")String begin, @Param("endTime")String end, @Param("groupId")Integer groupId);
+
+    String getFirstTime();
+
+    List<DayProfitType> getEarningsByParam(CommonBigScreenReq req);
+}

business-service-dao/src/main/java/com/ho/business/mapper/ElecMeterValueMapper.java

@@ -4,6 +4,7 @@ package com.ho.business.mapper;
 import com.ho.business.entity.ElecMeterValue;
 import com.ho.business.vo.req.bigScreen.CommonBigScreenReq;
 import com.ho.business.vo.req.carbin.ElecMeterReq;
+import com.ho.business.vo.resp.profit.DayProfitType;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -54,4 +55,7 @@ public interface ElecMeterValueMapper {
 
     List<ElecMeterValue> selectAllList(@Param("stationId") Integer stationId, @Param("typeList") List<Integer> typeList, @Param("beginTime") String beginTime, @Param("endTime") String endTime,
                                        @Param("deviceTypeList") List<Integer> deviceTypeList);
+
+    List<DayProfitType> getElec(@Param("beginTime") String beginTime,@Param("endTime")String endTime,
+                                @Param("groupId") Integer groupId, @Param("type")Integer type,List<Integer> stationIds);
 }

business-service-dao/src/main/java/com/ho/business/mapper/StationRemoteControlMapper.java

@@ -0,0 +1,21 @@
+package com.ho.business.mapper;
+
+import com.ho.business.entity.StationRemoteControl;
+import com.ho.business.vo.req.StationRemoteControlPageVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface StationRemoteControlMapper {
+    void insert(@Param("entity") StationRemoteControl entity);
+
+    void update(@Param("entity") StationRemoteControl entity);
+
+    void delete(@Param("id") Integer id);
+
+    StationRemoteControl search(@Param("stationId") Integer stationId);
+
+    List<StationRemoteControl> selectList(@Param("vo") StationRemoteControlPageVo vo);
+}

business-service-dao/src/main/java/com/ho/business/service/EarningsCalculateMpptService.java

@@ -0,0 +1,34 @@
+package com.ho.business.service;
+
+import com.ho.business.entity.Station;
+import com.ho.business.vo.req.bigScreen.CommonBigScreenReq;
+import com.ho.business.vo.resp.InverterResp.PowerGenerateRespVO;
+import com.ho.business.vo.resp.profit.DayProfitType;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description Mppt 尖峰平谷电量收益计算
+ * @Author zjl
+ * @Date 2025/11/19
+ */
+public interface EarningsCalculateMpptService {
+
+    int deleteByDay(String transDayStr, List<Integer> typeList);
+
+    public void allMpptIncome(List<Station> stations, String beginTime);
+
+    void todayMpptIncome(List<Station> stations, String beginTime);
+
+    List<PowerGenerateRespVO> countPvIncome(Integer stationId, String beginTime, String endTime);
+
+    BigDecimal countAllPvIncome(Integer id,String beginTime, String endTime);
+
+    List<DayProfitType> getProfit(String begin, String end, Integer groupId);
+
+    Date getFirstTime();
+
+    List<DayProfitType> getEarningsByParam(CommonBigScreenReq req);
+}

business-service-dao/src/main/java/com/ho/business/service/EarningsCalculateService.java

@@ -7,6 +7,7 @@ import com.ho.business.vo.req.bigScreen.CommonBigScreenReq;
 import com.ho.business.vo.req.carbin.EarningsCalculateReq;
 import com.ho.business.vo.req.pcsStation.PcsStationReq;
 import com.ho.business.vo.req.report.ReportReqVO;
+import com.ho.business.vo.resp.InverterResp.PowerGenerateRespVO;
 import com.ho.business.vo.resp.cabin.EarningsCalculateCountResp;
 import com.ho.business.vo.resp.cabin.EarningsCalculateResp;
 import com.ho.business.vo.resp.income.RevenueOverview;
@@ -137,4 +138,5 @@ public interface EarningsCalculateService {
 
     List<DayProfitType> getEarningsByParam(CommonBigScreenReq req);
 
+    List<PowerGenerateRespVO> getPvMonthData(EarningsCalculateReq req);
 }

business-service-dao/src/main/java/com/ho/business/service/ElecMeterValueService.java

@@ -3,6 +3,7 @@ package com.ho.business.service;
 import com.ho.business.entity.ElecMeterValue;
 import com.ho.business.vo.req.bigScreen.CommonBigScreenReq;
 import com.ho.business.vo.req.carbin.ElecMeterReq;
+import com.ho.business.vo.resp.profit.DayProfitType;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -50,4 +51,6 @@ public interface ElecMeterValueService {
      * @return
      */
     List<ElecMeterValue> selectGroupByDay(CommonBigScreenReq req);
+
+    List<DayProfitType> getElec(String begin, String end, Integer groupId, Integer type,List<Integer> stationIds);
 }

business-service-dao/src/main/java/com/ho/business/service/IargeScreenShowService.java

@@ -118,4 +118,18 @@ public interface IargeScreenShowService {
      */
     List<EventDayNum> getCommonEventCount(SimpleUser user);
     /**************************************************************/
+
+    List<Subdata> getCommonPvRegionList(List<Integer> byDeptId);
+
+    AnnualPvOverviewResp getPvOverviewData(List<Integer> stationIds);
+
+    EnergySavingRespVo getPvEnergySaving(List<Integer> stationIds);
+
+    List<AnnualChartValue> getPVCommonProfitCurve(CockpitReqVO vo,List<Integer> stationIds);
+
+    List<Subdata> getPvCommonProfit(String beginString, String endString,List<Integer> stationIds);
+
+    List<Subdata> getPvCommonElec(String beginString, String endString, List<Integer> stationIds);
+
+    List<AnnualChartValue> getCommonPvRelease(List<Integer> stationIds);
 }

business-service-dao/src/main/java/com/ho/business/service/OpenStationService.java

@@ -4,6 +4,7 @@ import com.ho.business.vo.req.StationReq;
 import com.ho.business.vo.req.pcsStation.PcsStationReq;
 import com.ho.business.vo.resp.DeviceRespVO;
 import com.ho.business.vo.resp.cabin.CircleCtrlResp;
+import com.ho.business.vo.resp.mppt.MpptActiveVo;
 import com.ho.business.vo.resp.pcsStation.HomePageStationDataResp;
 import com.ho.business.vo.resp.station.ActiveReactivePower;
 import com.ho.common.tools.util.PageResult;
@@ -24,6 +25,8 @@ public interface OpenStationService {
 
     ActiveReactivePower getAcPower(Integer stationId);
 
+    MpptActiveVo getPvActivePower(Integer stationId);
+
     //环控
     List<CircleCtrlResp> getCircle(List<DeviceRespVO> deviceList );
 
@@ -42,7 +45,7 @@ public interface OpenStationService {
      * @param req
      * @param response
      */
-    void exportEleData(PcsStationReq req, HttpServletResponse response);
+    void exportEleData(PcsStationReq req, HttpServletResponse response,String lang);
 
     /**
      * 查询日冻结数据

business-service-dao/src/main/java/com/ho/business/service/OutApiService.java

@@ -25,6 +25,8 @@ public interface OutApiService {
 
     void dayPVCharge(MonitorQuery monitorQuery);
 
+    void dayPVMpptCharge(MonitorQuery monitorQuery);
+
     //天小时的充放电量
     void hourChargeDeal(MonitorQuery monitorQuery) throws ParseException;
 

business-service-dao/src/main/java/com/ho/business/service/ShipEnergyService.java

@@ -0,0 +1,177 @@
+package com.ho.business.service;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
+import com.ho.business.vo.req.StationReqVO;
+import com.ho.common.tools.constant.CommonConstant;
+import com.ho.common.tools.service.RedisService;
+import com.ho.common.tools.util.HttpUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 西安寄点能源股份有限公司
+ * 西安寄点能源 API 接口 服务
+ *
+ * @author kerwin
+ */
+@Service
+@Slf4j
+public class ShipEnergyService {
+
+    /**
+     * token 缓存 key
+     */
+    private static final String SHIP_ENERGY_TOKEN_KEY = "ShipEnergyToken";
+
+    /**
+     * 获取token 参数 platform
+     */
+    private static final String PLATFORM = "f9599b6c79a5efbfc6ddce5fed1bbed5";
+
+    /**
+     * 获取token 参数 platformsecret
+     */
+    private static final String PLATFORM_SECRET = "2928b16f9cb8e85199a4caa6ba3b6620";
+
+    /**
+     * 寄点能源- 获取token Url
+     */
+    private static final String TOKEN_URL = "https://www.emind2000.cloud/rest-api/gettoken";
+
+    /**
+     * 寄点能源- 获取项目列表 Url
+     */
+    private static final String STATION_URL = "https://www.emind2000.cloud/rest-api/getStations";
+
+    /**
+     * 寄点能源- 主监控汇总 Url
+     */
+    private static final String MAIN_URL = "https://www.emind2000.cloud/rest-api/getMainTotal";
+
+    @Autowired
+    private  RedisService redisService;
+
+    @Autowired
+    private StationService stationService;
+
+    /**
+     * 寄点能源 - 获取token
+     * @return token
+     */
+    public String getToken(){
+        String token = null;
+        if(redisService.hasKey(SHIP_ENERGY_TOKEN_KEY)){
+            token = (String)redisService.get(SHIP_ENERGY_TOKEN_KEY);
+        }
+        Map<String, String> params = Maps.newHashMap();
+        params.put("platform",PLATFORM);
+        params.put("platformsecret",PLATFORM_SECRET);
+        try {
+            String json = HttpUtils.getWithForm(TOKEN_URL,params);
+            JSONObject jsonObject = JSONObject.parseObject(json);
+            Integer code = jsonObject.getInteger("code");
+            if(CommonConstant.HttpCode.SUCCESS_CODE.equals(code)){
+                JSONObject data = jsonObject.getJSONObject("data");
+                token = data.getString("access_token");
+                //redis 缓存
+                redisService.set(SHIP_ENERGY_TOKEN_KEY,token,10, TimeUnit.HOURS);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return token;
+    }
+
+    /**
+     * 寄点能源 - 获取 项目列表
+     * @return 项目列表 json 字符串
+     */
+    public String getStations(){
+        String  Authorization = "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjo5Nzg2LCJ1c2VyX2tleSI6Ijk3ODY6N2RkNjU0MTgtNDg5ZS00MzgzLWI1ZmYtMTU2MmI5ZTY0NDFkIiwidXNlcm5hbWUiOiJ6emt5YXBpIn0.fQLMlOHaEjmfHeyEu5EcxZmQ8UjRBOUoteNV-tJ2ttAwyJmQidOk7xqL25K_wRIC-OQKt0vFVOpTzMFdH71uhw";
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Authorization",Authorization);
+        try {
+            String json = HttpUtils.getWithHeaders(STATION_URL,null,headers);
+            JSONObject jsonObject = JSONObject.parseObject(json);
+            Integer code = jsonObject.getInteger("code");
+            if(CommonConstant.HttpCode.SUCCESS_CODE.equals(code)){
+                JSONObject data = jsonObject.getJSONObject("data");
+                return data.getString("rows");
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return null;
+    }
+
+    /**
+     *
+     * 寄点能源 - 获取 主监控汇总信息
+     * @param stationId 电站id
+     * @return 返回对应电站汇总信息
+     */
+    public String getMainTotal(String stationId){
+        String  Authorization = "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjo5Nzg2LCJ1c2VyX2tleSI6Ijk3ODY6MmE5YjUzODUtNjNiNC00OWRiLWFjODEtNzhmNWRmNjE0ZDgyIiwidXNlcm5hbWUiOiJ6emt5YXBpIn0.WMi4PgYQByeYXBfOGVM0mc4P5GcyAcGRkDo8F7TK8fXIkj9QZ9D34WmugiVX3GxRGODFs3u1ujH7qJyuQAM99w";
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Authorization",Authorization);
+        Map<String, String> params = new HashMap<>();
+        params.put("stationId",stationId);
+        try {
+            String json = HttpUtils.getWithHeaders(MAIN_URL,params,headers);
+            JSONObject jsonObject = JSONObject.parseObject(json);
+            Integer code = jsonObject.getInteger("code");
+            if(CommonConstant.HttpCode.SUCCESS_CODE.equals(code)){
+                return jsonObject.getString("data");
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return null;
+    }
+    /*****************************************业务处理******************************************************/
+
+    /**
+     * 寄点能源 - 电站信息融合储能平台处理
+     */
+    public void addShipEnergyStation(){
+        String stationJson = getStations();
+        JSONArray jsonStation = JSON.parseArray(stationJson);
+        jsonStation.forEach(i->{
+            JSONObject jsonObj = (JSONObject) i;
+            Integer stationId = jsonObj.getInteger("stationId");
+            String name = jsonObj.getString("name");
+            String address = jsonObj.getString("address");
+            String province = jsonObj.getString("province");
+            String city = jsonObj.getString("city");
+            BigDecimal longitude = jsonObj.getBigDecimal("longitude");
+            BigDecimal latitude = jsonObj.getBigDecimal("latitude");
+            BigDecimal maxPower = jsonObj.getBigDecimal("maxPower");
+            BigDecimal capacity = jsonObj.getBigDecimal("capacity");
+            Date commossioningTime  = jsonObj.getDate("commossioningTime");
+            StationReqVO vo = new StationReqVO();
+            vo.setId(stationId+10000);
+            vo.setName(name);
+            vo.setAddress(address);
+            vo.setLongitude(longitude);
+            vo.setLatitude(latitude);
+            vo.setCapacity(capacity);
+            vo.setRatePower(maxPower);
+            vo.setGridTime(commossioningTime);
+            vo.setGroupId(155);
+            vo.setDeptId(155);
+            stationService.insertStation(vo);
+        });
+    }
+}
+

business-service-dao/src/main/java/com/ho/business/service/StationHomeService.java

@@ -8,6 +8,7 @@ import com.ho.business.vo.resp.AppRealTimeCurveRespVo;
 import com.ho.business.vo.resp.CountEleData;
 import com.ho.business.vo.resp.DeviceColData;
 import com.ho.business.vo.resp.DeviceRespVO;
+import com.ho.business.vo.resp.InverterResp.PowerGenerateRespVO;
 import com.ho.business.vo.resp.cabin.TemperatureHumidityResp;
 import com.ho.business.vo.resp.pcsStation.OutStationData;
 import com.ho.business.vo.resp.pcsStation.PcsElecData;
@@ -72,6 +73,8 @@ public interface StationHomeService {
      */
     List<AppRealTimeCurveRespVo> getOpticalStorageCurve(MonitorQuery monitorQuery);
 
+    List<AppRealTimeCurveRespVo> pvCurve(MonitorQuery monitorQuery);
+
     List<TemperatureHumidityResp> getTemperatureHumidityCurve(MonitorQuery monitorQuery);
 
     CountEleData getCountEleData(StationReq req);
@@ -96,6 +99,6 @@ public interface StationHomeService {
      */
     OutStationData getStationData(StationReq req);
 
-    List<PcsElecData> getPvChargeElec(PcsStationReq req);
+    List<PowerGenerateRespVO> getPvData(PcsStationReq req);
 
 }

business-service-dao/src/main/java/com/ho/business/service/StationRemoteControlService.java

@@ -0,0 +1,17 @@
+package com.ho.business.service;
+
+import com.ho.business.entity.StationRemoteControl;
+import com.ho.business.vo.req.StationRemoteControlPageVo;
+import com.ho.common.tools.util.PageResult;
+
+public interface StationRemoteControlService {
+    void insert(StationRemoteControl entity);
+
+    void update(StationRemoteControl entity);
+
+    void delete(Integer id);
+
+    StationRemoteControl search(Integer stationId);
+
+    PageResult<StationRemoteControl> selectPageList(StationRemoteControlPageVo vo);
+}

business-service-dao/src/main/java/com/ho/business/service/impl/EarningsCalculateMpptServiceImpl.java

@@ -0,0 +1,212 @@
+package com.ho.business.service.impl;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.ho.business.constant.DeviceTypeConstant;
+import com.ho.business.entity.*;
+import com.ho.business.feignclient.TdFeignClient;
+import com.ho.business.mapper.EarningsCalculateMapper;
+import com.ho.business.mapper.EarningsCalculateMpptMapper;
+import com.ho.business.service.*;
+import com.ho.business.util.QueuesUtil;
+import com.ho.business.vo.req.bigScreen.CommonBigScreenReq;
+import com.ho.business.vo.req.device.DeviceTypeQuery;
+import com.ho.business.vo.resp.DeviceRespVO;
+import com.ho.business.vo.resp.InverterResp.PowerGenerateRespVO;
+import com.ho.business.vo.resp.profit.DayProfitType;
+import com.ho.common.tools.constant.CommonConstant;
+import com.ho.common.tools.constant.RedisKeyConstant;
+import com.ho.common.tools.exception.DataResult;
+import com.ho.common.tools.service.RedisService;
+import com.ho.common.tools.vo.req.StationHomeRespVo;
+import com.ho.td.api.entity.query.TdBaseTimeQuery;
+import jodd.util.CollectionUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class EarningsCalculateMpptServiceImpl implements EarningsCalculateMpptService {
+
+
+    @Autowired
+    EarningsCalculateMpptMapper earningsCalculateMpptMapper;
+
+    @Autowired
+    private DeviceService deviceService;
+
+    @Autowired
+    private ModelDeviceService modelDeviceService;
+
+    @Autowired
+    private DeviceTypeConfigService deviceTypeConfigService;
+
+    public static final String TOTAL_RELEASE = "totalRelease";
+
+    @Autowired
+    RedisService redisService;
+
+    @Autowired
+    EarningsCalculateMapper earningsCalculateMapper;
+
+    @Autowired
+    private TdFeignClient tdFeignClient;
+    @Override
+    public int deleteByDay(String day, List<Integer> typeList) {
+        int i = earningsCalculateMpptMapper.deleteByDay(day, typeList);
+        return i;
+    }
+
+    /**
+     * 计算光伏收益
+     * @return
+     */
+    private List<EarningsCalculateMppt> countMpptIncome(Station station,String beginTime){
+        List<EarningsCalculateMppt> list =new ArrayList<>();
+        Integer stationId = station.getId();
+        // 总发
+        List<DeviceRespVO> deviceRespVOS = deviceService.getListByDeviceType(stationId, DeviceTypeConstant.MPPT);
+        if (deviceRespVOS.isEmpty()) {
+            deviceRespVOS = deviceService.getListByFuzzyDeviceType(stationId, DeviceTypeConstant.MPPT);
+        }
+        for (DeviceRespVO vo : deviceRespVOS) {
+            // 查询光伏Mppt 放电量关联字段 如果没关联，则不计算
+            List<ModelDeviceColComp> deviceCp = modelDeviceService.getCompListByType("device", vo.getDeviceType(), TOTAL_RELEASE);
+            if(deviceCp == null ){
+                break;
+            }
+            // 查询设备模型，没查询到则返回，不计算
+            DeviceTypeQuery deviceTypeQuery = new DeviceTypeQuery();
+            deviceTypeQuery.setGroupId(station.getGroupId());
+            deviceTypeQuery.setDeviceType(deviceCp.get(0).getDeviceType());
+            List<DeviceTypeConfig> deviceTypeConfigs = deviceTypeConfigService.queryListByCondition(deviceTypeQuery);
+            if (deviceTypeConfigs == null){
+                break;
+            }
+            //开始计算
+            //1:组装时序数据库查询参数
+            DateTime beginDate = DateUtil.beginOfDay(DateUtil.parse(beginTime));
+            DateTime endDate = DateUtil.endOfDay(beginDate);
+            TdBaseTimeQuery tdBaseQuery = new TdBaseTimeQuery();
+            tdBaseQuery.setBeginTime(beginDate.toMsStr());
+            tdBaseQuery.setEndTime(endDate.toMsStr());
+            tdBaseQuery.setTime("1m");
+            tdBaseQuery.setStationId(station.getId());
+            tdBaseQuery.setGroupId(station.getGroupId());
+            tdBaseQuery.setModelName((deviceTypeConfigs.get(0)).getModelName());
+            tdBaseQuery.setCol(deviceCp.get(0).getDeviceCol());
+            tdBaseQuery.setSrcId(vo.getSrcId());
+            // 查询设备时序数据，如果为空则不计算
+            DataResult<List<StationHomeRespVo>> listDataResult = tdFeignClient.queryPointTableList(tdBaseQuery);
+            List<StationHomeRespVo> datas = listDataResult.getData();
+            if(datas ==null){
+                break;
+            }
+            // 获取电价分时段计算收益
+            List<EarningsCalculateSub> elecTemplateSubs = earningsCalculateMapper.queryElecTemplateSubByStationId(station.getId(), 0, beginTime,2);
+            BigDecimal lastelec = BigDecimal.ZERO;
+            BigDecimal elec = BigDecimal.ZERO;
+            int num = 0 ;
+            for (EarningsCalculateSub sub : elecTemplateSubs ){
+                String earnBegin = sub.getBeginTime();
+                String earnEnd = sub.getEndTime();
+                DateTime earnBeginDate = DateUtil.parse(beginTime + " " + earnBegin + ":00");
+                DateTime earnEndate = DateUtil.parse(beginTime + " " + earnEnd + ":59");
+                List<StationHomeRespVo> subData = datas.stream().filter(i->DateUtil.isIn(DateUtil.parse(i.getDate()),earnBeginDate,earnEndate)).collect(Collectors.toList());
+                if(subData.size()>0){
+                    if(num==0){
+                        elec = subData.get(subData.size()-1).getDigital().subtract(subData.get(0).getDigital());
+                    }else {
+                        elec = subData.get(subData.size() - 1).getDigital().subtract(lastelec);
+                    }
+                    lastelec = subData.get(subData.size()-1).getDigital();
+                    num++;
+                    EarningsCalculateMppt earn =new EarningsCalculateMppt();
+                    earn.setDay(beginTime);
+                    earn.setGroupId(station.getGroupId());
+                    earn.setStationId(station.getId());
+                    earn.setSrcId(tdBaseQuery.getSrcId());
+                    earn.setPrice(sub.getPrice());
+                    earn.setRateType(sub.getType());
+                    earn.setType(1);
+                    earn.setCreateTime(new Date());
+                    BigDecimal discount = sub.getDiscount() == null ? BigDecimal.ONE : sub.getDiscount();
+                    earn.setTotal(BigDecimal.ZERO);
+                    earn.setElec(elec);
+                    earn.setDiscount(discount);
+                    earn.setDigital(new BigDecimal(String.format("%.4f",elec.multiply(sub.getPrice()))));
+                    list.add(earn);
+                }
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public void todayMpptIncome(List<Station> stations,String beginTime){
+        if(stations != null && stations.size() > 0){
+            for (Station station:stations){
+                List<EarningsCalculateMppt> list = countMpptIncome(station,beginTime);
+                // 缓存今日收益
+                if(list.size()>0){
+                    String key = RedisKeyConstant.PV.STATION_PV_TODAY_PROFIT + station.getId();
+                    BigDecimal todayIncone = list.stream().map(EarningsCalculateMppt::getDigital).reduce(BigDecimal.ZERO,BigDecimal::add);
+                    redisService.set(key, todayIncone);
+                }
+            }
+        }
+    }
+
+    @Override
+    public List<PowerGenerateRespVO> countPvIncome(Integer stationId, String beginTime, String endTime) {
+        return earningsCalculateMpptMapper.countPvIncome(stationId,beginTime,endTime);
+    }
+
+    @Override
+    public BigDecimal countAllPvIncome(Integer stationId,String beginTime, String endTime) {
+        BigDecimal data = earningsCalculateMpptMapper.countAllPvIncome(stationId,beginTime,endTime);
+        return data==null?BigDecimal.ZERO:data;
+    }
+
+    @Override
+    public List<DayProfitType> getProfit(String begin, String end, Integer groupId) {
+        return earningsCalculateMpptMapper.getProfit(begin, end, groupId);
+    }
+
+    @Override
+    public Date getFirstTime() {
+        String day = earningsCalculateMpptMapper.getFirstTime();
+        DateTime date = null;
+        if(day!=null){
+            date = DateUtil.parse(day, CommonConstant.DATE_YMD);
+        }
+        return date;
+    }
+
+    @Override
+    public List<DayProfitType> getEarningsByParam(CommonBigScreenReq req) {
+        return earningsCalculateMpptMapper.getEarningsByParam(req);
+    }
+
+    @Override
+    public void allMpptIncome(List<Station> stations,String beginTime) {
+        if(stations != null && stations.size() > 0){
+            for (Station station:stations){
+                List<EarningsCalculateMppt> list = countMpptIncome(station,beginTime);
+                // 数据插入
+                if(list.size()>0){
+                    int a = this.earningsCalculateMpptMapper.insertBatch(list);
+                    System.err.println("修改的行数:" + a);
+                }
+            }
+        }
+    }
+}

business-service-dao/src/main/java/com/ho/business/service/impl/EarningsCalculateServiceImpl.java

@@ -24,11 +24,13 @@ import com.ho.business.vo.req.pcsStation.PcsStationReq;
 import com.ho.business.vo.req.report.ReportReqVO;
 import com.ho.business.vo.resp.CountEleData;
 import com.ho.business.vo.resp.DeviceRespVO;
+import com.ho.business.vo.resp.InverterResp.PowerGenerateRespVO;
 import com.ho.business.vo.resp.cabin.EarningsCalculateCountResp;
 import com.ho.business.vo.resp.cabin.EarningsCalculateResp;
 import com.ho.business.vo.resp.colCount.ColCountResp;
 import com.ho.business.vo.resp.income.RevenueOverview;
 import com.ho.business.vo.resp.income.RevenueOverviewData;
+import com.ho.business.vo.resp.mppt.MpptActiveVo;
 import com.ho.business.vo.resp.pcsStation.EarningsCalculateData;
 import com.ho.business.vo.resp.pcsStation.PcsElecData;
 import com.ho.business.vo.resp.profit.DayProfitType;
@@ -41,6 +43,7 @@ import com.ho.common.tools.exception.BusinessException;
 import com.ho.common.tools.service.RedisService;
 import com.ho.datacollect.api.constant.DataCollectConstant;
 import com.ho.user.api.vo.req.SysSubDictVO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -101,6 +104,12 @@ public class EarningsCalculateServiceImpl implements EarningsCalculateService {
     @Autowired
     UserFeignClient userFeignClient;
 
+    @Autowired
+    OpenStationService openStationService;
+
+    @Autowired
+    EarningsCalculateMpptService earningsCalculateMpptService;
+
     public static final String DICT_TYPE = "electrovalence_type";
 
     /** start */
@@ -160,6 +169,10 @@ public class EarningsCalculateServiceImpl implements EarningsCalculateService {
         if (station == null || station.getId() == null) {
             return ec;
         }
+        boolean flag = false;
+        if(DataCollectConstant.ONE.equals(station.getInverterFlag())){
+            flag = true;
+        }
         Integer stationId = station.getId();
         String deviceType = colCountService.getDeviceType(stationId);
         List<DeviceRespVO> deviceRespVOS = deviceService.getListByDeviceType(stationId, deviceType);
@@ -194,11 +207,17 @@ public class EarningsCalculateServiceImpl implements EarningsCalculateService {
 
         String time = earningsCalculateReq.getTime();
         ec.setMonth(time.substring(time.length() - 2, time.length()));
+        String reportName = CommonConstant.REPORT_NAME;
+        String billName = CommonConstant.BILL_NAME;
+        if(CommonConstant.langTemp.EN_US.equals(earningsCalculateReq.getLang())){
+            reportName = CommonConstant.REPORT_NAME_EN;
+            billName = CommonConstant.BILL_NAME_EN;
+        }
         // 电站名称(报表标题)
         if (type == 0) {
-            ec.setStationName(station.getName() + "( " + time + " ) 月度报表");
+            ec.setStationName(station.getName() + "( " + time + " ) "+reportName);
         } else {
-            ec.setStationName(station.getName() + "( " + time + " ) 月度账单");
+            ec.setStationName(station.getName() + "( " + time + " ) "+billName);
         }
         ec.setList(list);
         //充电收益
@@ -220,6 +239,10 @@ public class EarningsCalculateServiceImpl implements EarningsCalculateService {
         BigDecimal dailyChargeElec = BigDecimal.ZERO;
         //日放电量
         BigDecimal dailyDischargeElec = BigDecimal.ZERO;
+        //今日收益（mppt）
+        BigDecimal todayIncone = BigDecimal.ZERO;
+        //今日发电量（mppt）
+        BigDecimal dailyReleaseElec = BigDecimal.ZERO;
         //当月则叠加当日，否则不叠加
         if (sameMonth) {
             //将当日的日充日放叠加到日冻结中
@@ -234,8 +257,26 @@ public class EarningsCalculateServiceImpl implements EarningsCalculateService {
             dailyChargeElec = countEleData.getDailyChargeElec();
             //日放电量
             dailyDischargeElec = countEleData.getDailyDischargeElec();
+            if(flag){
+                //今日收益（mppt）
+                String key = RedisKeyConstant.PV.STATION_PV_TODAY_PROFIT + station.getId();
+                todayIncone = (BigDecimal)redisService.get(key)==null?BigDecimal.ZERO:(BigDecimal)redisService.get(key);
+                //今日发电量（mppt）
+                MpptActiveVo pv = openStationService.getPvActivePower(stationId);
+                dailyReleaseElec = pv.getDailyReleaseElec();
+            }
+        }
+        if(flag){
+            BigDecimal monthIncone = earningsCalculateMpptService.countAllPvIncome(station.getId(),earningsCalculateReq.getBeginTime(),earningsCalculateReq.getEndTime());
+            ec.setMonthIncone(monthIncone.add(todayIncone));
+            BigDecimal monthReleaseElec = elecMeterValueService.selectSumByType(station.getId(),DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE,earningsCalculateReq.getBeginTime(),earningsCalculateReq.getEndTime(),null);
+            ec.setMonthReleaseElec(monthReleaseElec.add(dailyReleaseElec));
+            BigDecimal totalIncome = earningsCalculateMpptService.countAllPvIncome(station.getId(),null,null);
+            ec.setTotalIncome(totalIncome.add(todayIncone));
+            BigDecimal totalReleaseElec = elecMeterValueService.selectSumValue(station.getId(),DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE,null);
+            ec.setTotalReleaseElec(totalReleaseElec.add(dailyReleaseElec));
+            ec.setPvPower(station.getPvPower());
         }
-
         ec.setTotalChargeElec(pcsElecData.stream().map(PcsElecData::getChargeElec).reduce(BigDecimal.ZERO, BigDecimal::add).add(dailyChargeElec));
         ec.setTotalDischargeElec(pcsElecData.stream().map(PcsElecData::getDischargeElec).reduce(BigDecimal.ZERO, BigDecimal::add).add(dailyDischargeElec));
 
@@ -649,7 +690,8 @@ public class EarningsCalculateServiceImpl implements EarningsCalculateService {
         if (dateStr != null && !"".equals(dateStr)) {
             date = dateStr.substring(0, 7);
         }
-        earningsCalculateSubs = earningsCalculateMapper.queryElecTemplateSubByStationId(stationId, templateType, dateStr);
+        Integer elecType = 1;
+        earningsCalculateSubs = earningsCalculateMapper.queryElecTemplateSubByStationId(stationId, templateType, dateStr,elecType);
         if (earningsCalculateSubs != null && earningsCalculateSubs.size() > 0) {
             return earningsCalculateSubs;
         }
@@ -1534,6 +1576,56 @@ public class EarningsCalculateServiceImpl implements EarningsCalculateService {
         return earningsCalculateMapper.getEarningsByParam(req);
     }
 
+    @Override
+    public List<PowerGenerateRespVO> getPvMonthData(EarningsCalculateReq req) {
+        List<PowerGenerateRespVO> list = new ArrayList<>();
+        LocalDateTime mDate = DateUtil.parse(req.getTime(), CommonConstant.DATE_YM).toLocalDateTime();
+        LocalDateTime begin = mDate.with(TemporalAdjusters.firstDayOfMonth());
+        LocalDateTime end = mDate.with(TemporalAdjusters.lastDayOfMonth());
+        String beginTime= DateUtil.format(begin, CommonConstant.DATE_YMD);
+        String endTime = DateUtil.format(end, CommonConstant.DATE_YMD);
+        String nowTime  = DateUtil.format(new Date(), CommonConstant.DATE_YMD);
+        //光伏收益
+        List<PowerGenerateRespVO> pvIncome = earningsCalculateMpptService.countPvIncome(req.getStationId(),beginTime, endTime);
+        Map<String,List<PowerGenerateRespVO>> mapIncome = pvIncome.stream().collect(Collectors.groupingBy(i ->i.getDate()));
+        //光伏放电
+        List<Integer> types = new ArrayList<>();
+        types.add(DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE);
+        List<ElecMeterValue> elecMeterValues = elecMeterValueService.selectList(req.getStationId(), types, beginTime, endTime);
+        Map<String, List<ElecMeterValue>> mapMeter = elecMeterValues.stream().collect(Collectors.groupingBy(i ->i.getDay()));
+
+        //根据天获取时间段
+        List<DateTime> dateTimes = DateUtil.rangeToList(DateUtil.parse(beginTime), DateUtil.parse(endTime), DateField.DAY_OF_MONTH);
+        for (DateTime dateTime : dateTimes){
+            String date = DateUtil.format(dateTime, CommonConstant.DATE_YMD);
+            PowerGenerateRespVO  pv = new PowerGenerateRespVO();
+            pv.setDate(date);
+            List<PowerGenerateRespVO> pvIn = mapIncome.get(date);
+            //收益
+            if(pvIn != null){
+                pv.setProfit(pvIn.get(0).getProfit());
+            }
+            //放电
+            List<ElecMeterValue> elecs = mapMeter.get(date);
+            if(elecs != null){
+                pv.setPowerGenerate(elecs.stream().map(ElecMeterValue::getDigital).reduce(BigDecimal.ZERO,BigDecimal::add));
+            }
+            if(date.equals(nowTime)){
+                String key = RedisKeyConstant.PV.STATION_PV_TODAY_PROFIT + req.getStationId();
+                //获取今日收益
+                BigDecimal todayIncone = (BigDecimal)redisService.get(key);
+                pv.setProfit(todayIncone);
+                //获取今日发电
+                //当前功率(光伏)、总发电量、日发电量
+                MpptActiveVo todayPv = openStationService.getPvActivePower(req.getStationId());
+                pv.setPowerGenerate(todayPv.getDailyReleaseElec());
+
+            }
+            list.add(pv);
+        }
+        return list;
+    }
+
     public static ArrayList<BigDecimal> list(EarningsCalculateSub earningsCalculateSub) {
         BigDecimal[] bigDecimal = new BigDecimal[49];
         ArrayList<BigDecimal> list = new ArrayList<BigDecimal>(Arrays.asList(bigDecimal));

business-service-dao/src/main/java/com/ho/business/service/impl/ElecMeterValueServiceImpl.java

@@ -5,6 +5,7 @@ import com.ho.business.mapper.ElecMeterValueMapper;
 import com.ho.business.service.ElecMeterValueService;
 import com.ho.business.vo.req.bigScreen.CommonBigScreenReq;
 import com.ho.business.vo.req.carbin.ElecMeterReq;
+import com.ho.business.vo.resp.profit.DayProfitType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,7 +27,7 @@ public class ElecMeterValueServiceImpl implements ElecMeterValueService {
     @Override
     public BigDecimal selectSumByType(Integer stationId, Integer type, String beginTime, String endTime,Integer srcId) {
         BigDecimal sum = elecMeterValueMapper.selectSumByType(stationId, type, beginTime, endTime,srcId);
-        return sum;
+        return sum == null ? BigDecimal.ZERO:sum;
     }
 
     //按日期和类型删除
@@ -77,7 +78,7 @@ public class ElecMeterValueServiceImpl implements ElecMeterValueService {
     @Override
     public BigDecimal selectSumValue(Integer stationId, Integer type,Integer srcId) {
         BigDecimal sum = elecMeterValueMapper.selectSumValue(stationId, type,srcId);
-        return sum;
+        return sum == null ? BigDecimal.ZERO:sum;
     }
 
     @Override
@@ -96,4 +97,9 @@ public class ElecMeterValueServiceImpl implements ElecMeterValueService {
     public List<ElecMeterValue> selectGroupByDay(CommonBigScreenReq req) {
         return elecMeterValueMapper.selectGroupByDay(req);
     }
+
+    @Override
+    public List<DayProfitType> getElec(String begin, String end, Integer groupId, Integer type,List<Integer> stationIds) {
+        return elecMeterValueMapper.getElec(begin,end,groupId,type,stationIds);
+    }
 }

business-service-dao/src/main/java/com/ho/business/service/impl/IargeScreenShowServiceImpl.java

@@ -19,8 +19,10 @@ import com.ho.business.vo.resp.DeviceRespVO;
 import com.ho.business.vo.resp.ProvinceStation;
 import com.ho.business.vo.resp.colCount.ColCountResp;
 import com.ho.business.vo.resp.iargeScreen.*;
+import com.ho.business.vo.resp.mppt.MpptActiveVo;
 import com.ho.business.vo.resp.profit.DayProfitType;
 import com.ho.common.tools.constant.CommonConstant;
+import com.ho.common.tools.constant.RedisKeyConstant;
 import com.ho.common.tools.entity.SimpleUser;
 import com.ho.common.tools.service.RedisService;
 import com.ho.common.tools.util.BigDecimalUtil;
@@ -77,6 +79,12 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
     @Autowired
     TranslateProvinceMapper translateProvinceMapper;
 
+    @Autowired
+    OpenStationService openStationService;
+
+    @Autowired
+    EarningsCalculateMpptService earningsCalculateMpptService;
+
 
     private final static BigDecimal value = new BigDecimal("0.475");
     private final static BigDecimal parameter = new BigDecimal("18.3");
@@ -201,6 +209,62 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         return annualOverviewResp;
     }*/
 
+    private AnnualPvOverviewResp getPvOverviewDatas(List<Station> list){
+        AnnualPvOverviewResp annualOverviewResp = new AnnualPvOverviewResp();
+        //装机容量
+        BigDecimal capacity = BigDecimal.ZERO;
+        //电站总数
+        Integer stationNumber = list.size();
+        BigDecimal todayIncone = BigDecimal.ZERO;
+        BigDecimal dailyReleaseElec = BigDecimal.ZERO;
+        BigDecimal yearIncone = BigDecimal.ZERO;
+        BigDecimal totalIncome = BigDecimal.ZERO;
+        BigDecimal yearReleaseElec = BigDecimal.ZERO;
+        BigDecimal totalReleaseElec = BigDecimal.ZERO;
+        //今年开始时间、结束时间
+        DateTime begin = DateUtil.beginOfYear(new Date());
+        String beginString = DateUtil.format(begin, CommonConstant.DATE_YMD);
+        String endString = DateUtil.format(DateUtil.endOfYear(new Date()), CommonConstant.DATE_YMD);
+        for (Station station : list) {
+            //装机容量进行累加
+            BigDecimal capacityStation = station.getCapacity();
+            if (capacityStation != null) {
+                capacity = capacity.add(capacityStation);
+            }
+            String key = RedisKeyConstant.PV.STATION_PV_TODAY_PROFIT + station.getId();
+            // 今日收益
+            BigDecimal tIncone = (BigDecimal)redisService.get(key);
+            todayIncone = todayIncone.add(tIncone==null?BigDecimal.ZERO:tIncone);
+            // 年收益
+            BigDecimal yIncone = earningsCalculateMpptService.countAllPvIncome(station.getId(),beginString,endString);
+            yearIncone = yearIncone.add(yIncone);
+            // 累计收益
+            BigDecimal allIncone = earningsCalculateMpptService.countAllPvIncome(station.getId(),null,null);
+            totalIncome = totalIncome.add(allIncone);
+            // 日发电
+            MpptActiveVo todayPv = openStationService.getPvActivePower(station.getId());
+            dailyReleaseElec = dailyReleaseElec.add(todayPv.getDailyReleaseElec());
+            // 年发电
+            BigDecimal yReleaseElec = elecMeterValueService.selectSumByType(station.getId(),DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE,beginString,endString,null);
+            yearReleaseElec = yearReleaseElec.add(yReleaseElec);
+            // 累计发电
+            BigDecimal allReleaseElec = elecMeterValueService.selectSumValue(station.getId(),DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE,null);
+            totalReleaseElec = totalReleaseElec.add(allReleaseElec);
+        }
+        //装机容量、电站数量
+        annualOverviewResp.setCapacity(capacity);
+        annualOverviewResp.setStationNumber(stationNumber);
+        // 今日收益、年收益、累计收益
+        annualOverviewResp.setTodayIncone(todayIncone);
+        annualOverviewResp.setYearIncone(yearIncone.add(todayIncone));
+        annualOverviewResp.setTotalIncome(totalIncome.add(todayIncone));
+        //今日发电量、年发电量、累计发电量
+        annualOverviewResp.setDailyReleaseElec(dailyReleaseElec);
+        annualOverviewResp.setYearReleaseElec(yearReleaseElec.add(dailyReleaseElec));
+        annualOverviewResp.setTotalReleaseElec(totalReleaseElec.add(dailyReleaseElec));
+        return annualOverviewResp;
+    }
+
     private AnnualOverviewResp getOverviewDatas(List<Station> list) {
         AnnualOverviewResp annualOverviewResp = new AnnualOverviewResp();
         List<Station> stations = new ArrayList<>();
@@ -282,7 +346,6 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
             annualOverviewResp.setYestProfit(overviewProfit.getYestProfit()==null?null:overviewProfit.getYestProfit().multiply(new BigDecimal("10000")));
             annualOverviewResp.setYearProfit(overviewProfit.getYearProfit()==null?null:overviewProfit.getYearProfit().multiply(new BigDecimal("10000")));
             annualOverviewResp.setTotalProfit(overviewProfit.getTotalProfit()==null?null:overviewProfit.getTotalProfit().multiply(new BigDecimal("10000")));
-            annualOverviewResp.setTodayProfit(overviewProfit.getTodayProfit()==null?null:overviewProfit.getTodayProfit().multiply(new BigDecimal("10000")));
             //时间当年
             DateTime begin = DateUtil.beginOfYear(new Date());
             String beginString = DateUtil.format(begin, CommonConstant.DATE_YMD);
@@ -468,7 +531,23 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         List<Station> list = stationService.selectAll();
         return getEnergySavingRespVo(list);
     }
+    private EnergySavingRespVo getPvEnergySavingRespVo(List<Station> list){
+        EnergySavingRespVo energySavingRespVo = new EnergySavingRespVo();
+        AnnualPvOverviewResp vo = getPvOverviewDatas(list);
+        BigDecimal totalReleaseElec = vo.getTotalReleaseElec();
+        BigDecimal reductionCO2 = totalReleaseElec.multiply(value);
+        energySavingRespVo.setReductionCO2(reductionCO2);
 
+        //等效植树量  等效植树量=等效减排CO2/183/40
+        BigDecimal treePlanting = reductionCO2.divide(parameter, 6, BigDecimal.ROUND_HALF_UP).divide(fours, 6, BigDecimal.ROUND_HALF_UP);
+        energySavingRespVo.setTreePlanting(treePlanting);
+        //等效节约煤 等效节约煤=所有电站总充*节约标准煤转换系数(04)
+        BigDecimal equivalentCoal = totalReleaseElec.multiply(four);
+        energySavingRespVo.setEquivalentCoal(equivalentCoal);
+        //等效经济收入 等效经济收入=等效节约煤*煤价 (600元/吨)  等效节约煤此处单位为kg,故而单价调整为0.6元/kg
+        energySavingRespVo.setIncome(equivalentCoal.multiply(coalPrice));
+        return energySavingRespVo;
+    }
     private EnergySavingRespVo getEnergySavingRespVo(List<Station> list) {
         EnergySavingRespVo energySavingRespVo = new EnergySavingRespVo();
         List<Station> stations = new ArrayList<>();
@@ -519,6 +598,56 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         return subdataList;
     }
 
+    private List<Subdata> getPvElec(String beginString, String endString, List<Station> stations){
+        Map<Integer, Station> stationMap = stations.stream().collect(Collectors.toMap(Station::getId, Function.identity()));
+        Integer groupId = null;
+        for (Station station : stations) {
+            groupId = station.getGroupId();
+        }
+        List<DayProfitType> stationElec = elecMeterValueService.getElec(beginString, endString, groupId,DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE,null);
+        Map<Integer, List<DayProfitType>> profitMap = stationElec.stream().collect(Collectors.groupingBy(DayProfitType::getStationId));
+        //创建返回对象
+        List<Subdata> subdataList = new ArrayList<>();
+        profitMap.forEach((k, v) -> {
+            Subdata subdata = new Subdata();
+            //收益
+            BigDecimal result = v.stream().map(DayProfitType::getDigital).reduce(BigDecimal.ZERO,BigDecimal::add);
+            if (stationMap.containsKey(k)) {
+                Station station = stationMap.get(k);
+                subdata.setStationId(k);
+                subdata.setStationName(station.getName());
+                subdata.setRelease(result);
+                subdataList.add(subdata);
+            }
+        });
+        subdataList.sort(Comparator.comparing((Subdata::getIncomeValue)).reversed());
+        return subdataList;
+    }
+    private List<Subdata> getPvSubdata(String beginString, String endString, List<Station> stations){
+        Map<Integer, Station> stationMap = stations.stream().collect(Collectors.toMap(Station::getId, Function.identity()));
+        Integer groupId = null;
+        for (Station station : stations) {
+            groupId = station.getGroupId();
+        }
+        List<DayProfitType> stationProfit = earningsCalculateMpptService.getProfit(beginString, endString, groupId);
+        Map<Integer, List<DayProfitType>> profitMap = stationProfit.stream().collect(Collectors.groupingBy(DayProfitType::getStationId));
+        //创建返回对象
+        List<Subdata> subdataList = new ArrayList<>();
+        profitMap.forEach((k, v) -> {
+            Subdata subdata = new Subdata();
+            //收益
+            BigDecimal result = v.stream().map(DayProfitType::getDigital).reduce(BigDecimal.ZERO,BigDecimal::add);
+            if (stationMap.containsKey(k)) {
+                Station station = stationMap.get(k);
+                subdata.setStationId(k);
+                subdata.setStationName(station.getName());
+                subdata.setIncomeValue(result);
+                subdataList.add(subdata);
+            }
+        });
+        subdataList.sort(Comparator.comparing((Subdata::getIncomeValue)).reversed());
+        return subdataList;
+    }
     @NotNull
     private List<Subdata> getSubdata(String beginString, String endString, List<Station> stations) {
         Map<Integer, Station> stationMap = stations.stream().collect(Collectors.toMap(Station::getId, Function.identity()));
@@ -572,6 +701,76 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         return subdataList;
     }
 
+    private List<Subdata> getPvElecByDay(String beginString, String endString, List<Station> stations){
+        Map<Integer, Station> stationMap = stations.stream().collect(Collectors.toMap(Station::getId, Function.identity()));
+        Integer groupId = null;
+        List<Integer> ids = new ArrayList<>();
+        for (Station station : stations) {
+            groupId = station.getGroupId();
+            ids.add(station.getId());
+        }
+        CommonBigScreenReq req = new CommonBigScreenReq();
+        req.setBeginTime(beginString);
+        req.setEndTime(endString);
+        req.setStationIds(ids);
+        req.setGroupId(groupId);
+        List<DayProfitType> stationElec = elecMeterValueService.getElec(beginString, endString, groupId,DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE,ids);
+        Map<String, List<DayProfitType>> elecMap = stationElec.stream().collect(Collectors.groupingBy(s -> s.getStationId() + "," + s.getDay()));
+        //创建返回对象
+        List<Subdata> subdataList = new ArrayList<>();
+        elecMap.forEach((k, v) -> {
+            Subdata subdata = new Subdata();
+            // 收益
+            BigDecimal result = v.stream().map(DayProfitType::getDigital).reduce(BigDecimal.ZERO,BigDecimal::add);
+            String[] split = k.split(",");
+            Integer stationId = Integer.parseInt(split[0]);
+            if (stationMap.containsKey(stationId)) {
+                Station station = stationMap.get(stationId);
+                subdata.setStationId(stationId);
+                subdata.setStationName(split[1] + station.getName());
+                subdata.setRelease(result);
+                subdataList.add(subdata);
+            }
+        });
+        subdataList.sort(Comparator.comparing((Subdata::getIncomeValue)).reversed());
+        return subdataList;
+
+    }
+
+    private List<Subdata> getPvSubdataByDay(String beginString, String endString, List<Station> stations){
+        Map<Integer, Station> stationMap = stations.stream().collect(Collectors.toMap(Station::getId, Function.identity()));
+        Integer groupId = null;
+        List<Integer> ids = new ArrayList<>();
+        for (Station station : stations) {
+            groupId = station.getGroupId();
+            ids.add(station.getId());
+        }
+        CommonBigScreenReq req = new CommonBigScreenReq();
+        req.setBeginTime(beginString);
+        req.setEndTime(endString);
+        req.setStationIds(ids);
+        req.setGroupId(groupId);
+        List<DayProfitType> stationProfit = earningsCalculateMpptService.getEarningsByParam(req);
+        Map<String, List<DayProfitType>> profitMap = stationProfit.stream().collect(Collectors.groupingBy(s -> s.getStationId() + "," + s.getDay()));
+        //创建返回对象
+        List<Subdata> subdataList = new ArrayList<>();
+        profitMap.forEach((k, v) -> {
+            Subdata subdata = new Subdata();
+            // 收益
+            BigDecimal result = v.stream().map(DayProfitType::getDigital).reduce(BigDecimal.ZERO,BigDecimal::add);
+            String[] split = k.split(",");
+            Integer stationId = Integer.parseInt(split[0]);
+            if (stationMap.containsKey(stationId)) {
+                Station station = stationMap.get(stationId);
+                subdata.setStationId(stationId);
+                subdata.setStationName(split[1] + station.getName());
+                subdata.setIncomeValue(result);
+                subdataList.add(subdata);
+            }
+        });
+        subdataList.sort(Comparator.comparing((Subdata::getIncomeValue)).reversed());
+        return subdataList;
+    }
 
     private List<Subdata> getSubdataByDay(String beginString, String endString, List<Station> stations) {
         Map<Integer, Station> stationMap = stations.stream().collect(Collectors.toMap(Station::getId, Function.identity()));
@@ -968,48 +1167,15 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
     }
 
     private List<ProvinceStation> getProvince(List<Station> stations) {
-        //地址选取前三个字
-//        Map<String, List<Station>> provincesMap = stations.stream().sorted(Comparator.comparing(Station::getName)).collect(Collectors.groupingBy(s -> {
-//            return s.getAddress().substring(0, 3);
-//        }));
-//        //创建返回值集合
-//        List<ProvinceStation> provinceList = new ArrayList<>();
-//        provincesMap.forEach((k, v) -> {
-//            ProvinceStation provinceStation = new ProvinceStation();
-//            if (k.contains("省")) {
-//                provinceStation.setName(k.replace("省", ""));
-//            } else if (k.contains("广西")) {
-//                provinceStation.setName(CommonConstant.ChineseProvinces.guangxi);
-//            } else if (k.contains("宁夏")) {
-//                provinceStation.setName(CommonConstant.ChineseProvinces.ningxia);
-//            } else if (k.contains("内蒙古")) {
-//                provinceStation.setName(CommonConstant.ChineseProvinces.neimenggu);
-//            } else if (k.contains("新疆")) {
-//                provinceStation.setName(CommonConstant.ChineseProvinces.xinjiang);
-//            } else if (k.contains("西藏")) {
-//                provinceStation.setName(CommonConstant.ChineseProvinces.xizang);
-//            } else if (k.contains("香港")) {
-//                provinceStation.setName(CommonConstant.ChineseProvinces.xianggang);
-//            } else if (k.contains("澳门")) {
-//                provinceStation.setName(CommonConstant.ChineseProvinces.aomen);
-//            } else {
-//                provinceStation.setName(k.replaceFirst("市", ""));
-//            }
-//            provinceStation.setList(v);
-//            provinceList.add(provinceStation);
-//        });
-        List<TranslateProvince> dictProvince = translateProvinceMapper.getDictProvince();
-        Map<String, String> provinceMap = dictProvince.stream().collect(Collectors.toMap(s -> s.getName(), s -> s.getNameEn(), (k1, k2) -> k1));
-        Map<String, List<Station>> provincesMap = stations.stream().filter(s->s.getProvince()!=null).collect(Collectors.groupingBy(Station::getProvince));
-        List<ProvinceStation> provinceList = new ArrayList<>();
-        provincesMap.forEach((k, v) -> {
+        Map<String, List<Station>> natioMap = stations.stream().filter(s->s.getProvince()!=null).collect(Collectors.groupingBy(Station::getNation));
+        List<ProvinceStation> list = new ArrayList<>();
+        natioMap.forEach((k, v) -> {
             ProvinceStation provinceStation = new ProvinceStation();
             provinceStation.setName(k);
-            provinceStation.setNameEn(provinceMap.get(k));
             provinceStation.setList(v);
-            provinceList.add(provinceStation);
+            list.add(provinceStation);
         });
-        return provinceList;
+        return list;
     }
 
     @Override
@@ -1065,6 +1231,36 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         return getAnnualChartValues(stations);
     }
 
+    private List<AnnualChartValue> getAnnualReleaseValues(List<Station> stations){
+        Integer groupId = null;
+        for (Station station : stations) {
+            groupId = station.getGroupId();
+        }
+        //时间（近30天）
+        Date date = DateUtil.yesterday();
+        Date startDate = DateUtils.addDays(date, -maxSize);
+        Date endDate = DateUtil.endOfDay(date);
+        List<DateTime> dateTimes = DateUtil.rangeToList(startDate, endDate, DateField.DAY_OF_MONTH);
+        String beginTime = DateUtil.format(startDate, CommonConstant.DATE_YMD);
+        String endTime = DateUtil.format(endDate, CommonConstant.DATE_YMD);
+        List<DayProfitType> stationElec = elecMeterValueService.getElec(beginTime, endTime, groupId,DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE,null);
+        Map<String, List<DayProfitType>> elecMap = stationElec.stream().collect(Collectors.groupingBy(s -> s.getDay()));
+        List<AnnualChartValue> resultList = new ArrayList<>();
+        for (DateTime dateTime:dateTimes){
+            AnnualChartValue annualChartValue = new AnnualChartValue();
+            BigDecimal release = BigDecimal.ZERO;
+            String time = DateUtil.format(dateTime, CommonConstant.DATE_YMD);
+            List<DayProfitType> elecList = elecMap.get(time);
+            if(elecList != null && elecList.size()>0){
+                release = elecList.stream().map(DayProfitType::getDigital).reduce(BigDecimal.ZERO,BigDecimal::add);
+            }
+            annualChartValue.setTime(time);
+            annualChartValue.setRelease(release);
+            resultList.add(annualChartValue);
+        }
+        return resultList;
+    }
+
     private List<AnnualChartValue> getAnnualChartValues(List<Station> stations) {
         //时间（近30天）
         Date date = DateUtil.yesterday();
@@ -1134,47 +1330,6 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
             annualChartValue.setDayDischarge(totalDischarge);
             resultList.add(annualChartValue);
         }
-        /*********************************************************/
-//        List<AnnualChartValue> annualChartList = new ArrayList<>();
-//        annualChartList = dateTimes.stream().map(s -> {
-//            AnnualChartValue annualChartValue = new AnnualChartValue();
-//            String dateString = s + "";
-//            String substring = dateString.substring(0, 10);
-//            annualChartValue.setTime(substring);
-//            annualChartValue.setDayCharge(BigDecimal.ZERO);
-//            annualChartValue.setDayDischarge(BigDecimal.ZERO);
-//            return annualChartValue;
-//        }).collect(Collectors.toList());
-//        for (AnnualChartValue annualChartValue : annualChartList) {
-//            String time = annualChartValue.getTime();
-//            //年总充/年总放（日冻结表计算）或者总充/总放
-//            BigDecimal yearCharge = BigDecimal.ZERO;
-//            BigDecimal yearDischarge = BigDecimal.ZERO;
-//            List<ElecMeterValue> byTimeList = getByTimeList(stations, time, time);
-//            List<ElecMeterValue> chargeList = new ArrayList<>();
-//            byTimeList.stream().filter(i -> DeviceTypeConstant.ELEC_METER_VALUE_TYPE.CHARGE.equals(i.getType())).forEach(s -> chargeList.add(s));
-//            List<ElecMeterValue> disList = new ArrayList<>();
-//            byTimeList.stream().filter(i -> DeviceTypeConstant.ELEC_METER_VALUE_TYPE.DISCHARGE.equals(i.getType())).forEach(s -> disList.add(s));
-//            for (ElecMeterValue elecMeterValue : chargeList) {
-//                if (FENGStationId == elecMeterValue.getStationId()) {
-//                    yearCharge = yearCharge.add(elecMeterValue.getDigital().multiply(new BigDecimal("1000")));
-//                } else {
-//                    yearCharge = yearCharge.add(elecMeterValue.getDigital());
-//                }
-//
-//            }
-//            for (ElecMeterValue elecMeterValue : disList) {
-//                if (FENGStationId == elecMeterValue.getStationId()) {
-//                    yearDischarge = yearDischarge.add(elecMeterValue.getDigital().multiply(new BigDecimal("1000")));
-//                } else {
-//                    yearDischarge = yearDischarge.add(elecMeterValue.getDigital());
-//                }
-//
-//            }
-//
-//            annualChartValue.setDayCharge(yearCharge);
-//            annualChartValue.setDayDischarge(yearDischarge);
-//        }
         return resultList;
     }
 
@@ -1300,6 +1455,34 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         return annualOverviewResp;
     }
 
+    @Override
+    public AnnualPvOverviewResp getPvOverviewData(List<Integer> stationIds) {
+        if (stationIds == null) {
+            return new AnnualPvOverviewResp();
+        }
+        List<Station> list = getCountPvStations(stationIds);
+        AnnualPvOverviewResp annualOverviewResp = getPvOverviewDatas(list);
+        return annualOverviewResp;
+    }
+
+    @Override
+    public EnergySavingRespVo getPvEnergySaving(List<Integer> stationIds) {
+        if (stationIds == null) {
+            return new EnergySavingRespVo();
+        }
+        List<Station> list = getCountPvStations(stationIds);
+        return getPvEnergySavingRespVo(list);
+    }
+
+    @Override
+    public List<AnnualChartValue> getPVCommonProfitCurve(CockpitReqVO vo, List<Integer> stationIds) {
+        if (stationIds == null) {
+            return new ArrayList<>();
+        }
+        List<Station> list = getCountPvStations(stationIds);
+        return getPvProfitCurve(vo, list);
+    }
+
     @Override
     public List<Subdata> getCommonRegionList(List<Integer> stationIds) {
         if (stationIds == null) {
@@ -1307,16 +1490,39 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         }
         List<Station> list = getCountStations(stationIds);
         List<Subdata> regionList = new ArrayList<>();
-        Map<String, List<Station>> provinceMap = list.stream().filter(i -> i.getProvince() != null).collect(Collectors.groupingBy(Station::getProvince));
-        if (provinceMap.size() > CommonConstant.ONE) {
-            regionList = getListSubdata(provinceMap);
+        Map<String, List<Station>> nationMap = list.stream().filter(i -> i.getProvince() != null).collect(Collectors.groupingBy(Station::getNation));
+        if (nationMap.size() > CommonConstant.ONE) {
+            regionList = getListSubdata(nationMap);
         } else {
-            Map<String, List<Station>> cityMap = list.stream().filter(i -> i.getCity() != null).collect(Collectors.groupingBy(Station::getCity));
-            if (cityMap.size() > CommonConstant.ONE) {
-                regionList = getListSubdata(cityMap);
+            Map<String, List<Station>> provinceMap = list.stream().filter(i -> i.getCity() != null).collect(Collectors.groupingBy(Station::getProvince));
+            if (provinceMap.size() > CommonConstant.ONE) {
+                regionList = getListSubdata(provinceMap);
             } else {
-                Map<String, List<Station>> districtMap = list.stream().filter(i -> i.getDistrict() != null).collect(Collectors.groupingBy(Station::getDistrict));
-                regionList = getListSubdata(districtMap);
+                Map<String, List<Station>> cityMap = list.stream().filter(i -> i.getDistrict() != null).collect(Collectors.groupingBy(Station::getCity));
+                regionList = getListSubdata(cityMap);
+            }
+        }
+        return regionList;
+    }
+
+
+    @Override
+    public List<Subdata> getCommonPvRegionList(List<Integer> stationIds) {
+        if (stationIds == null) {
+            return new ArrayList<>();
+        }
+        List<Station> list = getCountPvStations(stationIds);
+        List<Subdata> regionList = new ArrayList<>();
+        Map<String, List<Station>> nationMap = list.stream().filter(i -> i.getProvince() != null).collect(Collectors.groupingBy(Station::getNation));
+        if (nationMap.size() > CommonConstant.ONE) {
+            regionList = getListSubdata(nationMap);
+        } else {
+            Map<String, List<Station>> provinceMap = list.stream().filter(i -> i.getCity() != null).collect(Collectors.groupingBy(Station::getProvince));
+            if (provinceMap.size() > CommonConstant.ONE) {
+                regionList = getListSubdata(provinceMap);
+            } else {
+                Map<String, List<Station>> cityMap = list.stream().filter(i -> i.getDistrict() != null).collect(Collectors.groupingBy(Station::getCity));
+                regionList = getListSubdata(cityMap);
             }
         }
         return regionList;
@@ -1333,7 +1539,22 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         }
         return regionList;
     }
+    public List<AnnualChartValue> getPvProfitCurve(CockpitReqVO vo, List<Station> stations){
+        List<AnnualChartValue> curveResult = new ArrayList<>();
+        Integer groupId = null;
+        for (Station station : stations) {
+            groupId = station.getGroupId();
+        }
+        if (CommonConstant.DAY.equals(vo.getType())) {
+            setDayPvCurveResult(curveResult, groupId, stations);
+        } else if (CommonConstant.YEAR.equals(vo.getType())) {
+            setYearPVCurveResult(curveResult, groupId, stations);
+        } else {
+            setMonthPvCurveResult(curveResult, groupId, stations);
+        }
 
+        return curveResult;
+    }
     public List<AnnualChartValue> getProfitCurve(CockpitReqVO vo, List<Station> stations) {
         List<AnnualChartValue> curveResult = new ArrayList<>();
         Integer groupId = null;
@@ -1377,6 +1598,59 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         return getAnnualChartValues(getCountStations(stationIds));
     }
 
+    @Override
+    public List<AnnualChartValue> getCommonPvRelease(List<Integer> stationIds){
+        if (stationIds == null) {
+            return new ArrayList<>();
+        }
+        return getAnnualReleaseValues(getCountPvStations(stationIds));
+    }
+
+    @Override
+    public List<Subdata> getPvCommonElec(String beginString, String endString,List<Integer> stationIds){
+        List<Subdata> subdata = new ArrayList<>();
+        if (stationIds == null) {
+            return subdata;
+        }
+        List<Station> countStations = getCountPvStations(stationIds);
+        if (countStations != null && !countStations.isEmpty()) {
+            if (countStations.size() >= CommonConstant.FIVE) {
+                subdata = getPvElec(beginString,endString,countStations);
+            } else {
+                //电站数目小于5个
+                Date date = DateUtil.yesterday();
+                Date startDate = DateUtils.addDays(date, -CommonConstant.FIVE);
+                Date endDate = DateUtil.endOfDay(date);
+                beginString = DateUtil.format(startDate, CommonConstant.DATE_YMD);
+                endString = DateUtil.format(endDate, CommonConstant.DATE_YMD);
+                subdata = getPvElecByDay(beginString, endString, countStations);
+            }
+        }
+        return subdata;
+    }
+
+    @Override
+    public List<Subdata> getPvCommonProfit(String beginString, String endString,List<Integer> stationIds){
+        List<Subdata> subdata = new ArrayList<>();
+        if (stationIds == null) {
+            return subdata;
+        }
+        List<Station> countStations = getCountPvStations(stationIds);
+        if (countStations != null && !countStations.isEmpty()) {
+            if (countStations.size() >= CommonConstant.FIVE) {
+                subdata = getPvSubdata(beginString,endString,countStations);
+            } else {
+                //电站数目小于5个
+                Date date = DateUtil.yesterday();
+                Date startDate = DateUtils.addDays(date, -CommonConstant.FIVE);
+                Date endDate = DateUtil.endOfDay(date);
+                beginString = DateUtil.format(startDate, CommonConstant.DATE_YMD);
+                endString = DateUtil.format(endDate, CommonConstant.DATE_YMD);
+                subdata = getPvSubdataByDay(beginString, endString, countStations);
+            }
+        }
+        return subdata;
+    }
     @Override
     public List<Subdata> getCommonProfit(String beginString, String endString, List<Integer> stationIds) {
         List<Subdata> subdata = new ArrayList<>();
@@ -1428,6 +1702,16 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         return subdata;
     }
 
+    private void setMonthPvCurveResult(List<AnnualChartValue> curveResult, Integer groupId, List<Station> stations) {
+        Date date = DateUtil.yesterday();
+        Date startDate = DateUtil.beginOfYear(date);
+        Date endDate = DateUtil.endOfDay(date);
+        String begin = DateUtil.format(startDate, CommonConstant.DATE_YMD);
+        String end = DateUtil.format(endDate, CommonConstant.DATE_YMD);
+        List<DateTime> dateTime = DateUtil.rangeToList(startDate, endDate, DateField.MONTH);
+        setPvProfitByDayFormat(curveResult, groupId, dateTime, begin, end, CommonConstant.DATE_YM, stations);
+    }
+
     private void setMonthCurveResult(List<AnnualChartValue> curveResult, Integer groupId, List<Station> stations) {
         Date date = DateUtil.yesterday();
         Date startDate = DateUtil.beginOfYear(date);
@@ -1438,6 +1722,19 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         setProfitByDayFormat(curveResult, groupId, dateTime, begin, end, CommonConstant.DATE_YM, stations);
     }
 
+    private void setYearPVCurveResult(List<AnnualChartValue> curveResult, Integer groupId, List<Station> stations) {
+        //查询数据的最小日期
+        Date beginDate = earningsCalculateMpptService.getFirstTime();
+        if(beginDate != null){
+            Date date = DateUtil.yesterday();
+            Date startDate = DateUtil.beginOfYear(beginDate);
+            Date endDate = DateUtil.endOfDay(date);
+            String begin = DateUtil.format(startDate, CommonConstant.DATE_YMD);
+            String end = DateUtil.format(endDate, CommonConstant.DATE_YMD);
+            List<DateTime> dateTime = DateUtil.rangeToList(startDate, endDate, DateField.YEAR);
+            setPvProfitByDayFormat(curveResult, groupId, dateTime, begin, end, CommonConstant.DATE_Y, stations);
+        }
+    }
     private void setYearCurveResult(List<AnnualChartValue> curveResult, Integer groupId, List<Station> stations) {
         //查询数据的最小日期
         Date beginDate = earningsCalculateService.getFirstTime();
@@ -1451,6 +1748,16 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
             setProfitByDayFormat(curveResult, groupId, dateTime, begin, end, CommonConstant.DATE_Y, stations);
         }
     }
+    private void setDayPvCurveResult(List<AnnualChartValue> curveResult, Integer groupId, List<Station> stations) {
+        //开始结束时间为30天
+        Date date = DateUtil.yesterday();
+        Date startDate = DateUtils.addDays(date, -maxSize);
+        Date endDate = DateUtil.endOfDay(date);
+        String begin = DateUtil.format(startDate, CommonConstant.DATE_YMD);
+        String end = DateUtil.format(endDate, CommonConstant.DATE_YMD);
+        List<DateTime> dateTime = DateUtil.rangeToList(startDate, endDate, DateField.DAY_OF_MONTH);
+        setPvProfitByDayFormat(curveResult, groupId, dateTime, begin, end, CommonConstant.DATE_YMD, stations);
+    }
 
     private void setDayCurveResult(List<AnnualChartValue> curveResult, Integer groupId, List<Station> stations) {
         //开始结束时间为30天
@@ -1463,6 +1770,37 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         setProfitByDayFormat(curveResult, groupId, dateTime, begin, end, CommonConstant.DATE_YMD, stations);
     }
 
+    private void setPvProfitByDayFormat(List<AnnualChartValue> curveResult, Integer groupId, List<DateTime> dateTimes, String begin, String end, String type, List<Station> stations) {
+        Map<Integer, List<Station>> stationMap = stations.stream().collect(Collectors.groupingBy(Station::getId));
+        //查询收益
+        List<DayProfitType> dayProfit = earningsCalculateMpptService.getProfit(begin, end, groupId);
+        //在使用之前将不要的电站过滤
+        List<DayProfitType> profitList = new ArrayList<>();
+        for (DayProfitType dayProfitType : dayProfit) {
+            if (stationMap.containsKey(dayProfitType.getStationId())) {
+                profitList.add(dayProfitType);
+            }
+        }
+        Map<String, List<DayProfitType>> dayMap = profitList.stream().collect(Collectors.groupingBy(DayProfitType::getDay));
+        for (DateTime dateTime : dateTimes) {
+            AnnualChartValue annualChartValue = new AnnualChartValue();
+            String day = DateUtil.format(dateTime, type);
+            List<DayProfitType> dayProfitTypes = new ArrayList<>();
+            Set<String> dayList = dayMap.keySet();
+            for (String key : dayList) {
+                if (key.contains(day)) {
+                    dayProfitTypes.addAll(dayMap.get(key));
+                }
+            }
+            //收益
+            BigDecimal profit = dayProfitTypes.stream().map(DayProfitType::getDigital).reduce(BigDecimal.ZERO,BigDecimal::add);
+//            BigDecimal result = profit.divide(new BigDecimal("10000"));
+            annualChartValue.setProfit(profit);
+            annualChartValue.setTime(day);
+            curveResult.add(annualChartValue);
+        }
+    }
+
     private void setProfitByDayFormat(List<AnnualChartValue> curveResult, Integer groupId, List<DateTime> dateTimes, String begin, String end, String type, List<Station> stations) {
         //直接查询需要的电站
 //        List<Station> list = stationService.selectAll();
@@ -1533,7 +1871,7 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         if(beginDate == null){
             return annualOverviewResp;
         }
-        Date date = DateUtil.date();
+        Date date = DateUtil.yesterday();
         Date startDate = DateUtil.beginOfYear(beginDate);
         Date endDate = DateUtil.endOfDay(date);
         String begin = DateUtil.format(startDate, CommonConstant.DATE_YMD);
@@ -1547,7 +1885,6 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
                 profitList.add(dayProfitType);
             }
         }
-        //计算总收益
         Map<String, List<DayProfitType>> dayMap = profitList.stream().collect(Collectors.groupingBy(DayProfitType::getDay));
         List<AnnualChartValue> yearProfitCurve = new ArrayList<>();
         getAnnualOverviewResp(yearProfitCurve, dateTimes, CommonConstant.DATE_Y, dayMap);
@@ -1556,7 +1893,6 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
             yearProfit = yearProfit.add(chartValue.getProfit());
         }
         annualOverviewResp.setTotalProfit(yearProfit);
-        //计算年收益
         startDate = DateUtil.beginOfYear(date);
         List<DateTime> nowDateTime = DateUtil.rangeToList(startDate, endDate, DateField.MONTH);
         List<AnnualChartValue> monthProfitCurve = new ArrayList<>();
@@ -1566,18 +1902,6 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
             monthProfit = monthProfit.add(chartValue.getProfit());
         }
         annualOverviewResp.setYearProfit(monthProfit);
-        // 计算今日收益
-        List<DateTime> todayDateTime = DateUtil.rangeToList(endDate, endDate, DateField.DAY_OF_MONTH);
-        List<AnnualChartValue> todayProfitCurve = new ArrayList<>();
-        getAnnualOverviewResp(todayProfitCurve, todayDateTime, CommonConstant.DATE_YMD, dayMap);
-        BigDecimal todayProfit = BigDecimal.ZERO;
-        for (AnnualChartValue chartValue : todayProfitCurve) {
-            todayProfit = todayProfit.add(chartValue.getProfit());
-        }
-        annualOverviewResp.setTodayProfit(todayProfit);
-        // 计算昨日收益
-        date = DateUtil.yesterday();
-        endDate = DateUtil.endOfDay(date);
         List<DateTime> dayDateTime = DateUtil.rangeToList(endDate, endDate, DateField.DAY_OF_MONTH);
         List<AnnualChartValue> dayProfitCurve = new ArrayList<>();
         getAnnualOverviewResp(dayProfitCurve, dayDateTime, CommonConstant.DATE_YMD, dayMap);
@@ -1621,13 +1945,12 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
                 }
             }
             BigDecimal result = dischargeProfit.subtract(chargeProfit).divide(new BigDecimal("10000"));
-//            if (result.doubleValue() > 0.0) {
-//                annualChartValue.setProfit(result);
-//            } else {
-//                log.info("{}，大屏计算收益,放电收益小于充电收益",day);
-//                annualChartValue.setProfit(BigDecimal.ZERO);
-//            }
-            annualChartValue.setProfit(result);
+            if (result.doubleValue() > 0.0) {
+                annualChartValue.setProfit(result);
+            } else {
+                log.info("{}，大屏计算收益,放电收益小于充电收益",day);
+                annualChartValue.setProfit(BigDecimal.ZERO);
+            }
             annualChartValue.setTime(day);
             curveResult.add(annualChartValue);
         }
@@ -1724,6 +2047,13 @@ public class IargeScreenShowServiceImpl implements IargeScreenShowService {
         return oneList;
     }
 
+    public List<Station> getCountPvStations(List<Integer> stationIds) {
+        List<Station> list = stationService.selectStationsByIds(stationIds);
+        List<Station> oneList = list.stream().filter(i -> CommonConstant.ONE.equals(i.getStatus()) && CommonConstant.ONE.equals(i.getInverterFlag())).collect(Collectors.toList());
+        return oneList;
+    }
+
+
     @Override
     public List<Subdata> getCommonCapacity(List<Integer> stationIds) {
         List<Subdata> subDataList = new ArrayList<>();

business-service-dao/src/main/java/com/ho/business/service/impl/OpenStationServiceImpl.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.NumberUtil;
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import com.ho.business.constant.DeviceTypeConstant;
@@ -22,11 +23,14 @@ import com.ho.business.vo.resp.DeviceRespVO;
 import com.ho.business.vo.resp.VirtualDeviceColResp;
 import com.ho.business.vo.resp.cabin.CircleCtrlResp;
 import com.ho.business.vo.resp.colCount.ColCountResp;
+import com.ho.business.vo.resp.mppt.MpptActiveVo;
+import com.ho.business.vo.resp.mppt.MpptVo;
 import com.ho.business.vo.resp.openStationHome.OpenStationMiddleOrig;
 import com.ho.business.vo.resp.pcsStation.*;
 import com.ho.business.vo.resp.station.ActiveReactivePower;
 import com.ho.common.tools.constant.CommonConstant;
 import com.ho.common.tools.constant.DefineConstant;
+import com.ho.common.tools.constant.RedisKeyConstant;
 import com.ho.common.tools.entity.PointCurveSrcCol;
 import com.ho.common.tools.exception.BaseResponseCode;
 import com.ho.common.tools.exception.BusinessException;
@@ -131,6 +135,71 @@ public class OpenStationServiceImpl implements OpenStationService {
         }
         return acList;
     }
+    public MpptActiveVo getPvActivePower(Integer stationId){
+        DeviceReqVO deviceReqVO = new DeviceReqVO();
+        deviceReqVO.setStationId(stationId);
+        List<DeviceRespVO> pcsList = deviceService.getListByDeviceType(stationId, DeviceTypeConstant.MPPT);
+        if(pcsList.isEmpty()){
+            pcsList = deviceService.getListByFuzzyDeviceType(stationId, DeviceTypeConstant.MPPT);
+        }
+        MpptActiveVo mpptActiveVo =new MpptActiveVo();
+        BigDecimal pvActivePower = new BigDecimal(CommonConstant.ZERO);
+        BigDecimal totalRelease = new BigDecimal(CommonConstant.ZERO);
+        BigDecimal dailyReleaseElec = new BigDecimal(CommonConstant.ZERO);
+        String nowDay = DateUtil.format(new Date(), CommonConstant.DATE_YMD);
+        if (!pcsList.isEmpty()) {
+            for (DeviceRespVO deviceRespVO : pcsList) {
+                //在缓存里拿映射字段
+                String key = deviceRespVO.getDeviceType() + ":" + stationId + ":" + deviceRespVO.getSrcId();
+                if (redisService.hasKey(key)) {
+                    Map<Object, Object> mpptMap = redisService.hgetall(key);
+                    if (mpptMap != null) {
+                        MpptVo vo = JSON.parseObject(JSON.toJSONString(mpptMap), MpptVo.class);
+                        if (vo != null) {
+                            // 今日功率
+                            BigDecimal pvActivePowerMppt = BigDecimal.ZERO;
+                            if(vo.getPvActivePower() != null){
+                                if(nowDay.equals(DateUtil.format(vo.getPvActivePower().getUpdateTime(), CommonConstant.DATE_YMD))){
+                                    pvActivePowerMppt = vo.getPvActivePower().getValue();
+                                }
+                            }
+                            // 累计发电量
+                            BigDecimal totalReleaseMppt = vo.getTotalRelease() == null ? BigDecimal.ZERO : vo.getTotalRelease().getValue();
+                            // 今日发电起始值
+                            BigDecimal pvDailyReleaseStart = BigDecimal.ZERO;
+                            if(vo.getPvDailyReleaseStart() != null){
+                                if(nowDay.equals(DateUtil.format(vo.getPvDailyReleaseStart().getUpdateTime(), CommonConstant.DATE_YMD))){
+                                    pvDailyReleaseStart = vo.getPvDailyReleaseStart().getValue();
+                                }
+                            }
+                            // 今日更新的累计发电量
+                            BigDecimal totalReleaseMppt1 = BigDecimal.ZERO;
+                            if(vo.getTotalRelease() != null){
+                                if(nowDay.equals(DateUtil.format(vo.getTotalRelease().getUpdateTime(), CommonConstant.DATE_YMD))){
+                                    totalReleaseMppt1 = vo.getTotalRelease().getValue();
+                                }
+                            }
+                            // 计算今日发电量 = 今日更新的累计发电量 - 今日发电起始值
+                            BigDecimal dailyReleaseElecMppt = BigDecimal.ZERO;
+                            if(totalReleaseMppt1.compareTo(BigDecimal.ZERO)>0&&pvDailyReleaseStart.compareTo(BigDecimal.ZERO)>0){
+                                dailyReleaseElecMppt = totalReleaseMppt1.subtract(pvDailyReleaseStart);
+                            }
+                            // 如果计算到的今日发电量小于0 则设置为0
+                            dailyReleaseElecMppt = dailyReleaseElecMppt.compareTo(BigDecimal.ZERO)<0?BigDecimal.ZERO:dailyReleaseElecMppt;
+                            // 最后组装值
+                            pvActivePower = pvActivePower.add(pvActivePowerMppt);
+                            totalRelease = totalRelease.add(totalReleaseMppt);
+                            dailyReleaseElec = dailyReleaseElec.add(dailyReleaseElecMppt);
+                        }
+                    }
+                }
+            }
+        }
+        mpptActiveVo.setPvActivePower(pvActivePower);
+        mpptActiveVo.setTotalRelease(totalRelease);
+        mpptActiveVo.setDailyReleaseElec(dailyReleaseElec);
+        return mpptActiveVo;
+    }
 
     @Override
     public ActiveReactivePower getAcPower(Integer stationId) {
@@ -554,7 +623,7 @@ public class OpenStationServiceImpl implements OpenStationService {
     }
 
     @Override
-    public void exportEleData(PcsStationReq req, HttpServletResponse response) {
+    public void exportEleData(PcsStationReq req, HttpServletResponse response,String lang) {
         try {
             List<Integer> stationIds = req.getStationIds();
             List<Station> stations = stationService.selectStationsByIds(stationIds);
@@ -567,6 +636,10 @@ public class OpenStationServiceImpl implements OpenStationService {
             String name = "";
             String summary = DefineConstant.SUMMARY;
             String summaryData = DefineConstant.SUMMARY_DATA_STATION;
+            if(CommonConstant.langTemp.EN_US.equals(lang)){
+                summary = DefineConstant.SUMMARY_EN;
+                summaryData = DefineConstant.SUMMARY_DATA_STATION_EN;
+            }
             if("segment".equals(segmentType)){
                 List<EarningsCalculateData> totalList = new ArrayList<>();
                 BigDecimal chargeTip = BigDecimal.ZERO;
@@ -595,7 +668,7 @@ public class OpenStationServiceImpl implements OpenStationService {
                     name = idNameMap.get(stationId);
                     if(dataList.size()>0){
                         dataList.add(calculateData);
-                        setSheetEarningsData(sheetsList, name==null?"":name.replaceAll("/", " "), dataList);
+                        setSheetEarningsData(sheetsList, name==null?"":name.replaceAll("/", " "), dataList,lang);
                     }
                     charge = charge.add(calculateData.getChargeElec());
                     discharge = discharge.add(calculateData.getDischargeElec());
@@ -626,7 +699,7 @@ public class OpenStationServiceImpl implements OpenStationService {
                     calculateData.setDischargeElec(discharge);
                     calculateData.setDate(summary);
                     totalList.add(calculateData);
-                    setSheetEarningsData(sheetsList, summaryData, totalList);
+                    setSheetEarningsData(sheetsList, summaryData, totalList,lang);
                 }
                 ExcelUtil.exportExcel(sheetsList,response);
             }else{
@@ -649,7 +722,7 @@ public class OpenStationServiceImpl implements OpenStationService {
                     name = idNameMap.get(stationId);
                     if(dataList.size()>0){
                         dataList.add(pcsElecData);
-                        setSheetElecData(sheetsList, name==null?"":name.replaceAll("/", " "), dataList);
+                        setSheetElecData(sheetsList, name==null?"":name.replaceAll("/", " "), dataList,lang);
                     }
                     charge = charge.add(pcsElecData.getChargeElec());
                     discharge = discharge.add(pcsElecData.getDischargeElec());
@@ -664,7 +737,7 @@ public class OpenStationServiceImpl implements OpenStationService {
                     pcsElecData.setDischargeElec(discharge);
                     pcsElecData.setDate(summary);
                     totalList.add(pcsElecData);
-                    setSheetElecData(sheetsList, summaryData, totalList);
+                    setSheetElecData(sheetsList, summaryData, totalList,lang);
                 }
                 ExcelUtil.exportExcel(sheetsList,response);
             }
@@ -728,6 +801,9 @@ public class OpenStationServiceImpl implements OpenStationService {
             String segmentType = req.getSegmentType();
             String name = "";
             String summary = DefineConstant.SUMMARY;
+            if(CommonConstant.langTemp.EN_US.equals(req.getLang())){
+                summary = DefineConstant.SUMMARY_EN;
+            }
             if(CommonConstant.SEGMENT.equals(segmentType)){
                 List<EarningsCalculateData> resultList = new ArrayList<>();
                 BigDecimal chargeTip = BigDecimal.ZERO;
@@ -1024,7 +1100,7 @@ public class OpenStationServiceImpl implements OpenStationService {
         return data;
     }
 
-    private void setSheetElecData(List<Map<String, Object>> sheetsList, String name, List<PcsElecData> dataList) {
+    private void setSheetElecData(List<Map<String, Object>> sheetsList, String name, List<PcsElecData> dataList,String lang) {
         // 创建参数对象（用来设定excel的sheet1内容等信息）
         ExportParams userExportParams = new ExportParams();
         // 设置sheet得名称
@@ -1034,13 +1110,25 @@ public class OpenStationServiceImpl implements OpenStationService {
         // title的参数为ExportParams类型，目前仅仅在ExportParams中设置了sheetName
         userExportMap.put("title", userExportParams);
         // 模版导出对应得实体类型
-        userExportMap.put("entity", PcsElecData.class);
-        // sheet1中要填充得数据
-        userExportMap.put("data", dataList);
+        if(CommonConstant.langTemp.EN_US.equals(lang)){
+            userExportMap.put("entity", PcsElecDataEn.class);
+            List<PcsElecDataEn> enList=new ArrayList<>();
+            dataList.stream().forEach(s->{
+                PcsElecDataEn en = new PcsElecDataEn();
+                BeanUtils.copyProperties(s, en);
+                enList.add(en);
+            });
+            // sheet1中要填充得数据
+            userExportMap.put("data", enList);
+        }else{
+            userExportMap.put("entity", PcsElecData.class);
+            // sheet1中要填充得数据
+            userExportMap.put("data", dataList);
+        }
         sheetsList.add(userExportMap);
     }
 
-    private void setSheetEarningsData(List<Map<String, Object>> sheetsList, String name, List<EarningsCalculateData> dataList) {
+    private void setSheetEarningsData(List<Map<String, Object>> sheetsList, String name, List<EarningsCalculateData> dataList,String lang) {
         // 创建参数对象（用来设定excel的sheet1内容等信息）
         ExportParams userExportParams = new ExportParams();
         // 设置sheet得名称
@@ -1050,9 +1138,21 @@ public class OpenStationServiceImpl implements OpenStationService {
         // title的参数为ExportParams类型，目前仅仅在ExportParams中设置了sheetName
         userExportMap.put("title", userExportParams);
         // 模版导出对应得实体类型
-        userExportMap.put("entity", EarningsCalculateData.class);
-        // sheet1中要填充得数据
-        userExportMap.put("data", dataList);
+        if(CommonConstant.langTemp.EN_US.equals(lang)){
+            userExportMap.put("entity", EarningsCalculateDataEn.class);
+            List<EarningsCalculateDataEn> enList=new ArrayList<>();
+            dataList.stream().forEach(s->{
+                EarningsCalculateDataEn en = new EarningsCalculateDataEn();
+                BeanUtils.copyProperties(s, en);
+                enList.add(en);
+            });
+            // sheet1中要填充得数据
+            userExportMap.put("data", enList);
+        }else{
+            userExportMap.put("entity", EarningsCalculateData.class);
+            // sheet1中要填充得数据
+            userExportMap.put("data", dataList);
+        }
         sheetsList.add(userExportMap);
     }
 }

business-service-dao/src/main/java/com/ho/business/service/impl/OutApiServiceImpl.java

@@ -174,29 +174,8 @@ public class OutApiServiceImpl implements OutApiService {
                 stations.add(station);
             }
         }
-
-        List<Integer> groupIds = new ArrayList<>();
-        Map<Integer, List<Station>> groupMap = new HashMap<>();
-        groupIds = stations.stream().map(s -> {
-            return s.getGroupId();
-        }).distinct().collect(Collectors.toList());
-        if (EnvConstant.EXP.equals(env) || EnvConstant.DEV.equals(env)) {
-            //只增加集团为1的
-            //groupIds = new ArrayList<>();
-            //groupIds.add(1);
-        }
-        //groupMap = stations.stream().collect(Collectors.groupingBy(Station::getGroupId));
-        log.info("dayChargeDeal groupMap:" + groupMap);
-        //todo 先用349来跑
-       /* List<Station> stations = new ArrayList<>();
-        Station s349 = stationService.selectById(monitorQuery.getStationId());
-        stations.add(s349);*/
         String deviceType = DeviceTypeConstant.BMS;
         log.info("stations.size:" + stations.size());
-        //查询柴发冻结
-        SysSubDictVO sysSubDictVO = new SysSubDictVO();
-        sysSubDictVO.setType(CommonConstant.CF_FROZEN);
-        Map<String, String> cfMap = userFeignClient.getSysSubDict(sysSubDictVO);
         for (Station station : stations) {
             try {
                 //先删除站的当日数据
@@ -259,15 +238,6 @@ public class OutApiServiceImpl implements OutApiService {
                     //当日的零点时间
                     tdBaseTimeQuery.setBegin(beginOfDay);
                     tdBaseTimeQuery.setEnd(endOfDay);
-//                    if (station.getId() == 349) {
-//                        deviceType = deviceRespVO.getDeviceType().split("_")[0];
-//                        if (!DeviceTypeConstant.BMS.equals(deviceType)) {
-//                            //日充电量
-//                            dailyChargeElec = new BigDecimal(CommonConstant.ZERO);
-//                            //日放电量
-//                            dailyDischargeElec = new BigDecimal(CommonConstant.ZERO);
-//                        }
-//                    }
                     //查询模型表
                     DeviceTypeConfig deviceTypeConfig = deviceTypeConfigService.selectByDeviceType(deviceRespVO.getDeviceType(), deviceRespVO.getGroupId());
                     if (deviceTypeConfig == null) {
@@ -324,16 +294,6 @@ public class OutApiServiceImpl implements OutApiService {
                     elecMeterValueService.insert(elecMeterValues);
                     log.info("dayChargeDeal elecMeterValueService.insert OK");
                 }
-                if(cfMap!=null && cfMap.size()>0){
-                    Integer stationId = station.getId();
-                    if(cfMap.get(String.valueOf(stationId))!=null){
-                        deviceRespVOS = deviceService.getListByDeviceType(station.getId(), DeviceTypeConstant.CF);
-                        if (deviceRespVOS.isEmpty()) {
-                            deviceRespVOS = deviceService.getListByFuzzyDeviceType(station.getId(), DeviceTypeConstant.CF);
-                        }
-                        cfInsert(beginOfDay, endOfDay, dataProcessReqVO, station, deviceRespVOS);
-                    }
-                }
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -1274,7 +1234,110 @@ public class OutApiServiceImpl implements OutApiService {
         }
     }
 
+    @Override
+    public void dayPVMpptCharge(MonitorQuery monitorQuery){
+        //根据参数计算 beginTime 这天的起止时间
+        SimpleDateFormat sdfDay = new SimpleDateFormat(CommonConstant.DATE_YMD);
+        SimpleDateFormat sdfDateTime = new SimpleDateFormat(CommonConstant.DATE);
+        //转成Date格式
+        String transDayStr = null;
+        //时间格式的交易日期
+        Date transDay = null;
+        if (monitorQuery != null) {
+            if (monitorQuery.getBeginTime() != null) {
+                transDayStr = monitorQuery.getBeginTime();
+                try {
+                    transDay = sdfDay.parse(monitorQuery.getBeginTime());
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+            } else {
+                DateTime yesterdayTime = DateUtil.yesterday();
+                transDayStr = sdfDay.format(yesterdayTime);
+                transDay = yesterdayTime;
+            }
+        } else {
+            DateTime yesterdayTime = DateUtil.yesterday();
+            transDayStr = sdfDay.format(yesterdayTime);
+            transDay = yesterdayTime;
+        }
+        log.info("dayChargeDeal transDay:" + transDay);
+        //昨天的开始时间,昨天的结束时间
+        DateTime beginOfDay = DateUtil.beginOfDay(transDay);
+        DateTime endOfDay = DateUtil.endOfDay(transDay);
+        String beginTime = sdfDateTime.format(beginOfDay);
+        String endTime = sdfDateTime.format(endOfDay);
+        DataProcessReqVO dataProcessReqVO = new DataProcessReqVO();
+        dataProcessReqVO.setStartDayTime(beginTime);
+        dataProcessReqVO.setEndDayTime(endTime);
+        //业务发生日期
+        dataProcessReqVO.setDay(transDayStr);
+        List<Station> stations = stationService.selectAll();
+        stations = stations.stream().filter(i->CommonConstant.ONE.equals(i.getInverterFlag())).collect(Collectors.toList());
+        for (Station station :stations){
+            //先删除站的当日数据
+            List<Integer> typeList = Arrays.asList(
+                    DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE
+            );
+            //使用elecMeterValue
+            elecMeterValueService.deleteByStationAndDay(station.getId(), transDayStr, typeList);
+            //光伏总发电量
+            List<DeviceRespVO> deviceRespVOS = deviceService.getListByDeviceType(station.getId(), DeviceTypeConstant.MPPT);
+            if (deviceRespVOS.isEmpty()) {
+                deviceRespVOS = deviceService.getListByFuzzyDeviceType(station.getId(), DeviceTypeConstant.MPPT);
+            }
+            //判断是否存在电表设备
+            if (deviceRespVOS.isEmpty()) {
+                continue;
+            }
+            log.info("deviceRespVOS.size():" + deviceRespVOS.size());
+            for (DeviceRespVO deviceRespVO : deviceRespVOS) {
+                //创建远程调用的查询参数
+                TdBaseTimeQuery tdBaseTimeQuery = new TdBaseTimeQuery();
+                //由于mppt没有日发总电量，走计算  昨日最晚总发-昨日做早总发=昨日总发
+                List<ModelDeviceColComp> totalRelease = modelDeviceService.getCompListByType("device", deviceRespVO.getDeviceType(), DataCollectConstant.PV_CHARGE_POINT.TOTAL_RELEASE);
+                Map<Integer, String> colNameMap = new HashMap<>();
+                if (!totalRelease.isEmpty()) {
+                    colNameMap.put(deviceRespVO.getSrcId(), totalRelease.get(0).getDeviceCol());
+                }
+                tdBaseTimeQuery.setBeginTime(beginTime);
+                tdBaseTimeQuery.setEndTime(endTime);
+                tdBaseTimeQuery.setSrcId(deviceRespVO.getSrcId());
+                tdBaseTimeQuery.setMap(colNameMap);
+                tdBaseTimeQuery.setGroupId(deviceRespVO.getGroupId());
+                tdBaseTimeQuery.setStationId(deviceRespVO.getStationId());
+                tdBaseTimeQuery.setDeviceType(deviceRespVO.getDeviceType());
 
+                //当日的零点时间
+                tdBaseTimeQuery.setBegin(beginOfDay);
+                tdBaseTimeQuery.setEnd(endOfDay);
+                //查询模型表
+                DeviceTypeConfig deviceTypeConfig = deviceTypeConfigService.selectByDeviceType(deviceRespVO.getDeviceType(), deviceRespVO.getGroupId());
+                if (deviceTypeConfig == null) {
+                    log.info("电站{}未匹配到模型{}", deviceRespVO.getStationId(), deviceRespVO.getDeviceType());
+                    continue;
+                }
+                tdBaseTimeQuery.setModelName(deviceTypeConfig.getModelName());
+                //远程调用查询
+                log.info("查设备数据: start :" + new Date());
+                DataResult<StationHomeRespVo> result = tdFeignClient.getToDayPVMpptCharge(tdBaseTimeQuery);
+                log.info("dayChargeDeal tdFeignClient.getTodayPowerGeneration, result: {}", result);
+                StationHomeRespVo data = result.getData();
+                ElecMeterValue elecMeterValue = new ElecMeterValue();
+                elecMeterValue.setDigital(data.getDigital());
+                elecMeterValue.setSrcId(deviceRespVO.getSrcId());
+                elecMeterValue.setDeptId(station.getDeptId());
+                elecMeterValue.setStationId(station.getId());
+                elecMeterValue.setGroupId(station.getGroupId());
+                elecMeterValue.setDay(dataProcessReqVO.getDay());
+                elecMeterValue.setCreateTime(new Date());
+                elecMeterValue.setType(DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE);
+                elecMeterValue.setStatus(CommonConstant.STATUS_FLAG);
+                elecMeterValueService.insert(elecMeterValue);
+                log.info("dayChargeDeal elecMeterValueService.insert OK");
+            }
+        }
+    }
     //加工昨天光伏充放电量
     @Override
     public void dayPVCharge(MonitorQuery monitorQuery) {

business-service-dao/src/main/java/com/ho/business/service/impl/StationHomeServiceImpl.java

@@ -21,10 +21,12 @@ import com.ho.business.vo.req.device.DeviceTypeQuery;
 import com.ho.business.vo.req.dynamicConfig.DynamicConfigQuery;
 import com.ho.business.vo.req.pcsStation.PcsStationReq;
 import com.ho.business.vo.resp.*;
+import com.ho.business.vo.resp.InverterResp.PowerGenerateRespVO;
 import com.ho.business.vo.resp.cabin.TemperatureHumidityResp;
 import com.ho.business.vo.resp.cabin.TemperatureValue;
 import com.ho.business.vo.resp.colCount.ColCountResp;
 import com.ho.business.vo.resp.dynamicConfig.CurveConfigResp;
+import com.ho.business.vo.resp.mppt.MpptActiveVo;
 import com.ho.business.vo.resp.pcsStation.OutStationData;
 import com.ho.business.vo.resp.pcsStation.PcsElecData;
 import com.ho.business.vo.resp.pcsStation.PcsStationData;
@@ -33,6 +35,7 @@ import com.ho.business.vo.resp.station.ActiveReactivePower;
 import com.ho.business.vo.resp.station.NewRealTimeCurveVo;
 import com.ho.common.tools.constant.CommonConstant;
 import com.ho.common.tools.constant.DefineConstant;
+import com.ho.common.tools.constant.RedisKeyConstant;
 import com.ho.common.tools.entity.PointCurveSrcCol;
 import com.ho.common.tools.exception.BaseResponseCode;
 import com.ho.common.tools.exception.BusinessException;
@@ -129,6 +132,10 @@ public class StationHomeServiceImpl implements StationHomeService {
 
     private List<AppRealTimeCurveRespVo> list;
 
+    @Autowired
+    EarningsCalculateMpptService earningsCalculateMpptService;
+
+
     @Override
     public List<NewRealTimeCurveVo> getRealtimeCurve(StationReq stationReq) {
         Station station = stationService.selectById(stationReq.getStationId());
@@ -651,24 +658,6 @@ public class StationHomeServiceImpl implements StationHomeService {
 
         //计算系统转化效率
         BigDecimal systemEfficiency = BigDecimal.ZERO;
-//        List<DeviceRespVO> deviceRespVOList = deviceService.getListByDeviceType(stationId, DeviceTypeConstant.OUTSIDE_ELE);
-//        if (!deviceRespVOList.isEmpty()) {
-//            DeviceRespVO deviceRespVO = deviceRespVOList.get(0);
-//            //拼接rediskey
-//            String redisKey = deviceRespVO.getDeviceType() + ":" + stationId + ":" + deviceRespVO.getSrcId();
-//            if (redisService.hasKey(redisKey)) {
-//                Map<Object, Object> map = redisService.hgetall(redisKey);
-//                DeviceTransfer charge = (DeviceTransfer) map.get(DeviceTypeConstant.TOTAL_CHARGE);
-//                DeviceTransfer discharge = (DeviceTransfer) map.get(DeviceTypeConstant.TOTAL_DISCHARGE);
-//
-//                BigDecimal totalCharge = charge != null ? charge.getValue() : BigDecimal.ZERO;
-//                BigDecimal totalDisCharge = discharge != null ? discharge.getValue() : BigDecimal.ZERO;
-//
-//                if (!totalCharge.equals(BigDecimal.ZERO)) {
-//                    systemEfficiency = totalDisCharge.divide(totalCharge, 4, BigDecimal.ROUND_HALF_UP);
-//                }
-//            }
-//        }
         CountEleData countEleData = getCountEleData(req);
         //总充电量
         BigDecimal totalChargeElec = countEleData.getTotalChargeElec();
@@ -678,98 +667,6 @@ public class StationHomeServiceImpl implements StationHomeService {
         BigDecimal dailyChargeElec = countEleData.getDailyChargeElec();
         //日放电量
         BigDecimal dailyDischargeElec = countEleData.getDailyDischargeElec();
-//        //总充电量
-//        BigDecimal totalChargeElec = BigDecimal.ZERO;
-//        //总放电量
-//        BigDecimal totalDischargeElec = BigDecimal.ZERO;
-//        //日充电量 来自于PCS
-//        BigDecimal dailyChargeElec = BigDecimal.ZERO;
-//        //日放电量
-//        BigDecimal dailyDischargeElec = BigDecimal.ZERO;
-        //总充,总放默认来自于 BMS
-//        String deviceType = req.getDeviceType() == null ? DeviceTypeConstant.BMS : req.getDeviceType();
-//        //日充电量开始
-//        BigDecimal dailyChargeStartElec = BigDecimal.ZERO;
-//        //日放电量开始
-//        BigDecimal dailyDischargeStartElec = BigDecimal.ZERO;
-//        boolean hasStart = false;
-//        //总充,总放来自于BMS ,日充, 日放也来自于BMS
-//        List<DeviceRespVO> deviceRespVOS = deviceService.getListByDeviceType(stationId, deviceType);
-//        if(deviceRespVOS.isEmpty()){
-//            deviceRespVOS = deviceService.getListByFuzzyDeviceType(stationId, deviceType);
-//        }
-//        //从缓存中获取累计充电量与放电量
-//        boolean flag = true;
-//        for (DeviceRespVO deviceRespVO : deviceRespVOS) {
-//            //拼接电表缓存key
-//            String redisKey = deviceRespVO.getDeviceType() + ":" + deviceRespVO.getStationId() + ":" + deviceRespVO.getSrcId();
-//            //判断电表换是否存在
-//            if (redisService.hasKey(redisKey)) {
-//                Map<Object, Object> map = redisService.hgetall(redisKey);
-//                if (map != null) {
-//                    //总充, 总放
-//                    Object objTotalCharge = map.get(DataCollectConstant.Elec_Meter.TOTAL_CHARGE);
-//                    if (objTotalCharge instanceof DeviceTransfer) {
-//                        DeviceTransfer totalCharge = (DeviceTransfer) map.get(DataCollectConstant.Elec_Meter.TOTAL_CHARGE);
-//                        totalChargeElec = totalCharge.getValue() != null ? totalChargeElec.add(totalCharge.getValue()) : totalChargeElec;
-//                    }
-//                    Object objTotalDischarge = map.get(DataCollectConstant.Elec_Meter.TOTAL_DISCHARGE);
-//                    if (objTotalDischarge instanceof DeviceTransfer) {
-//                        DeviceTransfer totalDischarge = (DeviceTransfer) map.get(DataCollectConstant.Elec_Meter.TOTAL_DISCHARGE);
-//                        totalDischargeElec = totalDischarge.getValue() != null ? totalDischargeElec.add(totalDischarge.getValue()) : totalDischargeElec;
-//                    }
-//                    //日充
-//                    DeviceTransfer dailyChargeObj = (DeviceTransfer) map.get(DataCollectConstant.PCS_POINT.dailyCharge);
-//                    log.info("dailyChargeObj：{},stationId:{}", dailyChargeObj, stationId);
-//                    if (null != dailyChargeObj) {
-//                        DeviceTransfer dailyChargeTransfer = (DeviceTransfer) map.get(DataCollectConstant.PCS_POINT.dailyCharge);
-//                        dailyChargeElec = dailyChargeTransfer.getValue() != null ? dailyChargeElec.add(dailyChargeTransfer.getValue()) : dailyChargeElec;
-//                        flag = false;
-//                    }
-//                    //日放
-//                    Object dailyDischargeObj = map.get(DataCollectConstant.PCS_POINT.dailyDischarge);
-//                    if (dailyDischargeObj instanceof DeviceTransfer) {
-//                        DeviceTransfer dailyDischargeTransfer = (DeviceTransfer) map.get(DataCollectConstant.PCS_POINT.dailyDischarge);
-//                        dailyDischargeElec = dailyDischargeTransfer.getValue() != null ? dailyDischargeElec.add(dailyDischargeTransfer.getValue()) : dailyDischargeElec;
-//                    }
-//                    //日充电量开始
-//                    DeviceTransfer dailyChargeStart = (DeviceTransfer) map.get(DataCollectConstant.PCS_POINT.DAILY_CHARGE_START);
-//                    if(dailyChargeStart!=null){
-//                        Date updateTime = dailyChargeStart.getUpdateTime();
-//                        DateTime beginOfDay = DateUtil.beginOfDay(new Date());
-//                        if(updateTime.getTime()==beginOfDay.getTime()){
-//                            dailyChargeStartElec = dailyChargeStart.getValue() != null ? dailyChargeStartElec.add(dailyChargeStart.getValue()) : dailyChargeStartElec;
-//                            hasStart = true;
-//                        }
-//                    }
-//                    //日放电量开始
-//                    DeviceTransfer dailyDischargeStart = (DeviceTransfer) map.get(DataCollectConstant.PCS_POINT.DAILY_DISCHARGE_START);
-//                    if(dailyDischargeStart!=null){
-//                        Date updateTime = dailyDischargeStart.getUpdateTime();
-//                        DateTime beginOfDay = DateUtil.beginOfDay(new Date());
-//                        if(updateTime.getTime()==beginOfDay.getTime()){
-//                            dailyDischargeStartElec = dailyDischargeStart.getValue() != null ? dailyDischargeStartElec.add(dailyDischargeStart.getValue()) : dailyDischargeStartElec;
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//        //若查不到，走计算
-//        if (flag) {
-//            if(hasStart){
-//                dailyChargeElec = totalChargeElec.subtract(dailyChargeStartElec);
-//                dailyDischargeElec = totalDischargeElec.subtract(dailyDischargeStartElec);
-//            }else{
-//                MonitorQuery monitorQuery = new MonitorQuery();
-//                monitorQuery.setStationId(stationId);
-//                monitorQuery.setEndTime(req.getEndTime());
-//                JSONObject info = outApiService.getDayChargeDeal(monitorQuery, deviceType);
-//                DeviceTransfer dailyChargeTransfer = (DeviceTransfer) info.get(DataCollectConstant.PCS_POINT.dailyCharge);
-//                dailyChargeElec = dailyChargeTransfer.getValue();
-//                DeviceTransfer dailyDischargeTransfer = (DeviceTransfer) info.get(DataCollectConstant.PCS_POINT.dailyDischarge);
-//                dailyDischargeElec = dailyDischargeTransfer.getValue();
-//            }
-//        }
         ColCountReq colCountReq = new ColCountReq();
         colCountReq.setStationId(station.getId());
         colCountReq.setCol(DataCollectConstant.Elec_Meter.TOTAL_CHARGE);
@@ -843,6 +740,26 @@ public class StationHomeServiceImpl implements StationHomeService {
         data.setSystemEfficiency(systemEfficiency);
         //当前功率
         ActiveReactivePower acPower = openStationService.getAcPower(stationId);
+        //2025-11-13 start 储能加入mppt模块开发
+        //如果接入光伏mppt模块-则统计光伏模块监控数据
+        if(DataCollectConstant.ONE.equals(station.getInverterFlag())){
+            //当前功率(光伏)、总发电量、日发电量
+            MpptActiveVo pv = openStationService.getPvActivePower(stationId);
+            data.setPvCurrentPower(pv.getPvActivePower());
+            data.setDailyReleaseElec(pv.getDailyReleaseElec());
+            //计算累计发电量
+            BigDecimal totalReleaseElec = elecMeterValueService.selectSumValue(station.getId(),DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE,null);
+            data.setTotalReleaseElec(totalReleaseElec);
+            //今日收益
+            String key = RedisKeyConstant.PV.STATION_PV_TODAY_PROFIT + station.getId();
+            BigDecimal todayIncone = (BigDecimal)redisService.get(key);
+            data.setTodayIncone(todayIncone);
+            //累计收益
+            BigDecimal totalIncome = earningsCalculateMpptService.countAllPvIncome(station.getId(),null,null);
+            data.setTotalIncome(totalIncome);
+            //额定功率(光伏)
+            data.setPvPower(station.getPvPower());
+        }
         if (acPower != null) {
             data.setCurrentPower(acPower.getActivePowerPCS());
         }
@@ -1051,141 +968,58 @@ public class StationHomeServiceImpl implements StationHomeService {
 
 
     @Override
-    public List<PcsElecData> getPvChargeElec(PcsStationReq req) {
-        req.setDeviceType(DeviceTypeConstant.PLANCURVE);
-        DeviceTransfer countPvData = getCountPvData(req);
-        //创建返回值
-        List<PcsElecData> list = new ArrayList<>();
-
-        //查询冻结值
-        List<Integer> types = new ArrayList<>();
-        //光伏充
-        types.add(DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE);
-
-        //根据传入类型判断
-        //当前时间
+    public List<PowerGenerateRespVO> getPvData(PcsStationReq req) {
+        // 获取今日光伏收益
+        String type = req.getType();
         Date end = new Date();
         String endTime = DateUtil.format(end, CommonConstant.DATE_YMD);
-        String type = req.getType();
-        boolean isToday = true;
-        if (CommonConstant.HOUR.equals(type)) {
-            return list;
-        } else if (CommonConstant.DAY.equals(type)) {
-            //查询最近七天
-            //七天前的时间
-            DateTime begin = DateUtil.offsetDay(end, -6);
-            String beginTime = DateUtil.format(begin, CommonConstant.DATE_YMD);
-            List<ElecMeterValue> elecMeterValues = elecMeterValueService.selectList(req.getStationId(), types, beginTime, endTime);
-            elecMeterValues = getMeterValues(req, elecMeterValues);
-            //根据天获取时间段
-            List<DateTime> dateTimes = DateUtil.rangeToList(begin, end, DateField.DAY_OF_MONTH);
-            setDataByTime(dateTimes, elecMeterValues, list);
-            //根据类型进行分组
-//            Map<Integer, List<ElecMeterValue>> map = elecMeterValues.stream().collect(Collectors.groupingBy(ElecMeterValue::getType));
-//            setDataByTime(dateTimes, map, list);
-        } else if (CommonConstant.RANGE_TIME.equals(type)) {
-            list = new ArrayList<>();
-            //查询时间范围数据
-            List<Integer> typeHourList = new ArrayList<>();
-            typeHourList.add(DeviceTypeConstant.ELEC_METER_VALUE_TYPE.HOUR_CHARGE);
-            typeHourList.add(DeviceTypeConstant.ELEC_METER_VALUE_TYPE.HOUR_DISCHARGE);
-            DateTime begin = new DateTime(DateUtils.addDays(new DateTime(req.getBeginTime()), -1));
-            DateTime dateTime = new DateTime(req.getEndTime());
-            String beginTime = DateUtil.format(begin, CommonConstant.DATE);
-            List<ElecMeterValue> elecMeterValues = elecMeterValueService.selectList(req.getStationId(), typeHourList, beginTime, req.getEndTime());
-            Map<Integer, List<ElecMeterValue>> map = elecMeterValues.stream().collect(Collectors.groupingBy(ElecMeterValue::getType));
-            List<DateTime> days = DateUtil.rangeToList(begin, dateTime, DateField.DAY_OF_MONTH);
-            setRangeTime(days, map, list);
-        } else if (CommonConstant.MONTH.equals(type)) {
-            //七天前的时间
-            DateTime begin = DateUtil.offsetDay(end, -29);
-            String beginTime = DateUtil.format(begin, CommonConstant.DATE_YMD);
-            List<ElecMeterValue> elecMeterValues = elecMeterValueService.selectList(req.getStationId(), types, beginTime, endTime);
-            elecMeterValues = getMeterValues(req, elecMeterValues);
-            //根据天获取时间段
-            List<DateTime> dateTimes = DateUtil.rangeToList(begin, end, DateField.DAY_OF_MONTH);
-            setDataByTime(dateTimes, elecMeterValues, list);
-            //根据类型进行分组
-//            Map<Integer, List<ElecMeterValue>> map = elecMeterValues.stream().collect(Collectors.groupingBy(ElecMeterValue::getType));
-//            setDataByTime(dateTimes, map, list);
-        } else if (CommonConstant.YEAR.equals(type)) {
-            DateTime begin = DateUtil.offsetDay(end, -364);
-            String beginTime = DateUtil.format(begin, CommonConstant.DATE_YMD);
-            List<ElecMeterValue> elecMeterValues = elecMeterValueService.selectList(req.getStationId(), types, beginTime, endTime);
-            elecMeterValues = getMeterValues(req, elecMeterValues);
-            //根据类型进行分组
-            Map<Integer, List<ElecMeterValue>> map = elecMeterValues.stream().collect(Collectors.groupingBy(ElecMeterValue::getType));
-            //充电量
-            List<ElecMeterValue> chargeList = map.get(DeviceTypeConstant.ELEC_METER_VALUE_TYPE.CHARGE);
-            Map<String, List<ElecMeterValue>> monthChargeList = new HashMap<>();
-            if (chargeList != null) {
-                monthChargeList = chargeList.stream().collect(Collectors.groupingBy(s -> {
-                    String month = s.getDay().substring(0, 7);
-                    return month;
-                }));
-            }
-            //放电量
-            List<ElecMeterValue> dischargeList = map.get(DeviceTypeConstant.ELEC_METER_VALUE_TYPE.DISCHARGE);
-            Map<String, List<ElecMeterValue>> monthDischargeList = new HashMap<>();
-            if (dischargeList != null) {
-                monthDischargeList = dischargeList.stream().collect(Collectors.groupingBy(s -> {
-                    String month = s.getDay().substring(0, 7);
-                    return month;
-                }));
-            }
-            //根据天获取时间段
-            List<DateTime> dateTimes = DateUtil.rangeToList(begin, end, DateField.MONTH);
-            for (DateTime dateTime : dateTimes) {
-                String yearMonth = DateUtil.format(dateTime, CommonConstant.DATE_YM);
-                PcsElecData pcsElecData = new PcsElecData();
-                pcsElecData.setDate(yearMonth);
-                BigDecimal charge = BigDecimal.ZERO;
-                BigDecimal disCharge = BigDecimal.ZERO;
-                //按yyyy-MM分组
-                //分别计算充电,放电
-                if (monthChargeList.containsKey(yearMonth)) {
-                    List<ElecMeterValue> elecMeterValues1 = monthChargeList.get(yearMonth);
-                    for (ElecMeterValue elecMeterValue : elecMeterValues1) {
-                        charge = charge.add(elecMeterValue.getDigital());
-                    }
-                    pcsElecData.setChargeElec(charge);
-                }
-                if (monthDischargeList.containsKey(yearMonth)) {
-                    List<ElecMeterValue> elecMeterValues1 = monthDischargeList.get(yearMonth);
-
-                    for (ElecMeterValue elecMeterValue : elecMeterValues1) {
-                        disCharge = disCharge.add(elecMeterValue.getDigital());
-                    }
-                    pcsElecData.setDischargeElec(disCharge);
-                }
-
-                list.add(pcsElecData);
-            }
-        }
-        //根据时间排序
-        list.stream().
-
-                sorted((s1, s2) ->
-
-                {
-                    return s1.getDate().compareTo(s2.getDate());
-                }).
-
-                collect(Collectors.toList());
-        if (!isToday) {
+        List<PowerGenerateRespVO> list = new ArrayList<>();
+        DateTime begin;
+        if (CommonConstant.DAY.equals(type)){
+            begin = DateUtil.offsetDay(end, -6);
+        }else if(CommonConstant.MONTH.equals(type)){
+            begin = DateUtil.offsetDay(end, -29);
+        }else{
             return list;
         }
-        //查询今天的数据，set到返回值中
-        String nowDay = DateUtil.format(new Date(), CommonConstant.DATE_YMD);
-        String format = DateUtil.format(countPvData.getUpdateTime(), CommonConstant.DATE_YMD);
-        if (nowDay.equals(format)) {
-            for (PcsElecData pcsElecData : list) {
-                if (nowDay.equals(pcsElecData.getDate())) {
-                    pcsElecData.setPvChargeElec(countPvData.getValue());
-                }
+        String beginTime = DateUtil.format(begin, CommonConstant.DATE_YMD);
+        //光伏收益
+        List<PowerGenerateRespVO> pvIncome = earningsCalculateMpptService.countPvIncome(req.getStationId(),beginTime, endTime);
+        Map<String,List<PowerGenerateRespVO>> mapIncome = pvIncome.stream().collect(Collectors.groupingBy(i ->i.getDate()));
+        //光伏放电
+        List<Integer> types = new ArrayList<>();
+        types.add(DeviceTypeConstant.ELEC_METER_VALUE_TYPE.PV_CHARGE);
+        List<ElecMeterValue> elecMeterValues = elecMeterValueService.selectList(req.getStationId(), types, beginTime, endTime);
+        Map<String, List<ElecMeterValue>> mapMeter = elecMeterValues.stream().collect(Collectors.groupingBy(i ->i.getDay()));
+        //根据天获取时间段
+        List<DateTime> dateTimes = DateUtil.rangeToList(begin, end, DateField.DAY_OF_MONTH);
+        for (DateTime dateTime : dateTimes){
+            String date = DateUtil.format(dateTime, CommonConstant.DATE_YMD);
+            PowerGenerateRespVO  pv = new PowerGenerateRespVO();
+            pv.setDate(date);
+            List<PowerGenerateRespVO> pvIn = mapIncome.get(date);
+            //收益
+            if(pvIn != null){
+                pv.setProfit(pvIn.get(0).getProfit());
             }
-        }
+            //放电
+            List<ElecMeterValue> elecs = mapMeter.get(date);
+            if(elecs != null){
+                pv.setPowerGenerate(elecs.stream().map(ElecMeterValue::getDigital).reduce(BigDecimal.ZERO,BigDecimal::add));
+            }
+            if(date.equals(endTime)){
+                String key = RedisKeyConstant.PV.STATION_PV_TODAY_PROFIT + req.getStationId();
+                //获取今日收益
+                BigDecimal todayIncone = (BigDecimal)redisService.get(key);
+                pv.setProfit(todayIncone);
+                //获取今日发电
+                //当前功率(光伏)、总发电量、日发电量
+                MpptActiveVo todayPv = openStationService.getPvActivePower(req.getStationId());
+                pv.setPowerGenerate(todayPv.getDailyReleaseElec());
 
+            }
+            list.add(pv);
+        }
         return list;
     }
 
@@ -1994,6 +1828,13 @@ public class StationHomeServiceImpl implements StationHomeService {
         return pcsCurveCurveList;
     }
 
+    @Override
+    public List<AppRealTimeCurveRespVo> pvCurve(MonitorQuery monitorQuery) {
+        //mppt总发电量、有功功率
+        List<AppRealTimeCurveRespVo> appRealTimeCurveRespVos = getAppRealTimeCurveRespVos(monitorQuery, "totalRelease", "pvActivePower");
+        return appRealTimeCurveRespVos;
+    }
+
     @Override
     public List<AppRealTimeCurveRespVo> getOpticalStorageCurve(MonitorQuery monitorQuery) {
         //逆变有功功率、PV输出功率

business-service-dao/src/main/java/com/ho/business/service/impl/StationRemoteControlServiceImpl.java

@@ -0,0 +1,50 @@
+package com.ho.business.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ho.business.entity.StationRemoteControl;
+import com.ho.business.mapper.StationRemoteControlMapper;
+import com.ho.business.service.StationRemoteControlService;
+import com.ho.business.vo.req.StationRemoteControlPageVo;
+import com.ho.common.tools.util.PageResult;
+import com.ho.common.tools.util.PageUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class StationRemoteControlServiceImpl implements StationRemoteControlService {
+
+    @Autowired
+    StationRemoteControlMapper stationRemoteControlMapper;
+
+    @Override
+    public void insert(StationRemoteControl entity) {
+        stationRemoteControlMapper.insert(entity);
+    }
+
+    @Override
+    public void update(StationRemoteControl entity) {
+        stationRemoteControlMapper.update(entity);
+    }
+
+    @Override
+    public void delete(Integer id) {
+        stationRemoteControlMapper.delete(id);
+    }
+
+    @Override
+    public StationRemoteControl search(Integer stationId) {
+        return stationRemoteControlMapper.search(stationId);
+    }
+
+    @Override
+    public PageResult<StationRemoteControl> selectPageList(StationRemoteControlPageVo vo) {
+        PageHelper.startPage(vo.getPageNum(), vo.getPageSize());
+        List<StationRemoteControl> list = stationRemoteControlMapper.selectList(vo);
+        return PageUtils.getPageResult(new PageInfo<>(list));
+    }
+}

business-service-dao/src/main/resources/mapper/EarningsCalculateMapper.xml

@@ -147,9 +147,9 @@
             and date_format(#{date},'%Y-%m-%d') >= tem.validity_start_time and date_format(#{date},'%Y-%m-%d') <=
             tem.validity_end_time
         </if>
-        <!--        <if test="templateType != null">-->
-        <!--            and template_type = #{templateType}-->
-        <!--        </if>-->
+        <if test="elecType != null">
+            and tem.elec_type = #{elecType}
+        </if>
         order by begin_time
     </select>
 

business-service-dao/src/main/resources/mapper/EarningsCalculateMpptMapper.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ho.business.mapper.EarningsCalculateMpptMapper">
+
+
+    <delete id="deleteByDay">
+        delete
+        from earnings_calculate_mppt
+        <where>
+            and day = #{day}
+            <if test="typeList !=null and typeList.size() !=0">
+                and type in
+                <foreach collection="typeList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </delete>
+
+    <insert id="insertBatch">
+        INSERT INTO earnings_calculate_mppt
+        (group_id, pid, station_id, src_id, dept_id, create_time, day, type,
+        digital,elec,rate_type,price,total,discount)
+        VALUES
+        <foreach item="item" collection="list" index="index" separator=",">
+            (
+            #{item.groupId},#{item.pid},#{item.stationId},#{item.srcId},#{item.deptId}, now(),
+            #{item.day},#{item.type},#{item.digital},#{item.elec},#{item.rateType},#{item.price},#{item.total},#{item.discount}
+            )
+        </foreach>
+    </insert>
+
+    <select id="countPvIncome" resultType="com.ho.business.vo.resp.InverterResp.PowerGenerateRespVO">
+        SELECT DAY date,sum( digital ) profit
+        FROM
+            earnings_calculate_mppt
+        WHERE
+            station_id = #{stationId}
+          AND DAY BETWEEN #{beginTime}
+          AND #{endTime}
+        GROUP BY DAY
+    </select>
+    <select id="countAllPvIncome" resultType="java.math.BigDecimal">
+        SELECT sum( digital )
+        FROM
+        earnings_calculate_mppt
+        WHERE
+        station_id = #{stationId}
+        <if test="beginTime != null">
+            and day &gt;= #{beginTime}
+        </if>
+        <if test="endTime != null">
+            and day &lt;= #{endTime}
+        </if>
+    </select>
+    <select id="getProfit" resultType="com.ho.business.vo.resp.profit.DayProfitType">
+        select
+        station_id,day,type,sum(digital) as digital
+        from earnings_calculate_mppt
+        <where>
+            digital > 0
+            <if test="groupId != null">
+                and group_id = #{groupId}
+            </if>
+            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                and day BETWEEN #{beginTime}
+                AND #{endTime}
+            </if>
+        </where>
+        group by station_id, day,type
+    </select>
+
+    <select id="getFirstTime" resultType="java.lang.String">
+        SELECT min(day) day
+        FROM earnings_calculate_mppt;
+    </select>
+
+
+    <select id="getEarningsByParam" resultType="com.ho.business.vo.resp.profit.DayProfitType">
+        select
+        station_id,day,type,sum(digital) as digital
+        from earnings_calculate_mppt
+        <where>
+            digital > 0
+            <if test="groupId != null">
+                and group_id = #{groupId}
+            </if>
+            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                and day BETWEEN #{beginTime}
+                AND #{endTime}
+            </if>
+            <if test="stationIds != null and stationIds.size() != 0">
+                and station_id in
+                <foreach collection="stationIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        group by station_id, day,type
+    </select>
+
+</mapper>

business-service-dao/src/main/resources/mapper/ElecMeterValueMapper.xml

@@ -201,6 +201,31 @@
             group by type,station_id,day
         </where>
     </select>
+    <select id="getElec" resultType="com.ho.business.vo.resp.profit.DayProfitType">
+        select
+        station_id,day,type,sum(digital) as digital
+        from elec_meter_value
+        <where>
+            digital > 0
+            <if test="type != null">
+                and type = #{type}
+            </if>
+            <if test="groupId != null">
+                and group_id = #{groupId}
+            </if>
+            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                and day BETWEEN #{beginTime}
+                AND #{endTime}
+            </if>
+            <if test="stationIds != null and stationIds.size() != 0">
+                and station_id in
+                <foreach collection="stationIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        group by station_id, day,type;
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete

business-service-dao/src/main/resources/mapper/StationMapper.xml

@@ -12,7 +12,7 @@
         latitude,capacity,rate_power,
         status,type,create_time,
         contact,contact_details,grid_time,
-        update_time,deleted,is_enable,cabin_num,district,ad_code,is_daily_count,topology_type,cupboard_type,plan_version,inverter_flag,icc_id,province,city,
+        update_time,deleted,is_enable,cabin_num,district,ad_code,is_daily_count,topology_type,cupboard_type,plan_version,inverter_flag,pv_power,icc_id,province,city,
         electricity_type,customer_type,voltage_level,batch_number,nation
     </sql>
 
@@ -217,6 +217,7 @@
             <if test="record.cupboardType != null">cupboard_type,</if>
             <if test="record.planVersion != null">plan_version,</if>
             <if test="record.inverterFlag != null">inverter_flag,</if>
+            <if test="record.pvPower != null">pv_power,</if>
             <if test="record.iccId != null">icc_id,</if>
             <if test="record.province != null">province,</if>
             <if test="record.city != null">city,</if>
@@ -254,6 +255,7 @@
             <if test="record.cupboardType != null">#{record.cupboardType},</if>
             <if test="record.planVersion != null">#{record.planVersion},</if>
             <if test="record.inverterFlag != null">#{record.inverterFlag},</if>
+            <if test="record.pvPower != null">#{record.pvPower},</if>
             <if test="record.iccId != null">#{record.iccId},</if>
             <if test="record.province != null">#{record.province},</if>
             <if test="record.city != null">#{record.city},</if>
@@ -343,6 +345,9 @@
             <if test="record.inverterFlag != null">
                 inverter_flag = #{record.inverterFlag},
             </if>
+            <if test="record.pvPower != null">
+                pv_power = #{record.pvPower,jdbcType=DECIMAL},
+            </if>
             <if test="record.iccId != null">
                 icc_id = #{record.iccId},
             </if>

business-service-dao/src/main/resources/mapper/StationRemoteControlMapper.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ho.business.mapper.StationRemoteControlMapper">
+
+
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.ho.business.entity.StationRemoteControl"
+            useGeneratedKeys="true">
+        insert into station_remote_control
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="entity.id != null">id,</if>
+            <if test="entity.stationId != null">station_id,</if>
+            <if test="entity.ip != null">ip,</if>
+            <if test="entity.port != null">port,</if>
+            <if test="entity.userName != null">user_name,</if>
+            <if test="entity.password != null">password,</if>
+            <if test="entity.intranetIp != null">intranet_ip,</if>
+            <if test="entity.type != null">type,</if>
+            <if test="entity.createTime != null">create_time,</if>
+            <if test="entity.updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="entity.id != null">#{entity.id,jdbcType=INTEGER},</if>
+            <if test="entity.stationId != null">#{entity.stationId,jdbcType=INTEGER},</if>
+            <if test="entity.ip != null">#{entity.ip,jdbcType=VARCHAR},</if>
+            <if test="entity.port != null">#{entity.port,jdbcType=VARCHAR},</if>
+            <if test="entity.userName != null">#{entity.userName,jdbcType=VARCHAR},</if>
+            <if test="entity.password != null">#{entity.password,jdbcType=VARCHAR},</if>
+            <if test="entity.intranetIp != null">#{entity.intranetIp,jdbcType=VARCHAR},</if>
+            <if test="entity.type != null">#{entity.type,jdbcType=VARCHAR},</if>
+            <if test="entity.createTime != null">#{entity.createTime,jdbcType=TIMESTAMP},</if>
+            <if test="entity.updateTime != null">#{entity.updateTime,jdbcType=TIMESTAMP},</if>
+        </trim>
+    </insert>
+    <update id="update" parameterType="com.ho.business.entity.StationRemoteControl">
+        update station_remote_control
+        <set>
+            <if test="entity.ip != null">
+                ip = #{entity.ip,jdbcType=VARCHAR},
+            </if>
+            <if test="entity.port != null">
+                port = #{entity.port,jdbcType=VARCHAR},
+            </if>
+            <if test="entity.userName != null">
+                user_name = #{entity.userName,jdbcType=VARCHAR},
+            </if>
+            <if test="entity.password != null">
+                password = #{entity.password,jdbcType=VARCHAR},
+            </if>
+            <if test="entity.intranetIp != null">
+                intranet_ip = #{entity.intranetIp,jdbcType=VARCHAR},
+            </if>
+            <if test="entity.type != null">
+                type = #{entity.type,jdbcType=VARCHAR},
+            </if>
+            <if test="entity.updateTime != null">
+                update_time = #{entity.updateTime,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where id = #{entity.id,jdbcType=INTEGER}
+    </update>
+    <delete id="delete">
+        delete from  station_remote_control where id = #{id,jdbcType=INTEGER}
+    </delete>
+
+    <select id="search" resultType="com.ho.business.entity.StationRemoteControl">
+        select s.*,t.name stationName from station_remote_control s
+        left join station t on s.station_id = t.id
+        <where>
+            <if test="stationId != null and stationId !=''">
+                and s.station_id = #{stationId}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectList" resultType="com.ho.business.entity.StationRemoteControl">
+        select s.*,t.name stationName from station_remote_control s
+        left join station t on s.station_id = t.id
+        <where>
+            <if test="vo.stationId != null and vo.stationId !=''">
+                and s.station_id = #{vo.stationId}
+            </if>
+            <if test="vo.stationName != null and vo.stationName !=''">
+                and t.name like concat('%',#{vo.stationName},'%')
+            </if>
+            <if test="vo.intranetIp != null and vo.intranetIp !=''">
+                and s.intranet_ip like concat('%',#{vo.intranetIp},'%')
+            </if>
+            <if test="vo.ip != null and vo.ip !=''">
+                and s.ip  like concat('%',#{vo.ip},'%')
+            </if>
+            <if test="vo.type != null and vo.type !=''">
+                and s.type = #{vo.type}
+            </if>
+        </where>
+        order by s.create_time desc
+    </select>
+</mapper>

business-service/src/main/java/com/ho/business/controller/EarningsCalculateController.java

@@ -8,11 +8,13 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.ho.business.entity.*;
+import com.ho.business.service.EarningsCalculateMpptService;
 import com.ho.business.service.EarningsCalculateService;
 import com.ho.business.service.StationService;
 import com.ho.business.util.QueuesUtil;
 import com.ho.business.vo.OneKeyComputationVo;
 import com.ho.business.vo.req.carbin.EarningsCalculateReq;
+import com.ho.business.vo.resp.InverterResp.PowerGenerateRespVO;
 import com.ho.business.vo.resp.cabin.EarningsCalculateResp;
 import com.ho.common.tools.annotation.HzPermission;
 import com.ho.common.tools.annotation.TokenIgnore;
@@ -23,6 +25,7 @@ import com.ho.common.tools.exception.BaseResponseCode;
 import com.ho.common.tools.exception.BusinessException;
 import com.ho.common.tools.exception.DataResult;
 import com.ho.common.tools.service.RedisService;
+import com.ho.common.tools.util.BigDecimalUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -59,9 +62,15 @@ public class EarningsCalculateController {
     @Autowired
     EarningsCalculateService earningsCalculateService;
 
+    @Autowired
+    EarningsCalculateMpptService earningsCalculateMpptService;
+
     @Autowired
     private StationService stationService;
 
+    @Autowired
+    BigDecimalUtil bigDecimalUtil;
+
     @PostMapping("/getTotal")
     @ApiOperation(value = "获取月发电量报表")
     @TokenIgnore
@@ -85,6 +94,17 @@ public class EarningsCalculateController {
         return DataResult.success(total);
     }
 
+    @PostMapping("/getPvMonthData")
+    @ApiOperation(value = "mppt月发电、收益(使用mppt计算)")
+    public DataResult<List<PowerGenerateRespVO>> getPvMonthData(@RequestBody EarningsCalculateReq req) {
+        //获取光伏放电、收益
+        List<PowerGenerateRespVO> pvList = earningsCalculateService.getPvMonthData(req);
+        for (PowerGenerateRespVO pcsElecData : pvList) {
+            bigDecimalUtil.keepTwoDecimalPlaces(pcsElecData);
+            bigDecimalUtil.ifIsNUll(pcsElecData);
+        }
+        return DataResult.success(pvList);
+    }
     @TokenIgnore
     @PostMapping("/all")
     @ApiOperation(value = "查询所有电站接口")
@@ -111,6 +131,48 @@ public class EarningsCalculateController {
         stations = stations.stream().filter(i -> CommonConstant.ONE.equals(i.getStatus())).collect(Collectors.toList());
         earningsCalculateService.queryDeviceByStationId(stations,null,beginTime);
     }
+    @TokenIgnore
+    @PostMapping("/allMpptIncome")
+    @ApiOperation(value = "计算所有电站Mppt电价收益")
+    public void allMpptIncome(@RequestBody(required = false) String beginTime) {
+        try {
+            /*
+             * 定时任务 如果没有时间参数 就每天跑昨日数据
+             * 如果有 beginTime 参数不为空，则先清除beginTime 时间的收益数据重新计算
+             */
+            DateTime yesterday = DateUtil.yesterday();
+            String yesterdayStr = DateUtil.formatDate(yesterday);
+            if ( beginTime != null  ) {
+                int i = earningsCalculateMpptService.deleteByDay(beginTime, null);
+            } else {
+                beginTime = yesterdayStr;
+                int i = earningsCalculateMpptService.deleteByDay(yesterdayStr, null);
+            }
+        } catch (Exception e) {
+            log.error("删除昨日数据失败:{}",e.getMessage());
+        }
+        List<Station> stations = stationService.selectAll();
+        //批量算的时候只计算电站是在投的，且是接入光伏mppt的
+        stations = stations.stream().filter(i -> CommonConstant.ONE.equals(i.getStatus())
+                &&CommonConstant.ONE.equals(i.getInverterFlag())).collect(Collectors.toList());
+        earningsCalculateMpptService.allMpptIncome(stations,beginTime);
+    }
+    @TokenIgnore
+    @PostMapping("/allTodayMpptIncome")
+    @ApiOperation(value = "计算所有电站Mppt-今日收益")
+    public void allTodayMpptIncome(@RequestBody(required = false) String beginTime) {
+        DateTime nowDay = DateUtil.date();
+        String nowDayStr = DateUtil.formatDate(nowDay);
+        if ( beginTime == null  ) {
+            beginTime = nowDayStr;
+        }
+        List<Station> stations = stationService.selectAll();
+        //批量算的时候只计算电站是在投的，且是接入光伏mppt的
+        stations = stations.stream().filter(i -> CommonConstant.ONE.equals(i.getStatus())
+                &&CommonConstant.ONE.equals(i.getInverterFlag())).collect(Collectors.toList());
+        earningsCalculateMpptService.todayMpptIncome(stations,beginTime);
+    }
+
 
     private List<String> getBetweenDate(String begin,String end){
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@@ -134,7 +196,43 @@ public class EarningsCalculateController {
         }
         return betweenList;
     }
+    @TokenIgnore
+    @PostMapping("/exportPv")
+    @ApiOperation(value = "pv导出")
+    public void exportPv(HttpServletRequest req, HttpServletResponse response, @RequestBody EarningsCalculateReq earningsCalculateReq){
+        String lang = req.getHeader(CommonConstant.LANG);
+        earningsCalculateReq.setLang(lang);
+        EarningsCalculateResp total = earningsCalculateService.getTotal(earningsCalculateReq,PAGE_LIST_TYPE);
+        ServletOutputStream out = null;
+        try {
+            out = response.getOutputStream();
+            response.setContentType("multipart/form-data");
+            response.setCharacterEncoding("UTF-8");
+            //文件名字
+            String fileName = "demo.xlsx";
+            response.setHeader("Content-disposition", "attachment;filename=" +fileName);
+            String path="template/earningsPvTemplate.xlsx";
+            //文件模板输入流
+            InputStream inputStream = new ClassPathResource(path).getInputStream();
+            ExcelWriter writer = EasyExcel.write(out).withTemplate(inputStream).build();
+            WriteSheet sheet = EasyExcel.writerSheet().build();
+            FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build();
 
+            List<PowerGenerateRespVO> pvList = earningsCalculateService.getPvMonthData(earningsCalculateReq);
+            for (PowerGenerateRespVO pcsElecData : pvList) {
+                bigDecimalUtil.keepTwoDecimalPlaces(pcsElecData);
+                bigDecimalUtil.ifIsNUll(pcsElecData);
+            }
+            writer.fill(new FillWrapper("vo", pvList), fillConfig, sheet);
+            //填充数据
+            writer.fill(total,fillConfig,sheet);
+            //填充完成
+            writer.finish();
+            out.flush();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
     @TokenIgnore
     @PostMapping("/export")
     @ApiOperation(value = "导出")

business-service/src/main/java/com/ho/business/controller/IargeScreenShowController.java

@@ -7,10 +7,7 @@ import com.ho.business.service.IargeScreenShowService;
 import com.ho.business.service.StationService;
 import com.ho.business.vo.req.cockpit.CockpitReqVO;
 import com.ho.business.vo.resp.DeviceRespVO;
-import com.ho.business.vo.resp.iargeScreen.AnnualChartValue;
-import com.ho.business.vo.resp.iargeScreen.AnnualOverviewResp;
-import com.ho.business.vo.resp.iargeScreen.EnergySavingRespVo;
-import com.ho.business.vo.resp.iargeScreen.Subdata;
+import com.ho.business.vo.resp.iargeScreen.*;
 import com.ho.common.tools.annotation.CommonLargeScreenToken;
 import com.ho.common.tools.annotation.TokenIgnore;
 import com.ho.common.tools.constant.ContextConstant;
@@ -419,5 +416,88 @@ public class IargeScreenShowController {
         return DataResult.success(regionList);
     }
 
-    /************************************************************************/
+    /*********************************以下为中自-光伏大屏接口***************************************/
+
+    @PostMapping("getZhongZiPvDistribution")
+    @ApiOperation(value = "中自-光伏电站区域分布")
+    @TokenIgnore
+    public DataResult<List<Subdata>> getZhongZiPvDistribution(@RequestBody CockpitReqVO vo) {
+        List<Subdata> regionList = iargeScreenShowService.getCommonPvRegionList((getByDeptId(vo.getDeptId())));
+        regionList.sort(Comparator.comparing((Subdata::getRegionValue)).reversed());
+        return DataResult.success(regionList);
+    }
+
+    @PostMapping("getZhongZiPvOverviewData")
+    @ApiOperation(value = "中自储能-光伏年度概览/年度收益概览接口返回")
+    @TokenIgnore
+    public DataResult<AnnualPvOverviewResp> getZhongZiPvOverviewData(@RequestBody CockpitReqVO vo) {
+        AnnualPvOverviewResp annualOverviewResp = iargeScreenShowService.getPvOverviewData(getByDeptId(vo.getDeptId()));
+        bigDecimalUtil.keepTwoDecimalPlaces(annualOverviewResp);
+        bigDecimalUtil.ifIsNUll(annualOverviewResp);
+        return DataResult.success(annualOverviewResp);
+    }
+
+    @PostMapping("getZhongZiPvEnergySaving")
+    @ApiOperation(value = "中自-光伏节能减排")
+    @TokenIgnore
+    public DataResult<EnergySavingRespVo> getZhongZiPvEnergySaving(@RequestBody CockpitReqVO vo) {
+        EnergySavingRespVo energySaving = iargeScreenShowService.getPvEnergySaving(getByDeptId(vo.getDeptId()));
+        bigDecimalUtil.keepTwoDecimalPlaces(energySaving);
+        bigDecimalUtil.ifIsNUll(energySaving);
+        return DataResult.success(energySaving);
+    }
+
+    @PostMapping("getZhongZiPvIncomeCurve")
+    @ApiOperation(value = "中自光伏收益曲线")
+    @TokenIgnore
+    public DataResult<List<AnnualChartValue>> getZhongZiPvIncomeCurve(@RequestBody CockpitReqVO vo) {
+        List<AnnualChartValue> list = iargeScreenShowService.getPVCommonProfitCurve(vo, getByDeptId(vo.getDeptId()));
+        for (AnnualChartValue annualChartValue : list) {
+            bigDecimalUtil.keepTwoDecimalPlaces(annualChartValue);
+            bigDecimalUtil.ifIsNUll(annualChartValue);
+        }
+        return DataResult.success(list);
+    }
+
+    @PostMapping("getZhongZiPvIncomeList")
+    @ApiOperation(value = "中自-光伏电站收益排名")
+    @TokenIgnore
+    public DataResult<List<Subdata>> getZhongZiPvIncomeList(@RequestBody CockpitReqVO vo) {
+        List<Subdata> regionList = iargeScreenShowService.getPvCommonProfit(null,null,getByDeptId(vo.getDeptId()));
+        if (regionList.size() > maxSize) {
+            regionList = regionList.subList(0, maxSize);
+        }
+        for (Subdata subdata : regionList) {
+            bigDecimalUtil.keepTwoDecimalPlaces(subdata);
+            bigDecimalUtil.ifIsNUll(subdata);
+        }
+        return DataResult.success(regionList);
+    }
+
+    @PostMapping("getZhongZiPvElecList")
+    @ApiOperation(value = "中自-光伏电站发电量排名")
+    @TokenIgnore
+    public DataResult<List<Subdata>> getZhongZiPvElecList(@RequestBody CockpitReqVO vo) {
+        List<Subdata> regionList = iargeScreenShowService.getPvCommonElec(null,null,getByDeptId(vo.getDeptId()));
+        if (regionList.size() > maxSize) {
+            regionList = regionList.subList(0, maxSize);
+        }
+        for (Subdata subdata : regionList) {
+            bigDecimalUtil.keepTwoDecimalPlaces(subdata);
+            bigDecimalUtil.ifIsNUll(subdata);
+        }
+        return DataResult.success(regionList);
+    }
+
+    @PostMapping("getZhongZiPvRelease")
+    @ApiOperation(value = "中自pv日发电量")
+    @TokenIgnore
+    public DataResult<List<AnnualChartValue>> getZhongZiPvRelease(@RequestBody CockpitReqVO vo) {
+        List<AnnualChartValue> list = iargeScreenShowService.getCommonPvRelease(getByDeptId(vo.getDeptId()));
+        for (AnnualChartValue subdata : list) {
+            bigDecimalUtil.keepTwoDecimalPlaces(subdata);
+            bigDecimalUtil.ifIsNUll(subdata);
+        }
+        return DataResult.success(list);
+    }
 }

business-service/src/main/java/com/ho/business/controller/OpenStationController.java

@@ -10,6 +10,7 @@ import com.ho.business.vo.req.StationReq;
 import com.ho.business.vo.req.dynamicConfig.DynamicConfigQuery;
 import com.ho.business.vo.req.pcsStation.PcsStationReq;
 import com.ho.business.vo.resp.DeviceRespVO;
+import com.ho.business.vo.resp.InverterResp.PowerGenerateRespVO;
 import com.ho.business.vo.resp.cabin.CircleCtrlResp;
 import com.ho.business.vo.resp.cabin.EarningsCalculateCountResp;
 import com.ho.business.vo.resp.openStationHome.OpenStationMiddle;
@@ -25,6 +26,7 @@ import com.ho.business.vo.resp.station.NewRealTimeCurveVo;
 import com.ho.common.tools.annotation.TokenIgnore;
 import com.ho.common.tools.constant.CommonConstant;
 import com.ho.common.tools.constant.ContextConstant;
+import com.ho.common.tools.constant.RedisKeyConstant;
 import com.ho.common.tools.exception.DataResult;
 import com.ho.common.tools.service.RedisService;
 import com.ho.common.tools.util.BigDecimalUtil;
@@ -40,6 +42,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.math.BigDecimal;
@@ -269,19 +272,7 @@ public class OpenStationController {
             req.setDeviceType(deviceType);
         }
         List<PcsElecData> list = stationHomeService.getPcsElecData(req);
-        //获取光伏充电
-        List<PcsElecData> pvList = stationHomeService.getPvChargeElec(req);
-        Map<String, List<PcsElecData>> dataMap = pvList.stream().collect(Collectors.groupingBy(PcsElecData::getDate));
 
-
-        for (PcsElecData pcsElecData : list) {
-            if (dataMap.containsKey(pcsElecData.getDate())) {
-                List<PcsElecData> pcsElecData1 = dataMap.get(pcsElecData.getDate());
-                if (pcsElecData1.get(CommonConstant.ZERO).getPvChargeElec() != null) {
-                    pcsElecData.setPvChargeElec(pcsElecData1.get(CommonConstant.ZERO).getPvChargeElec());
-                }
-            }
-        }
         for (PcsElecData pcsElecData : list) {
             bigDecimalUtil.keepTwoDecimalPlaces(pcsElecData);
             bigDecimalUtil.ifIsNUll(pcsElecData);
@@ -289,6 +280,18 @@ public class OpenStationController {
         return DataResult.success(list);
     }
 
+    @PostMapping("/getPvData")
+    @ApiOperation(value = "mppt放电、收益(使用mppt计算)")
+    public DataResult<List<PowerGenerateRespVO>> getPvData(@RequestBody PcsStationReq req) throws ParseException {
+        //获取光伏放电、收益
+        List<PowerGenerateRespVO> pvList = stationHomeService.getPvData(req);
+        for (PowerGenerateRespVO pcsElecData : pvList) {
+            bigDecimalUtil.keepTwoDecimalPlaces(pcsElecData);
+            bigDecimalUtil.ifIsNUll(pcsElecData);
+        }
+        return DataResult.success(pvList);
+    }
+
     /**
      * 导出累计充放电量数据
      *
@@ -298,9 +301,10 @@ public class OpenStationController {
     @ApiOperation(value = "多电站导出累计充放电量数据")
     //@LogAnnotation(title = "累计充放电量", action = "导出累计充放电量数据")
     //@HzPermission(value = {PermissionConstant.REMOTECONTROL_COMMAND_EXPORT,PermissionConstant.DATA_SHOW_EXPORT,PermissionConstant.REMOTECONTROL_COMMAND_EXPORT})
-    public void exportExcel(@RequestBody @Valid PcsStationReq req, HttpServletResponse response) {
+    public void exportExcel(@RequestBody @Valid PcsStationReq req, HttpServletResponse response, HttpServletRequest request) {
+        String lang = request.getHeader(RedisKeyConstant.User.LANG);
         //功能描述：把同一个表格多个sheet测试结果重新输出，
-        openStationService.exportEleData(req, response);
+        openStationService.exportEleData(req, response,lang);
     }
 
 

business-service/src/main/java/com/ho/business/controller/OuterApiController.java

@@ -420,8 +420,10 @@ public class OuterApiController {
     public DataResult jobIntegratedCabinet(@RequestBody MonitorQuery monitorQuery) {
         log.info("jobIntegratedCabinet, {}", monitorQuery);
         outApiService.dayChargeDeal(monitorQuery);
-        outApiService.currentMonthYearDeal(monitorQuery);
+//        outApiService.currentMonthYearDeal(monitorQuery);
 //        outApiService.dayPVCharge(monitorQuery);
+        outApiService.dayPVMpptCharge(monitorQuery);
+
         return DataResult.success();
     }
 

business-service/src/main/java/com/ho/business/controller/PcsController.java

@@ -77,6 +77,18 @@ public class PcsController {
         return DataResult.success(resList);
     }
 
+    @PostMapping("/pvCurve")
+    @ApiOperation(value = "mppt曲线")
+    public DataResult<List<AppRealTimeCurveRespVo>> pvCurve(@RequestBody MonitorQuery monitorQuery) {
+        List<AppRealTimeCurveRespVo> resList = stationHomeService.pvCurve(monitorQuery);
+
+        //返回值的BigDecimal类型保留两位小数
+        for (AppRealTimeCurveRespVo realTimeCurveRespVo : resList) {
+            bigDecimalUtil.keepTwoDecimalPlaces(realTimeCurveRespVo);
+            bigDecimalUtil.ifIsNUll(realTimeCurveRespVo);
+        }
+        return DataResult.success(resList);
+    }
 
     @PostMapping("/opticalStorageCurve")
     @ApiOperation(value = "光储逆变器曲线")

business-service/src/main/java/com/ho/business/controller/ShipEnergyController.java

@@ -0,0 +1,32 @@
+package com.ho.business.controller;
+
+import com.ho.business.service.ShipEnergyService;
+import com.ho.common.tools.annotation.TokenIgnore;
+import com.ho.common.tools.constant.ContextConstant;
+import com.ho.common.tools.exception.DataResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping(ContextConstant.BUSINESS + "shipEnergyStation")
+@RestController
+@Api(tags = "业务模块-寄点能源电站管理")
+public class ShipEnergyController {
+
+
+    @Autowired
+    ShipEnergyService  shipEnergyService;
+
+
+    @PostMapping("add")
+    @ApiOperation(value = "新增电站接口")
+    @TokenIgnore
+    public DataResult add() {
+        shipEnergyService.addShipEnergyStation();
+        return DataResult.success();
+    }
+
+}

business-service/src/main/java/com/ho/business/controller/StationRemoteController.java

@@ -0,0 +1,72 @@
+package com.ho.business.controller;
+
+import com.ho.business.entity.StationRemoteControl;
+import com.ho.business.service.StationRemoteControlService;
+import com.ho.business.vo.req.StationRemoteControlPageVo;
+import com.ho.common.tools.annotation.LogAnnotation;
+import com.ho.common.tools.constant.ContextConstant;
+import com.ho.common.tools.exception.BaseResponseCode;
+import com.ho.common.tools.exception.BusinessException;
+import com.ho.common.tools.exception.DataResult;
+import com.ho.common.tools.util.PageResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
+
+@RequestMapping(ContextConstant.BUSINESS + "stationRemote")
+@RestController
+@Api(tags = "业务模块-电站远控管理")
+public class StationRemoteController {
+
+    @Autowired
+    private StationRemoteControlService stationRemoteControlService;
+
+    @PostMapping("saveOrUpdate")
+    @ApiOperation(value = "新增/修改远控电站信息")
+    @LogAnnotation(title = "电站远控管理", action = "新增/修改新增远控电站信息")
+    public DataResult saveOrUpdate(@RequestBody @Valid StationRemoteControl entity) {
+        if(entity==null){
+            throw new BusinessException(BaseResponseCode.DATA_NOT_EXISTS);
+        }
+        if(entity.getId()==null){
+            //新增
+            StationRemoteControl stationRemoteControl = stationRemoteControlService.search(entity.getStationId());
+            if (stationRemoteControl != null) {
+                throw new BusinessException(BaseResponseCode.STATION_ALREADY_EXISTS);
+            }
+            entity.setCreateTime(new Date());
+            stationRemoteControlService.insert(entity);
+        }else{
+            //修改
+            entity.setUpdateTime(new Date());
+            stationRemoteControlService.update(entity);
+        }
+        return DataResult.success();
+    }
+
+    @DeleteMapping("delete")
+    @ApiOperation(value = "删除远控电站信息")
+    @LogAnnotation(title = "电站远控管理", action = "删除远控电站信息")
+    public DataResult delete(@RequestBody Integer id) {
+        stationRemoteControlService.delete(id);
+        return DataResult.success();
+    }
+
+    @PostMapping("search")
+    @ApiOperation(value = "查询远控电站信息")
+    public DataResult<StationRemoteControl> search(@RequestBody StationRemoteControlPageVo vo) {
+        StationRemoteControl stationRemoteControl=stationRemoteControlService.search(vo.getStationId());
+        return DataResult.success(stationRemoteControl);
+    }
+
+    @PostMapping("pageList")
+    @ApiOperation(value = "查询远控电站信息")
+    public DataResult<PageResult<StationRemoteControl>> pageList(@RequestBody StationRemoteControlPageVo vo) {
+        PageResult<StationRemoteControl> page = stationRemoteControlService.selectPageList(vo);
+        return DataResult.success(page);
+    }
+}

business-service/src/main/resources/application-dev.yml

@@ -20,7 +20,7 @@ spring:
         server-addr: 127.0.0.1:8848
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://1.95.170.86:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    url: jdbc:mysql://192.168.0.139:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
     username: business_db
     password: zzkj@688737
     druid:
@@ -33,7 +33,7 @@ spring:
   redis:
     port: 6379 #端口
     timeout: 50000ms #连接超时
-    host: 1.95.170.86 #单机
+    host: 192.168.0.139 #单机
     password: 123456
     database: 0
     lettuce:

common-tools/src/main/java/com/ho/common/tools/constant/CommonConstant.java

@@ -994,4 +994,51 @@ public interface CommonConstant {
     String CF_FROZEN = "cfFrozen";
     //将数据库统配符合“_”变成普通字符
     String JOIN_STATION_ID = "\\_";
+
+    String REPORT_NAME="月度报表";
+    String REPORT_NAME_EN="Monthly report";
+
+    String BILL_NAME="月度账单";
+    String BILL_NAME_EN="Monthly bill";
+
+    // 语言切换
+    String LANG = "lang";
+    interface lang{
+        // 中文
+        String ZH = "zh";
+        // 英语
+        String EN = "en";
+        // 法语
+        String FRA = "fra";
+        // 西班牙
+        String SPA = "spa";
+        // 德语
+        String DE = "de";
+        // 波兰
+        String PL = "pl";
+        // 阿拉伯语
+        String ARA = "ara";
+    }
+
+    interface langTemp{
+        // 简体中文
+        String ZH_CN="zh_CN";
+        // 美式英语
+        String EN_US="en_US";
+        // 法语
+        String FR_FR="fr_FR";
+        // 西班牙语
+        String ES_ES="es_ES";
+        // 德语
+        String DE_DE="de_DE";
+        // 波兰语
+        String PL_PL="pl_PL";
+        // 阿拉伯语
+        String AR_EG="ar_EG";
+    }
+
+    interface HttpCode {
+        // 调用成功code
+        Integer SUCCESS_CODE = 200;
+    }
 }

common-tools/src/main/java/com/ho/common/tools/constant/DefineConstant.java

@@ -26,9 +26,12 @@ public interface DefineConstant {
     String SHARP = "尖";
 
     String SUMMARY = "汇总";
+    String SUMMARY_EN = "Summary";
 
     String SUMMARY_DATA_STATION = "电站汇总数据";
 
+    String SUMMARY_DATA_STATION_EN = "Summary data of power station";
+
     interface PeakShaving {
         String ADD_TEMPLATE_SUCCESS = "新增计划曲线模板成功";
         String TEMPLATE_CHECK_SIZE = "至少有一个时段和一个计划用电，请确认后重试！";

common-tools/src/main/java/com/ho/common/tools/util/AddressUntils.java

@@ -35,7 +35,7 @@ public class AddressUntils {
     }
 
     public static JSONObject getLocationInfo(String lat, String lng) throws IOException {
-        String urlString = "https://apis.map.qq.com/ws/geocoder/v1/?location=" + lat + "," + lng + "&key=" + secretKey;
+        String urlString = "http://apis.map.qq.com/ws/geocoder/v1/?location=" + lat + "," + lng + "&key=" + secretKey;
         System.out.println("请求经纬度url:" + urlString);
         URL url = new URL(urlString);
         HttpURLConnection conn = (HttpURLConnection) url.openConnection();

common-tools/src/main/java/com/ho/common/tools/util/HttpUtils.java

@@ -0,0 +1,342 @@
+package com.ho.common.tools.util;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringJoiner;
+
+/**
+ * HTTP工具类 - 支持GET/POST请求，支持表单和JSON传参
+ */
+public class HttpUtils {
+    /**
+     * 连接超时时间（毫秒）
+     */
+    private static final int CONNECT_TIMEOUT = 10000;
+
+    /**
+     * 读取超时时间（毫秒）
+     */
+    private static final int READ_TIMEOUT = 30000;
+
+    /**
+     * 发送GET请求（表单参数模式）
+     *
+     * @param url 请求URL
+     * @param params 表单参数
+     * @return 响应字符串
+     * @throws IOException 网络异常
+     */
+    public static String getWithForm(String url, Map<String, String> params) throws IOException {
+        return get(url, buildFormParams(params), "application/x-www-form-urlencoded");
+    }
+
+    /**
+     * 发送GET请求（JSON参数模式）
+     *
+     * @param url 请求URL
+     * @param jsonParams JSON参数字符串
+     * @return 响应字符串
+     * @throws IOException 网络异常
+     */
+    public static String getWithJson(String url, String jsonParams) throws IOException {
+        // 注意：GET请求通常不支持请求体中的JSON参数
+        // 但某些API可能支持，这里将其作为查询参数传递
+        Map<String, String> params = new HashMap<>();
+        params.put("json", jsonParams);
+        return get(url, buildFormParams(params), "application/x-www-form-urlencoded");
+    }
+
+    /**
+     * 发送POST请求（表单参数模式）
+     *
+     * @param url 请求URL
+     * @param params 表单参数
+     * @return 响应字符串
+     * @throws IOException 网络异常
+     */
+    public static String postWithForm(String url, Map<String, String> params) throws IOException {
+        return post(url, buildFormParams(params), "application/x-www-form-urlencoded");
+    }
+
+    /**
+     * 发送POST请求（JSON参数模式）
+     *
+     * @param url 请求URL
+     * @param jsonParams JSON参数字符串
+     * @return 响应字符串
+     * @throws IOException 网络异常
+     */
+    public static String postWithJson(String url, String jsonParams) throws IOException {
+        return post(url, jsonParams, "application/json; charset=utf-8");
+    }
+
+    /**
+     * 发送POST请求（JSON参数模式，使用Map自动转换为JSON）
+     *
+     * @param url 请求URL
+     * @param params 参数Map
+     * @return 响应字符串
+     * @throws IOException 网络异常
+     */
+    public static String postWithJson(String url, Map<String, Object> params) throws IOException {
+        String jsonParams = mapToJson(params);
+        return postWithJson(url, jsonParams);
+    }
+
+    /**
+     * 发送GET请求（基础方法）
+     */
+    private static String get(String url, String queryParams, String contentType) throws IOException {
+        String fullUrl = url;
+        if (queryParams != null && !queryParams.isEmpty()) {
+            fullUrl = url + "?" + queryParams;
+        }
+
+        HttpURLConnection connection = null;
+        BufferedReader reader = null;
+
+        try {
+            URL requestUrl = new URL(fullUrl);
+            connection = (HttpURLConnection) requestUrl.openConnection();
+            connection.setRequestMethod("GET");
+            connection.setConnectTimeout(CONNECT_TIMEOUT);
+            connection.setReadTimeout(READ_TIMEOUT);
+            connection.setRequestProperty("Content-Type", contentType);
+            connection.setRequestProperty("User-Agent", "HttpUtils/1.0");
+
+            int responseCode = connection.getResponseCode();
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8));
+                return readResponse(reader);
+            } else {
+                reader = new BufferedReader(new InputStreamReader(connection.getErrorStream(), StandardCharsets.UTF_8));
+                String errorResponse = readResponse(reader);
+                throw new IOException("HTTP GET Request Failed with Error Code: " + responseCode + ", Response: " + errorResponse);
+            }
+        } finally {
+            reader.close();
+            connection.disconnect();
+        }
+    }
+
+    /**
+     * 发送POST请求（基础方法）
+     */
+    private static String post(String url, String requestBody, String contentType) throws IOException {
+        HttpURLConnection connection = null;
+        OutputStream outputStream = null;
+        BufferedReader reader = null;
+
+        try {
+            URL requestUrl = new URL(url);
+            connection = (HttpURLConnection) requestUrl.openConnection();
+            connection.setRequestMethod("POST");
+            connection.setConnectTimeout(CONNECT_TIMEOUT);
+            connection.setReadTimeout(READ_TIMEOUT);
+            connection.setDoOutput(true);
+            connection.setRequestProperty("Content-Type", contentType);
+            connection.setRequestProperty("User-Agent", "HttpUtils/1.0");
+            connection.setRequestProperty("Accept", "application/json, text/plain, */*");
+
+            // 写入请求体
+            if (requestBody != null && !requestBody.isEmpty()) {
+                outputStream = connection.getOutputStream();
+                outputStream.write(requestBody.getBytes(StandardCharsets.UTF_8));
+                outputStream.flush();
+            }
+
+            int responseCode = connection.getResponseCode();
+            if (responseCode == HttpURLConnection.HTTP_OK ||
+                    responseCode == HttpURLConnection.HTTP_CREATED ||
+                    responseCode == HttpURLConnection.HTTP_ACCEPTED) {
+                reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8));
+                return readResponse(reader);
+            } else {
+                reader = new BufferedReader(new InputStreamReader(connection.getErrorStream(), StandardCharsets.UTF_8));
+                String errorResponse = readResponse(reader);
+                throw new IOException("HTTP POST Request Failed with Error Code: " + responseCode + ", Response: " + errorResponse);
+            }
+        } finally {
+            outputStream.close();
+            reader.close();
+            connection.connect();
+        }
+    }
+
+    /**
+     * 构建表单参数字符串
+     */
+    private static String buildFormParams(Map<String, String> params) throws UnsupportedEncodingException {
+        if (params == null || params.isEmpty()) {
+            return "";
+        }
+
+        StringJoiner joiner = new StringJoiner("&");
+        for (Map.Entry<String, String> entry : params.entrySet()) {
+            String encodedKey = URLEncoder.encode(entry.getKey(), StandardCharsets.UTF_8.toString());
+            String encodedValue = URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8.toString());
+            joiner.add(encodedKey + "=" + encodedValue);
+        }
+        return joiner.toString();
+    }
+    /**
+     * 将Map转换为JSON字符串（简单实现，实际项目中建议使用Jackson/Gson等库）
+     */
+    private static String mapToJson(Map<String, Object> params) {
+        if (params == null || params.isEmpty()) {
+            return "{}";
+        }
+
+        StringBuilder jsonBuilder = new StringBuilder("{");
+        boolean first = true;
+
+        for (Map.Entry<String, Object> entry : params.entrySet()) {
+            if (!first) {
+                jsonBuilder.append(",");
+            }
+            first = false;
+
+            jsonBuilder.append("\"").append(escapeJson(entry.getKey())).append("\":");
+
+            Object value = entry.getValue();
+            if (value == null) {
+                jsonBuilder.append("null");
+            } else if (value instanceof String) {
+                jsonBuilder.append("\"").append(escapeJson((String) value)).append("\"");
+            } else if (value instanceof Number || value instanceof Boolean) {
+                jsonBuilder.append(value);
+            } else {
+                // 复杂对象需要序列化，这里简单处理
+                jsonBuilder.append("\"").append(escapeJson(value.toString())).append("\"");
+            }
+        }
+
+        jsonBuilder.append("}");
+        return jsonBuilder.toString();
+    }
+    /**
+     * 转义JSON特殊字符
+     */
+    private static String escapeJson(String input) {
+        if (input == null) {
+            return "";
+        }
+
+        return input.replace("\\", "\\\\")
+                .replace("\"", "\\\"")
+                .replace("\b", "\\b")
+                .replace("\f", "\\f")
+                .replace("\n", "\\n")
+                .replace("\r", "\\r")
+                .replace("\t", "\\t");
+    }
+    /**
+     * 读取响应内容
+     */
+    private static String readResponse(BufferedReader reader) throws IOException {
+        StringBuilder response = new StringBuilder();
+        String line;
+        while ((line = reader.readLine()) != null) {
+            response.append(line);
+        }
+        return response.toString();
+    }
+
+
+    /**
+     * 发送带请求头的GET请求（扩展方法）
+     */
+    public static String getWithHeaders(String url, Map<String, String> params, Map<String, String> headers) throws IOException {
+        String fullUrl = url;
+        if (params != null && !params.isEmpty()) {
+            fullUrl = url + "?" + buildFormParams(params);
+        }
+
+        HttpURLConnection connection = null;
+        BufferedReader reader = null;
+
+        try {
+            URL requestUrl = new URL(fullUrl);
+            connection = (HttpURLConnection) requestUrl.openConnection();
+            connection.setRequestMethod("GET");
+            connection.setConnectTimeout(CONNECT_TIMEOUT);
+            connection.setReadTimeout(READ_TIMEOUT);
+            connection.setRequestProperty("User-Agent", "HttpUtils/1.0");
+
+            // 添加自定义请求头
+            if (headers != null) {
+                for (Map.Entry<String, String> header : headers.entrySet()) {
+                    connection.setRequestProperty(header.getKey(), header.getValue());
+                }
+            }
+
+            int responseCode = connection.getResponseCode();
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8));
+                return readResponse(reader);
+            } else {
+                reader = new BufferedReader(new InputStreamReader(connection.getErrorStream(), StandardCharsets.UTF_8));
+                String errorResponse = readResponse(reader);
+                throw new IOException("HTTP GET Request Failed with Error Code: " + responseCode + ", Response: " + errorResponse);
+            }
+        } finally {
+            reader.close();
+            connection.disconnect();
+        }
+    }
+
+    /**
+     * 发送带请求头的POST请求（扩展方法）
+     */
+    public static String postWithHeaders(String url, String requestBody, String contentType, Map<String, String> headers) throws IOException {
+        HttpURLConnection connection = null;
+        OutputStream outputStream = null;
+        BufferedReader reader = null;
+
+        try {
+            URL requestUrl = new URL(url);
+            connection = (HttpURLConnection) requestUrl.openConnection();
+            connection.setRequestMethod("POST");
+            connection.setConnectTimeout(CONNECT_TIMEOUT);
+            connection.setReadTimeout(READ_TIMEOUT);
+            connection.setDoOutput(true);
+            connection.setRequestProperty("Content-Type", contentType);
+            connection.setRequestProperty("User-Agent", "HttpUtils/1.0");
+
+            // 添加自定义请求头
+            if (headers != null) {
+                for (Map.Entry<String, String> header : headers.entrySet()) {
+                    connection.setRequestProperty(header.getKey(), header.getValue());
+                }
+            }
+
+            // 写入请求体
+            if (requestBody != null && !requestBody.isEmpty()) {
+                outputStream = connection.getOutputStream();
+                outputStream.write(requestBody.getBytes(StandardCharsets.UTF_8));
+                outputStream.flush();
+            }
+
+            int responseCode = connection.getResponseCode();
+            if (responseCode == HttpURLConnection.HTTP_OK ||
+                    responseCode == HttpURLConnection.HTTP_CREATED ||
+                    responseCode == HttpURLConnection.HTTP_ACCEPTED) {
+                reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8));
+                return readResponse(reader);
+            } else {
+                reader = new BufferedReader(new InputStreamReader(connection.getErrorStream(), StandardCharsets.UTF_8));
+                String errorResponse = readResponse(reader);
+                throw new IOException("HTTP POST Request Failed with Error Code: " + responseCode + ", Response: " + errorResponse);
+            }
+        } finally {
+            outputStream.close();
+            reader.close();
+            connection.disconnect();
+        }
+    }
+}

data-collect-service-api/src/main/java/com/ho/datacollect/api/constant/DataCollectConstant.java

@@ -215,6 +215,8 @@ public interface DataCollectConstant {
     interface PV_CHARGE_POINT {
         //光伏
         String PV_DAILY_CHARGING_ENERGY = "pvDailyChargingEnergy";
+        // Mppt 总发
+        String TOTAL_RELEASE = "totalRelease";
     }
 
     interface BMS_POINT {

data-collect-service/src/main/resources/application-dev.yml

@@ -48,7 +48,7 @@ spring:
         server-addr: 127.0.0.1:8848
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://1.95.170.86:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.0.139:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
     username: business_db
     password: zzkj@688737
     druid:
@@ -61,7 +61,7 @@ spring:
   redis:
     port: 6379 #端口
     timeout: 3000ms #连接超时
-    host: 1.95.170.86 #单机
+    host: 192.168.0.139 #单机
     password: 123456
     database: 0
     lettuce:

file-center/src/main/resources/application-dev.yml

@@ -62,7 +62,7 @@ spring:
         server-addr: 127.0.0.1:8848
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://1.95.170.86:3306/file_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    url: jdbc:mysql://192.168.0.139:3306/file_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
     username: file_center_db
     password: zzkj@688737
     druid:
@@ -81,7 +81,7 @@ spring:
   redis:
     port: 6379 #端口
     timeout: 3000ms #连接超时
-    host: 1.95.170.86 #单机
+    host: 192.168.0.139 #单机
     password: 123456
     database: 0
     lettuce:

flowable-center/src/main/resources/application-dev.yml

@@ -17,7 +17,7 @@ spring:
         server-addr: 127.0.0.1:8848
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://1.95.170.86:3306/flow_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowMultiQueries=true
+    url: jdbc:mysql://192.168.0.139:3306/flow_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowMultiQueries=true
     username: flow_db
     password: zzkj@688737
     druid:
@@ -31,7 +31,7 @@ spring:
   redis:
     port: 6379 #端口
     timeout: 300000ms #连接超时
-    host: 1.95.170.86 #单机
+    host: 192.168.0.139 #单机
     password: 123456
     database: 0
     lettuce:

td-service/src/main/java/com/ho/td/controller/Device001ApiController.java

@@ -1597,7 +1597,47 @@ public class Device001ApiController {
         }
         return DataResult.success(list);
     }
-
+    /**
+     * 冻结光伏-Mppt日发电量
+     * @param query
+     * @return
+     */
+    @PostMapping("getToDayPVMpptCharge")
+    public DataResult<StationHomeRespVo> getToDayPVMpptCharge(@RequestBody TdBaseTimeQuery query){
+        //拼接后缀表名
+        Map<Integer, String> colNameMap = query.getMap();
+        String modelName = query.getModelName();
+        StationHomeRespVo stationHomeRespVo = new StationHomeRespVo();
+        if (colNameMap != null) {
+            //查询发电量
+            String charge = colNameMap.get(query.getSrcId());
+            if (charge != null) {
+                query.setBeginLong(query.getBegin().getTime());
+                query.setEndLong(query.getEnd().getTime());
+                query.setCol(charge);
+                String tableName = getTableName(query);
+                log.info("charge != null");
+                //计算昨日发电量
+                BigDecimal ele = getPvBigDecimal(query, tableName, modelName, charge, DeviceTypeConstant.PV_DAILY_CHARGE_START);
+                stationHomeRespVo.setDigital(ele);
+                // 缓存今日发电量起始值
+                query.setBeginLong(DateUtil.beginOfDay(DateUtil.date()).getTime());
+                query.setEndLong(DateUtil.endOfDay(DateUtil.date()).getTime());
+                List<StationHomeRespVo> stationHomeRespVos = null;
+                if (DeviceTypeConstant.DEVICE_SIMPLE.equals(modelName)) {
+                    stationHomeRespVos = deviceSimpleMapper.selectAll(query, tableName);
+                } else if (DeviceTypeConstant.DEVICE_COMPLEX.equals(modelName)) {
+                    stationHomeRespVos = deviceComplexMapper.selectAll(query, tableName);
+                }
+                if (stationHomeRespVos != null && stationHomeRespVos.size() > 0) {
+                    BigDecimal startEle = stationHomeRespVos.get(0).getDigital();
+                    query.setBegin(DateUtil.beginOfDay(new Date()));
+                    cacheObj(query, DeviceTypeConstant.PV_DAILY_CHARGE_START, startEle);
+                }
+            }
+        }
+        return DataResult.success(stationHomeRespVo);
+    }
     /**
      * 光伏累计充
      */
@@ -1780,6 +1820,31 @@ public class Device001ApiController {
         return ele;
     }
 
+    @NotNull
+    private BigDecimal getPvBigDecimal(TdBaseTimeQuery query, String tableName, String modelName, String col, String dayCol) {
+        long start = System.currentTimeMillis();
+        List<StationHomeRespVo> stationHomeRespVos = null;
+        if (DeviceTypeConstant.DEVICE_SIMPLE.equals(modelName)) {
+            stationHomeRespVos = deviceSimpleMapper.selectAll(query, tableName);
+        } else if (DeviceTypeConstant.DEVICE_COMPLEX.equals(modelName)) {
+            stationHomeRespVos = deviceComplexMapper.selectAll(query, tableName);
+        }
+        BigDecimal ele = BigDecimal.ZERO;
+        if (stationHomeRespVos != null && stationHomeRespVos.size() > 0) {
+            int len = stationHomeRespVos.size();
+            BigDecimal startEle = stationHomeRespVos.get(0).getDigital();
+            BigDecimal endEle = stationHomeRespVos.get(len - 1).getDigital();
+            ele = endEle.subtract(startEle);
+            //处理异常值
+            ele = handleEle(ele, startEle, endEle, stationHomeRespVos);
+        } else {
+            log.info("getDayPowerGeneration get stationHomeRespVos is empty,col:{},tableName:{},time:{}", col, tableName, new Date());
+        }
+        long end = System.currentTimeMillis();
+        log.info("getBigDecimal used1:" + (end - start));
+        return ele;
+    }
+
     /**
      * 异常值处理
      *

td-service/src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
-    url: jdbc:TAOS-RS://1.95.170.86:6041/test_td_db?user=root&password=taosdata&charset=UTF-8&locale=zh_CN.UTF-8&timezone=UTC-8
+    url: jdbc:TAOS-RS://192.168.0.139:6041/test_td_db?user=root&password=taosdata&charset=UTF-8&locale=zh_CN.UTF-8&timezone=UTC-8
     username: root
     password: taosdata
     druid:
@@ -29,7 +29,7 @@ spring:
   redis:
     port: 6379 #端口
     timeout: 3000ms #连接超时
-    host: 1.95.170.86 #单机
+    host: 192.168.0.139 #单机
     password: 123456
     database: 0
 

user-service/src/main/resources/application-dev.yml

@@ -21,7 +21,7 @@ spring:
         server-addr: 127.0.0.1:8848
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://1.95.170.86:3306/user_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.0.139:3306/user_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
     username: user_center_db
     password: zzkj@688737
     druid:
@@ -38,7 +38,7 @@ spring:
   redis:
     port: 6379 #端口
     timeout: 3000ms #连接超时
-    host: 1.95.170.86 #单机
+    host: 192.168.0.139 #单机
     password: 123456
     database: 0
     lettuce:

xxl-job/src/main/java/com/ho/xxljob/JobHandler.java

@@ -178,6 +178,35 @@ public class JobHandler {
         return ReturnT.SUCCESS;
     }
 
+    /**
+     * 计算光伏-Mppt收益(昨日)
+     * @param param
+     * @return
+     */
+    @XxlJob("jobEarningsCalculateMppt")
+    public ReturnT<String> jobEarningsCalculateMppt(String param) {
+        XxlJobLogger.log("jobEarningsCalculateMppt");
+        log.info("jobEarningsCalculateMpptInsert start !");
+        Date date = DateUtil.addDays(new Date(), -1);
+        businessFeignClient.jobEarningsCalculateMppt(DateUtil.formatDate(date));
+        log.info("jobEarningsCalculateMpptInsert end !");
+        return ReturnT.SUCCESS;
+    }
+
+    /**
+     * 计算光伏-Mppt收益(当日)
+     * @param param
+     * @return
+     */
+    @XxlJob("jobEarningsCalculateMpptToDay")
+    public ReturnT<String> jobEarningsCalculateMpptToDay(String param) {
+        XxlJobLogger.log("jobEarningsCalculateMpptToDay");
+        log.info("jobEarningsCalculateMpptToDayInsert start !");
+        Date date = new Date();
+        businessFeignClient.jobEarningsCalculateMpptToDay(DateUtil.formatDate(date));
+        log.info("jobEarningsCalculateMpptToDayInsert end !");
+        return ReturnT.SUCCESS;
+    }
     /**
      * 计算收益(当日)
      *

xxl-job/src/main/java/com/ho/xxljob/feignclient/BusinessFeignClient.java

@@ -49,6 +49,12 @@ public interface BusinessFeignClient {
     @PostMapping(value = ContextConstant.ROOT_CONTEXT + ContextConstant.BUSINESS + "earningsCalculate/all")
     void jobEarningsCalculate(@RequestBody String dateTime);
 
+    @PostMapping(value = ContextConstant.ROOT_CONTEXT + ContextConstant.BUSINESS + "earningsCalculate/allMpptIncome")
+    void jobEarningsCalculateMppt(@RequestBody String dateTime);
+
+    @PostMapping(value = ContextConstant.ROOT_CONTEXT + ContextConstant.BUSINESS + "earningsCalculate/allTodayMpptIncome")
+    void jobEarningsCalculateMpptToDay(@RequestBody String dateTime);
+
     @PostMapping(value = ContextConstant.ROOT_CONTEXT + ContextConstant.BUSINESS + "earningsCalculate/freezeMonthTotalEle")
     void jobFreezeMonthTotalEle();
 

xxl-job/src/main/java/com/ho/xxljob/feignclient/BusinessFeignClientFallback.java

@@ -75,6 +75,18 @@ public class BusinessFeignClientFallback implements BusinessFeignClient {
         throw new BusinessException(BaseResponseCode.FEIGN_CALL_FAIL);
     }
 
+    @Override
+    public void jobEarningsCalculateMppt(String dateTime) {
+        log.error("BusinessFeignClient.jobEarningsCalculateMppt error!");
+        throw new BusinessException(BaseResponseCode.FEIGN_CALL_FAIL);
+    }
+
+    @Override
+    public void jobEarningsCalculateMpptToDay(String dateTime) {
+        log.error("BusinessFeignClient.jobEarningsCalculateMpptToDay error!");
+        throw new BusinessException(BaseResponseCode.FEIGN_CALL_FAIL);
+    }
+
     @Override
     public void jobFreezeMonthTotalEle() {
         log.error("BusinessFeignClient.jobFreezeMonthTotalEle error!");