diff --git a/coolstore-partner-common/pom.xml b/coolstore-partner-common/pom.xml index 2242999e3..0961b14dd 100644 --- a/coolstore-partner-common/pom.xml +++ b/coolstore-partner-common/pom.xml @@ -86,6 +86,18 @@ org.springframework.boot spring-boot-starter-data-redis + + + com.github.tencentyun + tls-sig-api-v2 + 2.0 + + + + com.github.librepdf + openpdf + 1.3.30 + \ No newline at end of file diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 923b814b5..557928901 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -44,6 +44,8 @@ public enum ErrorCodeEnum { USER_GROUP_NAME_EXIST(1021076, "用户分组名称已存在", null), USER_GROUP_NOT_EXIST(1021077, "用户分组不存在", null), GET_INFO_ERROR(1021078, "获取信息异常", null), + + INTERVIEW_ENTER_FAIL(1021101, "进入面试间失败", null), ; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java new file mode 100644 index 000000000..b12b8b33b --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java @@ -0,0 +1,117 @@ +package com.cool.store.utils; + +import com.lowagie.text.Document; +import com.lowagie.text.Font; +import com.lowagie.text.Image; +import com.lowagie.text.Paragraph; +import com.lowagie.text.pdf.*; + +import java.awt.*; +import java.io.IOException; +import java.io.OutputStream; + +/** + * 使用 OpenPDF 封装的 pdf 工具类 + */ +public class PDFUtils { + + private static final int[] A4Size = {595, 842}; + + /** + * 设置 pdf 背景图片（A4） + * 每页都需要单独设置 + */ + public static void setBackgroundImgA4(Document document, Image image) { + //图片顶格 + image.setAbsolutePosition(0, 0); + //填满 A4 大小的页面 + image.scaleAbsolute(A4Size[0], A4Size[1]); + document.add(image); + } + + /** + * 设置 pdf 背景图片 + * 每页都需要单独设置 + */ + public static void setBackgroundImg(Document document, Image image, int width, int height) { + //图片顶格 + image.setAbsolutePosition(0, 0); + image.scaleAbsolute(width, height); + document.add(image); + } + + /** + * 将文本放在 pdf 的绝对位置上来抠模板（不指定字体，默认为 OpenPDF 自带的 STSong-Light Normal） + * @param reader PdfReader 流 + * @param outputStream 输出流 + * @param x 左边距 + * @param y 下边距 + * @param content 要插入的文本 + * @param fontSize 字体大小 + * @param color 文本颜色 + */ + public static void putParagraphAbsolutely(PdfReader reader, OutputStream outputStream, float x, float y, String content, float fontSize, Color color) { + try { + BaseFont baseFont = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED); + addContent(reader, outputStream, content, x, y, baseFont, fontSize, 0, color); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * 指定字体的文本绝对位置插入方法 + * @param reader PdfReader 流 + * @param outputStream 输出流 + * @param x 左边距 + * @param y 下边距 + * @param content 要插入的文本 + * @param baseFont 字体设置（如果不使用 OpenPDF 自带的字体，就需要将字体文件放在项目路径下） + * 自定义字体方式 + * ttf 字体 + * 1. BaseFont baseFont = BaseFont.createFont("arial.ttf", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); + * ttc 字体（包含了两种字体，所以需要选择 0 或 1） + * 2. BaseFont baseFont = BaseFont.createFont("simsun.ttc,0", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); + * @param fontSize 字体大小 + * @param fontStyle 字体风格（） + * NORMAL = 0; BOLD = 1; ITALIC = 2; UNDERLINE = 4; STRIKETHRU = 8; BOLDITALIC = BOLD | ITALIC; + * @param color 字体颜色 + */ + public static void putParagraphAbsolutely(PdfReader reader, OutputStream outputStream, float x, float y, String content, BaseFont baseFont, float fontSize, int fontStyle, Color color) { + addContent(reader, outputStream, content, x, y, baseFont, fontSize, fontStyle, color); + } + + /** + * 插入文本的 raw 方法 + * @param reader PDF 读取流 + * @param outputStream 输出流 + * @param content 插入文本 + * @param x 左边距 + * @param y 下边距 + * @param baseFont 字体和编码设置 + * @param fontSize 字体大小 + * @param fontStyle 字体风格 + * @param color 字体颜色 + */ + private static void addContent(PdfReader reader, OutputStream outputStream, String content, float x, float y, BaseFont baseFont, float fontSize, int fontStyle, Color color) { + try { + //生成 paragraph 并放在正确位置 + //抠模板 + PdfStamper stamper = new PdfStamper(reader, outputStream); + PdfContentByte over = stamper.getOverContent(1); + Font font = new Font(baseFont, fontSize, fontStyle, color); + Paragraph insertContent = new Paragraph(content, font); + + ColumnText columnText = new ColumnText(over); + // llx 和 urx 最小的值决定离左边的距离. lly 和 ury 最大的值决定离下边的距离 + columnText.setSimpleColumn(x, y, Float.MAX_VALUE, Float.MIN_VALUE); + columnText.addElement(insertContent); + columnText.go(); + stamper.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + + } + +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/PassLetterUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/PassLetterUtils.java new file mode 100644 index 000000000..af3da67ef --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/PassLetterUtils.java @@ -0,0 +1,68 @@ +package com.cool.store.utils; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.RandomUtil; +import com.lowagie.text.Document; +import com.lowagie.text.Image; +import com.lowagie.text.pdf.PdfReader; +import com.lowagie.text.pdf.PdfWriter; + +import java.awt.*; +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Paths; + +//生成资格面试通过函的工具 +public class PassLetterUtils { + + /** + * 生成通过函的方法 + * 返回通过函编码 + * @param partnerName 加盟商姓名 + * @param verifyCity 审批城市 + * @param passTime 审批通过时间 + */ + public static String genPassLetter(String partnerName, String passCode, String verifyCity, DateTime passTime) { + String randomNum = RandomUtil.randomNumbers(5); + if (ObjectUtil.isEmpty(passCode)) { + passCode = "HSAY" + DateUtil.format(passTime, "yyMMdd") + "-" + randomNum; + } + String passTimeStr = DateUtil.format(passTime, "yyyy年MM月dd日"); + Document document = new Document(); + try { + //1. 创建 pdf document +// ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + FileOutputStream outputStream = new FileOutputStream("passLetter.pdf"); + PdfWriter.getInstance(document, outputStream); + document.open(); + + //2. 添加背景图片 + Image img = Image.getInstance(PassLetterUtils.class.getResource("/static/passLetterBg.jpg").toString()); + PDFUtils.setBackgroundImgA4(document, img); + document.close(); + + //3. 填写通过函模板信息 + addContentToPdf(partnerName + " 先生/女士", 122, 640); + addContentToPdf(passCode, 122, 558); + addContentToPdf(verifyCity, 155, 494); + addContentToPdf("60天", 135, 450); + addContentToPdf(passTimeStr, 393, 152); + return passCode; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + private static void addContentToPdf(String content, float x, float y) { + try { + PdfReader pdfReader = new PdfReader(Files.newInputStream(Paths.get("passLetter.pdf"))); + OutputStream outputStream = Files.newOutputStream(Paths.get("passLetter.pdf")); + PDFUtils.putParagraphAbsolutely(pdfReader, outputStream, x, y, content, 20, new Color(255, 82,25)); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/TRTCUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/TRTCUtils.java new file mode 100644 index 000000000..f22afb627 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/TRTCUtils.java @@ -0,0 +1,29 @@ +package com.cool.store.utils; + +import com.tencentyun.TLSSigAPIv2; + +/** + * 腾讯实时音视频TRTC工具类 + */ +public class TRTCUtils { + + /** + * 默认过期时间 30 s + */ + private static final Long expired = 30L; + + /** + * 生成 userSig 用于进入会议 + * 详见 https://cloud.tencent.com/document/product/647/17275#.E8.B0.83.E8.AF.95.E8.B7.91.E9.80.9A.E9.98.B6.E6.AE.B5.E5.A6.82.E4.BD.95.E8.AE.A1.E7.AE.97-UserSig.EF.BC.9F + */ + public static String genUserSig(Long sdkAppId, String key, String userId) { + TLSSigAPIv2 tlsSigAPIv2 = new TLSSigAPIv2(sdkAppId, key); + return tlsSigAPIv2.genUserSig(userId, expired); + } + + public static String genUserSig(Long sdkAppId, String key, String userId, Long expiredTime) { + TLSSigAPIv2 tlsSigAPIv2 = new TLSSigAPIv2(sdkAppId, key); + return tlsSigAPIv2.genUserSig(userId, expiredTime); + } + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ContentDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ContentDAO.java index 4dd47cf76..999948580 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ContentDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ContentDAO.java @@ -6,6 +6,7 @@ import com.cool.store.dto.content.ContentQueryListDto; import com.cool.store.dto.content.ContentUpdateDto; import com.cool.store.entity.HyContentInfoDO; import com.cool.store.mapper.HyContentInfoMapper; +import com.cool.store.vo.HyContentInfoVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -36,7 +37,7 @@ public class ContentDAO { contentInfoMapper.updateByPrimaryKeySelective(hyContentInfoDO); } - public List queryContentList(ContentQueryListDto dto) { + public List queryContentList(ContentQueryListDto dto) { return contentInfoMapper.queryContentList(dto); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java index 97486acbc..f466fe5c9 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java @@ -2,6 +2,7 @@ package com.cool.store.mapper; import com.cool.store.dto.content.ContentQueryListDto; import com.cool.store.entity.HyContentInfoDO; +import com.cool.store.vo.HyContentInfoVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -36,7 +37,7 @@ public interface HyContentInfoMapper { * 分页查询动态列表 * 根据传入参数匹配 */ - List queryContentList(ContentQueryListDto dto); + List queryContentList(ContentQueryListDto dto); /** * 根据contentId查询动态详情 diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java index af6ade214..4e0de1a97 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java @@ -2,6 +2,7 @@ package com.cool.store.mapper; import com.cool.store.entity.HyPartnerInterviewDO; import com.cool.store.vo.PartnerInterviewInfoVO; +import com.cool.store.vo.PartnerPassLetterDetailVO; import org.apache.ibatis.annotations.Param; /** @@ -31,4 +32,40 @@ public interface HyPartnerInterviewMapper { */ PartnerInterviewInfoVO queryByPartnerId(@Param("partnerId") String partnerId); + /** + * 修改面试状态 + * 预约状态 0 待预约;1待面试;2已开始;3待审核;4审批中;5审批通过;6拒绝 + */ + int updateInterviewStatus(@Param("interviewId") String interviewId, @Param("status") Integer status); + + /** + * 修改面试实际开始时间 + * @param dateTime "yyyy-MM-dd HH:mm:ss" + */ + int updateActualStartTime(@Param("interviewId") String interviewId, @Param("dateTime") String dateTime); + + /** + * 修改加盟商或面试官进入面试时间 + * @param userType 1.面试官2.加盟商3.其他 + * @param dateTime "yyyy-MM-dd HH:mm:ss" + * @return + */ + int updateEnterTime(@Param("interviewId") String interviewId, @Param("userType") Integer userType, @Param("dateTime") String dateTime); + + /** + * 将加盟商是否参会修改为参会 + * 0未参加，1参加 + */ + int updateWhetherPartnerEnter(@Param("interviewId") String interviewId); + + /** + * 根据会议 id 查询面试官 id + */ + String getInterviewerByInterviewId(@Param("interviewId") String interviewId); + + /** + * 获取通知函详情 + */ + PartnerPassLetterDetailVO getPassLetterDetail(@Param("interviewId") String interviewId); + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml index a2b208381..0c8a7bf6f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml @@ -17,8 +17,14 @@ + + + + + + - id, content_title, subject, content_type, cover, status, deleted, create_time, update_time, + id, content_title, subject, content_type, cover, content, status, deleted, create_time, update_time, create_user_id, update_user_id @@ -42,9 +48,6 @@ status, - - deleted, - create_time, @@ -143,8 +146,8 @@ where id = #{contentId} - + select , update_user_id updateUserId from hy_content_info where deleted = 0 @@ -156,6 +159,24 @@ and content_type = #{contentType} + + and update_time >= #{startTime} + + + and update_time <= #{endTime} + + + + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index c8229ffec..0fa5d3610 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -34,6 +34,11 @@ + + + + + id, status, partner_line_id, interview_plan_id, partner_id, deadline, interviewer, recorder, process_info, record_time, summary, auth_code, pass_file_url, expiry_date, @@ -261,4 +266,68 @@ WHERE deleted = 0 AND user_id = #{interview} + + + + UPDATE hy_partner_interview + SET `status` = #{status} + WHERE id = #{interviewId} + + + + + UPDATE hy_partner_interview_plan + SET actual_start_time = IF(actual_start_time IS NULL, #{dateTime}, actual_start_time) + WHERE id = ( + SELECT interview_plan_id + FROM hy_partner_interview + WHERE id = #{interviewId} + ) + + + + + UPDATE hy_partner_interview + + + interviewer_enter_time = IF(interviewer_enter_time IS NULL, #{dateTime}, interviewer_enter_time), + + + partner_enter_time = IF(partner_enter_time IS NULL, #{dateTime}, partner_enter_time) + + + WHERE id = 1 + + + + + UPDATE hy_partner_interview_plan + SET is_partner_interview = 1 + WHERE id = ( + SELECT interview_plan_id + FROM hy_partner_interview + WHERE id = #{interviewId} + ) + + + + + + + + + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryListDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryListDto.java index 9ac3cd8ea..96e23930d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryListDto.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryListDto.java @@ -18,4 +18,10 @@ public class ContentQueryListDto extends PageBasicInfo { @ApiModelProperty("类型，默认选中全部时不传值") private String contentType; + @ApiModelProperty("筛选开始时间") + private String startTime; + + @ApiModelProperty("筛选结束时间") + private String endTime; + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/EnterInterviewDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/EnterInterviewDto.java new file mode 100644 index 000000000..30015417d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/EnterInterviewDto.java @@ -0,0 +1,18 @@ +package com.cool.store.dto.partner; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class EnterInterviewDto { + + @ApiModelProperty(value = "会议id", required = true) + private String interviewId; + + @ApiModelProperty(value = "用户id", required = true) + private String userId; + + @ApiModelProperty(value = "1.面试官2.加盟商3.其他", required = true) + private Integer userType; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyContentInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyContentInfoDO.java index eea4e76cc..39724a0e5 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyContentInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyContentInfoDO.java @@ -40,10 +40,10 @@ public class HyContentInfoDO implements Serializable { private Integer deleted; @ApiModelProperty("创建时间") - private Date createTime; + private String createTime; @ApiModelProperty("更新时间") - private Date updateTime; + private String updateTime; @ApiModelProperty("新建人ID") private String createUserId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/HyContentInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/HyContentInfoVO.java new file mode 100644 index 000000000..4d412c27d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/HyContentInfoVO.java @@ -0,0 +1,48 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class HyContentInfoVO { + + @ApiModelProperty("") + private Long id; + + @ApiModelProperty("内容标题") + private String contentTitle; + + @ApiModelProperty("栏目CODE") + private String subject; + + @ApiModelProperty("类型 image-图文 video-视频") + private String contentType; + + @ApiModelProperty("封面URL") + private String cover; + + @ApiModelProperty("状态 0-启用 1-禁用") + private Integer status; + + @ApiModelProperty("创建时间") + private String createTime; + + @ApiModelProperty("更新时间") + private String updateTime; + + @ApiModelProperty("新建人ID") + private String createUserId; + + @ApiModelProperty("更新人ID") + private String updateUserId; + + @ApiModelProperty("更新人姓名") + private String updateUserName; + + @ApiModelProperty("更新人电话") + private String updateUserPhone; + + @ApiModelProperty("图文内容或者视频文件URL") + private String content; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerEnterInterviewVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerEnterInterviewVO.java new file mode 100644 index 000000000..c9a294e2d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerEnterInterviewVO.java @@ -0,0 +1,15 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PartnerEnterInterviewVO { + + @ApiModelProperty("userSig 进入会议需要的用户签名") + private String userSign; + + @ApiModelProperty("面试官id") + private String interviewerId; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerPassLetterDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerPassLetterDetailVO.java new file mode 100644 index 000000000..cc83453f9 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerPassLetterDetailVO.java @@ -0,0 +1,27 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PartnerPassLetterDetailVO { + + @ApiModelProperty("加盟商姓名") + private String partnerName; + + @ApiModelProperty("编码") + private String passCode; + + @ApiModelProperty("审核城市") + private String verifyCity; + + @ApiModelProperty("函文件URL") + private String passFileUrl; + + @ApiModelProperty("生成日期：YYYY-MM-DD") + private String createTime; + + @ApiModelProperty("有效期截至") + private String expiryDate; + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java index 30959d3af..2b3ebb5f3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java @@ -4,6 +4,7 @@ import com.cool.store.dto.content.ContentAddDto; import com.cool.store.dto.content.ContentQueryListDto; import com.cool.store.dto.content.ContentUpdateDto; import com.cool.store.entity.HyContentInfoDO; +import com.cool.store.vo.HyContentInfoVO; import java.util.List; @@ -31,7 +32,7 @@ public interface ContentService { /** * 查询动态列表 */ - List queryContentList(ContentQueryListDto dto); + List queryContentList(ContentQueryListDto dto); /** * 查询动态详情 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerInterviewService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerInterviewService.java index 2642ea009..efc740737 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerInterviewService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerInterviewService.java @@ -1,6 +1,9 @@ package com.cool.store.service; +import com.cool.store.dto.partner.EnterInterviewDto; +import com.cool.store.vo.PartnerEnterInterviewVO; import com.cool.store.vo.PartnerInterviewInfoVO; +import com.cool.store.vo.PartnerPassLetterDetailVO; public interface PartnerInterviewService { @@ -11,4 +14,17 @@ public interface PartnerInterviewService { */ PartnerInterviewInfoVO queryByPartnerId(String partnerId); + /** + * 进入面试间的方法 + * 修改一些面试状态 + * 最后返回 userSign 用于进入腾讯云音视频房间 + * @return userSign 进入视频所需签名 + */ + PartnerEnterInterviewVO enterInterviewRoom(EnterInterviewDto dto); + + /** + * 获取通知函详情 + */ + PartnerPassLetterDetailVO passLetterDetail(String interviewId); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java index 6babfd2e8..9be46e56d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java @@ -8,6 +8,7 @@ import com.cool.store.dto.content.ContentUpdateDto; import com.cool.store.entity.HyContentInfoDO; import com.cool.store.mapper.HyContentInfoMapper; import com.cool.store.service.ContentService; +import com.cool.store.vo.HyContentInfoVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -60,7 +61,7 @@ public class ContentServiceImpl implements ContentService { * 查询动态列表 */ @Override - public List queryContentList(ContentQueryListDto dto) { + public List queryContentList(ContentQueryListDto dto) { return contentInfoMapper.queryContentList(dto); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java index 0da11cb76..3507e4f8b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java @@ -1,10 +1,26 @@ package com.cool.store.service.impl; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.RandomUtil; +import com.cool.store.dto.partner.EnterInterviewDto; +import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.exception.ServiceException; import com.cool.store.mapper.HyPartnerInterviewMapper; import com.cool.store.service.PartnerInterviewService; +import com.cool.store.utils.PDFUtils; +import com.cool.store.utils.PassLetterUtils; +import com.cool.store.utils.TRTCUtils; +import com.cool.store.vo.PartnerEnterInterviewVO; import com.cool.store.vo.PartnerInterviewInfoVO; +import com.cool.store.vo.PartnerPassLetterDetailVO; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; @Service public class PartnerInterviewServiceImpl implements PartnerInterviewService { @@ -12,8 +28,15 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService { @Autowired private HyPartnerInterviewMapper interviewMapper; + @Value("${trtc.sdkAppId}") + private Long sdkAppId; + + @Value("${trtc.secretKey}") + private String key; + /** * 加盟商查询面试信息 + * * @param partnerId * @return */ @@ -22,4 +45,70 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService { return interviewMapper.queryByPartnerId(partnerId); } + /** + * 进入面试间的方法 + * 修改一些面试状态 + * 最后返回 userSign 用于进入腾讯云音视频房间 + * + * @return userSign 进入视频所需签名 + */ + @Override + @Transactional + public PartnerEnterInterviewVO enterInterviewRoom(EnterInterviewDto dto) { + try { + //1. 将面试状态改为 --> 2已开始 + interviewMapper.updateInterviewStatus(dto.getInterviewId(), 2); + //3. 修改面试实际开始时间，以第一个人进来的时间为准，后续不再修改 + interviewMapper.updateActualStartTime(dto.getInterviewId(), DateUtil.now()); + //4. 修改加盟商或面试官进入面试时间 + interviewMapper.updateEnterTime(dto.getInterviewId(), dto.getUserType(), DateUtil.now()); + //5. 加盟商如果进入了，就修改面试计划表 is_partner_interview 字段 + interviewMapper.updateWhetherPartnerEnter(dto.getInterviewId()); + //6. 查询对应的面试官id + String interviewId = interviewMapper.getInterviewerByInterviewId(dto.getInterviewId()); + //生成 userSign + String userSig = TRTCUtils.genUserSig(sdkAppId, key, dto.getUserId()); + PartnerEnterInterviewVO vo = new PartnerEnterInterviewVO(); + vo.setUserSign(userSig); + vo.setInterviewerId(interviewId); + return vo; + } catch (Exception e) { + throw new ServiceException(ErrorCodeEnum.INTERVIEW_ENTER_FAIL); + } + } + + /** + * 获取通知函详情 + * TODO 暂时将生成通过函文件的功能放在这里方便测试和联调，审批通过的回调方法完成后应该放到该方法中 + */ + @Override + public PartnerPassLetterDetailVO passLetterDetail(String interviewId) { + PartnerPassLetterDetailVO vo = interviewMapper.getPassLetterDetail(interviewId); + //有效期为审批通过次日起第 60 天的 23:59:59，由此倒推 createTime + DateTime expiryDate = DateUtil.parseDate(vo.getExpiryDate()); + DateTime createTime = DateUtil.offsetDay(expiryDate, -61); + vo.setCreateTime(DateUtil.format(createTime, "yyyy-MM-dd")); + //解析意向开店区域为市级行政区 + String verifyCity = vo.getVerifyCity(); + if (verifyCity == null) { + String passCode = PassLetterUtils.genPassLetter(vo.getPartnerName(), verifyCity, vo.getPassCode(), createTime); + vo.setPassCode(passCode); + return vo; + } + String[] split = verifyCity.split("/"); + //根据长度来取市级行政区域 + if (split.length == 2) { + vo.setVerifyCity(split[1]); + } else if (split.length == 3) { + vo.setVerifyCity(split[1]); + } else if (split.length == 4) { + vo.setVerifyCity(split[2]); + } else { + System.out.println("wrong"); + } + String passCode = PassLetterUtils.genPassLetter(vo.getPartnerName(), verifyCity, vo.getPassCode(), createTime); + vo.setPassCode(passCode); + return vo; + } + } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java index 164f1f48c..a93f954aa 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java @@ -6,6 +6,7 @@ import com.cool.store.dto.content.ContentUpdateDto; import com.cool.store.entity.HyContentInfoDO; import com.cool.store.response.ResponseResult; import com.cool.store.service.ContentService; +import com.cool.store.vo.HyContentInfoVO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.ApiOperation; @@ -43,10 +44,10 @@ public class ContentController { @PostMapping("/queryContentList") @ApiOperation("查询动态列表") - public ResponseResult> queryContentList(@RequestBody ContentQueryListDto dto) { + public ResponseResult> queryContentList(@RequestBody ContentQueryListDto dto) { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - List list = contentService.queryContentList(dto); - PageInfo page = new PageInfo<>(list); + List list = contentService.queryContentList(dto); + PageInfo page = new PageInfo<>(list); return ResponseResult.success(page); } diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index a26b3471a..be5eb0f6f 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -48,3 +48,7 @@ oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 oss.endpoint=oss-cn-hangzhou.aliyuncs.com oss.bucket=cool-store-hsay corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-dev.properties b/coolstore-partner-webb/src/main/resources/application-dev.properties index 6413d6b5d..95a66781d 100644 --- a/coolstore-partner-webb/src/main/resources/application-dev.properties +++ b/coolstore-partner-webb/src/main/resources/application-dev.properties @@ -47,4 +47,8 @@ oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS oss.endpoint=oss-cn-shanghai.aliyuncs.com oss.bucket=vec-coolstore -corp.id = 171cddee76471740 \ No newline at end of file +corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-hd.properties b/coolstore-partner-webb/src/main/resources/application-hd.properties index 513c5de3e..4151b74e7 100644 --- a/coolstore-partner-webb/src/main/resources/application-hd.properties +++ b/coolstore-partner-webb/src/main/resources/application-hd.properties @@ -47,4 +47,8 @@ oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS oss.endpoint=oss-cn-shanghai.aliyuncs.com oss.bucket=vec-coolstore -corp.id = 171cddee76471740 \ No newline at end of file +corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-local.properties b/coolstore-partner-webb/src/main/resources/application-local.properties index bd35ff37c..4e09f245b 100644 --- a/coolstore-partner-webb/src/main/resources/application-local.properties +++ b/coolstore-partner-webb/src/main/resources/application-local.properties @@ -49,4 +49,8 @@ oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 oss.endpoint=oss-cn-hangzhou.aliyuncs.com oss.bucket=vec-coolstore -corp.id = 171cddee76471740 \ No newline at end of file +corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-online.properties b/coolstore-partner-webb/src/main/resources/application-online.properties index b5f0f7a18..0da916d40 100644 --- a/coolstore-partner-webb/src/main/resources/application-online.properties +++ b/coolstore-partner-webb/src/main/resources/application-online.properties @@ -47,4 +47,8 @@ oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS oss.endpoint=oss-cn-shanghai.aliyuncs.com oss.bucket=vec-coolstore -corp.id = 171cddee76471740 \ No newline at end of file +corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-pre.properties b/coolstore-partner-webb/src/main/resources/application-pre.properties index b5f0f7a18..0da916d40 100644 --- a/coolstore-partner-webb/src/main/resources/application-pre.properties +++ b/coolstore-partner-webb/src/main/resources/application-pre.properties @@ -47,4 +47,8 @@ oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS oss.endpoint=oss-cn-shanghai.aliyuncs.com oss.bucket=vec-coolstore -corp.id = 171cddee76471740 \ No newline at end of file +corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-test.properties b/coolstore-partner-webb/src/main/resources/application-test.properties index 3f15a128c..6439240e0 100644 --- a/coolstore-partner-webb/src/main/resources/application-test.properties +++ b/coolstore-partner-webb/src/main/resources/application-test.properties @@ -47,4 +47,8 @@ oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS oss.endpoint=oss-cn-shanghai.aliyuncs.com oss.bucket=vec-coolstore -corp.id = 171cddee76471740 \ No newline at end of file +corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java index 643af29ca..96c06b465 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/InterviewController.java @@ -1,15 +1,26 @@ package com.cool.store.controller; +import com.cool.store.dto.partner.EnterInterviewDto; import com.cool.store.response.ResponseResult; import com.cool.store.service.PartnerInterviewService; +import com.cool.store.utils.PDFUtils; +import com.cool.store.vo.PartnerEnterInterviewVO; import com.cool.store.vo.PartnerInterviewInfoVO; +import com.cool.store.vo.PartnerPassLetterDetailVO; +import com.lowagie.text.Document; +import com.lowagie.text.Image; +import com.lowagie.text.pdf.PdfWriter; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.tomcat.util.http.fileupload.IOUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Paths; @Api(tags = "加盟商资格面试") @RestController @@ -25,4 +36,16 @@ public class InterviewController { return ResponseResult.success(interviewService.queryByPartnerId(partnerId)); } + @PostMapping("/enter") + @ApiOperation("进入面试间") + public ResponseResult enterInterviewRoom(@RequestBody EnterInterviewDto dto) { + return ResponseResult.success(interviewService.enterInterviewRoom(dto)); + } + + @PostMapping("/passLetter/detail") + @ApiOperation("通过函详情") + public ResponseResult passLetterDetail(@RequestParam String interviewId) { + return ResponseResult.success(interviewService.passLetterDetail(interviewId)); + } + } diff --git a/coolstore-partner-webc/src/main/resources/application-ab.properties b/coolstore-partner-webc/src/main/resources/application-ab.properties index 88b2838c8..be5eb0f6f 100644 --- a/coolstore-partner-webc/src/main/resources/application-ab.properties +++ b/coolstore-partner-webc/src/main/resources/application-ab.properties @@ -47,4 +47,8 @@ oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 oss.endpoint=oss-cn-hangzhou.aliyuncs.com oss.bucket=cool-store-hsay -corp.id = 171cddee76471740 \ No newline at end of file +corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-dev.properties b/coolstore-partner-webc/src/main/resources/application-dev.properties index 6413d6b5d..95a66781d 100644 --- a/coolstore-partner-webc/src/main/resources/application-dev.properties +++ b/coolstore-partner-webc/src/main/resources/application-dev.properties @@ -47,4 +47,8 @@ oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS oss.endpoint=oss-cn-shanghai.aliyuncs.com oss.bucket=vec-coolstore -corp.id = 171cddee76471740 \ No newline at end of file +corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-hd.properties b/coolstore-partner-webc/src/main/resources/application-hd.properties index b6ae4ad0f..1dda2b926 100644 --- a/coolstore-partner-webc/src/main/resources/application-hd.properties +++ b/coolstore-partner-webc/src/main/resources/application-hd.properties @@ -45,4 +45,8 @@ oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS oss.endpoint=oss-cn-shanghai.aliyuncs.com oss.bucket=vec-coolstore -corp.id = 171cddee76471740 \ No newline at end of file +corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-local.properties b/coolstore-partner-webc/src/main/resources/application-local.properties index f6e8fc512..1051ef908 100644 --- a/coolstore-partner-webc/src/main/resources/application-local.properties +++ b/coolstore-partner-webc/src/main/resources/application-local.properties @@ -51,3 +51,7 @@ oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS oss.endpoint=oss-cn-shanghai.aliyuncs.com oss.bucket=vec-coolstore corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 diff --git a/coolstore-partner-webc/src/main/resources/application-online.properties b/coolstore-partner-webc/src/main/resources/application-online.properties index b6ae4ad0f..1dda2b926 100644 --- a/coolstore-partner-webc/src/main/resources/application-online.properties +++ b/coolstore-partner-webc/src/main/resources/application-online.properties @@ -45,4 +45,8 @@ oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS oss.endpoint=oss-cn-shanghai.aliyuncs.com oss.bucket=vec-coolstore -corp.id = 171cddee76471740 \ No newline at end of file +corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-pre.properties b/coolstore-partner-webc/src/main/resources/application-pre.properties index b6ae4ad0f..1dda2b926 100644 --- a/coolstore-partner-webc/src/main/resources/application-pre.properties +++ b/coolstore-partner-webc/src/main/resources/application-pre.properties @@ -45,4 +45,8 @@ oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS oss.endpoint=oss-cn-shanghai.aliyuncs.com oss.bucket=vec-coolstore -corp.id = 171cddee76471740 \ No newline at end of file +corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/application-test.properties b/coolstore-partner-webc/src/main/resources/application-test.properties index e1f7f66b2..a365a8df7 100644 --- a/coolstore-partner-webc/src/main/resources/application-test.properties +++ b/coolstore-partner-webc/src/main/resources/application-test.properties @@ -45,4 +45,8 @@ oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3 oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS oss.endpoint=oss-cn-shanghai.aliyuncs.com oss.bucket=vec-coolstore -corp.id = 171cddee76471740 \ No newline at end of file +corp.id = 171cddee76471740 + +#TRTC +trtc.sdkAppId=1400811820 +trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/static/passLetterBg.jpg b/coolstore-partner-webc/src/main/resources/static/passLetterBg.jpg new file mode 100644 index 000000000..9c2c01786 Binary files /dev/null and b/coolstore-partner-webc/src/main/resources/static/passLetterBg.jpg differ