修改ods代码

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/tools/HttpClientUtil.java

@@ -11,10 +11,10 @@ import java.util.concurrent.TimeUnit;
 
 public class HttpClientUtil {
     private static final OkHttpClient client = new OkHttpClient.Builder()
-            .connectTimeout(100, TimeUnit.SECONDS)//连接超时
-            .readTimeout(100, TimeUnit.SECONDS)//读取响应超时
-            .writeTimeout(100, TimeUnit.SECONDS)//发送请求超时
-            .callTimeout(1000, TimeUnit.SECONDS)// 整个调用过程超时
+            .connectTimeout(20, TimeUnit.SECONDS)//连接超时
+            .readTimeout(30, TimeUnit.SECONDS)//读取响应超时
+            .writeTimeout(50, TimeUnit.SECONDS)//发送请求超时
+            .callTimeout(100, TimeUnit.SECONDS)// 整个调用过程超时
             .build();
     private static final MediaType JSON = MediaType.get("application/json; charset=utf-8");
     private static final MediaType FORM = MediaType.parse("application/x-www-form-urlencoded; charset=utf-8");

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/ois/issue/IssueCommManager.java

@@ -21,19 +21,19 @@ public abstract class IssueCommManager {
         dsiCustomerInfo.setUpdateTime(customerInfo.getUpdateTime());
         dsiCustomerInfo.setCustomerId(customerInfo.getCustomerId());
         dsiCustomerInfo.setIssuerId(customerInfo.getIssuerId());
-//        dsiCustomerInfo.setRegisteredTime(customerInfo.getRegisteredTime());
+        dsiCustomerInfo.setRegisteredTime(customerInfo.getRegisteredDate());
         dsiCustomerInfo.setRegisteredDate(customerInfo.getRegisteredDate());
         dsiCustomerInfo.setSeriseNo(customerInfo.getSeriseNo());
         dsiCustomerInfo.setCustomerType(customerInfo.getUserType().getCode());
-//        dsiCustomerInfo.setCustomerName(customerInfo.getCustomerName());
-//        dsiCustomerInfo.setCustomerIdType(customerInfo.getCustomerIdType());
-//        dsiCustomerInfo.setCustomerIdNum(customerInfo.getCustomerIdNum());
+        dsiCustomerInfo.setCustomerName(customerInfo.getCustoemrName());
+        dsiCustomerInfo.setCustomerIdType(customerInfo.getCustomerIdtype().getCode());
+        dsiCustomerInfo.setCustomerIdNum(customerInfo.getCustomerIdnum());
         dsiCustomerInfo.setTel(customerInfo.getCustomerTel());
         dsiCustomerInfo.setAddress(customerInfo.getCustomerAddress());
         dsiCustomerInfo.setDepartment(customerInfo.getDepartment());
         dsiCustomerInfo.setAgentName(customerInfo.getAgentName());
-//        dsiCustomerInfo.setAgentIdType(customerInfo.getAgentIdType());
-//        dsiCustomerInfo.setAgentIdNum(customerInfo.getAgentIdNum());
+        dsiCustomerInfo.setAgentIdType(customerInfo.getAgentIdtype().getCode());
+        dsiCustomerInfo.setAgentIdNum(customerInfo.getAgentIdnum());
         dsiCustomerInfo.setChannelId(customerInfo.getChannelId());
         dsiCustomerInfo.setStatus(customerInfo.getStatus());
 //        dsiCustomerInfo.setDaspRegisteredTime(customerInfo.getDaspRegisteredTime());
@@ -102,7 +102,7 @@ public abstract class IssueCommManager {
 //        dsiVehicleInfo.setVehicleFeatureVersion(vehicleInfo.getVehicleFeatureVersion());
 //        dsiVehicleInfo.setVehicleFeatureCode(vehicleInfo.getVehicleFeatureCode());
 //        dsiVehicleInfo.setPayAccountNum(vehicleInfo.getPayAccountNum());
-//        dsiVehicleInfo.setWheelCount(vehicleInfo.getWheelCount());
+        dsiVehicleInfo.setWheelCount(vehicleInfo.getVehicleWheelcount());
         dsiVehicleInfo.setUploadStatus(vehicleInfo.getUploadStatus());
         dsiVehicleInfo.setDaspVehicleId(vehicleInfo.getDaspVehicleId());
 //        dsiVehicleInfo.setDaspSign(vehicleInfo.getDaspSign());
@@ -113,18 +113,18 @@ public abstract class IssueCommManager {
     public static void enc(DsiCardInfo dsiCardInfo, QtkCardInfo cardInfo) {
         dsiCardInfo.setId(cardInfo.getId());
         dsiCardInfo.setCardId(cardInfo.getCardId());
-//        dsiCardInfo.setNetId(cardInfo.getCardNetid());
+        dsiCardInfo.setNetId(cardInfo.getCardNetId());
         dsiCardInfo.setCardType(cardInfo.getCardType());
         dsiCardInfo.setBrand(Integer.parseInt(cardInfo.getCardBrand()));
 //        dsiCardInfo.setModel(cardInfo.getCardModel());
         dsiCardInfo.setAgencyId(cardInfo.getAgencyId());
         dsiCardInfo.setCustomerId(cardInfo.getCustomerId());
         dsiCardInfo.setVehicleId(cardInfo.getVehicleId());
-//        dsiCardInfo.setEnableTime(cardInfo.getCardEnabletime());
-//        dsiCardInfo.setExpireTime(cardInfo.getCardExpiretime());
+        dsiCardInfo.setEnableTime(cardInfo.getCardEnableTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        dsiCardInfo.setExpireTime(cardInfo.getCardExpireTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         dsiCardInfo.setChannelId(cardInfo.getChannelId());
-//        dsiCardInfo.setIssuedType(cardInfo.getCardIssuedtype());
-//        dsiCardInfo.setIssuedTime(cardInfo.getCardIssuedtime());
+        dsiCardInfo.setIssuedType(cardInfo.getCardIssuedType());
+//        dsiCardInfo.setIssuedTime(cardInfo.getCardIssuedTime());
         dsiCardInfo.setStatus(cardInfo.getCardStatus().getStatusCode());
 //        dsiCardInfo.setStatusChangeTime(cardInfo.getCardStatusChangetime());
         dsiCardInfo.setPackageType(cardInfo.getPackageType());

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/IssueCommManager.java

@@ -2,10 +2,7 @@ package cn.com.taiji.ods.manager.oqs.issue;
 
 import cn.com.taiji.common.pub.TimeTools;
 import cn.com.taiji.core.entity.basic.*;
-import cn.com.taiji.core.entity.dict.basic.CardBlackType;
-import cn.com.taiji.core.entity.dict.basic.CardStatus;
-import cn.com.taiji.core.entity.dict.basic.ObuStatus;
-import cn.com.taiji.core.entity.dict.basic.UserType;
+import cn.com.taiji.core.entity.dict.basic.*;
 import cn.com.taiji.ods.entity.dsi.*;
 
 import java.time.LocalDateTime;
@@ -55,23 +52,23 @@ public abstract class IssueCommManager {
         customerInfo.setUpdateTime(dsiCustomerInfo.getUpdateTime());
         customerInfo.setCustomerId(dsiCustomerInfo.getCustomerId());
         customerInfo.setIssuerId(dsiCustomerInfo.getIssuerId());
-//        customerInfo.setRegisteredTime(dsiCustomerInfo.getRegisteredTime());
+        customerInfo.setRegisteredDate(dsiCustomerInfo.getRegisteredTime());
         customerInfo.setRegisteredDate(dsiCustomerInfo.getRegisteredDate());
         customerInfo.setSeriseNo(dsiCustomerInfo.getSeriseNo());
         customerInfo.setUserType(UserType.fromCode(dsiCustomerInfo.getCustomerType()));
-//        customerInfo.setCustomerName(dsiCustomerInfo.getCustomerName());
-//        customerInfo.setCustomerIdType(dsiCustomerInfo.getCustomerIdType());
-//        customerInfo.setCustomerIdNum(dsiCustomerInfo.getCustomerIdNum());
+        customerInfo.setCustoemrName(dsiCustomerInfo.getCustomerName());
+        customerInfo.setCustomerIdtype(IdType.findByCode(dsiCustomerInfo.getCustomerIdType()));
+        customerInfo.setCustomerIdnum(dsiCustomerInfo.getCustomerIdNum());
         customerInfo.setCustomerTel(dsiCustomerInfo.getTel());
         customerInfo.setCustomerAddress(dsiCustomerInfo.getAddress());
         customerInfo.setDepartment(dsiCustomerInfo.getDepartment());
         customerInfo.setAgentName(dsiCustomerInfo.getAgentName());
-//        customerInfo.setAgentIdType(dsiCustomerInfo.getAgentIdType());
-//        customerInfo.setAgentIdNum(dsiCustomerInfo.getAgentIdNum());
+        customerInfo.setAgentIdtype(IdType.findByCode(dsiCustomerInfo.getAgentIdType()));
+        customerInfo.setAgentIdnum(dsiCustomerInfo.getAgentIdNum());
         customerInfo.setChannelId(dsiCustomerInfo.getChannelId());
         customerInfo.setStatus(dsiCustomerInfo.getStatus());
 //        customerInfo.setDaspRegisteredTime(dsiCustomerInfo.getDaspRegisteredTime());
-//        customerInfo.setRegisteredType(dsiCustomerInfo.getRegisteredType());
+        customerInfo.setRegisteredType(dsiCustomerInfo.getRegisteredType());
 //        customerInfo.setEmergencyFlag(dsiCustomerInfo.getEmergencyFlag());
 //        customerInfo.setNewCustomerId(dsiCustomerInfo.getNewCustomerId());
 //        customerInfo.setNewCustomerIdUpload(dsiCustomerInfo.getNewCustomerIdUpload());
@@ -114,8 +111,8 @@ public abstract class IssueCommManager {
         vehicleInfo.setAxleCount(dsiVehicleInfo.getAxleCount());
         vehicleInfo.setIssueDate(dsiVehicleInfo.getIssueDate());
         vehicleInfo.setOwnerName(dsiVehicleInfo.getOwnerName());
-//        vehicleInfo.setOwnerIdType(dsiVehicleInfo.getOwnerIdType());
-//        vehicleInfo.setOwnerIdNum(dsiVehicleInfo.getOwnerIdNum());
+        vehicleInfo.setOwnerIdtype(IdType.findByCode(dsiVehicleInfo.getOwnerIdType()));
+        vehicleInfo.setOwnerIdnum(dsiVehicleInfo.getOwnerIdNum());
         vehicleInfo.setAgreementId(dsiVehicleInfo.getAgreementId());
         vehicleInfo.setChannelId(dsiVehicleInfo.getChannelId());
         if (dsiVehicleInfo.getCustomerInfo() != null) {
@@ -136,7 +133,7 @@ public abstract class IssueCommManager {
 //        vehicleInfo.setVehicleFeatureVersion(dsiVehicleInfo.getVehicleFeatureVersion());
 //        vehicleInfo.setVehicleFeatureCode(dsiVehicleInfo.getVehicleFeatureCode());
 //        vehicleInfo.setPayAccountNum(dsiVehicleInfo.getPayAccountNum());
-//        vehicleInfo.setWheelCount(dsiVehicleInfo.getWheelCount());
+        vehicleInfo.setVehicleWheelcount(dsiVehicleInfo.getWheelCount());
         vehicleInfo.setUploadStatus(dsiVehicleInfo.getUploadStatus());
         vehicleInfo.setDaspVehicleId(dsiVehicleInfo.getDaspVehicleId());
 //        vehicleInfo.setDaspSign(dsiVehicleInfo.getDaspSign());
@@ -149,18 +146,18 @@ public abstract class IssueCommManager {
         cardInfo.setInsertTime(TimeTools.calendar2LocalDateTime(dsiCardInfo.getCreateTime()));
         cardInfo.setUpdateTime(TimeTools.calendar2LocalDateTime(dsiCardInfo.getUpdateTime()));
         cardInfo.setCardId(dsiCardInfo.getCardId());
-//        cardInfo.setCardNetid(dsiCardInfo.getNetId());
+        cardInfo.setCardNetId(dsiCardInfo.getNetId());
         cardInfo.setCustomerId(dsiCardInfo.getCustomerId());
         cardInfo.setVehicleId(dsiCardInfo.getVehicleId());
         cardInfo.setCardType(dsiCardInfo.getCardType());
         cardInfo.setCardBrand(dsiCardInfo.getBrand()+"");
 //        cardInfo.setCardModel(dsiCardInfo.getModel());
         cardInfo.setAgencyId(dsiCardInfo.getAgencyId());
-//        cardInfo.setCardEnabletime(dsiCardInfo.getEnableTime());
-//        cardInfo.setCardExpiretime(dsiCardInfo.getExpireTime());
+        cardInfo.setCardEnableTime(LocalDateTime.parse(dsiCardInfo.getEnableTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        cardInfo.setCardExpireTime(LocalDateTime.parse(dsiCardInfo.getExpireTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         cardInfo.setChannelId(dsiCardInfo.getChannelId());
-//        cardInfo.setCardIssuedtype(dsiCardInfo.getIssuedType());
-//        cardInfo.setCardIssuedtime(dsiCardInfo.getIssuedTime());
+        cardInfo.setCardIssuedType(dsiCardInfo.getIssuedType());
+//        cardInfo.setCardIssuedTime(dsiCardInfo.getIssuedTime());
         cardInfo.setCardStatus(CardStatus.fromCode(dsiCardInfo.getStatus()));
 //        cardInfo.setCardStatusChangetime(dsiCardInfo.getStatusChangeTime());
         cardInfo.setPackageId(dsiCardInfo.getPackageId());