ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(asms): 78478、78475

Browse Source
This commit is contained in:
yjz
2024-02-02 16:22:54 +08:00
parent 5b295ae01b
commit c456271451
2 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
+28 -11
View File
@@ -608,7 +608,14 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
Map<String, String> paramMap3 = new HashMap<>(); Map<String, String> paramMap3 = new HashMap<>();
sarFileSplitInfoEOList.forEach(sarFileSplitInfoEO -> { sarFileSplitInfoEOList.forEach(sarFileSplitInfoEO -> {
paramMap.put("standardCode", sarFileSplitInfoEO.getSerialNumber()); 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 -> { mapList.forEach(eMap -> {
// 单个法规的条文解读详情 // 单个法规的条文解读详情
paramMap2.put("standardCode", sarFileSplitInfoEO.getSerialNumber()); paramMap2.put("standardCode", sarFileSplitInfoEO.getSerialNumber());
@@ -642,16 +649,26 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
lawsDocumentSplit.setApplications((String) objectMap2.get("modelsType")); lawsDocumentSplit.setApplications((String) objectMap2.get("modelsType"));
lawsDocumentSplit.setDynamicType((String) objectMap2.get("powerType")); lawsDocumentSplit.setDynamicType((String) objectMap2.get("powerType"));
lawsDocumentSplit.setLawsRequireType(getItemValues(lawsDocumentSplit.getLawsRequireType(), if (StringUtils.isNotBlank(lawsDocumentSplit.getLawsRequireType())){
"1702212236079886338", sysDictItemList)); // 法规要求类型 lawsDocumentSplit.setLawsRequireType(getItemValues(lawsDocumentSplit.getLawsRequireType().replace(",", ";"),
lawsDocumentSplit.setFunctionClassification(getItemValues(lawsDocumentSplit.getFunctionClassification(), "1702212236079886338", sysDictItemList)); // 法规要求类型
"1702212237296234497", sysDictItemList)); // 功能分类 }
lawsDocumentSplit.setFunctionProfessional(getItemValues(lawsDocumentSplit.getFunctionProfessional(), if (StringUtils.isNotBlank(lawsDocumentSplit.getFunctionClassification())){
"1702202280677044226", sysDictItemList)); // 功能专业 lawsDocumentSplit.setFunctionClassification(getItemValues(lawsDocumentSplit.getFunctionClassification().replace(",", ";"),
lawsDocumentSplit.setApplications(getItemValues(lawsDocumentSplit.getApplications(), "1702212237296234497", sysDictItemList)); // 功能分类
"1702518672924110850", sysDictItemList)); // 适用车型 }
lawsDocumentSplit.setDynamicType(getItemValues(lawsDocumentSplit.getDynamicType(), if (StringUtils.isNotBlank(lawsDocumentSplit.getFunctionProfessional())){
"1702518671166697474", sysDictItemList)); // 动力类型 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); lawsDocumentSplitMapper.insert(lawsDocumentSplit);
}); });
laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
+20 -10
View File
@@ -404,16 +404,26 @@ public class SynchronizationAsmsService {
lawsDocumentSplit.setId(UUIDUtils.randomUUID20()); lawsDocumentSplit.setId(UUIDUtils.randomUUID20());
lawsDocumentSplit.setLawsRequireType(getItemValues(lawsDocumentSplit.getLawsRequireType(), if (StringUtils.isNotBlank(lawsDocumentSplit.getLawsRequireType())){
"1702212236079886338", sysDictItemList)); // 法规要求类型 lawsDocumentSplit.setLawsRequireType(getItemValues(lawsDocumentSplit.getLawsRequireType().replace(",", ";"),
lawsDocumentSplit.setFunctionClassification(getItemValues(lawsDocumentSplit.getFunctionClassification(), "1702212236079886338", sysDictItemList)); // 法规要求类型
"1702212237296234497", sysDictItemList)); // 功能分类 }
lawsDocumentSplit.setFunctionProfessional(getItemValues(lawsDocumentSplit.getFunctionProfessional(), if (StringUtils.isNotBlank(lawsDocumentSplit.getFunctionClassification())){
"1702202280677044226", sysDictItemList)); // 功能专业 lawsDocumentSplit.setFunctionClassification(getItemValues(lawsDocumentSplit.getFunctionClassification().replace(",", ";"),
lawsDocumentSplit.setApplications(getItemValues(lawsDocumentSplit.getApplications(), "1702212237296234497", sysDictItemList)); // 功能分类
"1702518672924110850", sysDictItemList)); // 适用车型 }
lawsDocumentSplit.setDynamicType(getItemValues(lawsDocumentSplit.getDynamicType(), if (StringUtils.isNotBlank(lawsDocumentSplit.getFunctionProfessional())){
"1702518671166697474", sysDictItemList)); // 动力类型 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); insertDocumentList.add(lawsDocumentSplit);
lawsDocumentSplitMapper.insert(lawsDocumentSplit); lawsDocumentSplitMapper.insert(lawsDocumentSplit);