Commit a360bd18 by jianan

前端对接问题修复29

parent 290c4d3b
...@@ -41,14 +41,14 @@ import java.util.*; ...@@ -41,14 +41,14 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* @author Zhang Jianan * @author Zhang Jianan
* @description 针对表【policy(保单表)】的数据库操作Service实现 * @description 针对表【policy(保单表)】的数据库操作Service实现
* @createDate 2025-09-18 15:07:25 * @createDate 2025-09-18 15:07:25
*/ */
@Service @Service
@Slf4j @Slf4j
public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy> public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
implements PolicyService{ implements PolicyService {
@Resource @Resource
private PolicyAdditionalService policyAdditionalService; private PolicyAdditionalService policyAdditionalService;
...@@ -134,7 +134,7 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy> ...@@ -134,7 +134,7 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
if (CollUtil.isNotEmpty(apiProductPlanAdditionalInfoDtoList)) { if (CollUtil.isNotEmpty(apiProductPlanAdditionalInfoDtoList)) {
// 转换为实体类 // 转换为实体类
List<PolicyAdditional> policyAdditionalList = apiProductPlanAdditionalInfoDtoList.stream().map(additionalDto -> { List<PolicyAdditional> policyAdditionalList = apiProductPlanAdditionalInfoDtoList.stream().map(additionalDto -> {
PolicyAdditional policyAdditional = new PolicyAdditional(); PolicyAdditional policyAdditional = new PolicyAdditional();
BeanUtils.copyProperties(additionalDto, policyAdditional); BeanUtils.copyProperties(additionalDto, policyAdditional);
policyAdditional.setPolicyBizId(policyBizId); policyAdditional.setPolicyBizId(policyBizId);
...@@ -154,25 +154,27 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy> ...@@ -154,25 +154,27 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
/** /**
* 查询列表 * 查询列表
*
* @param dto * @param dto
* @return * @return
*/ */
@Override @Override
public List<Policy> queryList(QueryPolicyDto dto) { public List<Policy> queryList(QueryPolicyDto dto) {
List<Policy> list = baseMapper.selectList(new LambdaQueryWrapper<Policy>() List<Policy> list = baseMapper.selectList(new LambdaQueryWrapper<Policy>()
.in(!CollectionUtils.isEmpty(dto.getPolicyNoList()),Policy::getPolicyNo,dto.getPolicyNoList()) .in(!CollectionUtils.isEmpty(dto.getPolicyNoList()), Policy::getPolicyNo, dto.getPolicyNoList())
); );
return list; return list;
} }
/** /**
* 根据保单号查询单个对象 * 根据保单号查询单个对象
*
* @param policyNo * @param policyNo
* @return * @return
*/ */
@Override @Override
public Policy queryOne(String policyNo) { public Policy queryOne(String policyNo) {
return this.getOne(new LambdaQueryWrapper<Policy>().eq(Policy::getPolicyNo,policyNo).last(" limit 1 ")); return this.getOne(new LambdaQueryWrapper<Policy>().eq(Policy::getPolicyNo, policyNo).last(" limit 1 "));
} }
@Override @Override
...@@ -195,13 +197,12 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy> ...@@ -195,13 +197,12 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
return CollUtil.newArrayList(); return CollUtil.newArrayList();
} }
try { try {
log.info(JSONUtil.parseObj(result).toString()); log.info("Feign返回数据: {}", JSONUtil.parseObj(result).toString());
// 直接使用Map来处理数据,避免复杂的类型转换 // 直接使用Map来处理数据,避免复杂的类型转换
Object data = result.getData(); Object data = result.getData();
List<Map<String, Object>> policyProductInfoList = new ArrayList<>(); List<Map<String, Object>> policyProductInfoList = new ArrayList<>();
// 将数据转换为JSONObject进行解析 // 将数据转换为JSONObject进行解析
JSONObject jsonObject = JSONUtil.parseObj(data); JSONObject jsonObject = JSONUtil.parseObj(data);
...@@ -214,6 +215,9 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy> ...@@ -214,6 +215,9 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
Map<String, Object> infoMap = new HashMap<>(); Map<String, Object> infoMap = new HashMap<>();
infoMap.put("productLaunchBizId", record.getStr("productLaunchBizId")); infoMap.put("productLaunchBizId", record.getStr("productLaunchBizId"));
infoMap.put("productName", record.getStr("productName")); infoMap.put("productName", record.getStr("productName"));
infoMap.put("title", record.getStr("title"));
infoMap.put("shortTitle", record.getStr("shortTitle"));
infoMap.put("status", record.getStr("status"));
// 解析自定义属性 // 解析自定义属性
JSONArray attributeSettingArray = record.getJSONArray("apiAttributeSettingDtoList"); JSONArray attributeSettingArray = record.getJSONArray("apiAttributeSettingDtoList");
...@@ -224,12 +228,13 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy> ...@@ -224,12 +228,13 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
policyProductInfoList.add(infoMap); policyProductInfoList.add(infoMap);
} }
} }
log.info("解析后的保单产品信息: {}", JSONUtil.toJsonStr(policyProductInfoList));
return policyProductInfoList;
} catch (Exception e) { } catch (Exception e) {
log.error("解析Feign返回数据失败: {}", e.getMessage(), e); log.error("解析Feign返回数据失败: {}", e.getMessage(), e);
return CollUtil.newArrayList(); return CollUtil.newArrayList();
} }
return null;
} }
/** /**
...@@ -242,33 +247,32 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy> ...@@ -242,33 +247,32 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
for (int i = 0; i < attributeSettingArray.size(); i++) { for (int i = 0; i < attributeSettingArray.size(); i++) {
JSONObject attribute = attributeSettingArray.getJSONObject(i); JSONObject attribute = attributeSettingArray.getJSONObject(i);
// 根据实际字段名设置属性 String name = attribute.getStr("name");
// infoMap.put("insuranceCompanyBizId", attribute.getStr("fieldName")); String value = attribute.getStr("value");
// infoMap.put("insuranceCompany", attribute.getStr("fieldName"));
// infoMap.put("reconciliationCompanyBizId", attribute.getStr("fieldName")); // 根据属性名称设置对应的字段
// infoMap.put("reconciliationCompany", attribute.getStr("fieldName")); switch (name) {
} case "保险公司":
} infoMap.put("insuranceCompany", value);
infoMap.put("insuranceCompanyBizId", attribute.getStr("fieldValueBizId"));
/** break;
* 从附加险列表中获取保险公司业务ID case "对账公司":
* infoMap.put("reconciliationCompany", value);
* @param apiAttributeSettingDtoList infoMap.put("reconciliationCompanyBizId", attribute.getStr("fieldValueBizId"));
* @param infoMap break;
*/ case "产品计划类型":
private void getInfo(List<ApiAttributeSettingDto> apiAttributeSettingDtoList, Map<String, Object> infoMap) { infoMap.put("productPlanType", value);
if (CollUtil.isEmpty(apiAttributeSettingDtoList)) { break;
return; case "是否区分吸烟":
} infoMap.put("isSmokingDistinguish", value);
// insuranceCompanyBizId break;
// insuranceCompany default:
// reconciliationCompanyBizId // 其他自定义属性
// reconciliationCompany infoMap.put(name, value);
for (ApiAttributeSettingDto dto : apiAttributeSettingDtoList) { break;
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment