diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java index dd1d5b137..6cac00eda 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java @@ -48,6 +48,9 @@ public class KwMeterDataDto extends BaseEntity { private Integer reportType; + @io.swagger.annotations.ApiModelProperty(value = "报表时间", name = "reportTime") + private String reportTime; + @io.swagger.annotations.ApiModelProperty(value = "开始电量", name = "startNumber") private Integer startNumber; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumChart.java b/mallinkService/src/main/java/com/iformall/enums/EnumChart.java index e21e201f7..d694266b5 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumChart.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumChart.java @@ -63,6 +63,8 @@ public enum EnumChart { RENT_RATE_HISTORY(53, "商铺出租率走势"), BUSINESS(54,"业态分析"), + + POWER_SUMMERY(54,"电能分析"), ; public static EnumChart getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMeterDataReportType.java b/mallinkService/src/main/java/com/iformall/enums/EnumMeterDataReportType.java new file mode 100644 index 000000000..3bd4e6c2d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMeterDataReportType.java @@ -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; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 3f661fabd..d8b28ecb7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.domain.dto.KwMeterDataDto; import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.*; @@ -15,6 +16,7 @@ import com.iformall.service.MarkingDataReportService; import com.iformall.service.WxBusinessService; import com.iformall.service.WxChartDataService; import com.iformall.service.WxCouponService; +import com.iformall.service.kw.KwMeterDataService; import com.iformall.utils.DateUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; @@ -80,6 +82,9 @@ public class WxChartServiceImpl implements WxChartDataService { @Autowired WxBusinessService wxBusinessService; + @Autowired + KwMeterDataService kwMeterDataService; + @Override public ResultData queryData(Map paramsMap) { String tenantId = paramsMap.get("tenantId"); @@ -328,9 +333,43 @@ public class WxChartServiceImpl implements WxChartDataService { return getBusiness(tenantId,paramsMap); } + //电能分析 + if (chart.equals(EnumChart.POWER_SUMMERY.getCode())) { + return getPowerSummery(tenantId,paramsMap); + } + return new ResultData(ErrorCode.REPORT_TYPE_UNKNOWN); } + /** + * 业态分析 + * @param tenantId + * @return + */ + private ResultData getPowerSummery(String tenantId,Map paramsMap){ + /* + Map resultMap = new LinkedMap(); + + KwMeterDataDto kwMeterDataDto = new KwMeterDataDto(); + kwMeterDataDto.setStartTime(); + kwMeterDataDto.setEndTime(); + kwMeterDataDto.setTenantId(tenantId); + kwMeterDataDto.setReportType(EnumMeterDataReportType.DAY.getCode()); + List kwMeterDataVos = kwMeterDataService.findVoList(new WxBusiness()); + + Map query = new HashedMap(); + query.put("tenantId",tenantId); + query.put("id",paramsMap.get("id")); + query.put("buildingId",paramsMap.get("buildingId")); + List> mapList = wxMerchantMapper.findBusByFloorId(query); + for (Map map:mapList) { + resultMap.put((String)map.get("btitle"),(Long)map.get("count")); + } + */ + return new ResultData(); + } + + /** * 业态分析 * @param tenantId diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index 50d96a68b..850c0d916 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -96,6 +96,18 @@ and `create_time` between #{startTime} and #{endTime} + + and date_format(`create_time`, '%Y-%m-%d %H:00') = #{reportTime} + + + and date_format(`create_time`, '%Y-%m-%d') = #{reportTime} + + + and date_format(`create_time`, '%Y-%m') = #{reportTime} + + + and date_format(`create_time`, '%Y') = #{reportTime} +