Merge branch 'master' of http://git.hchbox.com/yuyou/client into master

# Conflicts:
#	src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java

src/main/java/com/yuyou/openapi/openapi/api/ABClient.java

@@ -488,4 +488,33 @@ public class ABClient {
         return abClientService.recordGuaziClientMsg(atoCvt)?
                 CommonResponse.createBySuccess() : CommonResponse.createByErrorMessage("调用失败请重试");
     }
+
+    /**
+     * 获取等待提交的数据
+     *
+     * @return 返回调用信息
+     */
+    @PostMapping("/api/req/forminput/fudaojun")
+    @ResponseBody
+    public CommonResponse getFormData(@RequestBody ABClientFudaojunMessageVO 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
+        FudaojunMessageDTO fudaojunMessageDTO = JSONUtil.toBean(jsonResult, FudaojunMessageDTO.class);
+        FudaojunMessageDTO atoCvt = FudaojunMessageConverter.convertFudaojunMessageDTOFromVO(fudaojunMessageDTO, vo);
+        // 处理具体逻辑，返回校验成功的结果
+        return abClientService.recordFudaojunClientMsg(atoCvt)?
+                CommonResponse.createBySuccess() : CommonResponse.createByErrorMessage("调用失败请重试");
+    }
 }

src/main/java/com/yuyou/openapi/openapi/dao/FudaojunMessageRepository.java

@@ -0,0 +1,31 @@
+package com.yuyou.openapi.openapi.dao;
+
+import com.yuyou.openapi.openapi.model.dataobject.FudaojunMessageDO;
+import com.yuyou.openapi.openapi.model.dataobject.ZhangmenMessageDO;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface FudaojunMessageRepository extends JpaRepository<FudaojunMessageDO,Long> {
+
+    /**
+     * 根据RecId来进行查询
+     *
+     * @param recId 记录Id
+     * @return
+     */
+    List<FudaojunMessageDO> findByRecId(Long recId);
+
+
+    /**
+     * fixme 因为避免多环境下recId会产生重复的问题,这里先进行写这个接口,后续和上游确认通过 app_id 和 rec_id 进行组合查询,进行去重
+     */
+     List<FudaojunMessageDO> findByRecIdAndAppId(Long recId, String appId);
+
+    /**
+     * 根据pnum和状态值来进行查询
+     */
+    List<FudaojunMessageDO> findByPnumAndSubmitStatus(String pnum, Integer submitStatus);
+}

src/main/java/com/yuyou/openapi/openapi/model/convert/FudaojunMessageConverter.java

