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 | 504 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 338 insertions(+), 166 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 a0af182..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
@@ -51,6 +51,9 @@
public class IotSendAsynImpl implements IIotSendAsyn {
private static final Logger logger = LoggerFactory.getLogger(IotSendAsynImpl.class);
+ private static final String DEFAULT_MACHINE_CODE = "-";
+ private static final String DEFAULT_MACHINE_ID = "-";
+
@Autowired
private RestTemplate outRestTemplate;
@@ -99,17 +102,10 @@
@Override
@Async
public void addCommunity(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_ADD_COMMUNITY);
- machineTranslateDto.setMachineCode("-");
- machineTranslateDto.setMachineId("-");
- machineTranslateDto.setObjId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setObjName(postParameters.getString("name"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_COMMUNITY);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_ADD_COMMUNITY,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID, "extCommunityId", "name", MachineTranslateDto.TYPE_COMMUNITY);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.ADD_COMMUNITY_URL);
try {
@@ -138,17 +134,9 @@
@Override
@Async
public void editCommunity(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_UPDATE_COMMUNITY);
- machineTranslateDto.setMachineCode("-");
- machineTranslateDto.setMachineId("-");
- machineTranslateDto.setObjId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setObjName(postParameters.getString("name"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_COMMUNITY);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_UPDATE_COMMUNITY,
+ DEFAULT_MACHINE_CODE, DEFAULT_MACHINE_ID, "extCommunityId", "name", MachineTranslateDto.TYPE_COMMUNITY);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.UPDATE_COMMUNITY_URL);
try {
@@ -179,17 +167,10 @@
@Override
@Async
public void deleteCommunity(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_DELETE_COMMUNITY);
- machineTranslateDto.setMachineCode("-");
- machineTranslateDto.setMachineId("-");
- machineTranslateDto.setObjId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setObjName(postParameters.getString("name"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_COMMUNITY);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_DELETE_COMMUNITY,
+ DEFAULT_MACHINE_CODE, DEFAULT_MACHINE_ID,
+ "extCommunityId", "name", MachineTranslateDto.TYPE_COMMUNITY);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.DELETE_COMMUNITY_URL);
try {
@@ -225,17 +206,9 @@
@Override
@Async
public void addMachine(JSONObject postParameters, List<JSONObject> ownerDtos) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_ADD_MACHINE);
- machineTranslateDto.setMachineCode(postParameters.getString("machineCode"));
- machineTranslateDto.setMachineId(postParameters.getString("extMachineId"));
- machineTranslateDto.setObjId(postParameters.getString("extMachineId"));
- machineTranslateDto.setObjName(postParameters.getString("machineName"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_MACHINE);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters, MachineTranslateDto.CMD_ADD_MACHINE,
+ postParameters.getString("machineCode"), postParameters.getString("extMachineId"),
+ "extMachineId", "machineName", MachineTranslateDto.TYPE_MACHINE);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.ADD_MACHINE_URL);
try {
@@ -287,17 +260,10 @@
@Override
@Async
public void updateMachine(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_UPDATE_MACHINE);
- machineTranslateDto.setMachineCode(postParameters.getString("machineCode"));
- machineTranslateDto.setMachineId(postParameters.getString("extMachineId"));
- machineTranslateDto.setObjId(postParameters.getString("extMachineId"));
- machineTranslateDto.setObjName(postParameters.getString("machineName"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_MACHINE);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters, MachineTranslateDto.CMD_UPDATE_MACHINE,
+ postParameters.getString("machineCode"),
+ postParameters.getString("extMachineId"),
+ "extMachineId", "machineName", MachineTranslateDto.TYPE_MACHINE);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.UPDATE_MACHINE_URL);
try {
@@ -342,17 +308,12 @@
@Override
public void deleteMachine(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_DELETE_MACHINE);
- machineTranslateDto.setMachineCode(postParameters.getString("machineCode"));
- machineTranslateDto.setMachineId(postParameters.getString("extMachineId"));
- machineTranslateDto.setObjId(postParameters.getString("extMachineId"));
- machineTranslateDto.setObjName(postParameters.getString("machineName"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_MACHINE);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters, MachineTranslateDto.CMD_DELETE_MACHINE,
+ postParameters.getString("machineCode"),
+ postParameters.getString("extMachineId"),
+ "extMachineId",
+ "machineName",
+ MachineTranslateDto.TYPE_MACHINE);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.DELETE_MACHINE_URL);
try {
@@ -374,7 +335,6 @@
machineTranslateDto.setRemark(tokenObj.getString("msg"));
//淇濆瓨 澶辫触鎶ユ枃
saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "", url);
-
}
} catch (Exception e) {
machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
@@ -390,17 +350,12 @@
@Override
public void addOwner(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_ADD_OWNER_FACE);
- machineTranslateDto.setMachineCode(postParameters.getString("machineCode"));
- machineTranslateDto.setMachineId(postParameters.getString("extMachineId"));
- machineTranslateDto.setObjId(postParameters.getString("userId"));
- machineTranslateDto.setObjName(postParameters.getString("name"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters, MachineTranslateDto.CMD_ADD_OWNER_FACE,
+ postParameters.getString("machineCode"),
+ postParameters.getString("extMachineId"),
+ "userId",
+ "name",
+ MachineTranslateDto.TYPE_OWNER);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.ADD_OWNER);
try {
@@ -439,17 +394,11 @@
@Override
public void sendUpdateOwner(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_UPDATE_OWNER_FACE);
- machineTranslateDto.setMachineCode(postParameters.getString("machineCode"));
- machineTranslateDto.setMachineId(postParameters.getString("extMachineId"));
- machineTranslateDto.setObjId(postParameters.getString("userId"));
- machineTranslateDto.setObjName(postParameters.getString("name"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters, MachineTranslateDto.CMD_UPDATE_OWNER_FACE,
+ postParameters.getString("machineCode"),
+ postParameters.getString("extMachineId"),
+ "userId", "name",
+ MachineTranslateDto.TYPE_OWNER);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.EDIT_OWNER);
try {
@@ -488,17 +437,13 @@
@Override
public void sendDeleteOwner(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_DELETE_OWNER_FACE);
- machineTranslateDto.setMachineCode(postParameters.getString("machineCode"));
- machineTranslateDto.setMachineId(postParameters.getString("extMachineId"));
- machineTranslateDto.setObjId(postParameters.getString("userId"));
- machineTranslateDto.setObjName(postParameters.getString("name"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_DELETE_OWNER_FACE,
+ postParameters.getString("machineCode"),
+ postParameters.getString("extMachineId"),
+ "userId",
+ "name",
+ MachineTranslateDto.TYPE_OWNER);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.DELETE_OWNER);
try {
@@ -574,17 +519,12 @@
@Override
public void addParkingArea(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_ADD_PARKING_AREA);
- machineTranslateDto.setMachineCode("-");
- machineTranslateDto.setMachineId("-");
- machineTranslateDto.setObjId(postParameters.getString("extPaId"));
- machineTranslateDto.setObjName(postParameters.getString("num"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_PARKING_AREA);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters, MachineTranslateDto.CMD_ADD_PARKING_AREA,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extPaId",
+ "num",
+ MachineTranslateDto.TYPE_PARKING_AREA);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.ADD_PARKING_AREA_URL);
try {
@@ -625,17 +565,12 @@
@Override
public void updateParkingArea(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_UPDATE_PARKING_AREA);
- machineTranslateDto.setMachineCode("-");
- machineTranslateDto.setMachineId("-");
- machineTranslateDto.setObjId(postParameters.getString("extPaId"));
- machineTranslateDto.setObjName(postParameters.getString("num"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_PARKING_AREA);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters, MachineTranslateDto.CMD_UPDATE_PARKING_AREA,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extPaId",
+ "num",
+ MachineTranslateDto.TYPE_PARKING_AREA);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.UPDATE_PARKING_AREA_URL);
try {
@@ -676,17 +611,12 @@
@Override
public void deleteParkingArea(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_DELETE_PARKING_AREA);
- machineTranslateDto.setMachineCode("-");
- machineTranslateDto.setMachineId("-");
- machineTranslateDto.setObjId(postParameters.getString("extPaId"));
- machineTranslateDto.setObjName(postParameters.getString("num"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_PARKING_AREA);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters, MachineTranslateDto.CMD_DELETE_PARKING_AREA,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extPaId",
+ "num",
+ MachineTranslateDto.TYPE_PARKING_AREA);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.DELETE_PARKING_AREA_URL);
try {
@@ -727,17 +657,13 @@
@Override
public void addOwnerCar(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_ADD_OWNER_CAR);
- machineTranslateDto.setMachineCode("-");
- machineTranslateDto.setMachineId("-");
- machineTranslateDto.setObjId(postParameters.getString("extCarId"));
- machineTranslateDto.setObjName(postParameters.getString("carNum"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER_CAR);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_ADD_OWNER_CAR,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extCarId",
+ "carNum",
+ MachineTranslateDto.TYPE_OWNER_CAR);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.ADD_OWNER_CAR_URL);
try {
@@ -778,17 +704,12 @@
@Override
public void updateOwnerCar(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_UPDATE_OWNER_CAR);
- machineTranslateDto.setMachineCode("-");
- machineTranslateDto.setMachineId("-");
- machineTranslateDto.setObjId(postParameters.getString("extCarId"));
- machineTranslateDto.setObjName(postParameters.getString("carNum"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER_CAR);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters, MachineTranslateDto.CMD_UPDATE_OWNER_CAR,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extCarId",
+ "carNum",
+ MachineTranslateDto.TYPE_OWNER_CAR);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.UPDATE_OWNER_CAR_URL);
try {
@@ -829,17 +750,12 @@
@Override
public void deleteOwnerCar(JSONObject postParameters) {
- MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
- machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
- machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
- machineTranslateDto.setMachineCmd(MachineTranslateDto.CMD_DELETE_OWNER_CAR);
- machineTranslateDto.setMachineCode("-");
- machineTranslateDto.setMachineId("-");
- machineTranslateDto.setObjId(postParameters.getString("extCarId"));
- machineTranslateDto.setObjName(postParameters.getString("carNum"));
- machineTranslateDto.setTypeCd(MachineTranslateDto.TYPE_OWNER_CAR);
- machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
- machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters, MachineTranslateDto.CMD_DELETE_OWNER_CAR,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extCarId",
+ "carNum",
+ MachineTranslateDto.TYPE_OWNER_CAR);
ResponseEntity<String> responseEntity = null;
String url = IotConstant.getUrl(IotConstant.DELETE_OWNER_CAR_URL);
try {
@@ -878,6 +794,262 @@
}
}
+ @Override
+ public void addCarBlackWhite(JSONObject postParameters) {
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_ADD_CAR_BLACK_WHITE,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extBwId",
+ "carNum",
+ MachineTranslateDto.TYPE_OWNER_CAR);
+ ResponseEntity<String> responseEntity = null;
+ String url = IotConstant.getUrl(IotConstant.ADD_CAR_BLACK_WHITE_URL);
+ 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 deleteCarBlackWhite(JSONObject postParameters) {
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_DELETE_CAR_BLACK_WHITE,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extBwId",
+ "carNum",
+ MachineTranslateDto.TYPE_OWNER_CAR);
+ ResponseEntity<String> responseEntity = null;
+ String url = IotConstant.getUrl(IotConstant.DELETE_CAR_BLACK_WHITE_URL);
+ 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 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,
+ String objId,
+ String objName,
+ String typeCd) {
+ MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
+ machineTranslateDto.setMachineTranslateId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
+ machineTranslateDto.setCommunityId(postParameters.getString("extCommunityId"));
+ machineTranslateDto.setMachineCmd(cmd);
+ machineTranslateDto.setMachineCode(machineCode);
+ machineTranslateDto.setMachineId(machineId);
+ machineTranslateDto.setObjId(postParameters.getString(objId));
+ machineTranslateDto.setObjName(postParameters.getString(objName));
+ machineTranslateDto.setTypeCd(typeCd);
+ machineTranslateDto.setState(MachineTranslateDto.STATE_SUCCESS);
+ machineTranslateDto.setRemark("鍚屾鐗╄仈缃戠郴缁熸垚鍔�");
+ return machineTranslateDto;
+ }
+
/**
* 瀛樺偍浜や簰 璁板綍
--
Gitblit v1.8.0