日志

liuhaonan

2022-05-20 54981d0263617a11fb1e16bf1cb1be19b14bc1ca

日志

 dao/src/main/java/com/sandu/ximon/dao/domain/LightEnergyData.java

@@ -8,7 +8,6 @@

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
 * 单灯任务能耗/节能率表
@@ -32,7 +31,7 @@
    /**
     * 昨天的时间
     */
    private LocalDateTime ytdTime;
    private String ytdTime;

    /**
     * 能耗

 dao/src/main/resources/mapper/LightEnergyDataMapper.xml

@@ -7,7 +7,7 @@
    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LightEnergyData">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="taskId" column="task_id" jdbcType="BIGINT"/>
            <result property="ytdTime" column="ytd_time" jdbcType="TIMESTAMP"/>
            <result property="ytdTime" column="ytd_time" jdbcType="VARCHAR"/>
            <result property="energy" column="energy" jdbcType="DOUBLE"/>
            <result property="energySaving" column="energy_saving" jdbcType="DOUBLE"/>
            <result property="userId" column="user_id" jdbcType="BIGINT"/>

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java

@@ -44,6 +44,7 @@

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -550,9 +551,10 @@
            LocalDateTime now = LocalDateTime.now();
            LocalDateTime yesterday = now.minusDays(1);


            LightEnergyData lightEnergyData = new LightEnergyData();
            lightEnergyData.setTaskId(lightTask.getTaskId());
            lightEnergyData.setYtdTime(yesterday);
            lightEnergyData.setYtdTime(yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
            lightEnergyData.setEnergySaving(energySaving);
            lightEnergyData.setEnergy(energy);
            lightEnergyData.setUserId(lightTask.getUserId());