From 71fe365131db23fa769b9cb43982c3385f9ec557 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 7 Jan 2019 16:13:33 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][1000758]:=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E5=AE=A2=E6=B5=81=E6=95=B0=E6=8D=AE=E6=9C=89=E6=95=88=E6=97=A0?= =?UTF-8?q?=E6=95=88=E6=A0=87=E8=AE=B0=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxWiWideInfo.java | 11 ++++++ .../iformall/enums/EnumWiWideInfoStatus.java | 36 +++++++++++++++++++ .../service/impl/DataTowerServiceImpl.java | 12 +++++++ .../resources/mapper/WxWiwideInfoMapper.xml | 4 +-- 4 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumWiWideInfoStatus.java diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java index b073fa387..771a7999c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWiWideInfo.java +++ b/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") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumWiWideInfoStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumWiWideInfoStatus.java new file mode 100644 index 000000000..c7869d904 --- /dev/null +++ b/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; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index a88051ba2..b8ec1c830 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/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 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){ diff --git a/mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml index 5e1b36d86..6898a08c4 100644 --- a/mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWiwideInfoMapper.xml @@ -9,11 +9,11 @@ - + - `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`