From c456271451031354468a65d5817e3754d89dbafd Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 2 Feb 2024 16:22:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(asms):=2078478=E3=80=8178475?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsAsmsOpenApiServiceImpl.java      | 39 +++++++++++++------
 .../impl/SynchronizationAsmsService.java      | 30 +++++++++-----
 2 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
index 87c9a884..bc1d108e 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
@@ -608,7 +608,14 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
 				Map<String, String> paramMap3 = new HashMap<>();
 				sarFileSplitInfoEOList.forEach(sarFileSplitInfoEO -> {
 					paramMap.put("standardCode", sarFileSplitInfoEO.getSerialNumber());
-					List<Map<String, String>> mapList = asmsPostUtil.sendGetReq(lawsAsmsOpenApi.getApiUrl(), paramMap);
+					List<Map<String, String>> mapList = new ArrayList<>();
+					try{
+						mapList = asmsPostUtil.sendGetReq(lawsAsmsOpenApi.getApiUrl(), paramMap);
+					}
+					catch (JeroBootException e){
+						log.error(e.getMessage());
+					}
+//					List<Map<String, String>> mapList = asmsPostUtil.sendGetReq(lawsAsmsOpenApi.getApiUrl(), paramMap);
 					mapList.forEach(eMap -> {
 						// 单个法规的条文解读详情
 						paramMap2.put("standardCode", sarFileSplitInfoEO.getSerialNumber());
@@ -642,16 +649,26 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
 						lawsDocumentSplit.setApplications((String) objectMap2.get("modelsType"));
 						lawsDocumentSplit.setDynamicType((String) objectMap2.get("powerType"));
 
-						lawsDocumentSplit.setLawsRequireType(getItemValues(lawsDocumentSplit.getLawsRequireType(),
-								"1702212236079886338", sysDictItemList)); // 法规要求类型
-						lawsDocumentSplit.setFunctionClassification(getItemValues(lawsDocumentSplit.getFunctionClassification(),
-								"1702212237296234497", sysDictItemList)); // 功能分类
-						lawsDocumentSplit.setFunctionProfessional(getItemValues(lawsDocumentSplit.getFunctionProfessional(),
-								"1702202280677044226", sysDictItemList)); // 功能专业
-						lawsDocumentSplit.setApplications(getItemValues(lawsDocumentSplit.getApplications(),
-								"1702518672924110850", sysDictItemList)); // 适用车型
-						lawsDocumentSplit.setDynamicType(getItemValues(lawsDocumentSplit.getDynamicType(),
-								"1702518671166697474", sysDictItemList)); // 动力类型
+						if (StringUtils.isNotBlank(lawsDocumentSplit.getLawsRequireType())){
+							lawsDocumentSplit.setLawsRequireType(getItemValues(lawsDocumentSplit.getLawsRequireType().replace(",", ";"),
+									"1702212236079886338", sysDictItemList)); // 法规要求类型
+						}
+						if (StringUtils.isNotBlank(lawsDocumentSplit.getFunctionClassification())){
+							lawsDocumentSplit.setFunctionClassification(getItemValues(lawsDocumentSplit.getFunctionClassification().replace(",", ";"),
+									"1702212237296234497", sysDictItemList)); // 功能分类
+						}
+						if (StringUtils.isNotBlank(lawsDocumentSplit.getFunctionProfessional())){
+							lawsDocumentSplit.setFunctionProfessional(getItemValues(lawsDocumentSplit.getFunctionProfessional().replace(",", ";"),
+									"1702202280677044226", sysDictItemList)); // 功能专业
+						}
+						if (StringUtils.isNotBlank(lawsDocumentSplit.getApplications())){
+							lawsDocumentSplit.setApplications(getItemValues(lawsDocumentSplit.getApplications().replace(",", ";"),
+									"1702518672924110850", sysDictItemList)); // 适用车型
+						}
+						if (StringUtils.isNotBlank(lawsDocumentSplit.getDynamicType())){
+							lawsDocumentSplit.setDynamicType(getItemValues(lawsDocumentSplit.getDynamicType().replace(",", ";"),
+									"1702518671166697474", sysDictItemList)); // 动力类型
+						}
 
 						lawsDocumentSplitMapper.insert(lawsDocumentSplit);
 					});
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
index 76f19a91..4fa266e3 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
@@ -404,16 +404,26 @@ public class SynchronizationAsmsService {
 
                 lawsDocumentSplit.setId(UUIDUtils.randomUUID20());
 
-                lawsDocumentSplit.setLawsRequireType(getItemValues(lawsDocumentSplit.getLawsRequireType(),
-                        "1702212236079886338", sysDictItemList)); // 法规要求类型
-                lawsDocumentSplit.setFunctionClassification(getItemValues(lawsDocumentSplit.getFunctionClassification(),
-                        "1702212237296234497", sysDictItemList)); // 功能分类
-                lawsDocumentSplit.setFunctionProfessional(getItemValues(lawsDocumentSplit.getFunctionProfessional(),
-                        "1702202280677044226", sysDictItemList)); // 功能专业
-                lawsDocumentSplit.setApplications(getItemValues(lawsDocumentSplit.getApplications(),
-                        "1702518672924110850", sysDictItemList)); // 适用车型
-                lawsDocumentSplit.setDynamicType(getItemValues(lawsDocumentSplit.getDynamicType(),
-                        "1702518671166697474", sysDictItemList)); // 动力类型
+                if (StringUtils.isNotBlank(lawsDocumentSplit.getLawsRequireType())){
+                    lawsDocumentSplit.setLawsRequireType(getItemValues(lawsDocumentSplit.getLawsRequireType().replace(",", ";"),
+                            "1702212236079886338", sysDictItemList)); // 法规要求类型
+                }
+                if (StringUtils.isNotBlank(lawsDocumentSplit.getFunctionClassification())){
+                    lawsDocumentSplit.setFunctionClassification(getItemValues(lawsDocumentSplit.getFunctionClassification().replace(",", ";"),
+                            "1702212237296234497", sysDictItemList)); // 功能分类
+                }
+                if (StringUtils.isNotBlank(lawsDocumentSplit.getFunctionProfessional())){
+                    lawsDocumentSplit.setFunctionProfessional(getItemValues(lawsDocumentSplit.getFunctionProfessional().replace(",", ";"),
+                            "1702202280677044226", sysDictItemList)); // 功能专业
+                }
+                if (StringUtils.isNotBlank(lawsDocumentSplit.getApplications())){
+                    lawsDocumentSplit.setApplications(getItemValues(lawsDocumentSplit.getApplications().replace(",", ";"),
+                            "1702518672924110850", sysDictItemList)); // 适用车型
+                }
+                if (StringUtils.isNotBlank(lawsDocumentSplit.getDynamicType())){
+                    lawsDocumentSplit.setDynamicType(getItemValues(lawsDocumentSplit.getDynamicType().replace(",", ";"),
+                            "1702518671166697474", sysDictItemList)); // 动力类型
+                }
 
                 insertDocumentList.add(lawsDocumentSplit);
                 lawsDocumentSplitMapper.insert(lawsDocumentSplit);