Просмотр исходного кода

[电表][修改]:电表电量报表接口

release_toaliyun_real
hupeng 6 лет назад
Родитель
Сommit
8405120779
3 измененных файлов: 19 добавлений и 15 удалений
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java
  3. +14
    -15
      mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java Просмотреть файл

@@ -67,6 +67,7 @@ public class KwMeterController extends BaseController {
return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST);
kwMeter.setTenantId(getTenantId());
kwMeter.setBoxId(0L);
kwMeter.setStatus(EnumMeterStatus.VALID.getCode());
kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode());
return kwMeterService.saveOrUpdate(kwMeter);
}


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java Просмотреть файл

@@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.List;


@@ -38,8 +39,11 @@ public class KwMeterServiceImpl implements KwMeterService {
if (record.getId() == null) {
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
record.setCreateTime(new Date());
record.setUpdateTime(new Date());
kwMeterMapper.insertSelective(record);
} else {
record.setUpdateTime(new Date());
kwMeterMapper.updateByPrimaryKeySelective(record);
}
return new ResultData();


+ 14
- 15
mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml Просмотреть файл

@@ -101,8 +101,8 @@

<select id="findVoList" parameterType="com.iformall.domain.dto.KwMeterDataDto" resultMap="VoResultMap">
select
tenant_id,
temp.reportTime as reportTime,
temp.tenant_id,
temp.reportTime,
min(temp.recordStartTime) as recordStartTime,
max(temp.recordEndTime) as recordEndTime,
sum(temp.totalPower) as totalPower,
@@ -112,16 +112,16 @@
(SELECT
tenant_id,box_id,meter_id,
<if test=" null == reportType">
temp.create_time as reportTime,
create_time as reportTime,
</if>
<if test=" null != reportType and 1 != reportType ">
date_format(temp.create_time, '%Y-%m-%d %H:00') as reportTime,
<if test=" null != reportType and 1 == reportType ">
date_format(create_time, '%Y-%m-%d %H:00') as reportTime,
</if>
<if test=" null != reportType and 2 != reportType ">
date_format(temp.create_time, '%Y-%m-%d') as reportTime,
<if test=" null != reportType and 2 == reportType ">
date_format(create_time, '%Y-%m-%d') as reportTime,
</if>
<if test=" null != reportType and 3 != reportType ">
date_format(temp.create_time, '%Y-%m') as reportTime,
<if test=" null != reportType and 3 == reportType ">
date_format(create_time, '%Y-%m') as reportTime,
</if>
min(last_device_time) as recordStartTime,
min(last_total_power) as lastTotalPower,
@@ -129,20 +129,19 @@
max(total_power) as totalPower,
sum(used_power) as usedPower
FROM kw_meter_data
where
<include refid="dynamicWhereConditionsVo"/>
group by reportTime,meter_id
) as temp
group by
reportTime,
tenant_id
temp.reportTime,
temp.tenant_id
<if test=" null != boxId ">
,box_id
,temp.box_id
</if>
<if test=" null != meterId ">
,meter_id
,temp.meter_id
</if>
order by reportTime desc
order by temp.reportTime asc
</select>

<select id="getPower" parameterType="com.iformall.domain.dto.KwMeterDataDto" resultMap="VoResultMap">


Загрузка…
Отмена
Сохранить