ods调整

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

@@ -132,7 +132,7 @@ public abstract class IssueCommManagerImpl {
         vehicleInfo.setTestRecord(dsiVehicleInfo.getTestRecord());
         vehicleInfo.setFileNum(dsiVehicleInfo.getFileNum());
         if (!StringUtils.isEmpty(dsiVehicleInfo.getRegisteredTime())){
-            vehicleInfo.setRegisteredTime(LocalDateTime.parse(dsiVehicleInfo.getRegisteredTime(), dsiVehicleInfo.getRegisteredTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
+            vehicleInfo.setRegisteredTime(LocalDateTime.parse(dsiVehicleInfo.getRegisteredTime().trim().length() == 10 ? dsiVehicleInfo.getRegisteredTime().trim()+ " 00:00:00" : dsiVehicleInfo.getRegisteredTime(), dsiVehicleInfo.getRegisteredTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
         }
         vehicleInfo.setOwnerTel(dsiVehicleInfo.getOwnerTel());
         vehicleInfo.setRegisterDate(dsiVehicleInfo.getRegisterDate());
@@ -161,10 +161,10 @@ public abstract class IssueCommManagerImpl {
 //        cardInfo.setCardModel(dsiCardInfo.getModel());
         cardInfo.setAgencyId(dsiCardInfo.getAgencyId());
         if (!StringUtils.isEmpty(dsiCardInfo.getEnableTime())){
-            cardInfo.setCardEnableTime(LocalDateTime.parse(dsiCardInfo.getEnableTime(), dsiCardInfo.getEnableTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
+            cardInfo.setCardEnableTime(LocalDateTime.parse(dsiCardInfo.getEnableTime().trim().length() == 10 ? dsiCardInfo.getEnableTime().trim()+ " 00:00:00" : dsiCardInfo.getEnableTime(), dsiCardInfo.getEnableTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
         }
         if (!StringUtils.isEmpty(dsiCardInfo.getExpireTime())){
-            cardInfo.setCardExpireTime(LocalDateTime.parse(dsiCardInfo.getExpireTime(), dsiCardInfo.getExpireTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
+            cardInfo.setCardExpireTime(LocalDateTime.parse(dsiCardInfo.getExpireTime().trim().length() == 10 ? dsiCardInfo.getExpireTime().trim()+ " 00:00:00" : dsiCardInfo.getExpireTime(), dsiCardInfo.getExpireTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
         }
         cardInfo.setChannelId(dsiCardInfo.getChannelId());
         cardInfo.setCardIssuedType(dsiCardInfo.getIssuedType());
@@ -219,16 +219,16 @@ public abstract class IssueCommManagerImpl {
 //        obuInfo.setObuModel(dsiOBUInfo.getModel());
         obuInfo.setAgencyId(dsiOBUInfo.getRegisteredChannelId().substring(0, 11));
         if (!StringUtils.isEmpty(dsiOBUInfo.getEnableTime())){
-            obuInfo.setObuEnableTime(LocalDateTime.parse(dsiOBUInfo.getEnableTime(), dsiOBUInfo.getEnableTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
+            obuInfo.setObuEnableTime(LocalDateTime.parse(dsiOBUInfo.getEnableTime().trim().length() == 10 ? dsiOBUInfo.getEnableTime().trim()+ " 00:00:00" : dsiOBUInfo.getEnableTime(), dsiOBUInfo.getEnableTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
         }
         if (!StringUtils.isEmpty(dsiOBUInfo.getExpireTime())){
-            obuInfo.setObuExpireTime(LocalDateTime.parse(dsiOBUInfo.getExpireTime(), dsiOBUInfo.getExpireTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
+            obuInfo.setObuExpireTime(LocalDateTime.parse(dsiOBUInfo.getExpireTime().trim().length() == 10 ? dsiOBUInfo.getExpireTime().trim()+ " 00:00:00" : dsiOBUInfo.getExpireTime(), dsiOBUInfo.getExpireTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME :  TimeTools.DATE_TIME_FORMATTER));
         }
         obuInfo.setChannelId(dsiOBUInfo.getRegisteredChannelId());
         obuInfo.setRegisteredType(dsiOBUInfo.getRegisteredType());
         obuInfo.setRegisteredChannelId(dsiOBUInfo.getRegisteredChannelId());
         if (!StringUtils.isEmpty(dsiOBUInfo.getRegisteredTime())){
-            obuInfo.setRegisteredTime(LocalDateTime.parse(dsiOBUInfo.getRegisteredTime(), dsiOBUInfo.getRegisteredTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
+            obuInfo.setRegisteredTime(LocalDateTime.parse(dsiOBUInfo.getRegisteredTime().trim().length() == 10 ? dsiOBUInfo.getRegisteredTime().trim()+ " 00:00:00" : dsiOBUInfo.getRegisteredTime(), dsiOBUInfo.getRegisteredTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
         }
         obuInfo.setObuStatus(ObuStatus.fromCode(dsiOBUInfo.getStatus()));
 //        obuInfo.setInstallType(dsiOBUInfo.getInstallType());
@@ -258,7 +258,7 @@ public abstract class IssueCommManagerImpl {
         blackCard.setId(dsiBlackCard.getId());
         blackCard.setCardId(dsiBlackCard.getCardId());
         if (!StringUtils.isEmpty(dsiBlackCard.getCreationTime())){
-            blackCard.setCreationTime(LocalDateTime.parse(dsiBlackCard.getCreationTime(), dsiBlackCard.getCreationTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
+            blackCard.setCreationTime(LocalDateTime.parse(dsiBlackCard.getCreationTime().trim().length() == 10 ? dsiBlackCard.getCreationTime().trim()+ " 00:00:00" : dsiBlackCard.getCreationTime(), dsiBlackCard.getCreationTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
         }
         blackCard.setIssuerId(dsiBlackCard.getIssuerId());
         blackCard.setStatus(dsiBlackCard.getStatus());
@@ -273,10 +273,10 @@ public abstract class IssueCommManagerImpl {
         blackObu.setId(dsiBlackObu.getId());
         blackObu.setIssuerId(dsiBlackObu.getIssuerId());
         if (!StringUtils.isEmpty(dsiBlackObu.getCreationTime())){
-            blackObu.setCreationTime(LocalDateTime.parse(dsiBlackObu.getCreationTime(), dsiBlackObu.getCreationTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
+            blackObu.setCreationTime(LocalDateTime.parse(dsiBlackObu.getCreationTime().trim().length() == 10 ? dsiBlackObu.getCreationTime().trim()+ " 00:00:00" : dsiBlackObu.getCreationTime(), dsiBlackObu.getCreationTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
         }
         if (!StringUtils.isEmpty(dsiBlackObu.getReleaseTime())){
-            blackObu.setReleaseTime(LocalDateTime.parse(dsiBlackObu.getReleaseTime(), dsiBlackObu.getReleaseTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
+            blackObu.setReleaseTime(LocalDateTime.parse(dsiBlackObu.getReleaseTime().trim().length() == 10 ? dsiBlackObu.getReleaseTime().trim()+ " 00:00:00" : dsiBlackObu.getReleaseTime(), dsiBlackObu.getReleaseTime().contains("T") ?  TimeTools.ISO_LOCAL_DATE_TIME : TimeTools.DATE_TIME_FORMATTER));
         }
         blackObu.setObuId(dsiBlackObu.getObuId());
         blackObu.setType(ObuBlackType.fromCode(dsiBlackObu.getType()));