Przeglądaj źródła

[电表][修复]:电量统计列表接口更改

release_toaliyun_real
hupeng 6 lat temu
rodzic
commit
3efbcefce5
5 zmienionych plików z 92 dodań i 0 usunięć
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumChart.java
  3. +36
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumMeterDataReportType.java
  4. +39
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  5. +12
    -0
      mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java Wyświetl plik

@@ -48,6 +48,9 @@ public class KwMeterDataDto extends BaseEntity {


private Integer reportType; private Integer reportType;


@io.swagger.annotations.ApiModelProperty(value = "报表时间", name = "reportTime")
private String reportTime;

@io.swagger.annotations.ApiModelProperty(value = "开始电量", name = "startNumber") @io.swagger.annotations.ApiModelProperty(value = "开始电量", name = "startNumber")
private Integer startNumber; private Integer startNumber;




+ 2
- 0
mallinkService/src/main/java/com/iformall/enums/EnumChart.java Wyświetl plik

@@ -63,6 +63,8 @@ public enum EnumChart {
RENT_RATE_HISTORY(53, "商铺出租率走势"), RENT_RATE_HISTORY(53, "商铺出租率走势"),


BUSINESS(54,"业态分析"), BUSINESS(54,"业态分析"),

POWER_SUMMERY(54,"电能分析"),
; ;


public static EnumChart getEnum(Integer code) { public static EnumChart getEnum(Integer code) {


+ 36
- 0
mallinkService/src/main/java/com/iformall/enums/EnumMeterDataReportType.java Wyświetl plik

@@ -0,0 +1,36 @@
package com.iformall.enums;

/**
* Created by Stormeye on 2018/08/09.
*/
public enum EnumMeterDataReportType {

VALID(0, "全量"),
HOUR(1, "时"),
DAY(2, "日"),
MONTH(3, "月");
public static EnumMeterDataReportType getEnum(Integer code) {
for (EnumMeterDataReportType value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumMeterDataReportType(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 39
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java Wyświetl plik

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.dto.KwMeterDataDto;
import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.dto.MarkingCouponDataReportDto;
import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.dto.WxCUserBasicInfoDto;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
@@ -15,6 +16,7 @@ import com.iformall.service.MarkingDataReportService;
import com.iformall.service.WxBusinessService; import com.iformall.service.WxBusinessService;
import com.iformall.service.WxChartDataService; import com.iformall.service.WxChartDataService;
import com.iformall.service.WxCouponService; import com.iformall.service.WxCouponService;
import com.iformall.service.kw.KwMeterDataService;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.map.HashedMap; import org.apache.commons.collections.map.HashedMap;
@@ -80,6 +82,9 @@ public class WxChartServiceImpl implements WxChartDataService {
@Autowired @Autowired
WxBusinessService wxBusinessService; WxBusinessService wxBusinessService;


@Autowired
KwMeterDataService kwMeterDataService;

@Override @Override
public ResultData queryData(Map<String, String> paramsMap) { public ResultData queryData(Map<String, String> paramsMap) {
String tenantId = paramsMap.get("tenantId"); String tenantId = paramsMap.get("tenantId");
@@ -328,9 +333,43 @@ public class WxChartServiceImpl implements WxChartDataService {
return getBusiness(tenantId,paramsMap); return getBusiness(tenantId,paramsMap);
} }


//电能分析
if (chart.equals(EnumChart.POWER_SUMMERY.getCode())) {
return getPowerSummery(tenantId,paramsMap);
}

return new ResultData(ErrorCode.REPORT_TYPE_UNKNOWN); return new ResultData(ErrorCode.REPORT_TYPE_UNKNOWN);
} }


/**
* 业态分析
* @param tenantId
* @return
*/
private ResultData getPowerSummery(String tenantId,Map<String, String> paramsMap){
/*
Map<String,Long> resultMap = new LinkedMap();

KwMeterDataDto kwMeterDataDto = new KwMeterDataDto();
kwMeterDataDto.setStartTime();
kwMeterDataDto.setEndTime();
kwMeterDataDto.setTenantId(tenantId);
kwMeterDataDto.setReportType(EnumMeterDataReportType.DAY.getCode());
List<KwMeterDataVo> kwMeterDataVos = kwMeterDataService.findVoList(new WxBusiness());

Map<String,Object> query = new HashedMap();
query.put("tenantId",tenantId);
query.put("id",paramsMap.get("id"));
query.put("buildingId",paramsMap.get("buildingId"));
List<Map<String,Object>> mapList = wxMerchantMapper.findBusByFloorId(query);
for (Map<String,Object> map:mapList) {
resultMap.put((String)map.get("btitle"),(Long)map.get("count"));
}
*/
return new ResultData();
}


/** /**
* 业态分析 * 业态分析
* @param tenantId * @param tenantId


+ 12
- 0
mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml Wyświetl plik

@@ -96,6 +96,18 @@
and `create_time` between #{startTime} and #{endTime} and `create_time` between #{startTime} and #{endTime}
</if> </if>


<if test=" null == reportType and null != reportTime">
and date_format(`create_time`, '%Y-%m-%d %H:00') = #{reportTime}
</if>
<if test=" null != reportType and 1 == reportType and null != reportTime">
and date_format(`create_time`, '%Y-%m-%d') = #{reportTime}
</if>
<if test=" null != reportType and 2 == reportType and null != reportTime">
and date_format(`create_time`, '%Y-%m') = #{reportTime}
</if>
<if test=" null != reportType and 3 == reportType and null != reportTime">
and date_format(`create_time`, '%Y') = #{reportTime}
</if>
</sql> </sql>






Ładowanie…
Anuluj
Zapisz