From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +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 | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 220 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
old mode 100644
new mode 100755
index 9b7e8fd..f523206
--- 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
@@ -15,6 +15,7 @@
*/
package com.java110.job.adapt.hcIot.asyn.impl;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.client.RestTemplate;
import com.java110.core.factory.GenerateCodeFactory;
@@ -1047,16 +1048,17 @@
}
@Override
+ @Async
public void addAttendance(JSONObject postParameters, List<JSONObject> staffs) {
MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
- MachineTranslateDto.CMD_DELETE_TEAM_CAR_FEE_CONFIG,
+ MachineTranslateDto.CMD_ADD_ATTENDANCE_CLASSES,
DEFAULT_MACHINE_CODE,
DEFAULT_MACHINE_ID,
- "extBwId",
- "carNum",
- MachineTranslateDto.TYPE_TEAM_CAR_FEE_CONFIG);
+ "extClassesId",
+ "classesName",
+ MachineTranslateDto.TYPE_ATTENDANCE);
ResponseEntity<String> responseEntity = null;
- String url = IotConstant.getUrl(IotConstant.DELETE_TEAM_CAR_FEE_CONFIG);
+ String url = IotConstant.getUrl(IotConstant.ADD_ATTENDANCE_CLASSES);
try {
postParameters.put("taskId", machineTranslateDto.getMachineTranslateId());
HttpEntity httpEntity = new HttpEntity(postParameters.toJSONString(), getHeaders());
@@ -1080,6 +1082,219 @@
return;
}
+
+ if (staffs == null || staffs.size() < 1) {
+ return;
+ }
+
+ url = IotConstant.getUrl(IotConstant.ADD_ATTENDANCE_CLASSES_STAFFS);
+ for (JSONObject staff : staffs) {
+ staff.put("taskId", machineTranslateDto.getMachineTranslateId());
+ }
+
+ httpEntity = new HttpEntity(JSONArray.toJSONString(staffs), getHeaders());
+ responseEntity = outRestTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+
+
+ } 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
+ @Async
+ public void addAttendanceStaff(JSONObject postParameters, List<JSONObject> staffs) {
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_ADD_ATTENDANCE_CLASSES,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extClassesId",
+ "classesName",
+ MachineTranslateDto.TYPE_ATTENDANCE);
+ ResponseEntity<String> responseEntity = null;
+ String url = IotConstant.getUrl(IotConstant.ADD_ATTENDANCE_CLASSES_STAFFS);
+ try {
+ for (JSONObject staff : staffs) {
+ staff.put("taskId", machineTranslateDto.getMachineTranslateId());
+ }
+ HttpEntity httpEntity = new HttpEntity(JSONArray.toJSONString(staffs), 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
+ @Async
+ public void deleteAttendanceStaff(JSONObject postParameters) {
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_DELETE_ATTENDANCE_CLASSES,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extClassesId",
+ "classesName",
+ MachineTranslateDto.TYPE_ATTENDANCE);
+ ResponseEntity<String> responseEntity = null;
+ String url = IotConstant.getUrl(IotConstant.DELETE_ATTENDANCE_CLASSES_STAFFS);
+ 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
+ @Async
+ public void updateAttendance(JSONObject postParameters) {
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_UPDATE_ATTENDANCE_CLASSES,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extClassesId",
+ "classesName",
+ MachineTranslateDto.TYPE_ATTENDANCE);
+ ResponseEntity<String> responseEntity = null;
+ String url = IotConstant.getUrl(IotConstant.UPDATE_ATTENDANCE_CLASSES);
+ 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
+ @Async
+ public void deleteAttendance(JSONObject postParameters) {
+ MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+ MachineTranslateDto.CMD_DELETE_ATTENDANCE_CLASSES,
+ DEFAULT_MACHINE_CODE,
+ DEFAULT_MACHINE_ID,
+ "extClassesId",
+ "classesName",
+ MachineTranslateDto.TYPE_ATTENDANCE);
+ ResponseEntity<String> responseEntity = null;
+ String url = IotConstant.getUrl(IotConstant.DELETE_ATTENDANCE_CLASSES);
+ 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());
--
Gitblit v1.8.0