|
@@ -215,7 +215,7 @@ public class SyncOrderInfoLogic {
|
|
|
|
|
|
Map<String, Object> bodyMap = JSON.parseObject(body);
|
|
|
|
|
|
- log.info(itfGreeSynRule.getSalesWebsitNumber()+"时间为:"+time+"【工单同步数据内容】:" + bodyMap.toString());
|
|
|
+ log.info(itfGreeSynRule.getSalesWebsitNumber() + "时间为:" + time + "【工单同步数据内容】:" + bodyMap.toString());
|
|
|
|
|
|
String s = bodyMap.get("data").toString();
|
|
|
|
|
@@ -223,7 +223,6 @@ public class SyncOrderInfoLogic {
|
|
|
JSONArray jsonArray = JSONUtil.parseArray(s);
|
|
|
|
|
|
|
|
|
-
|
|
|
itfGreeSynRule.setLastSynUpdTime(new Date());
|
|
|
|
|
|
itfGreeSynRule.updateById();
|
|
@@ -258,8 +257,8 @@ public class SyncOrderInfoLogic {
|
|
|
itfGreeSynDownloadRecService.lambdaUpdate().in(ItfGreeSynDownloadRec::getWorkOrderId,
|
|
|
itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getWorkOrderId)
|
|
|
.collect(Collectors.toList()))
|
|
|
- .eq(ItfGreeSynDownloadRec::getGreeStatSynStatus,0)
|
|
|
- .set(ItfGreeSynDownloadRec::getGreeStatSynStatus,9)
|
|
|
+ .eq(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0)
|
|
|
+ .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 9)
|
|
|
.update();
|
|
|
|
|
|
itfGreeSynDownloadRecService.saveBatch(itfGreeSynDownloadRecs);
|
|
@@ -306,12 +305,11 @@ public class SyncOrderInfoLogic {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
public void syncDetail() {
|
|
|
|
|
|
|
|
|
List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecs = itfGreeSynDownloadRecService.lambdaQuery()
|
|
|
- .in(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0,99)
|
|
|
+ .in(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0, 99)
|
|
|
.last("limit 50")
|
|
|
.orderByAsc(ItfGreeSynDownloadRec::getGreeStatSynStatus)
|
|
|
.list();
|
|
@@ -348,14 +346,13 @@ public class SyncOrderInfoLogic {
|
|
|
String json = JSONUtil.toJsonStr(workOrderSearchReq);
|
|
|
|
|
|
|
|
|
-
|
|
|
String body = HttpUtils.requestPostBody(greeUrl + Constant.gree.POST_WORKER_ORDER_DETAIL, json, heard);
|
|
|
|
|
|
Map<String, Object> bodyMap = JSON.parseObject(body);
|
|
|
String s = bodyMap.get("data").toString();
|
|
|
|
|
|
|
|
|
- log.info("工单同步详情返回:"+s);
|
|
|
+ log.info("工单同步详情返回:" + s);
|
|
|
|
|
|
|
|
|
JSONArray jsonArray = JSONUtil.parseArray(s);
|
|
@@ -458,77 +455,140 @@ public class SyncOrderInfoLogic {
|
|
|
|
|
|
}
|
|
|
|
|
|
- feedbackRespList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderFeedbackService.saveBatch(feedbackRespList);
|
|
|
-
|
|
|
- tblWorkOrderDetailList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderDetailService.saveBatch(tblWorkOrderDetailList);
|
|
|
-
|
|
|
- collectionChargeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblCollectionChargeService.saveBatch(collectionChargeList);
|
|
|
- collectionChargeDetails.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblCollectionChargeDetailService.saveBatch(collectionChargeDetails);
|
|
|
- tblOldProductOrderDetailList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblOldProductOrderDetailService.saveBatch(tblOldProductOrderDetailList);
|
|
|
- tblWorkOrderAddComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderAddComplainService.saveBatch(tblWorkOrderAddComplainList);
|
|
|
- tblWorkOrderAppointList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderAppointService.saveBatch(tblWorkOrderAppointList);
|
|
|
- tblWorkOrderCancelList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderCancelService.saveBatch(tblWorkOrderCancelList);
|
|
|
- tblWorkOrderComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderComplainService.saveBatch(tblWorkOrderComplainList);
|
|
|
- tblWorkOrderComplainFeedbackList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderComplainFeedbackService.saveBatch(tblWorkOrderComplainFeedbackList);
|
|
|
- tblWorkOrderCompleteInfoList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderCompleteInfoService.saveBatch(tblWorkOrderCompleteInfoList);
|
|
|
- tblWorkOrderConsultList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderConsultService.saveBatch(tblWorkOrderConsultList);
|
|
|
- tblWorkOrderDetailBarcodeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderDetailBarcodeService.saveBatch(tblWorkOrderDetailBarcodeList);
|
|
|
- tblWorkOrderDetailRelocationList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderDetailRelocationService.saveBatch(tblWorkOrderDetailRelocationList);
|
|
|
- tblWorkOrderDispatchOutletsList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderDispatchOutletsService.saveBatch(tblWorkOrderDispatchOutletsList);
|
|
|
- tblWorkOrderEngineerList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderEngineerService.saveBatch(tblWorkOrderEngineerList);
|
|
|
- tblWorkOrderEvaluationList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderEvaluationService.saveBatch(tblWorkOrderEvaluationList);
|
|
|
- tblWorkOrderExtList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderExtService.saveBatch(tblWorkOrderExtList);
|
|
|
- tblWorkOrderIndicatorsList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderIndicatorsService.saveBatch(tblWorkOrderIndicatorsList);
|
|
|
- tblWorkOrderSignList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderSignService.saveBatch(tblWorkOrderSignList);
|
|
|
- tblWorkOrderTagList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderTagService.saveBatch(tblWorkOrderTagList);
|
|
|
- workOrderChargeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderChargeService.saveBatch(workOrderChargeList);
|
|
|
- workOrderCollectionComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderCollectionComplainService.saveBatch(workOrderCollectionComplainList);
|
|
|
- tblWorkOrderDispatchEngineerList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderDispatchEngineerService.saveBatch(tblWorkOrderDispatchEngineerList);
|
|
|
- tblWorkOrderStatusList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderStatusService.saveBatch(tblWorkOrderStatusList);
|
|
|
- workOrderCollectionList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblWorkOrderCollectionService.saveBatch(workOrderCollectionList);
|
|
|
- collectionRepairList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblCollectionRepairService.saveBatch(collectionRepairList);
|
|
|
- collectionRepairPartList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblCollectionRepairPartService.saveBatch(collectionRepairPartList);
|
|
|
- collectionRepairProjectList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblCollectionRepairProjectService.saveBatch(collectionRepairProjectList);
|
|
|
- collectionRepairSymptomReasonList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
- itfTblCollectionRepairSymptomReasonService.saveBatch(collectionRepairSymptomReasonList);
|
|
|
-
|
|
|
-
|
|
|
- itfTblWorkOrderService.saveBatch(itfTblWorkOrders);
|
|
|
+ if (CollectionUtils.isEmpty(feedbackRespList)) {
|
|
|
+ feedbackRespList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderFeedbackService.saveBatch(feedbackRespList);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderDetailList)) {
|
|
|
+ tblWorkOrderDetailList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderDetailService.saveBatch(tblWorkOrderDetailList);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (CollectionUtils.isEmpty(collectionChargeList)) {
|
|
|
+ collectionChargeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblCollectionChargeService.saveBatch(collectionChargeList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(collectionChargeDetails)) {
|
|
|
+ collectionChargeDetails.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblCollectionChargeDetailService.saveBatch(collectionChargeDetails);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (CollectionUtils.isEmpty(tblOldProductOrderDetailList)) {
|
|
|
+ tblOldProductOrderDetailList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblOldProductOrderDetailService.saveBatch(tblOldProductOrderDetailList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderAddComplainList)) {
|
|
|
+ tblWorkOrderAddComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderAddComplainService.saveBatch(tblWorkOrderAddComplainList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderAppointList)) {
|
|
|
+ tblWorkOrderAppointList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderAppointService.saveBatch(tblWorkOrderAppointList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderCancelList)) {
|
|
|
+ tblWorkOrderCancelList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderCancelService.saveBatch(tblWorkOrderCancelList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderComplainList)) {
|
|
|
+ tblWorkOrderComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderComplainService.saveBatch(tblWorkOrderComplainList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderComplainFeedbackList)) {
|
|
|
+ tblWorkOrderComplainFeedbackList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderComplainFeedbackService.saveBatch(tblWorkOrderComplainFeedbackList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderCompleteInfoList)) {
|
|
|
+ tblWorkOrderCompleteInfoList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderCompleteInfoService.saveBatch(tblWorkOrderCompleteInfoList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderConsultList)) {
|
|
|
+ tblWorkOrderConsultList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderConsultService.saveBatch(tblWorkOrderConsultList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderDetailBarcodeList)) {
|
|
|
+ tblWorkOrderDetailBarcodeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderDetailBarcodeService.saveBatch(tblWorkOrderDetailBarcodeList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderDetailRelocationList)) {
|
|
|
+ tblWorkOrderDetailRelocationList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderDetailRelocationService.saveBatch(tblWorkOrderDetailRelocationList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderDispatchOutletsList)) {
|
|
|
+ tblWorkOrderDispatchOutletsList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderDispatchOutletsService.saveBatch(tblWorkOrderDispatchOutletsList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderEngineerList)) {
|
|
|
+ tblWorkOrderEngineerList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderEngineerService.saveBatch(tblWorkOrderEngineerList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderEvaluationList)) {
|
|
|
+ tblWorkOrderEvaluationList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderEvaluationService.saveBatch(tblWorkOrderEvaluationList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderExtList)) {
|
|
|
+ tblWorkOrderExtList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderExtService.saveBatch(tblWorkOrderExtList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderIndicatorsList)) {
|
|
|
+ tblWorkOrderIndicatorsList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderIndicatorsService.saveBatch(tblWorkOrderIndicatorsList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderSignList)) {
|
|
|
+ tblWorkOrderSignList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderSignService.saveBatch(tblWorkOrderSignList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderTagList)) {
|
|
|
+ tblWorkOrderTagList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderTagService.saveBatch(tblWorkOrderTagList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(workOrderChargeList)) {
|
|
|
+ workOrderChargeList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderChargeService.saveBatch(workOrderChargeList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(workOrderCollectionComplainList)) {
|
|
|
+ workOrderCollectionComplainList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderCollectionComplainService.saveBatch(workOrderCollectionComplainList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderDispatchEngineerList)) {
|
|
|
+ tblWorkOrderDispatchEngineerList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderDispatchEngineerService.saveBatch(tblWorkOrderDispatchEngineerList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(tblWorkOrderStatusList)) {
|
|
|
+ tblWorkOrderStatusList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderStatusService.saveBatch(tblWorkOrderStatusList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(workOrderCollectionList)) {
|
|
|
+ workOrderCollectionList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderCollectionService.saveBatch(workOrderCollectionList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(collectionRepairList)) {
|
|
|
+ collectionRepairList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblCollectionRepairService.saveBatch(collectionRepairList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(collectionRepairPartList)) {
|
|
|
+ collectionRepairPartList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblCollectionRepairPartService.saveBatch(collectionRepairPartList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(collectionRepairProjectList)) {
|
|
|
+ collectionRepairProjectList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblCollectionRepairProjectService.saveBatch(collectionRepairProjectList);
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isEmpty(collectionRepairSymptomReasonList)) {
|
|
|
+ collectionRepairSymptomReasonList.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblCollectionRepairSymptomReasonService.saveBatch(collectionRepairSymptomReasonList);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (CollectionUtils.isEmpty(itfTblWorkOrders)) {
|
|
|
+ itfTblWorkOrders.stream().forEach(item -> item.setDownloadBatchNo(batch));
|
|
|
+ itfTblWorkOrderService.saveBatch(itfTblWorkOrders);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
List<Long> syncIds = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getSynReqId).collect(Collectors.toList());
|
|
|
|
|
|
- log.error("工单同步错误"+e.getMessage());
|
|
|
+ log.error("工单同步错误" + e.getMessage());
|
|
|
|
|
|
itfGreeSynDownloadRecService.lambdaUpdate()
|
|
|
.in(ItfGreeSynDownloadRec::getSynReqId, syncIds)
|
|
@@ -559,19 +619,19 @@ public class SyncOrderInfoLogic {
|
|
|
workerOrderSyncBean.setInDownloadBatchNo(itfTblWorkOrder.getDownloadBatchNo());
|
|
|
WorkerOrderSyncBean workerOrderSyncBean1 = syncMapper.orderExecute(workerOrderSyncBean);
|
|
|
|
|
|
- if (!workerOrderSyncBean1.getOutSynStatus()){
|
|
|
+ if (!workerOrderSyncBean1.getOutSynStatus()) {
|
|
|
|
|
|
- log.info("工单同步返回内容:"+workerOrderSyncBean1.toString());
|
|
|
- itfTblWorkOrder.setSynTimes(itfTblWorkOrder.getSynTimes()+1);
|
|
|
+ log.info("工单同步返回内容:" + workerOrderSyncBean1.toString());
|
|
|
+ itfTblWorkOrder.setSynTimes(itfTblWorkOrder.getSynTimes() + 1);
|
|
|
itfTblWorkOrder.setSynErrMsg(workerOrderSyncBean1.getOutSynErrMsg());
|
|
|
itfTblWorkOrder.updateById();
|
|
|
}
|
|
|
- }catch (Exception e){
|
|
|
- itfTblWorkOrder.setSynTimes(itfTblWorkOrder.getSynTimes()+1);
|
|
|
+ } catch (Exception e) {
|
|
|
+ itfTblWorkOrder.setSynTimes(itfTblWorkOrder.getSynTimes() + 1);
|
|
|
itfTblWorkOrder.setSynErrMsg(e.getMessage());
|
|
|
itfTblWorkOrder.updateById();
|
|
|
|
|
|
- log.info("工单同步返回日志错误内容:"+itfTblWorkOrder.getDownloadBatchNo()+e);
|
|
|
+ log.info("工单同步返回日志错误内容:" + itfTblWorkOrder.getDownloadBatchNo() + e);
|
|
|
}
|
|
|
|
|
|
|