|
@@ -1,5 +1,6 @@
|
|
|
package com.zfire.jiasm.syncdata.gree.recycle;
|
|
|
|
|
|
+import com.aliyun.oss.common.utils.StringUtils;
|
|
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
|
import com.fasterxml.jackson.core.type.TypeReference;
|
|
|
import com.fasterxml.jackson.databind.DeserializationFeature;
|
|
@@ -13,6 +14,7 @@ import com.zfire.jiasm.syncdata.plus.service.*;
|
|
|
import io.jsonwebtoken.lang.Collections;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
@@ -49,15 +51,21 @@ public class RecycleAssignLogic {
|
|
|
ItfTblRecycleHsptJjcjFjDownloadService recycleHsptJjcjFjDownloadService;
|
|
|
@Autowired
|
|
|
ItfTblRecycleHsptJjcjTmmxDownloadService recycleHsptJjcjTmmxDownloadService;
|
|
|
-
|
|
|
-
|
|
|
- /*
|
|
|
@Autowired
|
|
|
- FaOrderRecycleAssignFkmxService orderRecycleAssignFkmxService;
|
|
|
+ OrderRecycleAssignFkmxService orderRecycleAssignFkmxService;
|
|
|
@Autowired
|
|
|
OrderRecycleAssignService orderRecycleAssignService;
|
|
|
@Autowired
|
|
|
+ OrderRecycleAssignCollectionService orderRecycleAssignCollectionService;
|
|
|
+ @Autowired
|
|
|
+ OrderRecycleAssignAnnexService orderRecycleAssignAnnexService;
|
|
|
+ @Autowired
|
|
|
OrderRecycleAssignMxService orderRecycleAssignMxService;
|
|
|
+
|
|
|
+ /*
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
@Autowired
|
|
|
OrderWebsitItemService orderWebsitItemService;
|
|
|
@Autowired
|
|
@@ -66,8 +74,7 @@ public class RecycleAssignLogic {
|
|
|
OrderRecycleAssignWorkerService orderRecycleAssignWorkerService;
|
|
|
@Autowired
|
|
|
OrderRecycleAssignExpandService orderRecycleAssignExpandService;
|
|
|
- @Autowired
|
|
|
- OrderRecycleAssignCollectionService orderRecycleAssignCollectionService;*/
|
|
|
+ */
|
|
|
@Autowired
|
|
|
AreaService areaService;
|
|
|
@Autowired
|
|
@@ -1111,7 +1118,7 @@ public class RecycleAssignLogic {
|
|
|
String xjwdmc = "";
|
|
|
|
|
|
// 反馈明细数据
|
|
|
- OrderRecycleUploadEvent event = eventMap.get(feedback.getId()).get(0);
|
|
|
+ FaOrderRecycleUploadEvent event = eventMap.get(feedback.getId()).get(0);
|
|
|
// 组装请求参数
|
|
|
RecycleAssignFeedbackUploadBean feedbackUploadBean = mapper.readValue(mapper.writeValueAsString(feedback), RecycleAssignFeedbackUploadBean.class);
|
|
|
feedbackUploadBean.setBatchNo(batchNo);
|
|
@@ -1137,6 +1144,377 @@ public class RecycleAssignLogic {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 批量上传采集信息
|
|
|
+ */
|
|
|
+ public void acquisitionUpload() {
|
|
|
+ List<OrderRecycleUploadEvent> collectionEventList = orderRecycleUploadEventService.lambdaQuery()
|
|
|
+ .eq(OrderRecycleUploadEvent::getSynStatus, Constant.SynStatus.UN_SYN.getCode())
|
|
|
+ .eq(OrderRecycleUploadEvent::getOrderType, Constant.RecycleOrderType.RECYCLE_ASSGIN_COLLECTION)
|
|
|
+ .list();
|
|
|
+ if(null != collectionEventList && !collectionEventList.isEmpty()) {
|
|
|
+ List<OrderRecycleUploadEvent> annexEventList = orderRecycleUploadEventService.lambdaQuery()
|
|
|
+ .eq(OrderRecycleUploadEvent::getSynStatus, Constant.SynStatus.UN_SYN.getCode())
|
|
|
+ .eq(OrderRecycleUploadEvent::getOrderType, Constant.RecycleOrderType.RECYCLE_ASSIGN_ANNEX)
|
|
|
+ .list();
|
|
|
+ String batchNo = java.util.UUID.randomUUID().toString();
|
|
|
+ final Map<Integer, List<OrderRecycleUploadEvent>> collectionEventMap = collectionEventList.stream().collect(Collectors.groupingBy(OrderRecycleUploadEvent::getId));
|
|
|
+ final Map<Integer, List<OrderRecycleUploadEvent>> annexEventMap = (null == annexEventList || annexEventList.isEmpty()) ? null : annexEventList.stream().collect(Collectors.groupingBy(OrderRecycleUploadEvent::getId));
|
|
|
+ LinkedHashSet<Integer> ids = new LinkedHashSet<>();
|
|
|
+ LinkedHashSet<Integer> annexIds = new LinkedHashSet<>();
|
|
|
+ collectionEventList.stream().forEach(event->{
|
|
|
+ ids.add(event.getId());
|
|
|
+ });
|
|
|
+ if(null != annexEventList && !annexEventList.isEmpty()) {
|
|
|
+ annexEventList.stream().forEach(annexEvent->{
|
|
|
+ annexIds.add(annexEvent.getId());
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if(!ids.isEmpty()) {
|
|
|
+ List<OrderRecycleAssignCollection> collectionList = orderRecycleAssignCollectionService.lambdaQuery()
|
|
|
+ .in(OrderRecycleAssignCollection::getId, ids).list();
|
|
|
+ if( null != collectionList && !collectionList.isEmpty()) {
|
|
|
+ final List<OrderRecycleAssignAnnex> annexList = annexIds.isEmpty() ? null :
|
|
|
+ orderRecycleAssignAnnexService.lambdaQuery().in(OrderRecycleAssignAnnex::getId, annexIds).list();
|
|
|
+ //条码表分组gr
|
|
|
+ final Map<Integer, List<OrderRecycleAssignAnnex>> annexMap = (null == annexList || annexList.isEmpty()) ? null : annexList.stream().collect(Collectors.groupingBy(OrderRecycleAssignAnnex::getCollectionId));
|
|
|
+ LinkedHashSet<Integer> orderIds = new LinkedHashSet<>();
|
|
|
+ LinkedHashSet<Integer> mxIds = new LinkedHashSet<>();
|
|
|
+ collectionList.stream().forEach(collection->{
|
|
|
+ orderIds.add(collection.getOrderId());
|
|
|
+ mxIds.add(collection.getMxId());
|
|
|
+ });
|
|
|
+
|
|
|
+ List<OrderRecycleAssign> recycleList = orderRecycleAssignService.lambdaQuery().in(OrderRecycleAssign::getId, orderIds).list();
|
|
|
+ final Map<Integer, List<OrderRecycleAssign>> recycleMap = (null == recycleList || recycleList.isEmpty()) ? null : recycleList.stream().collect(Collectors.groupingBy(OrderRecycleAssign::getId));
|
|
|
+ List<OrderRecycleAssignMx> mxList = orderRecycleAssignMxService.lambdaQuery()
|
|
|
+ .in(OrderRecycleAssignMx::getId, mxIds).list();
|
|
|
+ collectionList.stream().forEach(collection->{
|
|
|
+ List<OrderRecycleUploadEvent> eventList = new ArrayList<>();
|
|
|
+ final List<OrderRecycleUploadEvent> collectionEventGroupList = collectionEventMap.get(collection.getId());
|
|
|
+ eventList.addAll(collectionEventGroupList);
|
|
|
+// OrderRecycleUploadEvent event = collectionEventMap.get(collection.getId()).get(0);
|
|
|
+// eventList.add(event);
|
|
|
+ RecycleAcquisitionUploadBean bean = new RecycleAcquisitionUploadBean();
|
|
|
+// RecycleHsptJjcjUploadBean feedbackUploadBean = mapper.readValue(mapper.writeValueAsString(collection), RecycleHsptJjcjUploadBean.class);
|
|
|
+ RecycleHsptJjcjUploadBean feedbackUploadBean = new RecycleHsptJjcjUploadBean();
|
|
|
+ //完工和报废状态才上传
|
|
|
+ if(null != recycleMap && recycleMap.containsKey(collection.getOrderId())
|
|
|
+ && null != recycleMap.get(collection.getOrderId())
|
|
|
+ && !recycleMap.get(collection.getOrderId()).isEmpty()) {
|
|
|
+ if(null != recycleMap.get(collection.getOrderId()).get(0).getOrderState()
|
|
|
+ && 6 != recycleMap.get(collection.getOrderId()).get(0).getOrderState().intValue()
|
|
|
+ && 7 != recycleMap.get(collection.getOrderId()).get(0).getOrderState().intValue()
|
|
|
+ ) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ feedbackUploadBean.setPgguid(recycleList.stream().filter(recycle->recycle.getId().intValue() ==collection.getOrderId().intValue() ).collect(Collectors.toList()).get(0).getPgguid());
|
|
|
+ feedbackUploadBean.setPgmxid(mxList.stream().filter(mx->mx.getId().intValue() == collection.getMxId()).collect(Collectors.toList()).get(0).getPgmxid());
|
|
|
+ //总部和广佛两边鉴定结果刚好相反
|
|
|
+ feedbackUploadBean.setJdjg( (null == collection.getIdentificationResult()) ? null :( 0 == collection.getIdentificationResult().intValue() ? 1 : 0));
|
|
|
+ feedbackUploadBean.setSfcj(collection.getDismantle());
|
|
|
+ feedbackUploadBean.setLceng(collection.getFloor());
|
|
|
+ feedbackUploadBean.setCcun(collection.getMachineSize());
|
|
|
+ feedbackUploadBean.setJjpp(collection.getMachineBrand());
|
|
|
+ feedbackUploadBean.setJjlx(collection.getMachineType());
|
|
|
+ feedbackUploadBean.setJjqsqk(collection.getMachineDefectData());
|
|
|
+ feedbackUploadBean.setPshu(collection.getMachineLmx());
|
|
|
+// feedbackUploadBean.setJjrj(jjrj);
|
|
|
+ feedbackUploadBean.setSpid(mxList.stream().filter(mx->mx.getId().intValue() == collection.getMxId()).collect(Collectors.toList()).get(0).getSpid());
|
|
|
+ feedbackUploadBean.setSpmc(mxList.stream().filter(mx->mx.getId().intValue() == collection.getMxId()).collect(Collectors.toList()).get(0).getSpmc());
|
|
|
+ //gps经纬度
|
|
|
+ feedbackUploadBean.setGps((!StringUtils.isNullOrEmpty(collection.getLat()) && !StringUtils.isNullOrEmpty(collection.getLng()) ) ? (collection.getLat()+","+collection.getLng()) : "");
|
|
|
+ feedbackUploadBean.setSjcjsfen(collection.getProvince());
|
|
|
+ feedbackUploadBean.setSjcjcshi(collection.getCity());
|
|
|
+ feedbackUploadBean.setSjcjxian(collection.getArea());
|
|
|
+ feedbackUploadBean.setGpsdizi(collection.getGpsAddress());
|
|
|
+ //工程师编号,工程师名称,工程师电话
|
|
|
+ WebsitWorker websitWorker = null;
|
|
|
+ if( null != collection.getMainResponsibleId() ) {
|
|
|
+ websitWorker = websitWorkerService.getById(collection.getMainResponsibleId());
|
|
|
+ }
|
|
|
+ if( null != websitWorker ) {
|
|
|
+ feedbackUploadBean.setAzrenno(websitWorker.getNumber());
|
|
|
+ feedbackUploadBean.setAzren(websitWorker.getName());
|
|
|
+ feedbackUploadBean.setAzrenyddh(websitWorker.getPhone());
|
|
|
+ }
|
|
|
+ //网点编号,网点名称
|
|
|
+ Websit websit = null;
|
|
|
+ OrderRecycleAssign orderRecycleAssign = recycleMap.get(collection.getOrderId()).get(0);
|
|
|
+ if(null != orderRecycleAssign.getAfterWebsitId()) {
|
|
|
+ websit = websitService.getById(orderRecycleAssign.getAfterWebsitId());
|
|
|
+ }
|
|
|
+ if( null != websit) {
|
|
|
+ feedbackUploadBean.setWdno(websit.getWebsitNumber());
|
|
|
+ feedbackUploadBean.setWdmc(websit.getName());
|
|
|
+ }
|
|
|
+ bean.setTblHsptJjcjVO(feedbackUploadBean);
|
|
|
+ bean.setBatchNo(batchNo);
|
|
|
+ bean.setTaskNo(java.util.UUID.randomUUID().toString());
|
|
|
+// 附件
|
|
|
+ List<RecycleHsptJjcjFjUploadBean> tblHsptJjcjFjVO = new ArrayList<>();
|
|
|
+ //条码
|
|
|
+ List<RecycleHsptJjcjTmmxUploadBean> tblHsptJjcjTmmxVO = new ArrayList<>();
|
|
|
+
|
|
|
+ if(!StringUtils.isNullOrEmpty(collection.getInsideTempCode())) {
|
|
|
+ if(null != annexMap && annexMap.containsKey(collection.getId())
|
|
|
+ && null != annexMap.get(collection.getId()) && !annexMap.get(collection.getId()).isEmpty()) {
|
|
|
+ List<OrderRecycleAssignAnnex> subAnnexList = annexMap.get(collection.getId());
|
|
|
+ if( null != subAnnexList && !subAnnexList.isEmpty() ) {
|
|
|
+ subAnnexList.stream().forEach(o->{
|
|
|
+ if(null != o.getType() && 1 == o.getType().intValue()) {//内机条码
|
|
|
+ RecycleHsptJjcjTmmxUploadBean tmmxBean = new RecycleHsptJjcjTmmxUploadBean();
|
|
|
+ tmmxBean.setTmlx(0);
|
|
|
+ tmmxBean.setJqtm(collection.getInsideTempCode());
|
|
|
+ tmmxBean.setFjserverpath(o.getGreeImageId());
|
|
|
+ tblHsptJjcjTmmxVO.add(tmmxBean);
|
|
|
+
|
|
|
+ //图片id不为空才上传
|
|
|
+ if( !StringUtils.isEmpty(o.getGreeImageId()) ) {
|
|
|
+ RecycleHsptJjcjFjUploadBean fjBean = new RecycleHsptJjcjFjUploadBean();
|
|
|
+ fjBean.setType(1);
|
|
|
+ fjBean.setFjindex(1);
|
|
|
+ fjBean.setFjname("内机条码图");
|
|
|
+ fjBean.setFjserverpath(o.getGreeImageId());
|
|
|
+ tblHsptJjcjFjVO.add(fjBean);
|
|
|
+ }
|
|
|
+
|
|
|
+ if(null != annexEventMap
|
|
|
+ && annexEventMap.containsKey(o.getId())
|
|
|
+ && null != annexEventMap.get(o.getId())
|
|
|
+ ) {
|
|
|
+ List<OrderRecycleUploadEvent> annexEventGroupList = annexEventMap.get(o.getId());
|
|
|
+ eventList.addAll(annexEventGroupList);
|
|
|
+ }
|
|
|
+ }else if(null != o.getType() && 2 == o.getType().intValue()) {//外机条码
|
|
|
+ RecycleHsptJjcjTmmxUploadBean tmmxBean = new RecycleHsptJjcjTmmxUploadBean();
|
|
|
+ tmmxBean.setTmlx(1);
|
|
|
+ tmmxBean.setJqtm(collection.getOutTempCode());
|
|
|
+ tmmxBean.setFjserverpath(o.getGreeImageId());
|
|
|
+ tblHsptJjcjTmmxVO.add(tmmxBean);
|
|
|
+// 图片id不为空才上传
|
|
|
+ if(!StringUtils.isEmpty(o.getGreeImageId())) {
|
|
|
+ RecycleHsptJjcjFjUploadBean fjBean = new RecycleHsptJjcjFjUploadBean();
|
|
|
+ fjBean.setType(2);
|
|
|
+ fjBean.setFjindex(2);
|
|
|
+ fjBean.setFjname("外机条码图");
|
|
|
+ fjBean.setFjserverpath(o.getGreeImageId());
|
|
|
+ tblHsptJjcjFjVO.add(fjBean);
|
|
|
+ }
|
|
|
+
|
|
|
+ if(null != annexEventMap
|
|
|
+ && annexEventMap.containsKey(o.getId())
|
|
|
+ && null != annexEventMap.get(o.getId())
|
|
|
+ ) {
|
|
|
+ List<OrderRecycleUploadEvent> annexEventGroupList = annexEventMap.get(o.getId());
|
|
|
+ eventList.addAll(annexEventGroupList);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //外机条码
|
|
|
+ if(!StringUtils.isNullOrEmpty(collection.getOutTempCode())) {
|
|
|
+ if(null != annexMap && annexMap.containsKey(collection.getId())
|
|
|
+ && null != annexMap.get(collection.getId()) && !annexMap.get(collection.getId()).isEmpty()) {
|
|
|
+ if(annexMap.get(collection.getId()).stream().filter(annex->annex.getType().intValue()==2).findAny().isPresent()) {
|
|
|
+ List<OrderRecycleAssignAnnex> outAnnex = annexMap.get(collection.getId()).stream().filter(annex->annex.getType().intValue()==2).collect(Collectors.toList());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ bean.setTblHsptJjcjFjVO(tblHsptJjcjFjVO);
|
|
|
+ bean.setTblHsptJjcjTmmxVO(tblHsptJjcjTmmxVO);
|
|
|
+ GreeResponseHelper response = acquisitionUploadReq(bean, eventList);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //采集信息上传接口
|
|
|
+ @Transactional
|
|
|
+ public GreeResponseHelper acquisitionUploadReq(
|
|
|
+ RecycleAcquisitionUploadBean acquisitionUploadBean,
|
|
|
+ List<OrderRecycleUploadEvent> eventList
|
|
|
+ ) {
|
|
|
+ if(null != acquisitionUploadBean) {
|
|
|
+ final String apiPath = Constant.GreeApiPath.RECYCLE_ACQUISITION_UPLOAD;
|
|
|
+ //采集主表
|
|
|
+ RecycleHsptJjcjUploadBean jjcjBean = acquisitionUploadBean.getTblHsptJjcjVO();
|
|
|
+ //附件表
|
|
|
+ List<RecycleHsptJjcjFjUploadBean> fjBeanList = acquisitionUploadBean.getTblHsptJjcjFjVO();
|
|
|
+ //条码明细表
|
|
|
+ List<RecycleHsptJjcjTmmxUploadBean> tmmxBeanList = acquisitionUploadBean.getTblHsptJjcjTmmxVO();
|
|
|
+ Map<String,Object> map = new HashMap<>();
|
|
|
+ map.put("tblHsptJjcjVO", jjcjBean);
|
|
|
+ map.put("tblHsptJjcjFjVO", fjBeanList);
|
|
|
+ map.put("tblHsptJjcjTmmxVO", tmmxBeanList);
|
|
|
+ RecycleHsptJjcjUpload jjcjUpload = new RecycleHsptJjcjUpload();
|
|
|
+ List<RecycleHsptJjcjFjUpload> fjlist = new ArrayList<>();
|
|
|
+ List<RecycleHsptJjcjTmmxUpload> tmmxlist = new ArrayList<>();
|
|
|
+ try {
|
|
|
+ jjcjUpload = mapper.readValue(mapper.writeValueAsString(jjcjBean), RecycleHsptJjcjUpload.class);
|
|
|
+ jjcjUpload.setSynStatus(Constant.SynStatus.SYN.getCode());
|
|
|
+ jjcjUpload.setSynTime(new Date());
|
|
|
+ jjcjUpload.setCreatedDate(new Date());
|
|
|
+ jjcjUpload.setLastModifiedDate(new Date());
|
|
|
+ jjcjUpload.setUploadBatchNo(acquisitionUploadBean.getBatchNo());
|
|
|
+// jjcjUpload.setUploadTaskNo(java.util.UUID.randomUUID().toString());
|
|
|
+ jjcjUpload.setUploadTaskNo(acquisitionUploadBean.getTaskNo());
|
|
|
+// recycleHsptJjcjUploadService.saveOrUpdate(jjcjUpload);
|
|
|
+ if(null != fjBeanList && !fjBeanList.isEmpty()) {
|
|
|
+ fjBeanList.stream().forEach(fjBean->{
|
|
|
+ RecycleHsptJjcjFjUpload fjUpload = new RecycleHsptJjcjFjUpload();
|
|
|
+ try {
|
|
|
+ fjUpload = mapper.readValue(mapper.writeValueAsString(fjBean), RecycleHsptJjcjFjUpload.class);
|
|
|
+ fjUpload.setSynStatus(Constant.SynStatus.SYN.getCode());
|
|
|
+ fjUpload.setSynTime(new Date());
|
|
|
+ fjUpload.setCreatedDate(new Date());
|
|
|
+ fjUpload.setLastModifiedDate(new Date());
|
|
|
+ fjUpload.setUploadBatchNo(acquisitionUploadBean.getBatchNo());
|
|
|
+ fjUpload.setUploadTaskNo(acquisitionUploadBean.getTaskNo());
|
|
|
+ fjlist.add(fjUpload);
|
|
|
+ } catch (JsonProcessingException e) {
|
|
|
+ fjUpload.setSynStatus(Constant.SynStatus.FAIL.getCode());
|
|
|
+ fjUpload.setSynTime(new Date());
|
|
|
+ fjUpload.setCreatedDate(new Date());
|
|
|
+ fjUpload.setLastModifiedDate(new Date());
|
|
|
+ fjUpload.setUploadBatchNo(acquisitionUploadBean.getBatchNo());
|
|
|
+ fjUpload.setUploadTaskNo(acquisitionUploadBean.getTaskNo());
|
|
|
+ fjlist.add(fjUpload);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if(null != tmmxBeanList && !tmmxBeanList.isEmpty()) {
|
|
|
+ tmmxBeanList.stream().forEach(tmmxBean->{
|
|
|
+ RecycleHsptJjcjTmmxUpload tmmxUpload = new RecycleHsptJjcjTmmxUpload();
|
|
|
+ try {
|
|
|
+ tmmxUpload = mapper.readValue(mapper.writeValueAsString(tmmxBean), RecycleHsptJjcjTmmxUpload.class);
|
|
|
+ tmmxUpload.setSynStatus(Constant.SynStatus.SYN.getCode());
|
|
|
+ tmmxUpload.setSynTime(new Date());
|
|
|
+ tmmxUpload.setCreatedDate(new Date());
|
|
|
+ tmmxUpload.setLastModifiedDate(new Date());
|
|
|
+ tmmxUpload.setUploadBatchNo(acquisitionUploadBean.getBatchNo());
|
|
|
+ tmmxUpload.setUploadTaskNo(acquisitionUploadBean.getTaskNo());
|
|
|
+ tmmxlist.add(tmmxUpload);
|
|
|
+ } catch (JsonProcessingException e) {
|
|
|
+ tmmxUpload.setSynStatus(Constant.SynStatus.FAIL.getCode());
|
|
|
+ tmmxUpload.setSynTime(new Date());
|
|
|
+ tmmxUpload.setCreatedDate(new Date());
|
|
|
+ tmmxUpload.setLastModifiedDate(new Date());
|
|
|
+ tmmxUpload.setUploadBatchNo(acquisitionUploadBean.getBatchNo());
|
|
|
+ tmmxUpload.setUploadTaskNo(acquisitionUploadBean.getTaskNo());
|
|
|
+ tmmxlist.add(tmmxUpload);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ GreeResponseHelper response = greeLogic.greePost(apiPath, map, 1);
|
|
|
+ if( 200 == response.getStatus()) {
|
|
|
+ jjcjUpload.setGreeStatSynStatus(Constant.SynStatus.SYN.getCode());
|
|
|
+ jjcjUpload.setGreeStatSynTime(new Date());
|
|
|
+ if( null != eventList && !eventList.isEmpty() ) {
|
|
|
+// eventList.stream().peek(event->event.setSynStatus(Constant.SynStatus.SYN.getCode()))
|
|
|
+// .peek(event->event.setSynTime(new Date()));
|
|
|
+ eventList.stream().forEach(event->{
|
|
|
+ event.setSynStatus(Constant.SynStatus.SYN.getCode());
|
|
|
+ event.setSynTime(new Date());
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if(null != fjlist && !fjlist.isEmpty()) {
|
|
|
+ fjlist.stream().forEach(fj->{
|
|
|
+ fj.setGreeStatSynStatus(Constant.SynStatus.SYN.getCode());
|
|
|
+ fj.setGreeStatSynTime(new Date());
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if(null != tmmxlist && !tmmxlist.isEmpty()) {
|
|
|
+ tmmxlist.stream().forEach(tmmx->{
|
|
|
+ tmmx.setGreeStatSynStatus(Constant.SynStatus.SYN.getCode());
|
|
|
+ tmmx.setGreeStatSynTime(new Date());
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ jjcjUpload.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode());
|
|
|
+ jjcjUpload.setGreeStatSynErrMsg(response.getMsg());
|
|
|
+ jjcjUpload.setGreeStatSynTime(new Date());
|
|
|
+ if( null != eventList && !eventList.isEmpty() ) {
|
|
|
+ eventList.stream().forEach(event->{
|
|
|
+ event.setSynStatus(Constant.SynStatus.FAIL.getCode());
|
|
|
+ event.setSynTime(new Date());
|
|
|
+ event.setSynErrMsg(response.getMsg());
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if(null != fjlist && !fjlist.isEmpty()) {
|
|
|
+ fjlist.stream().forEach(fj->{
|
|
|
+ fj.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode());
|
|
|
+ fj.setGreeStatSynTime(new Date());
|
|
|
+ fj.setSynErrMsg(response.getMsg());
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if(null != tmmxlist && !tmmxlist.isEmpty()) {
|
|
|
+ tmmxlist.stream().forEach(tmmx->{
|
|
|
+ tmmx.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode());
|
|
|
+ tmmx.setGreeStatSynTime(new Date());
|
|
|
+ tmmx.setSynErrMsg(response.getMsg());
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ recycleHsptJjcjUploadService.saveOrUpdate(jjcjUpload);
|
|
|
+ if( null != eventList && !eventList.isEmpty()) {
|
|
|
+ orderRecycleUploadEventService.saveOrUpdateBatch(eventList);
|
|
|
+ }
|
|
|
+ if(null != fjlist && !fjlist.isEmpty()) {
|
|
|
+ recycleHsptJjcjFjUploadService.saveOrUpdateBatch(fjlist);
|
|
|
+ }
|
|
|
+ if(null != tmmxlist && !tmmxlist.isEmpty()) {
|
|
|
+ recycleHsptJjcjTmmxUploadService.saveOrUpdateBatch(tmmxlist);
|
|
|
+ }
|
|
|
+ return response;
|
|
|
+ }catch(Exception e) {
|
|
|
+ jjcjUpload.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode());
|
|
|
+ jjcjUpload.setGreeStatSynTime(new Date());
|
|
|
+ if( null != eventList && !eventList.isEmpty() ) {
|
|
|
+ eventList.stream().forEach(event->{
|
|
|
+ event.setSynStatus(Constant.SynStatus.FAIL.getCode());
|
|
|
+ event.setSynTime(new Date());
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if(null != fjlist && !fjlist.isEmpty()) {
|
|
|
+// fjlist.stream().peek(fj->fj.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode())).
|
|
|
+// peek(fj->fj.setGreeStatSynTime(new Date()));
|
|
|
+ fjlist.stream().forEach(fj->{
|
|
|
+ fj.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode());
|
|
|
+ fj.setGreeStatSynTime(new Date());
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if(null != tmmxlist && !tmmxlist.isEmpty()) {
|
|
|
+// tmmxlist.stream().peek(tmmx->tmmx.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode())).
|
|
|
+// peek(tmmx->tmmx.setGreeStatSynTime(new Date()));
|
|
|
+ tmmxlist.stream().forEach(tmmx->{
|
|
|
+ tmmx.setGreeStatSynStatus(Constant.SynStatus.FAIL.getCode());
|
|
|
+ tmmx.setGreeStatSynTime(new Date());
|
|
|
+ });
|
|
|
+ }
|
|
|
+ recycleHsptJjcjUploadService.saveOrUpdate(jjcjUpload);
|
|
|
+// orderRecycleUploadEventService.saveOrUpdate(event);
|
|
|
+ if( null != eventList && !eventList.isEmpty()) {
|
|
|
+ orderRecycleUploadEventService.saveOrUpdateBatch(eventList);
|
|
|
+ }
|
|
|
+ if(null != fjlist && !fjlist.isEmpty()) {
|
|
|
+ recycleHsptJjcjFjUploadService.saveOrUpdateBatch(fjlist);
|
|
|
+ }
|
|
|
+ if(null != tmmxlist && !tmmxlist.isEmpty()) {
|
|
|
+ recycleHsptJjcjTmmxUploadService.saveOrUpdateBatch(tmmxlist);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
@Transactional
|
|
|
public GreeResponseHelper status(RecycleAssignFeedbackUploadBean feedbackUploadBean, FaOrderRecycleUploadEvent event,
|