Skip to content

Y
yd-csf
Commit 5e5263f3 by zhangxingmin
Options

依赖

parent d83cb213
Showing with 137 additions and 162 deletions
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentFileServiceImpl.java
......@@ -2,10 +2,7 @@ package com.yd.csf.api.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.auth.core.dto.AuthUserDto;
import com.yd.auth.core.utils.SecurityUtil;
import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.ResultCode;
import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result;
import com.yd.common.utils.RandomStringGenerator;
......@@ -15,22 +12,19 @@ import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileAddRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFileEditRequest;
import com.yd.csf.feign.request.appointmentfile.ApiAppointmentFilePageRequest;
import com.yd.csf.feign.response.appointmentfile.ApiAppointmentFilePageResponse;
//import com.yd.csf.service.dto.ItineraryDto;
import com.yd.csf.service.dto.ItineraryDto;
import com.yd.csf.service.model.AppointmentFile;
import com.yd.csf.service.model.Policyholder;
import com.yd.csf.service.service.IAppointmentFileService;
import com.yd.csf.service.service.IAppointmentService;
//import com.yd.oss.service.enums.TemplateTypeEnum;
//import com.yd.oss.service.service.PdfService;
import com.yd.user.feign.response.sysuser.ApiSysUserPageResponse;
import com.yd.oss.feign.client.ApiPdfFeignClient;
import com.yd.oss.feign.enums.TemplateTypeEnum;
import com.yd.oss.feign.request.ApiGeneratePdfRequest;
import com.yd.oss.feign.response.ApiGeneratePdfResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
......@@ -49,8 +43,8 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
@Autowired
private IAppointmentService iAppointmentService;
// @Autowired
// private PdfService pdfService;
@Autowired
private ApiPdfFeignClient apiPdfFeignClient;
/**
* 预约附件信息分页查询
......@@ -141,33 +135,14 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
*/
@Override
public Result<String> itineraryPdf(String appointmentBizId) {
String url = "";
//获取行程单的数据
// ItineraryDto itineraryDto = iAppointmentService.getItineraryDto(appointmentBizId);
// ItineraryDto itineraryDto = new ItineraryDto();
// itineraryDto.setArrivalTime("2025-09-10 15:30:20");
// itineraryDto.setBusinessRepresentMobile1("1366666666");
// itineraryDto.setBusinessRepresentMobile1Code("86");
// itineraryDto.setBusinessRepresentName1("王红");
// itineraryDto.setCurrency("CY");
// itineraryDto.setEachIssuePremium("2999.99");
// itineraryDto.setInsurantName("陈发");
// itineraryDto.setMeetingPoint("香港大厦");
// itineraryDto.setName("王飞");
// itineraryDto.setPaymentTerm("10");
// itineraryDto.setProductName("全保产品");
// itineraryDto.setSigningAddress("香港保险公司");
// itineraryDto.setTotal("29990.99");
// itineraryDto.setNp("王");
// itineraryDto.setPolicyFee("999.89");
// try {
//// url = pdfService.generatePDF(itineraryDto,appointmentBizId, TemplateTypeEnum.XCD.getItemValue());
// return Result.success(url);
// } catch (IOException e) {
// e.printStackTrace();
// throw new BusinessException("生成行程单PDF异常");
// }
return null;
ItineraryDto itineraryDto = iAppointmentService.getItineraryDto(appointmentBizId);
ApiGeneratePdfRequest request = new ApiGeneratePdfRequest();
request.setDataObject(itineraryDto);
request.setObjectId(appointmentBizId);
request.setTemplateType(TemplateTypeEnum.XCD.getItemValue());
Result<ApiGeneratePdfResponse> result = apiPdfFeignClient.generatePDF(request);
return Result.success(!Objects.isNull(result.getData()) ? result.getData().getUrl() : "");
}
/**
......
yd-csf-service/pom.xml
......@@ -73,12 +73,12 @@
<groupId>com.yd</groupId>
<artifactId>yd-csf-feign</artifactId>
</dependency>
<!-- OSS实现模块 -->
<!-- <dependency>-->
<!-- <groupId>com.yd</groupId>-->
<!-- <artifactId>yd-oss-service</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<!-- yd-oss-feign模块 -->
<dependency>
<groupId>com.yd</groupId>
<artifactId>yd-oss-feign</artifactId>
<version>${project.version}</version>
</dependency>
<!-- 认证模块 -->
<dependency>
......
yd-csf-service/src/main/java/com/yd/csf/service/dao/AppointmentMapper.java
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.appointment.ApiAppointmentPageRequest;
import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
//import com.yd.csf.service.dto.ItineraryDto;
import com.yd.csf.service.dto.ItineraryDto;
import com.yd.csf.service.model.Appointment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
......@@ -23,5 +23,5 @@ public interface AppointmentMapper extends BaseMapper<Appointment> {
@Param("request") ApiAppointmentPageRequest request);
//获取行程单的数据
// ItineraryDto getItineraryDto(@Param("appointmentBizId") String appointmentBizId);
ItineraryDto getItineraryDto(@Param("appointmentBizId") String appointmentBizId);
}
yd-csf-service/src/main/java/com/yd/csf/service/dto/ItineraryDto.java
//package com.yd.csf.service.dto;
//
//import com.yd.oss.service.annotation.PdfField;
//import lombok.Data;
//
///**
// * 预约行程单PDF字段映射实体类
// */
//@Data
//public class ItineraryDto {
//
// /**
// * 集合时间（到港时间）
// */
// @PdfField("arrivalTime")
// private String arrivalTime;
//
// /**
// * 集合地点（字典）（会面地点）
// */
// @PdfField("meetingPoint")
// private String meetingPoint;
//
// /**
// * 意向地点（签单地址）
// */
// @PdfField("signingAddress")
// private String signingAddress;
//
// /**
// * 业务代表1姓名
// */
// @PdfField("businessRepresentName1")
// private String businessRepresentName1;
//
// /**
// * 业务代表1电话号码区号
// */
// @PdfField("businessRepresentMobile1Code")
// private String businessRepresentMobile1Code;
//
// /**
// * 业务代表1电话号码
// */
// @PdfField("businessRepresentMobile1")
// private String businessRepresentMobile1;
//
// /**
// * 咨询人（客户表-客户姓名）
// */
// @PdfField("name")
// private String name;
//
// /**
// * 受保人（受保人姓名）
// */
// @PdfField("insurantName")
// private String insurantName;
//
// /**
// * 意向缴费年期（产品计划-供款年期（字典））
// */
// @PdfField("paymentTerm")
// private String paymentTerm;
//
// /**
// * 意向年缴保费（产品计划-每期保费）
// */
// @PdfField("eachIssuePremium")
// private String eachIssuePremium;
//
// /**
// * 保单证费（产品计划-保单证费）
// */
// @PdfField("policyFee")
// private String policyFee;
//
// /**
// * 币种（产品计划-货币（字典））
// */
// @PdfField("currency")
// private String currency;
//
// /**
// * 意向咨询产品（产品计划-保险产品名称（中台保险产品名称，冗余））
// */
// @PdfField("productName")
// private String productName;
//
// /**
// * 合计金额（供款年期*每期保费）
// */
// @PdfField("total")
// private String total;
//
// /**
// * 客户姓名前缀
// */
// @PdfField("np")
// private String np;
//}
package com.yd.csf.service.dto;
import com.yd.oss.feign.annotation.PdfField;
import lombok.Data;
/**
* 预约行程单PDF字段映射实体类
*/
@Data
public class ItineraryDto {
/**
* 集合时间（到港时间）
*/
@PdfField("arrivalTime")
private String arrivalTime;
/**
* 集合地点（字典）（会面地点）
*/
@PdfField("meetingPoint")
private String meetingPoint;
/**
* 意向地点（签单地址）
*/
@PdfField("signingAddress")
private String signingAddress;
/**
* 业务代表1姓名
*/
@PdfField("businessRepresentName1")
private String businessRepresentName1;
/**
* 业务代表1电话号码区号
*/
@PdfField("businessRepresentMobile1Code")
private String businessRepresentMobile1Code;
/**
* 业务代表1电话号码
*/
@PdfField("businessRepresentMobile1")
private String businessRepresentMobile1;
/**
* 咨询人（客户表-客户姓名）
*/
@PdfField("name")
private String name;
/**
* 受保人（受保人姓名）
*/
@PdfField("insurantName")
private String insurantName;
/**
* 意向缴费年期（产品计划-供款年期（字典））
*/
@PdfField("paymentTerm")
private String paymentTerm;
/**
* 意向年缴保费（产品计划-每期保费）
*/
@PdfField("eachIssuePremium")
private String eachIssuePremium;
/**
* 保单证费（产品计划-保单证费）
*/
@PdfField("policyFee")
private String policyFee;
/**
* 币种（产品计划-货币（字典））
*/
@PdfField("currency")
private String currency;
/**
* 意向咨询产品（产品计划-保险产品名称（中台保险产品名称，冗余））
*/
@PdfField("productName")
private String productName;
/**
* 合计金额（供款年期*每期保费）
*/
@PdfField("total")
private String total;
/**
* 客户姓名前缀
*/
@PdfField("np")
private String np;
}
yd-csf-service/src/main/java/com/yd/csf/service/service/IAppointmentService.java
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.appointment.ApiAppointmentPageRequest;
import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
//import com.yd.csf.service.dto.ItineraryDto;
import com.yd.csf.service.dto.ItineraryDto;
import com.yd.csf.service.model.Appointment;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -23,5 +23,5 @@ public interface IAppointmentService extends IService<Appointment> {
Appointment queryOne(String appointmentBizId);
// ItineraryDto getItineraryDto(String appointmentBizId);
ItineraryDto getItineraryDto(String appointmentBizId);
}
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/AppointmentServiceImpl.java
......@@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.appointment.ApiAppointmentPageRequest;
import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
//import com.yd.csf.service.dto.ItineraryDto;
import com.yd.csf.service.dto.ItineraryDto;
import com.yd.csf.service.model.Appointment;
import com.yd.csf.service.dao.AppointmentMapper;
import com.yd.csf.service.service.IAppointmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.ibatis.annotations.Param;
//import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
/**
......@@ -45,13 +45,13 @@ public class AppointmentServiceImpl extends ServiceImpl<AppointmentMapper, Appoi
return this.getOne(new LambdaQueryWrapper<Appointment>().eq(Appointment::getAppointmentBizId,appointmentBizId));
}
// /**
// * 获取行程单的数据
// * @param appointmentBizId
// * @return
// */
// public ItineraryDto getItineraryDto(String appointmentBizId){
// return baseMapper.getItineraryDto(appointmentBizId);
// }
/**
* 获取行程单的数据
* @param appointmentBizId
* @return
*/
public ItineraryDto getItineraryDto(String appointmentBizId){
return baseMapper.getItineraryDto(appointmentBizId);
}
}
yd-csf-service/src/main/resources/mappers/AppointmentMapper.xml
......@@ -52,7 +52,7 @@
and a.is_deleted = 0
</select>
<!-- <select id="getItineraryDto" resultType="com.yd.csf.service.dto.ItineraryDto">
<select id="getItineraryDto" resultType="com.yd.csf.service.dto.ItineraryDto">
select
a.arrival_time,a.meeting_point,
a.signing_address,a.business_represent_name1,
......@@ -69,6 +69,6 @@
and a.is_deleted = 0
</where>
limit 1
</select>-->
</select>
</mapper>
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