优化

src/main/java/cn/quantgroup/customer/service/impl/KdspServiceImpl.java

@@ -3,10 +3,13 @@ package cn.quantgroup.customer.service.impl;
 import static cn.quantgroup.customer.constant.Constant.GSON;
 
 import cn.quantgroup.customer.enums.ErrorCodeEnum;
+import cn.quantgroup.customer.model.kaordermapping.LoanOrderMapping;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.rest.vo.thirdworkorder.ThirdWorkOrderExportVo;
 import cn.quantgroup.customer.service.IKdspService;
 import cn.quantgroup.customer.service.http.IHttpService;
+import cn.quantgroup.customer.util.JSONTools;
+import com.fasterxml.jackson.core.type.TypeReference;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -44,7 +47,10 @@ public class KdspServiceImpl implements IKdspService {
             Map<String,String> header = new HashMap<>();
             header.put("qg-tenant-id",tenantId.toString());
             String result = httpService.post(url, header,orderNos);
-            jsonResult = GSON.fromJson(result, JsonResult.class);
+
+            TypeReference<JsonResult<List<ThirdWorkOrderExportVo>>> typeToken = new TypeReference<JsonResult<List<ThirdWorkOrderExportVo>>>() {
+            };
+            jsonResult = JSONTools.deserialize(result, typeToken);
             log.info("工单查询订单详情返回值:{}", result);
         } catch (Exception ex) {
             log.error("工单查询订单详情异常",ex);

src/main/java/cn/quantgroup/customer/service/impl/ThirdWorkOrderServiceImpl.java

@@ -289,8 +289,8 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
                 String tempSql = sql.toString() + " limit "+offset+","+pageSize;
                 Query nativeQuery = entityManager.createNativeQuery(tempSql);
                 List<Object[]> result = nativeQuery.getResultList();
-                ThirdWorkOrderExportVo exportVo = new ThirdWorkOrderExportVo();
                 for (Object[] objects : result) {
+                    ThirdWorkOrderExportVo exportVo = new ThirdWorkOrderExportVo();
                     if (objects[0] != null) {
                         exportVo.setCreateTime(objects[0].toString());
                     }
@@ -349,31 +349,31 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
             }
 
             Map<String, List<ThirdWorkOrderExportVo>> groupBy = kdspResult.stream().collect(Collectors.groupingBy(ThirdWorkOrderExportVo::getOrderNo));
-            for (ThirdWorkOrderExportVo exportVo : dbAllData){
-                List<ThirdWorkOrderExportVo> temp = groupBy.get(exportVo.getOrderNo());
-                if (CollectionUtils.isEmpty(temp)){
-                    exportVos.add(exportVo);
+            for (ThirdWorkOrderExportVo dbData : dbAllData){
+                List<ThirdWorkOrderExportVo> kdspOrders = groupBy.get(dbData.getOrderNo());
+                if (CollectionUtils.isEmpty(kdspOrders)){
+                    exportVos.add(dbData);
                     continue;
                 }
-                for (ThirdWorkOrderExportVo orderExportVo : temp){
-                    String orderStatus = exportVo.getOrderStatus();
+                for (ThirdWorkOrderExportVo kdspOrder : kdspOrders){
+                    String orderStatus = kdspOrder.getOrderStatus();
                     Integer code = StringUtils.isNotBlank(orderStatus)?Integer.parseInt(orderStatus):null;
                     KdspOrderStatusEnum orderStatusEnum = KdspOrderStatusEnum.getByCode(code);
                     if (orderStatusEnum != null){
-                        orderExportVo.setOrderStatus(orderStatusEnum.getDesc());
+                        kdspOrder.setOrderStatus(orderStatusEnum.getDesc());
                     }
 
-                    orderExportVo.setId(exportVo.getId());
-                    orderExportVo.setProcessInstanceId(exportVo.getProcessInstanceId());
-                    orderExportVo.setCreateUser(exportVo.getCreateUser());
-                    orderExportVo.setAcceptUser(exportVo.getAcceptUser());
-                    orderExportVo.setStatus(exportVo.getStatus());
-                    orderExportVo.setProblemDesc(exportVo.getProblemDesc());
-                    orderExportVo.setCreateTime(exportVo.getCreateTime());
-                    orderExportVo.setFeedbackChannel(exportVo.getFeedbackChannel());
-                    orderExportVo.setQuestionLevel(exportVo.getQuestionLevel());
-                    orderExportVo.setCloseTime(exportVo.getCloseTime());
-                    exportVos.add(orderExportVo);
+                    kdspOrder.setId(dbData.getId());
+                    kdspOrder.setProcessInstanceId(dbData.getProcessInstanceId());
+                    kdspOrder.setCreateUser(dbData.getCreateUser());
+                    kdspOrder.setAcceptUser(dbData.getAcceptUser());
+                    kdspOrder.setStatus(dbData.getStatus());
+                    kdspOrder.setProblemDesc(dbData.getProblemDesc());
+                    kdspOrder.setCreateTime(dbData.getCreateTime());
+                    kdspOrder.setFeedbackChannel(dbData.getFeedbackChannel());
+                    kdspOrder.setQuestionLevel(dbData.getQuestionLevel());
+                    kdspOrder.setCloseTime(dbData.getCloseTime());
+                    exportVos.add(kdspOrder);
                 }
             }