Просмотр исходного кода

[BUG][1000758]:移动端客流数据有效无效标记添加

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
71fe365131
4 измененных файлов: 61 добавлений и 2 удалений
  1. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java
  2. +36
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumWiWideInfoStatus.java
  3. +12
    -0
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  4. +2
    -2
      mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml

+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java Просмотреть файл

@@ -59,6 +59,9 @@ public class WxWiWideInfo implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="expiredTime",name="expiredTime")
private Date expiredTime;

/*卖外迪信息类型列表,1,支持客流 2,支持wifi*/
@io.swagger.annotations.ApiModelProperty(value="capability",name="capability")
private String capability;

public String getTenantId() {
return tenantId;
@@ -105,6 +108,14 @@ public class WxWiWideInfo implements Serializable {
this.expiredTime = expiredTime;
}

public String getCapability() {
return capability;
}

public void setCapability(String capability) {
this.capability = capability;
}

public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")


+ 36
- 0
mallinkService/src/main/java/com/iformall/enums/EnumWiWideInfoStatus.java Просмотреть файл

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

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

INVALID(0, "未开通"),
VALID(1, "已开通")
;

public static EnumWiWideInfoStatus getEnum(Integer code) {
for (EnumWiWideInfoStatus value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

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

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 12
- 0
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.service.impl;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
@@ -673,6 +674,17 @@ public class DataTowerServiceImpl implements DataTowerService {
return new ResultData(ErrorCode.WIWIDE_INFO_NOT_FOUND);
}
wiWideInfo = list.get(0);
List<Integer> cap = JSONArray.parseArray(wiWideInfo.getCapability(), Integer.class);
Integer dataType;
try {
dataType = Integer.valueOf(params.get("dataType"));
}catch (Exception e){
return new ResultData(ErrorCode.WIWIDE_INFO_NOT_FOUND);
}

if (cap == null || !cap.stream().anyMatch(c->c.equals(dataType))) {
return new ResultData(ErrorCode.WIWIDE_INFO_NOT_FOUND);
}
String res = WiwideUtil.queryData(wiWideInfo, getWiwideToken(wiWideInfo), params);
JSONObject result = JSONObject.parseObject(res);
if (result.getInteger("result") == 200){


+ 2
- 2
mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml Просмотреть файл

@@ -9,11 +9,11 @@
<result column="wiwide_url" jdbcType="VARCHAR" property="wiwideUrl"/>
<result column="token" jdbcType="VARCHAR" property="token"/>
<result column="expired_time" jdbcType="TIMESTAMP" property="expiredTime"/>
<result column="capability" jdbcType="VARCHAR" property="capability"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`wiwide_id`,`wiwide_key`,`wiwide_url`, `token`,`expired_time`
`id`,`tenant_id`,`wiwide_id`,`wiwide_key`,`wiwide_url`, `token`,`expired_time`,`capability`
</sql>

<sql id="dynamicWhereConditions">


Загрузка…
Отмена
Сохранить