push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentFileServiceImpl.java

@@ -10,10 +10,7 @@ import com.yd.common.enums.CommonEnum;
 import com.yd.common.enums.DictTypeEnum;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
-import com.yd.common.utils.BeanMapUtils;
-import com.yd.common.utils.DateUtil;
-import com.yd.common.utils.RandomStringGenerator;
-import com.yd.common.utils.RedisUtil;
+import com.yd.common.utils.*;
 import com.yd.csf.api.service.ApiAppointmentFileService;
 import com.yd.csf.api.service.ApiAppointmentService;
 import com.yd.csf.feign.dto.appointment.*;
@@ -39,6 +36,9 @@ import com.yd.oss.feign.request.ApiOssExportAppointmentExcelRequest;
 import com.yd.oss.feign.response.ApiGeneratePdfResponse;
 import com.yd.oss.feign.response.ApiOssExcelParseResponse;
 import com.yd.oss.feign.response.ApiOssExportAppointmentExcelResponse;
+import com.yd.product.feign.client.productlaunch.ApiProductLaunchFeignClient;
+import com.yd.product.feign.request.productlaunch.ApiProductLaunchPageRequest;
+import com.yd.product.feign.response.productlaunch.ApiProductLaunchPageResponse;
 import com.yd.user.feign.response.sysdict.GetDictItemListByDictTypeResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -91,6 +91,9 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
     private ApiExcelFeignClient apiExcelFeignClient;
 
     @Autowired
+    private ApiProductLaunchFeignClient apiProductLaunchFeignClient;
+
+    @Autowired
     private RedisUtil redisUtil;
 
     /**
@@ -422,6 +425,38 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
         }
     }
 
+    /**
+     * 远程调用feign-根据Excel解析的数据-转换产品计划名称和ID
+     * @param appointmentDto
+     * @return
+     */
+//    public List<ApiConvertExcelPlanNameDto> convertExcelPlanName(ApiExcelImportAppointmentDto appointmentDto) {
+//        List<String> reqNameList = new ArrayList<>();
+//        if (StringUtils.isNotBlank(appointmentDto.getPlanProductName())){
+//            //主计划产品名称
+//            //繁转简
+//            reqNameList.add(ChineseTextConverter.traditionalToSimplified(appointmentDto.getPlanProductName()));
+//            //简转繁
+//            reqNameList.add(ChineseTextConverter.simplifiedToTraditional(appointmentDto.getPlanProductName()));
+//        }
+//        if (CollectionUtils.isEmpty(appointmentDto.getAdditionalDtoList())){
+//            for (ApiExcelImportAdditionalDto additionalDto : appointmentDto.getAdditionalDtoList()) {
+//                //附加计划产品名称
+//                //繁转简
+//                reqNameList.add(ChineseTextConverter.traditionalToSimplified(additionalDto.getAddProductName()));
+//                //简转繁
+//                reqNameList.add(ChineseTextConverter.simplifiedToTraditional(additionalDto.getAddProductName()));
+//            }
+//        }
+//        ApiProductLaunchPageRequest request = new ApiProductLaunchPageRequest();
+//        request.setNameList(reqNameList);
+//        Result<IPage<ApiProductLaunchPageResponse>> result = apiProductLaunchFeignClient.page(request);
+//        if (!Objects.isNull(result.getData()) && !CollectionUtils.isEmpty(result.getData().getRecords())) {
+//            List<ApiProductLaunchPageResponse> responses = result.getData().getRecords();
+//
+//        }
+//    }
+
 
     /**
      * 校验预约附件信息是否存在

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiInsurantInfoDto.java

@@ -125,19 +125,19 @@ public class ApiInsurantInfoDto {
     /**
      * 婚姻情况（字典）
      */
-    @NotBlank(message = "受保人-婚姻情况不能为空", groups = GroupValid.NotSelf.class)
+//    @NotBlank(message = "受保人-婚姻情况不能为空", groups = GroupValid.NotSelf.class)
     private String maritalStatus;
 
     /**
      * 教育程度（字典）
      */
-    @NotBlank(message = "受保人-教育程度不能为空", groups = GroupValid.NotSelf.class)
+//    @NotBlank(message = "受保人-教育程度不能为空", groups = GroupValid.NotSelf.class)
     private String educationLevel;
 
     /**
      * 是否退休（字典）
      */
-    @NotNull(message = "受保人-是否退休不能为空", groups = GroupValid.NotSelf.class)
+//    @NotNull(message = "受保人-是否退休不能为空", groups = GroupValid.NotSelf.class)
     private Integer isRetirement;
 
     /**
@@ -211,7 +211,7 @@ public class ApiInsurantInfoDto {
     /**
      * 证件地址
      */
-    @NotBlank(message = "受保人-证件地址不能为空", groups = GroupValid.NotSelf.class)
+//    @NotBlank(message = "受保人-证件地址不能为空", groups = GroupValid.NotSelf.class)
     private String certificateAddress;
 
     /**

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiPolicyholderInfoDto.java

@@ -118,19 +118,19 @@ public class ApiPolicyholderInfoDto {
     /**
      * 婚姻情况（字典）
      */
-    @NotBlank(message = "投保人-婚姻情况不能为空")
+//    @NotBlank(message = "投保人-婚姻情况不能为空")
     private String maritalStatus;
 
     /**
      * 教育程度（字典）
      */
-    @NotBlank(message = "投保人-教育程度不能为空")
+//    @NotBlank(message = "投保人-教育程度不能为空")
     private String educationLevel;
 
     /**
      * 是否退休（字典）
      */
-    @NotNull(message = "投保人-是否退休不能为空")
+//    @NotNull(message = "投保人-是否退休不能为空")
     private Integer isRetirement;
 
     /**
@@ -204,7 +204,7 @@ public class ApiPolicyholderInfoDto {
     /**
      * 证件地址
      */
-    @NotBlank(message = "投保人-证件地址不能为空")
+//    @NotBlank(message = "投保人-证件地址不能为空")
     private String certificateAddress;
 
     /**

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/excel/ApiConvertExcelPlanNameDto.java

+package com.yd.csf.feign.dto.excel;
+
+import lombok.Data;
+import java.util.List;
+
+@Data
+public class ApiConvertExcelPlanNameDto {
+
+    /**
+     * 主产品计划名称
+     */
+    private String mainPlanName;
+
+    /**
+     * 主产品计划名称集合（主产品计划名称，繁转简，简转繁两个名称）
+     */
+    private List<String> mainPlanNameList;
+
+    /**
+     * 主产品计划ID
+     */
+    private String mainPlanId;
+
+    /**
+     * 附加产品计划1名称
+     */
+    private String addPlanName1;
+
+    /**
+     * 附加产品计划1名称集合（附加产品计划1名称，繁转简，简转繁两个名称）
+     */
+    private List<String> addPlanName1List;
+
+    /**
+     * 附加产品计划1 ID
+     */
+    private String addPlanId1;
+
+    /**
+     * 附加产品计划2名称
+     */
+    private String addPlanName2;
+
+    /**
+     * 附加产品计划2名称集合（附加产品计划2名称，繁转简，简转繁两个名称）
+     */
+    private List<String> addPlanName2List;
+
+    /**
+     * 附加产品计划2 ID
+     */
+    private String addPlanId2;
+}