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

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

@@ -66,6 +66,23 @@ public class ABClient {
                 CommonResponse.createBySuccess() : CommonResponse.createByErrorMessage("调用失败请重试");
     }
 
+    /**
+     * 获取上游公司的AB数据推送接口 - 推送到yznew
+     *
+     * @return 返回调用信息
+     */
+    @PostMapping("/api/req/taginfo/yznew")
+    @ResponseBody
+    public CommonResponse getDBTagInfoNew(@RequestBody ABClientInterMessageNewVO vo) {
+        // 记录日志
+        log.info("====== [ one request comming,request content is {} ] ======", vo.toString());
+        // 转换实体类映射
+        List<ABMessageDTO> dtos = ABMessageConverter.convertABMessageDTOFromNewVO(vo);
+        // 调用业务处理接口  返回校验成功的结果
+        return abClientService.recordAndSendABClientMsg(dtos) ?
+                CommonResponse.createBySuccess() : CommonResponse.createByErrorMessage("调用失败请重试");
+    }
+
     /**
      * 获取上游公司的AB数据推送接口 - 推送到时机
      *

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

@@ -7,6 +7,7 @@ import com.yuyou.openapi.openapi.common.security.SecurityService;
 import com.yuyou.openapi.openapi.model.dataobject.*;
 import com.yuyou.openapi.openapi.model.dto.ABMessageDTO;
 import com.yuyou.openapi.openapi.model.dto.LieheMessageDTO;
+import com.yuyou.openapi.openapi.model.vo.ABClientInterMessageNewVO;
 import com.yuyou.openapi.openapi.model.vo.ABClientInterMessageVO;
 import com.yuyou.openapi.openapi.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -59,6 +60,51 @@ public class ABMessageConverter {
         return dataList;
     }
 
+    /**
+     * VO层转为DTO层 修改版
+     * @param abMessageVO
+     * @return
+     */
+    public static List<ABMessageDTO> convertABMessageDTOFromNewVO(ABClientInterMessageNewVO abMessageVO) {
+        ArrayList<ABMessageDTO> dataList = new ArrayList<>();
+        if (abMessageVO == null){
+            return dataList;
+        }
+//        List<ABClientInterMessageNewVO.DetailInfoNew> detailInfoList = abMessageVO.getData();
+//        if (CollectionUtils.isEmpty(detailInfoList)){
+//            return dataList;
+//        }
+        ABMessageDTO abMessageDTO = new ABMessageDTO();
+        abMessageDTO.setAppId(abMessageVO.getAppId());
+        abMessageDTO.setTimestamp(abMessageVO.getTimestamp());
+        // 设置默认的坐席ID为 0
+        if (abMessageVO.getEmpId() == null){
+            abMessageVO.setEmpId(0);
+        }
+        // 对特殊的ActName进行处理
+        checkSpecailAppNameNew(abMessageVO);
+        BeanUtils.copyProperties(abMessageVO, abMessageDTO);
+        dataList.add(abMessageDTO);
+
+//        detailInfoList.forEach(
+//                each->{
+//                    ABMessageDTO abMessageDTO = new ABMessageDTO();
+//                    abMessageDTO.setAppId(abMessageVO.getAppId());
+//                    abMessageDTO.setTimestamp(abMessageVO.getTimestamp());
+//                    // 设置默认的坐席ID为 0
+//                    if (each.getEmpId() == null){
+//                        each.setEmpId(0);
+//                    }
+//                    // 对特殊的ActName进行处理
+//                    checkSpecailAppNameNew(each);
+//                    BeanUtils.copyProperties(each, abMessageDTO);
+//                    dataList.add(abMessageDTO);
+//                }
+//        );
+
+        return dataList;
+    }
+
     /**
      * VO层转为DTO层
      * @param abMessageVO
@@ -801,4 +847,23 @@ public class ABMessageConverter {
         detailInfo.setActName(matchActName);
     }
 
+
+    /**
+     * 对特殊的AppName进行检查处理
+     * 例如:
+     *      待处理 xxxx-1-1
+     *      处理后 xxxx-1
+     *      无需处理的直接进行返回原值
+     *
+     * @param detailInfo 对需要处理的AppName进行处理
+     * @return 返回处理后的结果
+     */
+    private static void checkSpecailAppNameNew(ABClientInterMessageNewVO detailInfo){
+        String actName = detailInfo.getActName();
+        String decodeStr = Base64.decodeStr(actName,  CharsetUtil.UTF_8);
+        log.info("test decodeStr str is {}", decodeStr);
+        String matchActName = StringUtils.substringBeforeLast(decodeStr, "-");
+        detailInfo.setActName(matchActName);
+    }
+
 }

src/main/java/com/yuyou/openapi/openapi/model/vo/ABClientInterMessageNewVO.java

@@ -0,0 +1,115 @@
+package com.yuyou.openapi.openapi.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.*;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Copyright (C), 2012 - 2018, qyx
+ * FileName: ABClientInterMessageVO
+ * Author:   x
+ * Date:     2020/8/5 2:00 PM
+ * Description: AB分级标签调用接口映射实体
+ * History:
+ * <author>          <time>          <version>          <desc>
+ * x             2020/8/5          v1.0              创建此文件
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ABClientInterMessageNewVO extends ABClientBaseVO implements Serializable {
+
+    /**
+     * 详细的数据实体
+     */
+    @JsonProperty(value = "data")
+    private List<DetailInfoNew> data;
+
+    /**
+     * poneNum 这个字段是用Base64进行加密
+     */
+    @JsonProperty(value = "mobile")
+    private String mobile;
+
+    /**
+     * 业务名称 这个字段是用Base64进行加密
+     */
+    @JsonProperty(value = "actName")
+    private String actName;
+
+    /**
+     * 业务名称 这个字段是用Base64进行加密
+     */
+    @JsonProperty(value = "app_id")
+    private String appId;
+
+    /**
+     * 呼叫开始时间 时间戳
+     */
+    @JsonProperty(value = "startTime")
+    private Long startTime;
+
+    /**
+     * 标签分级 1:A,2:B....依次类推
+     */
+    @JsonProperty(value = "clientType")
+    private Integer clientType;
+
+    /**
+     * 单条记录标识ID
+     */
+    @JsonProperty(value = "recId")
+    private String recId;
+
+    /**
+     * 坐席号,有可能是为空的 , 默认坐席号为 0 做下通配
+     */
+    @JsonProperty(value = "emp_id", defaultValue = "0")
+    private Integer empId;
+    /**
+     * ps:
+     *
+     * 问题本质为：内部非静态类无法实例化
+     * 你需要做两件事：
+     *
+     * 给内部类前面加上static
+     * 给内部类加上默认构造函数
+     */
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class DetailInfoNew{
+
+
+        /**
+         * 话单详细信息,有可能是为空的
+         */
+        private List<ChatMsgNew> messages;
+
+        // modify by x 2021-1-29
+
+
+
+
+
+
+        /**
+         * 这里对于详细的话单信息进行解析
+         */
+        @AllArgsConstructor
+        @NoArgsConstructor
+        @Getter
+        @Setter
+        public static class ChatMsgNew {
+
+            private Long talkTime;
+
+            private Integer talkerType;
+
+            private String message;
+        }
+    }
+}