@@ -0,0 +1,91 @@
+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;
+import com.yuyou.openapi.openapi.common.security.SecurityService;
+import com.yuyou.openapi.openapi.model.dataobject.FudaojunMessageDO;
+import com.yuyou.openapi.openapi.model.dto.FudaojunMessageDTO;
+import com.yuyou.openapi.openapi.model.vo.ABClientFudaojunMessageVO;
+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 FudaojunMessageConverter {
+
+    /**
+     * VO层转为DTO层
+     * @param abClientFudaojunMessageVO
+     * @return
+     */
+    public static FudaojunMessageDTO convertFudaojunMessageDTOFromVO(FudaojunMessageDTO fudaojunMessageDTO, ABClientFudaojunMessageVO abClientFudaojunMessageVO) {
+        BeanUtils.copyProperties(abClientFudaojunMessageVO, fudaojunMessageDTO);
+        return fudaojunMessageDTO;
+    }
+
+    /**
+     * 批量DTO转DO
+     * @param list
+     * @return
+     */
+    public static List<FudaojunMessageDO> convertFudaojunMessageDOFromDTO(List<FudaojunMessageDTO> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        List<FudaojunMessageDO> fudaojunMessageDOs = new ArrayList<>();
+        list.forEach(each -> {
+            FudaojunMessageDO fudaojunMessageDO = convertFudaojunMessageDOFromDTO(each);
+            if (fudaojunMessageDO != null) {
+                fudaojunMessageDOs.add(fudaojunMessageDO);
+            }
+        });
+        return fudaojunMessageDOs;
+    }
+
+    /**
+     * DTO层转为DO层
+     * @param fudaojunMessageDTO
+     * @return
+     */
+    public static FudaojunMessageDO convertFudaojunMessageDOFromDTO(FudaojunMessageDTO fudaojunMessageDTO) {
+        if (fudaojunMessageDTO == null || fudaojunMessageDTO.getTag() == null || fudaojunMessageDTO.getData() == null) {
+            return null;
+        }
+        FudaojunMessageDO zhangmenMessageDO = new FudaojunMessageDO();
+        BeanUtils.copyProperties(fudaojunMessageDTO.getData(), zhangmenMessageDO);
+        try {
+            fudaojunMessageDTO.getData().setMobile(Base64.encode(fudaojunMessageDTO.getData().getMobile()));
+            String encryptedMobile = SecurityService.encrypt(fudaojunMessageDTO.getData().getMobile(), SecurityConstants.PHONE);
+            String encryptedName = SecurityService.encrypt(fudaojunMessageDTO.getData().getName(), SecurityConstants.SIMPLE);
+            zhangmenMessageDO.setPnum(encryptedMobile);
+            zhangmenMessageDO.setStuName(encryptedName);
+        } catch (Exception e) {
+            log.error("Encrypt data raise Error, recId = {}, error is :", fudaojunMessageDTO.getTag().getTag_key_id(), e);
+            zhangmenMessageDO.setPnum(fudaojunMessageDTO.getData().getMobile());
+            zhangmenMessageDO.setStuName(fudaojunMessageDTO.getData().getName());
+        }
+
+        zhangmenMessageDO.setAppId(fudaojunMessageDTO.getAppId());
+        zhangmenMessageDO.setPushTime(DateUtils.date(fudaojunMessageDTO.getTimestamp()));
+
+        zhangmenMessageDO.setStuGrade(GradeEnum.codeOf(fudaojunMessageDTO.getData().getGrade()));
+        zhangmenMessageDO.setStuSub(SubjectEnum.codeOf(fudaojunMessageDTO.getData().getCourse()));
+        zhangmenMessageDO.setDevice(ConstantEnum.YesOrNo.codeOf(fudaojunMessageDTO.getData().getDevice()));
+        zhangmenMessageDO.setRecId(fudaojunMessageDTO.getTag().getTag_key_id());
+
+        return zhangmenMessageDO;
+    }
+}

src/main/java/com/yuyou/openapi/openapi/model/dataobject/FudaojunMessageDO.java

@@ -0,0 +1,83 @@
+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 = "fudaojun_message")
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+public class FudaojunMessageDO {
+
+    /**
+     * 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 = "stu_name")
+    private String stuName;
+
+    /**
+     * 报课学生码
+     */
+    private String pnum;
+
+    /**
+     * 报课学生年级
+     */
+    @Column(name = "stu_grade")
+    private Integer stuGrade;
+
+    /**
+     * 报课学生学科
+     */
+    @Column(name = "stu_sub")
+    private Integer stuSub;
+
+    @Column(name = "device")
+    private Integer device;
+
+    /**
+     * 上游推送用户id
+     */
+    @Column(name = "app_id")
+    private String appId;
+
+    /**
+     * 上游推送时间
+     */
+    @Column(name = "push_time")
+    private Date pushTime;
+
+    @Column(name = "submit_status")
+    private Integer submitStatus = 0;
+}

src/main/java/com/yuyou/openapi/openapi/model/dto/FudaojunMessageDTO.java

