diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsDayMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsDayMapper.java index 3e6188b..a6f8d80 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsDayMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcStatisticsDayMapper.java @@ -37,8 +37,8 @@ public interface PsdcStatisticsDayMapper{ */ int insert(PsdcStatisticsDay psdcStatisticsDay); - long count(@Param("deviceId") Integer deviceId, - @Param("datetime") String datetime); + Integer count(@Param("deviceId") Integer deviceId, + @Param("datetime") String datetime); /** * 新增数据 diff --git a/psdc-business/src/main/java/com/psdc/mqtt/savedata/DataAndPowerSave.java b/psdc-business/src/main/java/com/psdc/mqtt/savedata/DataAndPowerSave.java index 52abbf3..a9b7a79 100644 --- a/psdc-business/src/main/java/com/psdc/mqtt/savedata/DataAndPowerSave.java +++ b/psdc-business/src/main/java/com/psdc/mqtt/savedata/DataAndPowerSave.java @@ -58,7 +58,8 @@ public class DataAndPowerSave { String date1 = timestamp.split("T")[0]; String samDate = date1.split("-")[0] + date1.split("-")[1] + date1.split("-")[2]; String time1 = timestamp.split("T")[1]; - int hour = Integer.parseInt(time1.substring(0, 8).split(":")[0]); + String time2 = time1.substring(0, 8).split(":")[0]; + int hour = Integer.parseInt(time2); int min = Integer.parseInt(time1.substring(0, 8).split(":")[1]); String begin = date1 + " " + time1.substring(0,5) + ":00"; String end = date1 + " " + time1.substring(0,5) + ":59"; @@ -116,8 +117,8 @@ public class DataAndPowerSave { electricHtDataMapper.insert(peht); } - Long devCountDay = statisticsDayMapper.count(deviceId, date1); - if (devCountDay < 1){ + Integer devCountDay = statisticsDayMapper.count(deviceId, date1); + if (devCountDay <= 0){ PsdcStatisticsDay statisticsDay = new PsdcStatisticsDay(); statisticsDay.setDayDate(date1); statisticsDay.setDeviceId(deviceId); @@ -125,7 +126,7 @@ public class DataAndPowerSave { statisticsDayMapper.insertDay(statisticsDay); } Double hourUse = electricHtDataMapper.selTodayUseEnergy(deviceId, begin, end); - String hourNo = "hour_" + hour; + String hourNo = "hour_" + time2; statisticsDayMapper.updateTodayDevEnergy(hourNo, hourUse, deviceId, date1); // 根据设备id查询设备功率表中该设备的条数 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 16be171..50c710d 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 @@ -153,7 +153,6 @@ public class PsdcElectricHtdataServiceImpl implements IPsdcElectricHtdataService @Scheduled(cron = "0 0 0 1/1 * ?") // 每天凌晨零点执行一次 @Override public void statisticalTask(){ - System.out.println("李雷:How are you?Jerry: I am fine and you!\n"); // 获取昨日用电量总和 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat dayDateFormat = new SimpleDateFormat("dd"); diff --git a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsDayMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsDayMapper.xml index db39eec..a16e52a 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcStatisticsDayMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcStatisticsDayMapper.xml @@ -237,9 +237,9 @@ from psdc_statistics_day where device_id = #{deviceId} and date_format(day_date,'%Y-%m-d') = #{datetime} - Select count(1) From psdc_statistics_day - Where device_id = #{deviceId} And date_format(day_date,'%Y-%m-d') = #{datetime} + Where device_id = #{deviceId} And day_date = #{datetime}