diff --git a/psdc-admin/src/main/resources/application.yml b/psdc-admin/src/main/resources/application.yml index caf4dfc..90385b2 100644 --- a/psdc-admin/src/main/resources/application.yml +++ b/psdc-admin/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: dev \ No newline at end of file + active: prod \ No newline at end of file diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricHtdataServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricHtdataServiceImpl.java index 937dc06..3da4071 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricHtdataServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricHtdataServiceImpl.java @@ -10,6 +10,7 @@ import com.psdc.service.IPsdcElectricHtdataService; import com.psdc.utils.StringUtils; import com.psdc.utils.bean.BeanUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -113,6 +114,7 @@ public class PsdcElectricHtdataServiceImpl implements IPsdcElectricHtdataService * @param energyStatisticsRequest 请求数据 * @return 一天每小时能耗数据 */ + @Override public List selectAllByListDay(EnergyStatisticsRequest energyStatisticsRequest){ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); /* @@ -129,6 +131,7 @@ public class PsdcElectricHtdataServiceImpl implements IPsdcElectricHtdataService * @param energyStatisticsRequest 请求数据 * @return 一天每小时能耗数据 */ + @Override public List selectAllByListMonth(EnergyStatisticsRequest energyStatisticsRequest) { return psdcStatisticsMonthMapper.queryAllByLimit(energyStatisticsRequest); @@ -139,6 +142,7 @@ public class PsdcElectricHtdataServiceImpl implements IPsdcElectricHtdataService * @param energyStatisticsRequest 请求数据 * @return 一天每小时能耗数据 */ + @Override public List selectAllByListYear(EnergyStatisticsRequest energyStatisticsRequest){ return psdcStatisticsYearMapper.queryAllByLimit(energyStatisticsRequest); } @@ -147,6 +151,7 @@ public class PsdcElectricHtdataServiceImpl implements IPsdcElectricHtdataService * 每日统计定时任务 */ // @Scheduled(cron = "0 10 0 * * ? ") + @Override public void statisticalTask(){ //获取昨日用电量总和 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml index b860ddd..4d599a3 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsMonthMapper.xml @@ -91,11 +91,11 @@ - AND date_format(monthDate,'%Y-%m') >= #{startTime} + AND date_format(month_date,'%Y-%m') >= #{startTime} - AND date_format(monthDate,'%Y-%m') <= #{endTime} + AND date_format(month_date,'%Y-%m') <= #{endTime}