@@ -0,0 +1,110 @@
+package com.yuyou.openapi.openapi.model.dto;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class FudaojunMessageDTO {
+
+    /**
+     * 推送用户的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_grade;
+
+        /**
+         * 课程科目
+         */
+        private String tag_key_course;
+
+        /**
+         * 试听设备
+         */
+        private String tag_key_device;
+
+        /**
+         * 预约时间段
+         */
+        private String tag_key_appointment;
+    }
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Datas {
+
+        /**
+         * 学生姓名
+         */
+        private String name;
+
+        /**
+         * 手机号
+         */
+        private String mobile;
+
+        /**
+         * 学生报学年级
+         */
+        private String grade;
+
+        /**
+         * 学生报课科目
+         */
+        private String course;
+
+        /**
+         * 试听设备
+         */
+        private String device;
+
+        /**
+         * 预约时间段
+         */
+        private Integer appointment;
+    }
+
+}

src/main/java/com/yuyou/openapi/openapi/model/vo/ABClientFudaojunMessageVO.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:
+ * <author>          <time>          <version>          <desc>
+ * x             2020/8/4          v1.0              创建此文件
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ABClientFudaojunMessageVO extends ABClientBaseVO implements Serializable {
+
+    /**
+     * 需要接收到的加密数据
+     */
+    private String calllog;
+
+}

src/main/java/com/yuyou/openapi/openapi/service/ABClientService.java

@@ -123,4 +123,11 @@ public interface ABClientService {
      * @param dto 解密后的瓜子数据对应实体Bean
      */
     boolean recordGuaziClientMsg(GuaziMessageDTO dto);
+
+    /**
+     * 记录推送辅导君的数据,并存储入库
+     *
+     * @param dto 解密后的辅导君数据对应实体Bean
+     */
+    boolean recordFudaojunClientMsg(FudaojunMessageDTO dto);
 }

src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java

@@ -79,6 +79,9 @@ public class ABClientServiceImpl implements ABClientService {
     @Autowired
     private GuaziMessageRepository guaziMessageRepository;
 
+    @Autowired
+    private FudaojunMessageRepository fudaojunMessageRepository;
+
     @Override
     public boolean recordAndSendABClientMsg(List<ABMessageDTO> dtos) {
         if (CollectionUtils.isEmpty(dtos)) {
@@ -540,4 +543,33 @@ public class ABClientServiceImpl implements ABClientService {
         }
         return Boolean.TRUE;
     }
+
+    @Override
+    public boolean recordFudaojunClientMsg(FudaojunMessageDTO dto) {
+        if (dto == null) {
+            log.error("Param dtos is empty");
+            return Boolean.FALSE;
+        }
+
+        FudaojunMessageDO fudaojunMessageDO = FudaojunMessageConverter.convertFudaojunMessageDOFromDTO(dto);
+
+        Long recId = fudaojunMessageDO.getRecId();
+        if (recId <= 0){
+            log.error("========== [recId is null,please check this data , error msg is {} ] ==========", dto.toString());
+            return Boolean.FALSE;
+        }
+        // 增加前先进行校验在数据库中是否存在
+        List<FudaojunMessageDO> fudaojunMessageDOList = fudaojunMessageRepository.findByRecId(recId);
+        if (CollectionUtils.isEmpty(fudaojunMessageDOList)){
+            FudaojunMessageDO result = fudaojunMessageRepository.save(fudaojunMessageDO);
+            if (result == null) {
+                log.error("========== [insert fudaojun data error , please check . ] ==========");
+                return Boolean.FALSE;
+            }
+        }else{
+            log.error("========== [insert fudaojun data error , recId is exist , recId is {} ] ==========", recId);
+            return Boolean.TRUE;
+        }
+        return Boolean.TRUE;
+    }
 }

src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceProxy.java

@@ -133,6 +133,10 @@ public class ABClientServiceProxy implements ABClientService {
         return abClientService.recordGuaziClientMsg(dto);
     }
 
+    @Override
+    public boolean recordFudaojunClientMsg(FudaojunMessageDTO dto) {
+        return abClientService.recordFudaojunClientMsg(dto);
+    }
 
     /**
      * 解密加密字段