From 3efbcefce53c932399a35286a8f965e2ae7e49a4 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 12 Jul 2019 16:10:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E7=94=B5=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/dto/KwMeterDataDto.java | 3 ++ .../java/com/iformall/enums/EnumChart.java | 2 + .../enums/EnumMeterDataReportType.java | 36 +++++++++++++++++ .../service/impl/WxChartServiceImpl.java | 39 +++++++++++++++++++ .../resources/mapper/KwMeterDataMapper.xml | 12 ++++++ 5 files changed, 92 insertions(+) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumMeterDataReportType.java 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} + From a5949026ab2977e1574a70d7e37f4c90db4e9f99 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 12 Jul 2019 16:32:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=81=9C=E8=BD=A6=E5=95=86=E6=88=B7][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E5=81=9C=E8=BD=A6=E5=95=86=E6=88=B7?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=A2=AB=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 1 + .../com/iformall/service/impl/WxMerchantServiceImpl.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index fbd871021..9e3391e0a 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -87,6 +87,7 @@ public enum ErrorCode{ MERCHANT_INFO_NOT_VALID(2013, "商户信息禁用"), MERCHANT_REPORT_DATE_NOT_VALID(999, "上报日期大于当天"), MERCHANT_NAME_IS_FOUND(2014, "商户名称已存在"), + MERCHANT_CAR_NOT_DEL(2015, "停车商户不能被删除"), /** * 券 */ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 9b9b4a916..e57aa6f59 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -447,6 +447,14 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (hasMerchant(wxMerchant)) { return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); } + if(wxMerchant.getIsDel().equals(EnumDelStatus.DEL.getCode())) { + // 停用商户 + if(wxMerchant.getCarVendorType() > 0) { + // 停车商户 + logger.error("停车商户不能被删除"); + return new ResultData(ErrorCode.MERCHANT_CAR_NOT_DEL); + } + } Date date = new Date(); wxMerchant.setUpdateDate(date); wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant); From de1d6a62a66382be1830d4ade108f30b5af4b862 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 12 Jul 2019 16:35:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=81=9C=E8=BD=A6=E5=95=86=E6=88=B7][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E5=81=9C=E8=BD=A6=E5=95=86=E6=88=B7?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=A2=AB=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxMerchantServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index e57aa6f59..0dffc3ada 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -449,7 +449,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { } if(wxMerchant.getIsDel().equals(EnumDelStatus.DEL.getCode())) { // 停用商户 - if(wxMerchant.getCarVendorType() > 0) { + if(!wxMerchant.getCarVendorType().equals(EnumCarVendor.CAR_NOTFOUND.getCode())){ // 停车商户 logger.error("停车商户不能被删除"); return new ResultData(ErrorCode.MERCHANT_CAR_NOT_DEL);