|
|
@@ -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 |
|
|
|