From 792e5e13f5a0b18c679efad3f271e218c3b6b12e Mon Sep 17 00:00:00 2001 From: queyounan <358146538@qq.com> Date: Tue, 10 Nov 2020 19:05:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=93=9C=E5=AD=90=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yuyou/openapi/openapi/api/ABClient.java | 29 ++++++ .../common/security/SecurityConstants.java | 3 + .../common/security/SecurityService.java | 2 +- .../openapi/dao/GuaziMessageRepository.java | 20 +++++ .../model/convert/AcasuoMessageConverter.java | 3 - .../model/convert/AngliMessageConverter.java | 3 - .../model/convert/GuaziMessageConverter.java | 85 ++++++++++++++++++ .../convert/NeteaseMessageConverter.java | 3 - .../convert/QingqingMessageConverter.java | 2 + .../convert/SongshuMessageConverter.java | 2 - .../model/convert/XiaomaMessageConverter.java | 4 - .../model/convert/XuebaMessageConverter.java | 3 - .../convert/ZhangmenKidMessageConverter.java | 4 +- .../model/dataobject/GuaziMessageDO.java | 81 +++++++++++++++++ .../model/dataobject/QingqingMessageDO.java | 2 +- .../openapi/model/dto/GuaziMessageDTO.java | 89 +++++++++++++++++++ .../openapi/model/dto/QingqingMessageDTO.java | 11 +-- .../model/vo/ABClientGuaziMessageVO.java | 27 ++++++ .../openapi/service/ABClientService.java | 7 ++ .../service/impl/ABClientServiceImpl.java | 32 +++++++ .../service/impl/ABClientServiceProxy.java | 6 ++ 21 files changed, 385 insertions(+), 33 deletions(-) create mode 100644 src/main/java/com/yuyou/openapi/openapi/dao/GuaziMessageRepository.java create mode 100644 src/main/java/com/yuyou/openapi/openapi/model/convert/GuaziMessageConverter.java create mode 100644 src/main/java/com/yuyou/openapi/openapi/model/dataobject/GuaziMessageDO.java create mode 100644 src/main/java/com/yuyou/openapi/openapi/model/dto/GuaziMessageDTO.java create mode 100644 src/main/java/com/yuyou/openapi/openapi/model/vo/ABClientGuaziMessageVO.java diff --git a/src/main/java/com/yuyou/openapi/openapi/api/ABClient.java b/src/main/java/com/yuyou/openapi/openapi/api/ABClient.java index 2e8a6b5..e5e5ce6 100644 --- a/src/main/java/com/yuyou/openapi/openapi/api/ABClient.java +++ b/src/main/java/com/yuyou/openapi/openapi/api/ABClient.java @@ -443,4 +443,33 @@ public class ABClient { return abClientService.recordXuebaClientMsg(atoCvt)? CommonResponse.createBySuccess() : CommonResponse.createByErrorMessage("调用失败请重试"); } + + /** + * 获取等待提交的数据 + * + * @return 返回调用信息 + */ + @PostMapping("/api/req/forminput/guazi") + @ResponseBody + public CommonResponse getFormData(@RequestBody ABClientGuaziMessageVO vo){ + //记录日志 + log.info("====== [ one request comming, request content is {} ] ======", vo.toString()); + // 验证参数,并进行解密 + String callLog = vo.getCalllog(); + if (StringUtils.isEmpty(callLog)){ + return CommonResponse.createByErrorMessage(ResponseCode.EMPTY_ARGUMENT.getDesc()); + } + // 获取的是解密且解码后的Json字符串 + String jsonResult = SecurityOperationUtil.decCallLogSecurityInfo(callLog); + // Json转成对应的实体类 + if (StringUtils.isEmpty(jsonResult)){ + return CommonResponse.createByErrorMessage(ResponseCode.DECRYPT_ERROR.getDesc()); + } + // vo赋值到DTO + GuaziMessageDTO guaziMessageDTO = JSONUtil.toBean(jsonResult, GuaziMessageDTO.class); + GuaziMessageDTO atoCvt = GuaziMessageConverter.convertGuaziMessageDTOFromVO(guaziMessageDTO, vo); + // 处理具体逻辑，返回校验成功的结果 + return abClientService.recordGuaziClientMsg(atoCvt)? + CommonResponse.createBySuccess() : CommonResponse.createByErrorMessage("调用失败请重试"); + } } diff --git a/src/main/java/com/yuyou/openapi/openapi/common/security/SecurityConstants.java b/src/main/java/com/yuyou/openapi/openapi/common/security/SecurityConstants.java index 4e467d3..e908b78 100644 --- a/src/main/java/com/yuyou/openapi/openapi/common/security/SecurityConstants.java +++ b/src/main/java/com/yuyou/openapi/openapi/common/security/SecurityConstants.java @@ -8,6 +8,9 @@ package com.yuyou.openapi.openapi.common.security; */ public interface SecurityConstants { + public static final int PHONE_ENCRYPT_TAG = 0; + public static final int SIMPLE_ENCRYPT_TAG = 1; + public static final String PHONE_ENCRYPT_TYPE = "0"; public static final String SIMPLE_ENCRYPT_TYPE = "1"; diff --git a/src/main/java/com/yuyou/openapi/openapi/common/security/SecurityService.java b/src/main/java/com/yuyou/openapi/openapi/common/security/SecurityService.java index b59bb90..2788060 100644 --- a/src/main/java/com/yuyou/openapi/openapi/common/security/SecurityService.java +++ b/src/main/java/com/yuyou/openapi/openapi/common/security/SecurityService.java @@ -1,6 +1,6 @@ package com.yuyou.openapi.openapi.common.security; -import cn.hutool.core.codec.Base64; + import cn.hutool.core.util.StrUtil; import com.yuyou.openapi.openapi.exception.SecretException; import com.yuyou.openapi.openapi.utils.SecurityOperationUtil; diff --git a/src/main/java/com/yuyou/openapi/openapi/dao/GuaziMessageRepository.java b/src/main/java/com/yuyou/openapi/openapi/dao/GuaziMessageRepository.java new file mode 100644 index 0000000..1a039b7 --- /dev/null +++ b/src/main/java/com/yuyou/openapi/openapi/dao/GuaziMessageRepository.java @@ -0,0 +1,20 @@ +package com.yuyou.openapi.openapi.dao; + +import com.yuyou.openapi.openapi.model.dataobject.GuaziMessageDO; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface GuaziMessageRepository extends JpaRepository { + + /** + * 根据RecId来进行查询 + * + * @param recId 记录Id + * @return + */ + List findByRecId(Long recId); + +} diff --git a/src/main/java/com/yuyou/openapi/openapi/model/convert/AcasuoMessageConverter.java b/src/main/java/com/yuyou/openapi/openapi/model/convert/AcasuoMessageConverter.java index c21d043..879e2a2 100644 --- a/src/main/java/com/yuyou/openapi/openapi/model/convert/AcasuoMessageConverter.java +++ b/src/main/java/com/yuyou/openapi/openapi/model/convert/AcasuoMessageConverter.java @@ -7,11 +7,8 @@ import com.yuyou.openapi.openapi.common.enums.SubjectEnum; import com.yuyou.openapi.openapi.common.security.SecurityConstants; import com.yuyou.openapi.openapi.common.security.SecurityService; import com.yuyou.openapi.openapi.model.dataobject.AcasuoMessageDO; -import com.yuyou.openapi.openapi.model.dataobject.NeteaseMessageDO; import com.yuyou.openapi.openapi.model.dto.AcasuoMessageDTO; -import com.yuyou.openapi.openapi.model.dto.NeteaseMessageDTO; import com.yuyou.openapi.openapi.model.vo.ABClientAcasuoMessageVO; -import com.yuyou.openapi.openapi.model.vo.ABClientNeteaseMessageVO; import com.yuyou.openapi.openapi.utils.DateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/yuyou/openapi/openapi/model/convert/AngliMessageConverter.java b/src/main/java/com/yuyou/openapi/openapi/model/convert/AngliMessageConverter.java index 61bb72b..665d795 100644 --- a/src/main/java/com/yuyou/openapi/openapi/model/convert/AngliMessageConverter.java +++ b/src/main/java/com/yuyou/openapi/openapi/model/convert/AngliMessageConverter.java @@ -6,11 +6,8 @@ import com.yuyou.openapi.openapi.common.enums.SubjectEnum; import com.yuyou.openapi.openapi.common.security.SecurityConstants; import com.yuyou.openapi.openapi.common.security.SecurityService; import com.yuyou.openapi.openapi.model.dataobject.AngliMessageDO; -import com.yuyou.openapi.openapi.model.dataobject.ZhangmenMessageDO; -import com.yuyou.openapi.openapi.model.dto.ABZMMessageDTO; import com.yuyou.openapi.openapi.model.dto.AngliMessageDTO; import com.yuyou.openapi.openapi.model.vo.ABClientAngliMessageVO; -import com.yuyou.openapi.openapi.model.vo.ABClientZMMessageVO; import com.yuyou.openapi.openapi.utils.DateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/yuyou/openapi/openapi/model/convert/GuaziMessageConverter.java b/src/main/java/com/yuyou/openapi/openapi/model/convert/GuaziMessageConverter.java new file mode 100644 index 0000000..1d1a917 --- /dev/null +++ b/src/main/java/com/yuyou/openapi/openapi/model/convert/GuaziMessageConverter.java @@ -0,0 +1,85 @@ +package com.yuyou.openapi.openapi.model.convert; + +import cn.hutool.core.codec.Base64; +import com.yuyou.openapi.openapi.common.security.SecurityConstants; +import com.yuyou.openapi.openapi.common.security.SecurityService; +import com.yuyou.openapi.openapi.model.dataobject.GuaziMessageDO; +import com.yuyou.openapi.openapi.model.dto.GuaziMessageDTO; +import com.yuyou.openapi.openapi.model.vo.ABClientGuaziMessageVO; +import com.yuyou.openapi.openapi.utils.DateUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * 瓜子记录转换类 + * + * @version 1.0 + * @date 2020/8/10 + */ +@Slf4j +public class GuaziMessageConverter { + + /** + * VO层转为DTO层 + * @param guaziMessageDTO + * @param abClientGuaziMessageVO + * @return + */ + public static GuaziMessageDTO convertGuaziMessageDTOFromVO(GuaziMessageDTO guaziMessageDTO, ABClientGuaziMessageVO abClientGuaziMessageVO) { + BeanUtils.copyProperties(abClientGuaziMessageVO, guaziMessageDTO); + return guaziMessageDTO; + } + + /** + * 批量DTO转DO + * @param list + * @return + */ + public static List convertGuaziMessageDOFromDTO(List list) { + if (CollectionUtils.isEmpty(list)) { + return null; + } + List guaziMessageDOs = new ArrayList<>(); + list.forEach(each -> { + GuaziMessageDO guaziMessageDO = convertGuaziMessageDOFromDTO(each); + if (guaziMessageDO != null) { + guaziMessageDOs.add(guaziMessageDO); + } + }); + return guaziMessageDOs; + } + + /** + * DTO层转为DO层 + * @param guaziMessageDTO + * @return + */ + public static GuaziMessageDO convertGuaziMessageDOFromDTO(GuaziMessageDTO guaziMessageDTO) { + if (guaziMessageDTO == null || guaziMessageDTO.getTag() == null || guaziMessageDTO.getData() == null) { + return null; + } + GuaziMessageDO guaziMessageDO = new GuaziMessageDO(); + BeanUtils.copyProperties(guaziMessageDTO.getData(), guaziMessageDO); + try { + guaziMessageDTO.getData().setMobile(Base64.encode(guaziMessageDTO.getData().getMobile())); + String encryptedMobile = SecurityService.encrypt(guaziMessageDTO.getData().getMobile(), SecurityConstants.PHONE); + String encryptedName = SecurityService.encrypt(guaziMessageDTO.getData().getName(), SecurityConstants.SIMPLE); + guaziMessageDO.setPnum(encryptedMobile); + guaziMessageDO.setName(encryptedName); + } catch (Exception e) { + log.error("Encrypt data raise Error, recId = {}, error is :", guaziMessageDTO.getTag().getTag_key_id(), e); + guaziMessageDO.setPnum(guaziMessageDTO.getData().getMobile()); + guaziMessageDO.setName(guaziMessageDTO.getData().getName()); + } + + guaziMessageDO.setAppId(guaziMessageDTO.getAppId()); + guaziMessageDO.setPushTime(DateUtils.date(guaziMessageDTO.getTimestamp())); + guaziMessageDO.setRecId(guaziMessageDTO.getTag().getTag_key_id()); + + return guaziMessageDO; + } +} diff --git a/src/main/java/com/yuyou/openapi/openapi/model/convert/NeteaseMessageConverter.java b/src/main/java/com/yuyou/openapi/openapi/model/convert/NeteaseMessageConverter.java index 66592d5..9ef25e3 100644 --- a/src/main/java/com/yuyou/openapi/openapi/model/convert/NeteaseMessageConverter.java +++ b/src/main/java/com/yuyou/openapi/openapi/model/convert/NeteaseMessageConverter.java @@ -6,11 +6,8 @@ import com.yuyou.openapi.openapi.common.enums.SubjectEnum; import com.yuyou.openapi.openapi.common.security.SecurityConstants; import com.yuyou.openapi.openapi.common.security.SecurityService; import com.yuyou.openapi.openapi.model.dataobject.NeteaseMessageDO; -import com.yuyou.openapi.openapi.model.dataobject.ZhangmenKidMessageDO; import com.yuyou.openapi.openapi.model.dto.NeteaseMessageDTO; -import com.yuyou.openapi.openapi.model.dto.ZhangmenKidMessageDTO; import com.yuyou.openapi.openapi.model.vo.ABClientNeteaseMessageVO; -import com.yuyou.openapi.openapi.model.vo.ABClientZMKidMessageVO; import com.yuyou.openapi.openapi.utils.DateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/yuyou/openapi/openapi/model/convert/QingqingMessageConverter.java b/src/main/java/com/yuyou/openapi/openapi/model/convert/QingqingMessageConverter.java index 81f172f..0b9b96f 100644 --- a/src/main/java/com/yuyou/openapi/openapi/model/convert/QingqingMessageConverter.java +++ b/src/main/java/com/yuyou/openapi/openapi/model/convert/QingqingMessageConverter.java @@ -1,6 +1,7 @@ package com.yuyou.openapi.openapi.model.convert; import cn.hutool.core.codec.Base64; +import com.yuyou.openapi.openapi.common.enums.ConstantEnum; import com.yuyou.openapi.openapi.common.enums.GradeEnum; import com.yuyou.openapi.openapi.common.enums.SubjectEnum; import com.yuyou.openapi.openapi.common.security.SecurityConstants; @@ -83,6 +84,7 @@ public class QingqingMessageConverter { qingqingMessageDO.setStuGrade(GradeEnum.codeOf(qingqingMessageDTO.getData().getGrade())); qingqingMessageDO.setStuSub(SubjectEnum.codeOf(qingqingMessageDTO.getData().getCourse())); + qingqingMessageDO.setDevice(ConstantEnum.YesOrNo.codeOf(qingqingMessageDTO.getData().getDevice())); qingqingMessageDO.setRecId(qingqingMessageDTO.getTag().getTag_key_id()); diff --git a/src/main/java/com/yuyou/openapi/openapi/model/convert/SongshuMessageConverter.java b/src/main/java/com/yuyou/openapi/openapi/model/convert/SongshuMessageConverter.java index 7266e6d..f3e0e4f 100644 --- a/src/main/java/com/yuyou/openapi/openapi/model/convert/SongshuMessageConverter.java +++ b/src/main/java/com/yuyou/openapi/openapi/model/convert/SongshuMessageConverter.java @@ -6,9 +6,7 @@ import com.yuyou.openapi.openapi.common.enums.GradeEnum; import com.yuyou.openapi.openapi.common.enums.SubjectEnum; import com.yuyou.openapi.openapi.common.security.SecurityConstants; import com.yuyou.openapi.openapi.common.security.SecurityService; -import com.yuyou.openapi.openapi.model.dataobject.NeteaseMessageDO; import com.yuyou.openapi.openapi.model.dataobject.SongshuMessageDO; -import com.yuyou.openapi.openapi.model.dto.NeteaseMessageDTO; import com.yuyou.openapi.openapi.model.dto.SongshuMessageDTO; import com.yuyou.openapi.openapi.model.vo.ABClientSongshuMessageVO; import com.yuyou.openapi.openapi.utils.DateUtils; diff --git a/src/main/java/com/yuyou/openapi/openapi/model/convert/XiaomaMessageConverter.java b/src/main/java/com/yuyou/openapi/openapi/model/convert/XiaomaMessageConverter.java index 2a10585..95cec6a 100644 --- a/src/main/java/com/yuyou/openapi/openapi/model/convert/XiaomaMessageConverter.java +++ b/src/main/java/com/yuyou/openapi/openapi/model/convert/XiaomaMessageConverter.java @@ -4,14 +4,10 @@ import cn.hutool.core.codec.Base64; import com.yuyou.openapi.openapi.common.enums.CityEnum; import com.yuyou.openapi.openapi.common.enums.ConstantEnum; import com.yuyou.openapi.openapi.common.enums.GradeEnum; -import com.yuyou.openapi.openapi.common.enums.SubjectEnum; import com.yuyou.openapi.openapi.common.security.SecurityConstants; import com.yuyou.openapi.openapi.common.security.SecurityService; -import com.yuyou.openapi.openapi.model.dataobject.QingqingMessageDO; import com.yuyou.openapi.openapi.model.dataobject.XiaomaMessageDO; -import com.yuyou.openapi.openapi.model.dto.QingqingMessageDTO; import com.yuyou.openapi.openapi.model.dto.XiaomaMessageDTO; -import com.yuyou.openapi.openapi.model.vo.ABClientQingqingMessageVO; import com.yuyou.openapi.openapi.model.vo.ABClientXiaomaMessageVO; import com.yuyou.openapi.openapi.utils.DateUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/yuyou/openapi/openapi/model/convert/XuebaMessageConverter.java b/src/main/java/com/yuyou/openapi/openapi/model/convert/XuebaMessageConverter.java index ab574cc..55e75af 100644 --- a/src/main/java/com/yuyou/openapi/openapi/model/convert/XuebaMessageConverter.java +++ b/src/main/java/com/yuyou/openapi/openapi/model/convert/XuebaMessageConverter.java @@ -6,11 +6,8 @@ import com.yuyou.openapi.openapi.common.enums.GradeEnum; import com.yuyou.openapi.openapi.common.enums.SubjectEnum; import com.yuyou.openapi.openapi.common.security.SecurityConstants; import com.yuyou.openapi.openapi.common.security.SecurityService; -import com.yuyou.openapi.openapi.model.dataobject.SongshuMessageDO; import com.yuyou.openapi.openapi.model.dataobject.XuebaMessageDO; -import com.yuyou.openapi.openapi.model.dto.SongshuMessageDTO; import com.yuyou.openapi.openapi.model.dto.XuebaMessageDTO; -import com.yuyou.openapi.openapi.model.vo.ABClientSongshuMessageVO; import com.yuyou.openapi.openapi.model.vo.ABClientXuebaMessageVO; import com.yuyou.openapi.openapi.utils.DateUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/yuyou/openapi/openapi/model/convert/ZhangmenKidMessageConverter.java b/src/main/java/com/yuyou/openapi/openapi/model/convert/ZhangmenKidMessageConverter.java index b3d6aa5..8ac8fc3 100644 --- a/src/main/java/com/yuyou/openapi/openapi/model/convert/ZhangmenKidMessageConverter.java +++ b/src/main/java/com/yuyou/openapi/openapi/model/convert/ZhangmenKidMessageConverter.java @@ -7,11 +7,9 @@ import com.yuyou.openapi.openapi.common.enums.SubjectEnum; import com.yuyou.openapi.openapi.common.security.SecurityConstants; import com.yuyou.openapi.openapi.common.security.SecurityService; import com.yuyou.openapi.openapi.model.dataobject.ZhangmenKidMessageDO; -import com.yuyou.openapi.openapi.model.dataobject.ZhangmenMessageDO; -import com.yuyou.openapi.openapi.model.dto.ABZMMessageDTO; + import com.yuyou.openapi.openapi.model.dto.ZhangmenKidMessageDTO; import com.yuyou.openapi.openapi.model.vo.ABClientZMKidMessageVO; -import com.yuyou.openapi.openapi.model.vo.ABClientZMMessageVO; import com.yuyou.openapi.openapi.utils.DateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/yuyou/openapi/openapi/model/dataobject/GuaziMessageDO.java b/src/main/java/com/yuyou/openapi/openapi/model/dataobject/GuaziMessageDO.java new file mode 100644 index 0000000..13a13d7 --- /dev/null +++ b/src/main/java/com/yuyou/openapi/openapi/model/dataobject/GuaziMessageDO.java @@ -0,0 +1,81 @@ +package com.yuyou.openapi.openapi.model.dataobject; + +import lombok.Data; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import javax.persistence.*; +import java.util.Date; + +/** + * 轻轻教育成单记录表 + * @version 1.0 + * @date 2020/8/10 + */ +@Data +@Table(name = "guazi_message") +@Entity +@EntityListeners(AuditingEntityListener.class) +public class GuaziMessageDO { + + /** + * id + */ + @Id + @GeneratedValue(strategy= GenerationType.IDENTITY) + private Long id; + + @Column(name = "gmt_create") + @CreatedDate + private Date gmtCreate; + + @Column(name = "gmt_modified") + @LastModifiedDate + private Date gmtModified; + + /** + * 记录推送id + */ + @Column(name = "rec_id") + private Long recId; + + /** + * 姓名 + */ + @Column(name = "name") + private String name; + + /** + * 码号 + */ + private String pnum; + + /** + * 品牌 + */ + private String brand; + + /** + * 型号 + */ + private String type; + + /** + * 上游推送用户id + */ + @Column(name = "app_id") + private String appId; + + /** + * 上游推送时间 + */ + @Column(name = "push_time") + private Date pushTime; + + @Column(name = "submit_status") + private Integer submitStatus = 0; + + @Column(name = "response_status") + private Integer responseStatus = 0; +} diff --git a/src/main/java/com/yuyou/openapi/openapi/model/dataobject/QingqingMessageDO.java b/src/main/java/com/yuyou/openapi/openapi/model/dataobject/QingqingMessageDO.java index db86bb5..2e3b483 100644 --- a/src/main/java/com/yuyou/openapi/openapi/model/dataobject/QingqingMessageDO.java +++ b/src/main/java/com/yuyou/openapi/openapi/model/dataobject/QingqingMessageDO.java @@ -70,7 +70,7 @@ public class QingqingMessageDO { private Integer device; @Column(name = "appointment") - private Integer appointment; + private Integer appointment = -1; /** * 上游推送用户id diff --git a/src/main/java/com/yuyou/openapi/openapi/model/dto/GuaziMessageDTO.java b/src/main/java/com/yuyou/openapi/openapi/model/dto/GuaziMessageDTO.java new file mode 100644 index 0000000..5f243a9 --- /dev/null +++ b/src/main/java/com/yuyou/openapi/openapi/model/dto/GuaziMessageDTO.java @@ -0,0 +1,89 @@ +package com.yuyou.openapi.openapi.model.dto; + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class GuaziMessageDTO { + + /** + * 推送用户的ID + */ + private String appId; + + /** + * 请求时间戳 + */ + private Long timestamp; + + /** + * 标记集合 + */ + private Tag tag; + + /** + * 数据集合 + */ + private Datas data; + + + @Data + @AllArgsConstructor + @NoArgsConstructor + public static class Tag { + /** + * 记录id + */ + private Long tag_key_id; + + /** + * 姓名 + */ + private String tag_key_name; + + /** + * 联系方式 + */ + private String tag_key_mobile; + + /** + * 品牌 + */ + private String tag_key_brand; + + /** + * 型号 + */ + private String tag_key_type; + } + + @Data + @AllArgsConstructor + @NoArgsConstructor + public static class Datas { + + /** + * 学生姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 品牌 + */ + private String brand; + + /** + * 型号 + */ + private String type; + } +} diff --git a/src/main/java/com/yuyou/openapi/openapi/model/dto/QingqingMessageDTO.java b/src/main/java/com/yuyou/openapi/openapi/model/dto/QingqingMessageDTO.java index 5587d3f..557c39c 100644 --- a/src/main/java/com/yuyou/openapi/openapi/model/dto/QingqingMessageDTO.java +++ b/src/main/java/com/yuyou/openapi/openapi/model/dto/QingqingMessageDTO.java @@ -65,11 +65,6 @@ public class QingqingMessageDTO { */ private String tag_key_device; - /** - * 预约时间段 - */ - private String tag_key_appointment; - } @Data @@ -100,12 +95,8 @@ public class QingqingMessageDTO { /** * 试听设备 */ - private Integer device; + private String device; - /** - * 预约时间段 - */ - private Integer appointment; } } diff --git a/src/main/java/com/yuyou/openapi/openapi/model/vo/ABClientGuaziMessageVO.java b/src/main/java/com/yuyou/openapi/openapi/model/vo/ABClientGuaziMessageVO.java new file mode 100644 index 0000000..dde64ec --- /dev/null +++ b/src/main/java/com/yuyou/openapi/openapi/model/vo/ABClientGuaziMessageVO.java @@ -0,0 +1,27 @@ +package com.yuyou.openapi.openapi.model.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * Copyright (C), 2012 - 2018, qyx + * FileName: ABClientMessageVO + * Author: x + * Date: 2020/8/4 6:59 PM + * Description: ABClient接口对应接口表现层映射 + * History: + *