From 597cae7743fde0ca86efb4659a2ded937fc308ae Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 一月 2021 00:32:28 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-job/src/main/java/com/java110/job/adapt/hcIot/asyn/impl/IotSendAsynImpl.java | 148 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 143 insertions(+), 5 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/asyn/impl/IotSendAsynImpl.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/asyn/impl/IotSendAsynImpl.java
index dc569a7..02d7c59 100644
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/asyn/impl/IotSendAsynImpl.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/asyn/impl/IotSendAsynImpl.java
@@ -34,11 +34,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -892,6 +888,148 @@
}
}
+
+ @Override
+ public void addTempCarFeeConfig(JSONObject postParameters) {
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_ADD_TEAM_CAR_FEE_CONFIG,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extConfigId",
+ "feeName",
+ MachineTranslateDto.TYPE_TEAM_CAR_FEE_CONFIG);
+ ResponseEntity<String> responseEntity = null;
+ String url = IotConstant.getUrl(IotConstant.ADD_TEAM_CAR_FEE_CONFIG);
+ try {
+ postParameters.put("taskId", machineTranslateDto.getMachineTranslateId());
+ HttpEntity httpEntity = new HttpEntity(postParameters.toJSONString(), getHeaders());
+ responseEntity = outRestTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+
+ logger.debug("璋冪敤HC IOT淇℃伅锛�" + responseEntity);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+ machineTranslateDto.setRemark(responseEntity.getBody());
+ saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "", url);
+ return;
+ }
+ JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
+
+ if (!tokenObj.containsKey("code") || ResultVo.CODE_OK != tokenObj.getInteger("code")) {
+ machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+ machineTranslateDto.setRemark(tokenObj.getString("msg"));
+ //淇濆瓨 澶辫触鎶ユ枃
+ saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "", url);
+
+ return;
+ }
+ } catch (Exception e) {
+ machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+ machineTranslateDto.setRemark(e.getLocalizedMessage());
+ //淇濆瓨 澶辫触鎶ユ枃
+ saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "", url);
+
+ return;
+ } finally {
+ saveTranslateLog(machineTranslateDto);
+ refreshAccessToken(responseEntity);
+ }
+ }
+
+ @Override
+ public void updateTempCarFeeConfig(JSONObject postParameters) {
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_UPDATE_TEAM_CAR_FEE_CONFIG,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extConfigId",
+ "feeName",
+ MachineTranslateDto.TYPE_TEAM_CAR_FEE_CONFIG);
+ ResponseEntity<String> responseEntity = null;
+ String url = IotConstant.getUrl(IotConstant.UPDATE_TEAM_CAR_FEE_CONFIG);
+ try {
+ postParameters.put("taskId", machineTranslateDto.getMachineTranslateId());
+ HttpEntity httpEntity = new HttpEntity(postParameters.toJSONString(), getHeaders());
+ responseEntity = outRestTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+
+ logger.debug("璋冪敤HC IOT淇℃伅锛�" + responseEntity);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+ machineTranslateDto.setRemark(responseEntity.getBody());
+ saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "", url);
+ return;
+ }
+ JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
+
+ if (!tokenObj.containsKey("code") || ResultVo.CODE_OK != tokenObj.getInteger("code")) {
+ machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+ machineTranslateDto.setRemark(tokenObj.getString("msg"));
+ //淇濆瓨 澶辫触鎶ユ枃
+ saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "", url);
+
+ return;
+ }
+ } catch (Exception e) {
+ machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+ machineTranslateDto.setRemark(e.getLocalizedMessage());
+ //淇濆瓨 澶辫触鎶ユ枃
+ saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "", url);
+
+ return;
+ } finally {
+ saveTranslateLog(machineTranslateDto);
+ refreshAccessToken(responseEntity);
+ }
+ }
+
+ @Override
+ public void deleteTempCarFeeConfig(JSONObject postParameters) {
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_DELETE_TEAM_CAR_FEE_CONFIG,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extBwId",
+ "carNum",
+ MachineTranslateDto.TYPE_TEAM_CAR_FEE_CONFIG);
+ ResponseEntity<String> responseEntity = null;
+ String url = IotConstant.getUrl(IotConstant.DELETE_TEAM_CAR_FEE_CONFIG);
+ try {
+ postParameters.put("taskId", machineTranslateDto.getMachineTranslateId());
+ HttpEntity httpEntity = new HttpEntity(postParameters.toJSONString(), getHeaders());
+ responseEntity = outRestTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+
+ logger.debug("璋冪敤HC IOT淇℃伅锛�" + responseEntity);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+ machineTranslateDto.setRemark(responseEntity.getBody());
+ saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "", url);
+ return;
+ }
+ JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
+
+ if (!tokenObj.containsKey("code") || ResultVo.CODE_OK != tokenObj.getInteger("code")) {
+ machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+ machineTranslateDto.setRemark(tokenObj.getString("msg"));
+ //淇濆瓨 澶辫触鎶ユ枃
+ saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "", url);
+
+ return;
+ }
+ } catch (Exception e) {
+ machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+ machineTranslateDto.setRemark(e.getLocalizedMessage());
+ //淇濆瓨 澶辫触鎶ユ枃
+ saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "", url);
+
+ return;
+ } finally {
+ saveTranslateLog(machineTranslateDto);
+ refreshAccessToken(responseEntity);
+ }
+ }
+
private MachineTranslateDto getMachineTranslateDto(JSONObject postParameters, String cmd,
String machineCode,
String machineId,
--
Gitblit v1.8.0