| @@ -105,14 +105,15 @@ public class DataTowerController extends BaseController { | |||||
| @ApiOperation("调取客流接口客流") | @ApiOperation("调取客流接口客流") | ||||
| @PostMapping("/queryWiWideData") | @PostMapping("/queryWiWideData") | ||||
| @SystemControllerLog(description = "数据塔台-查询客流") | @SystemControllerLog(description = "数据塔台-查询客流") | ||||
| public ResultData queryWiWideData(@RequestBody Map<String,String> params) { | |||||
| public ResultData queryWiWideData(@RequestBody Map<String,Object> params) { | |||||
| logger.debug("[" + getIpAddr() + "] DataTowerController::queryWiWideData"); | logger.debug("[" + getIpAddr() + "] DataTowerController::queryWiWideData"); | ||||
| String url = params.get("url"); | |||||
| if(StringUtils.isBlank(url)){ | |||||
| Object url = params.get("url"); | |||||
| if(url == null){ | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"url不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"url不能为空"); | ||||
| } | } | ||||
| String requrl = url.toString(); | |||||
| params.remove("url"); | params.remove("url"); | ||||
| return dataTowerService.queryWiWideDataUrl(getTenantInfo(),url,params); | |||||
| return dataTowerService.queryWiWideDataUrl(getTenantInfo(),requrl,params); | |||||
| } | } | ||||
| } | } | ||||
| @@ -21,5 +21,5 @@ public interface DataTowerService { | |||||
| ResultData queryCustomerData(TenantEntity tenantEntity, Map<String, String> params); | ResultData queryCustomerData(TenantEntity tenantEntity, Map<String, String> params); | ||||
| ResultData queryWiWideDataUrl(TenantEntity tenantInfo, String url, Map<String, String> params); | |||||
| ResultData queryWiWideDataUrl(TenantEntity tenantInfo, String url, Map<String, Object> params); | |||||
| } | } | ||||
| @@ -900,7 +900,7 @@ public class DataTowerServiceImpl implements DataTowerService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public ResultData queryWiWideDataUrl(TenantEntity tenantEntity, String url, Map<String, String> params) { | |||||
| public ResultData queryWiWideDataUrl(TenantEntity tenantEntity, String url, Map<String, Object> params) { | |||||
| WxWiWideInfo wiWideInfo = new WxWiWideInfo(); | WxWiWideInfo wiWideInfo = new WxWiWideInfo(); | ||||
| wiWideInfo.updateTenantInfo(tenantEntity); | wiWideInfo.updateTenantInfo(tenantEntity); | ||||
| List<WxWiWideInfo> list = wxWiwideInfoMapper.findList(wiWideInfo); | List<WxWiWideInfo> list = wxWiwideInfoMapper.findList(wiWideInfo); | ||||
| @@ -4,6 +4,7 @@ import java.io.UnsupportedEncodingException; | |||||
| import java.io.UnsupportedEncodingException; | import java.io.UnsupportedEncodingException; | ||||
| import java.security.Key; | import java.security.Key; | ||||
| import java.util.Calendar; | import java.util.Calendar; | ||||
| import java.util.Date; | |||||
| import javax.crypto.Cipher; | import javax.crypto.Cipher; | ||||
| import javax.crypto.spec.SecretKeySpec; | import javax.crypto.spec.SecretKeySpec; | ||||
| @@ -13,8 +14,11 @@ import com.iformall.domain.po.WxWiWideInfo; | |||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.utils.Base64Util; | import com.iformall.utils.Base64Util; | ||||
| import com.iformall.utils.DataUtil; | |||||
| import lombok.extern.slf4j.Slf4j; | import lombok.extern.slf4j.Slf4j; | ||||
| import static cn.afterturn.easypoi.excel.entity.enmus.CellValueType.Date; | |||||
| @Slf4j | @Slf4j | ||||
| public class WiwideEntry { | public class WiwideEntry { | ||||
| @@ -164,8 +168,7 @@ public class WiwideEntry { | |||||
| } | } | ||||
| public static String encrypt(WxWiWideInfo wiWideInfo) { | public static String encrypt(WxWiWideInfo wiWideInfo) { | ||||
| Calendar calendar=Calendar.getInstance(); | |||||
| int seconds=calendar.get(Calendar.SECOND); | |||||
| long seconds = new Date().getTime() / 1000; | |||||
| return encrypt(wiWideInfo.getSignKey(), wiWideInfo.getWiwideId(), wiWideInfo.getWiwideKey(), seconds); | return encrypt(wiWideInfo.getSignKey(), wiWideInfo.getWiwideId(), wiWideInfo.getWiwideKey(), seconds); | ||||
| } | } | ||||
| @@ -2,15 +2,22 @@ package com.iformall.sms.wiwide; | |||||
| import com.alibaba.fastjson.JSONObject; | import com.alibaba.fastjson.JSONObject; | ||||
| import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
| import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.po.WxWiWideInfo; | import com.iformall.domain.po.WxWiWideInfo; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.enums.EnumVerifyCode; | import com.iformall.enums.EnumVerifyCode; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.service.DataTowerService; | |||||
| import com.iformall.sms.SMSExcutor; | import com.iformall.sms.SMSExcutor; | ||||
| import com.iformall.utils.*; | import com.iformall.utils.*; | ||||
| import com.sun.glass.ui.Application; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.apache.shiro.codec.Base64; | import org.apache.shiro.codec.Base64; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | |||||
| import org.springframework.boot.SpringApplication; | |||||
| import org.springframework.context.ApplicationContext; | |||||
| import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
| import java.util.HashMap; | import java.util.HashMap; | ||||
| @@ -215,7 +222,7 @@ public class WiwideUtil implements SMSExcutor { | |||||
| return data; | return data; | ||||
| } | } | ||||
| public static String queryDataNew(String url, String sign, Map<String, String> params) { | |||||
| public static String queryDataNew(String url, String sign, Map<String, Object> params) { | |||||
| String data = HttpUtil.doPostWiwideNew(url, sign, params); | String data = HttpUtil.doPostWiwideNew(url, sign, params); | ||||
| return data; | return data; | ||||
| @@ -223,10 +230,33 @@ public class WiwideUtil implements SMSExcutor { | |||||
| public static void main(String[] args) { | public static void main(String[] args) { | ||||
| Map<String, String> params = new HashMap<>(2); | Map<String, String> params = new HashMap<>(2); | ||||
| params.put("username", "lianhua"); | |||||
| params.put("password", "widash1234"); | |||||
| String token = HttpUtil.doPost("http://140.143.33.245/api/user/auth", params); | |||||
| System.out.println(DataUtil.unicodeToUtf8(token)); | |||||
| } | |||||
| params.put("username", "fm_test"); | |||||
| params.put("password", "wiwide123"); | |||||
| String res = HttpUtil.doPost("http://140.143.33.245/api/user/auth", params); | |||||
| System.out.println(res); | |||||
| JSONObject result = JSONObject.parseObject(res); | |||||
| if (result.getInteger("result") == 0) { | |||||
| JSONObject data = result.getJSONObject("data"); | |||||
| String secretKey = data.getString("SecretKey"); | |||||
| String secretId = data.getString("SecretId"); | |||||
| WxWiWideInfo wiWideInfo = new WxWiWideInfo(); | |||||
| wiWideInfo.setSignKey("191ffbbb437946318bfecb373e694a13"); | |||||
| wiWideInfo.setWiwideId(secretId); | |||||
| wiWideInfo.setWiwideKey(secretKey); | |||||
| String sign = WiwideEntry.encrypt(wiWideInfo); | |||||
| Map<String, Object> param = new HashMap<>(); | |||||
| param.put("pageStart",1); | |||||
| param.put("pageSize",10); | |||||
| param.put("key",0); | |||||
| param.put("value",""); | |||||
| param.put("placeStatus",0); | |||||
| String s = queryDataNew("http://140.143.33.245" + "/api/place/place", sign, param); | |||||
| System.out.println(DataUtil.unicodeToUtf8(s)); | |||||
| } | |||||
| } | |||||
| } | } | ||||