elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev'

dev_shibei_match
wxz 5 years ago
parent
165fc03c80 83a7b6b5d1
commit
6411f12f6f
2 changed files with 98 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java
  2. 160
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java

15
epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java
View File

@ -11,6 +11,8 @@ import com.epmet.commons.thirdplat.properties.JcetThirdplatProps;
import com.epmet.commons.thirdplat.properties.ThirdplatProps; import com.epmet.commons.thirdplat.properties.ThirdplatProps;
import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.HttpClientManager;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.HashMap; import java.util.HashMap;
@ -18,6 +20,8 @@ import java.util.Map;
public class JcetApiService extends AbstractApiService { public class JcetApiService extends AbstractApiService {
Logger logger = LoggerFactory.getLogger(getClass());
private JcetThirdplatProps jcetThirdplatProps; private JcetThirdplatProps jcetThirdplatProps;
public JcetApiService(ThirdplatProps props) { public JcetApiService(ThirdplatProps props) {
@ -32,6 +36,10 @@ public class JcetApiService extends AbstractApiService {
* @date 2021.01.19 10:26 * @date 2021.01.19 10:26
*/ */
public ThirdPlatUserInfo getUserInfoByTicket(String ticket) throws UnsupportedEncodingException { public ThirdPlatUserInfo getUserInfoByTicket(String ticket) throws UnsupportedEncodingException {
logger.info("【请求酒城e通第三方平台】getUserInfoByTicket()接口开始>>>>>>>>>>>>");
logger.info("【请求酒城e通第三方平台】getUserInfoByTicket()接口入参 ticket:{}", ticket);
SsoTicketFormDTO ssoTicket = new SsoTicketFormDTO(); SsoTicketFormDTO ssoTicket = new SsoTicketFormDTO();
ssoTicket.setSsoTicket(ticket); ssoTicket.setSsoTicket(ticket);
@ -42,6 +50,13 @@ public class JcetApiService extends AbstractApiService {
JSON.toJSONString(ssoTicket), JSON.toJSONString(ssoTicket),
getHeaders(ssoTicket)); getHeaders(ssoTicket));
try {
logger.info("【请求酒城e通第三方平台】getUserInfoByTicket()接口返回:{}", result.getData());
} catch (Exception e) {
//e.printStackTrace();
}
logger.info("【请求酒城e通第三方平台】getUserInfoByTicket()接口结束<<<<<<<<<<<<");
JcetUserInfoResultDTO resultDTO = parseResult(result, JcetUserInfoResultDTO.class); JcetUserInfoResultDTO resultDTO = parseResult(result, JcetUserInfoResultDTO.class);
ThirdPlatUserInfo userInfo = new ThirdPlatUserInfo(); ThirdPlatUserInfo userInfo = new ThirdPlatUserInfo();

160
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java
View File

@ -28,85 +28,91 @@ import java.util.Map;
@Slf4j @Slf4j
@Component @Component
public class SendMqMsgUtils { public class SendMqMsgUtils {
private static MqConfig mqConfig; private static MqConfig mqConfig;
/** /**
* desc:发送mq消息 * desc:发送mq消息(如果失败重试1次)
* *
* @return * @return
*/ */
public static Result<String> sendMsg(MqBaseMsgDTO msg) { public static Result<String> sendMsg(MqBaseMsgDTO msg) {
if (mqConfig == null) { if (mqConfig == null) {
mqConfig = SpringContextUtils.getBean(MqConfig.class); mqConfig = SpringContextUtils.getBean(MqConfig.class);
} }
log.info("sendMsg param:{}", JSON.toJSONString(msg)); log.info("sendMsg param:{}", JSON.toJSONString(msg));
try { try {
// TODO // TODO
ValidatorUtils.validateEntity(msg, DefaultGroup.class); ValidatorUtils.validateEntity(msg, DefaultGroup.class);
} catch (ValidateException e) { } catch (ValidateException e) {
return new Result<String>().error(e.getMsg()); return new Result<String>().error(e.getMsg());
} }
msg.setAppId(mqConfig.getAppId()); msg.setAppId(mqConfig.getAppId());
msg.setRequestUrl(mqConfig.getHost().concat(MqMethodPathEnum.SEND_MSG.getCode())); msg.setRequestUrl(mqConfig.getHost().concat(MqMethodPathEnum.SEND_MSG.getCode()));
msg.setToken(mqConfig.getToken()); msg.setToken(mqConfig.getToken());
try { try {
Result<String> result = HttpClientManager.getInstance().sendPostByHttps(msg.getRequestUrl(), JSON.toJSONString(msg)); int retryTime = 0;
log.info("sendMsg result:{}", JSON.toJSONString(result)); Result<String> result = null;
if (result.success()) { do {
MqReturnBaseResult resultResult = JSON.parseObject(result.getData(), MqReturnBaseResult.class); retryTime++;
if (resultResult.getErrCode().equals(NumConstant.ZERO)) { result = HttpClientManager.getInstance().sendPostByHttps(msg.getRequestUrl(), JSON.toJSONString(msg));
JSONObject jsonObject = JSON.parseObject(resultResult.getData()); log.info("sendMsg retryTime:{},result:{}", retryTime, JSON.toJSONString(result));
return new Result<String>().ok(jsonObject.getString("msgId")); } while ((!result.success()) && retryTime < 2);
} else {
log.error("sendMsg fail,resultData:{}", JSON.toJSONString(resultResult));
return new Result<String>().error(EpmetErrorCode.SERVER_ERROR.getCode(), resultResult.getErrMsg());
}
}
Result<String> resultResult = new Result<>();
resultResult.error(result.getCode(), result.getMsg());
resultResult.setInternalMsg(result.getInternalMsg());
return resultResult;
} catch (Exception e) {
log.error("sendMsg exception", e);
return new Result<String>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
}
}
if (result.success()) {
MqReturnBaseResult resultResult = JSON.parseObject(result.getData(), MqReturnBaseResult.class);
if (resultResult.getErrCode().equals(NumConstant.ZERO)) {
JSONObject jsonObject = JSON.parseObject(resultResult.getData());
return new Result<String>().ok(jsonObject.getString("msgId"));
} else {
log.error("sendMsg fail,resultData:{}", JSON.toJSONString(resultResult));
return new Result<String>().error(EpmetErrorCode.SERVER_ERROR.getCode(), resultResult.getErrMsg());
}
}
Result<String> resultResult = new Result<>();
resultResult.error(result.getCode(), result.getMsg());
resultResult.setInternalMsg(result.getInternalMsg());
return resultResult;
} catch (Exception e) {
log.error("sendMsg exception", e);
return new Result<String>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
}
}
/**
* desc:发送mq消息
*
* @return
*/
public static Result<List<EventClassDto>> getEventClassList() {
if (mqConfig == null) {
mqConfig = SpringContextUtils.getBean(MqConfig.class);
}
Map<String, String> param = new HashMap<>();
param.put("appId", mqConfig.getAppId());
param.put("token", mqConfig.getToken());
String requestUrl = mqConfig.getHost().concat(MqMethodPathEnum.GET_EVENT_LIST.getCode());
try { /**
Result<String> result = HttpClientManager.getInstance().sendPostByHttps(requestUrl, JSON.toJSONString(param)); * desc:发送mq消息
log.info("getEventClassList result:{}", JSON.toJSONString(result)); *
if (result.success()) { * @return
MqReturnBaseResult resultResult = JSON.parseObject(result.getData(), MqReturnBaseResult.class); */
if (resultResult.getErrCode().equals(NumConstant.ZERO)) { public static Result<List<EventClassDto>> getEventClassList() {
List<EventClassDto> eventClassDto = JSON.parseArray(resultResult.getData(), EventClassDto.class); if (mqConfig == null) {
return new Result<List<EventClassDto>>().ok(eventClassDto); mqConfig = SpringContextUtils.getBean(MqConfig.class);
} else { }
log.error("sendMsg fail,resultData:{}", JSON.toJSONString(resultResult)); Map<String, String> param = new HashMap<>();
return new Result<List<EventClassDto>>().error(EpmetErrorCode.SERVER_ERROR.getCode(), resultResult.getErrMsg()); param.put("appId", mqConfig.getAppId());
} param.put("token", mqConfig.getToken());
} String requestUrl = mqConfig.getHost().concat(MqMethodPathEnum.GET_EVENT_LIST.getCode());
Result<List<EventClassDto>> resultResult = new Result<>();
resultResult.error(result.getCode(), result.getMsg()); try {
resultResult.setInternalMsg(result.getInternalMsg()); Result<String> result = HttpClientManager.getInstance().sendPostByHttps(requestUrl, JSON.toJSONString(param));
return resultResult; log.info("getEventClassList result:{}", JSON.toJSONString(result));
} catch (Exception e) { if (result.success()) {
log.error("sendMsg exception", e); MqReturnBaseResult resultResult = JSON.parseObject(result.getData(), MqReturnBaseResult.class);
return new Result<List<EventClassDto>>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); if (resultResult.getErrCode().equals(NumConstant.ZERO)) {
} List<EventClassDto> eventClassDto = JSON.parseArray(resultResult.getData(), EventClassDto.class);
} return new Result<List<EventClassDto>>().ok(eventClassDto);
} else {
log.error("sendMsg fail,resultData:{}", JSON.toJSONString(resultResult));
return new Result<List<EventClassDto>>().error(EpmetErrorCode.SERVER_ERROR.getCode(), resultResult.getErrMsg());
}
}
Result<List<EventClassDto>> resultResult = new Result<>();
resultResult.error(result.getCode(), result.getMsg());
resultResult.setInternalMsg(result.getInternalMsg());
return resultResult;
} catch (Exception e) {
log.error("sendMsg exception", e);
return new Result<List<EventClassDto>>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
}
}
} }

Write Preview
Loading…
Cancel
Save