fix能源计划-时间段新增

module_base/src/main/java/org/jeecg/modules/energyPlan/dto/TimeRangeEnergyPlan.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.energyPlan.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import org.jeecg.modules.energyPlan.entity.EnergyPlan;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -16,8 +17,10 @@ public class TimeRangeEnergyPlan extends EnergyPlan implements Serializable {
 
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date BeginTime;
+    @ApiModelProperty(value = "开始时间")
+    private Date beginTime;
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date EndTime;
+    @ApiModelProperty(value = "结束时间")
+    private Date endTime;
 }

module_base/src/main/java/org/jeecg/modules/energyPlan/mapper/EnergyPlanMapper.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.energyPlan.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.energyPlan.entity.EnergyPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -11,4 +12,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EnergyPlanMapper extends BaseMapper<EnergyPlan> {
 
+
+    boolean deleteInfoByIdAndDay(@Param("equipmentid") String equipmentid, @Param("energytypeid") String energytypeid, @Param("day") String day);
+
+
+
 }

module_base/src/main/java/org/jeecg/modules/energyPlan/mapper/xml/EnergyPlanMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.energyPlan.mapper.EnergyPlanMapper">
 
+
+    <delete id="deleteInfoByIdAndDay">
+        delete from base_energy_plan where equipmentid = #{equipmentid} and energytypeid = #{energytypeid} and day = #{day}
+    </delete>
+
 </mapper>

module_base/src/main/java/org/jeecg/modules/energyPlan/service/impl/EnergyPlanServiceImpl.java

@@ -7,11 +7,16 @@ import org.jeecg.modules.energyPlan.mapper.EnergyPlanMapper;
 import org.jeecg.modules.energyPlan.service.IEnergyPlanService;
 import org.springframework.aop.framework.*;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -26,23 +31,28 @@ import java.util.Date;
 @EnableAspectJAutoProxy(exposeProxy = true)
 public class EnergyPlanServiceImpl extends ServiceImpl<EnergyPlanMapper, EnergyPlan> implements IEnergyPlanService {
 
+
+    @Autowired
+    private EnergyPlanMapper energyPlanMapper;
+
     @Override
     public Result<String> rangeAdd(TimeRangeEnergyPlan rangeEnergyPlan) {
+        // 获取开始时间和结束时间
         Date beginTime = rangeEnergyPlan.getBeginTime();
         Date endTime = rangeEnergyPlan.getEndTime();
+        // 检查开始日期是否大于结束日期
         if (beginTime.after(endTime)) return Result.error("开始日期大于结束日期，请检查！");
 
+        // 计算时间范围内的天数
         long diffInMillies = endTime.getTime() - beginTime.getTime();
         int diffDay = (int) ((diffInMillies / (24 * 60 * 60 * 1000)) + 1);
 
+
         Calendar beginTimeInstance = Calendar.getInstance();
         beginTimeInstance.setTime(beginTime);
-
         Calendar endTimeInstance = Calendar.getInstance();
         endTimeInstance.setTime(endTime);
 
-        Double planValue = rangeEnergyPlan.getPlanvalue();
-        double avgValue = planValue / diffDay;
 
         ArrayList<EnergyPlan> energyPlans = new ArrayList<>();
         int i = diffDay + 1;
@@ -51,8 +61,12 @@ public class EnergyPlanServiceImpl extends ServiceImpl<EnergyPlanMapper, EnergyP
             EnergyPlan energyPlan = new EnergyPlan();
             BeanUtils.copyProperties(rangeEnergyPlan, energyPlan);
             energyPlan.setPlandate(beginTimeInstance.getTime());
-            energyPlan.setPlanvalue(avgValue);
             energyPlans.add(energyPlan);
+
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            String day = simpleDateFormat.format(beginTimeInstance.getTime());
+            energyPlanMapper.deleteInfoByIdAndDay(rangeEnergyPlan.getEquipmentid(), rangeEnergyPlan.getEnergytypeid(),day);
+
             beginTimeInstance.add(Calendar.DAY_OF_MONTH, 1);
             mark++;
         }