Przeglądaj źródła

Merge tag 'refs/tags/jenkins-back-end-2222' into release

develop
release_toaliyun_real
Stormeye Wu 6 lat temu
rodzic
commit
d46db56c89
7 zmienionych plików z 101 dodań i 0 usunięć
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/dto/KwMeterDataDto.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumChart.java
  4. +36
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumMeterDataReportType.java
  5. +39
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  6. +8
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  7. +12
    -0
      mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml

+ 1
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Wyświetl plik

@@ -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, "停车商户不能被删除"),
/**
* 券
*/


+ 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;

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

@io.swagger.annotations.ApiModelProperty(value = "开始电量", name = "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, "商铺出租率走势"),

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

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

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.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<String, String> 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<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


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

@@ -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().equals(EnumCarVendor.CAR_NOTFOUND.getCode())){
// 停车商户
logger.error("停车商户不能被删除");
return new ResultData(ErrorCode.MERCHANT_CAR_NOT_DEL);
}
}
Date date = new Date();
wxMerchant.setUpdateDate(date);
wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant);


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

@@ -96,6 +96,18 @@
and `create_time` between #{startTime} and #{endTime}
</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>




Ładowanie…
Anuluj
Zapisz