Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/common/CallRecordVo.java

@@ -0,0 +1,62 @@
+package com.gree.mall.manager.bean.common;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.plus.entity.CallSendRecord;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ZfireField(tbName = "a")
+public class CallRecordVo   {
+
+    @ZfireField(hide = true)
+    @TableId(value = "id", type = IdType.ID_WORKER_STR)
+    private String id;
+
+    @ApiModelProperty(value = "信息编号")
+    private String orderBaseId;
+
+    @ApiModelProperty(value = "流程名称")
+    private String name;
+
+    @ApiModelProperty(value = "网点编号")
+    private String websitId;
+
+    @ApiModelProperty(value = "网点名称")
+    private String websitName;
+
+    @ApiModelProperty(value = "客户名称")
+    private String userName;
+
+    @ApiModelProperty(value = "客户电话")
+    private String userMobile;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "AI标签")
+    private String tag;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -7,6 +7,7 @@ import com.gree.mall.manager.bean.activity.PromotionActivityVO;
 import com.gree.mall.manager.bean.admin.AdminCompanyPayConfigVO;
 import com.gree.mall.manager.bean.charging.ChargingStandardBean;
 import com.gree.mall.manager.bean.common.AmityUrlVO;
+import com.gree.mall.manager.bean.common.CallRecordVo;
 import com.gree.mall.manager.bean.contract.SettleRelaConfigVO;
 import com.gree.mall.manager.bean.engin.OrderEnginBaseVO;
 import com.gree.mall.manager.bean.engin.ProjectRepairVO;
@@ -698,5 +699,9 @@ public interface CommonMapper {
                                 @Param("adminWebsitIds") List<String> adminWebsitIds,
                                 @Param("userName") String userName);
 
+    IPage<CallRecordVo> list(Page page,
+                             @Param("ex")  ZfireParamBean zfireParam,
+                             @Param("adminWebsitIds") List<String> websitIds);
+
     IPage<SettleRelaConfigVO> settleRelaConfigPage(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 }

mall-server-api/src/main/java/com/gree/mall/manager/constant/Constant.java

@@ -52,6 +52,7 @@ public class Constant {
 
     public class RedisPrefix {
         public final static String LOCK_LOGIN = "jsm:sxb:login:";
+        public final static String TOKEN_UNICOME_YUNH = "jsm:sxb:UNICOME:";
         public final static String WORK_MINI_ACCESS_TOKEN = "jsm:sxb:work:mini:access:token";
         public final static String TOKEN_WX = "jsm:sxb:token:wx";
         public final static String TOKEN_MP_WX = "mp:token:wx";

mall-server-api/src/main/java/com/gree/mall/manager/controller/common/CallRecordController.java

@@ -0,0 +1,77 @@
+package com.gree.mall.manager.controller.common;
+
+import cn.hutool.core.lang.TypeReference;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.annotation.ZfireList;
+import com.gree.mall.manager.bean.common.CallRecordVo;
+import com.gree.mall.manager.bean.workorder.IncreVO;
+import com.gree.mall.manager.exception.RemoteServiceException;
+import com.gree.mall.manager.helper.ResponseHelper;
+import com.gree.mall.manager.logic.unicom.UnicomLogic;
+import com.gree.mall.manager.plus.entity.CallSendRecord;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@RestController
+@Api(value = "云呼API", tags ={"云呼API"} )
+@RequestMapping("unCall")
+public class CallRecordController {
+
+    @Autowired
+    UnicomLogic unicomLogic;
+
+
+    @ZfireList
+    @PostMapping("/list")
+    @ApiOperation(value = "AI拨号记录")
+    public ResponseHelper<IPage<CallRecordVo>> list(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) throws RemoteServiceException {
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        IPage<CallRecordVo> increVOIPage = unicomLogic.list(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        return ResponseHelper.success(increVOIPage, new TypeReference<IncreVO>() {});
+    }
+
+    @PostMapping("/list/export")
+    @ApiOperation(value = "AI拨号记录导出")
+    public void listExport(
+            @RequestBody ZfireParamBean zfireParamBean,
+            HttpServletRequest request,
+            HttpServletResponse response
+    ) throws Exception {
+        //1.组装查询条件
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        //2.查询要导出的内容
+        IPage<CallRecordVo> increVOIPage = unicomLogic.list(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
+        //3.导出
+        FieldUtils.exportData(increVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
+    }
+
+    @PostMapping("unicome/config/save")
+    @ApiOperation(value = "云呼-保存配置")
+    public ResponseHelper saveUnicomeConfig(@ApiParam(value = "联通云呼integratedid") @RequestParam String unicomIntegratedId,
+                                            @ApiParam(value = "联通云呼ExtenType（支持三种方式Local（直线方式），sip（软电话），gateway（语音网关/IP话机）") @RequestParam String unicomIntegratedType) {
+        unicomLogic.saveConfig(unicomIntegratedId, unicomIntegratedType);
+        return ResponseHelper.success();
+    }
+
+    @PostMapping("unicome/call")
+    @ApiOperation(value = "云呼-拨打")
+    public ResponseHelper callUicome(
+            @ApiParam(value = "服务单号") @RequestParam String orderBaseId,
+            @ApiParam(value = "手机号") @RequestParam String phone,
+            @ApiParam(value = "A=回访",required = false) @RequestParam(required = false) String flag
+    ){
+        unicomLogic.commonlnte(phone,orderBaseId,flag);
+        return ResponseHelper.success();
+    }
+}

mall-server-api/src/main/java/com/gree/mall/manager/logic/unicom/UnicomLogic.java

@@ -0,0 +1,259 @@
+package com.gree.mall.manager.logic.unicom;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.druid.util.StringUtils;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.gree.mall.manager.bean.admin.AdminUserCom;
+import com.gree.mall.manager.bean.common.CallRecordVo;
+import com.gree.mall.manager.bean.workorder.IncreVO;
+import com.gree.mall.manager.commonmapper.CommonMapper;
+import com.gree.mall.manager.constant.Constant;
+import com.gree.mall.manager.constant.SysDictConstant;
+import com.gree.mall.manager.exception.RemoteServiceException;
+import com.gree.mall.manager.logic.common.CommonLogic;
+import com.gree.mall.manager.logic.common.SysDictLogic;
+import com.gree.mall.manager.plus.entity.AdminUser;
+import com.gree.mall.manager.plus.entity.CallRecord;
+import com.gree.mall.manager.plus.entity.CallSendRecord;
+import com.gree.mall.manager.plus.entity.PgOrderBase;
+import com.gree.mall.manager.plus.service.AdminUserService;
+import com.gree.mall.manager.plus.service.CallRecordService;
+import com.gree.mall.manager.plus.service.CallSendRecordService;
+import com.gree.mall.manager.plus.service.PgOrderBaseService;
+import com.gree.mall.manager.utils.RedisUtil;
+import com.gree.mall.manager.utils.oss.OSSUtil;
+import com.gree.mall.manager.zfire.bean.ZfireParamBean;
+import com.gree.mall.manager.zfire.util.FieldUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
+/**
+ * 联通外呼，隐私号对接
+ */
+@Slf4j
+@Service
+public class UnicomLogic {
+
+    //private final static String BASE_URL = "https://a5.7x24cc.com";
+
+    @Value("${unicome.yunh.baseurl}")
+    private String baseUrl;
+    @Value("${unicome.yunh.account}")
+    private String ACCOUNT;
+    @Value("${unicome.yunh.secret}")
+    private String SECRET;
+    @Value("${unicome.yunh.appid}")
+    private String APPID;
+
+    @Autowired
+    CommonLogic commonLogic;
+    @Autowired
+    RedisUtil redisUtil;
+    @Autowired
+    OSSUtil ossUtil;
+    @Autowired
+    SysDictLogic sysDictLogic;
+    @Autowired
+    AdminUserService adminUserService;
+    @Autowired
+    CallRecordService callRecordService;
+    @Resource
+    PgOrderBaseService pgOrderBaseService;
+
+    @Resource
+    CallSendRecordService callSendRecordService;
+    @Autowired
+    CommonMapper commonMapper;
+
+
+
+
+
+
+
+
+    /**
+     * 联通云呼请求token
+     * @return
+     */
+    public  String getAccessToken(){
+        String tokenKey = Constant.RedisPrefix.TOKEN_UNICOME_YUNH;
+        if(redisUtil.get(tokenKey) != null){
+            return (String)redisUtil.get(tokenKey);
+        }
+//        String ACCOUNT = "N000000015221";
+//        String APPID = "69jpgmwqxyhtcsor";
+//        String SECRET = "fe443fc0264411ec80212baafe602ea7";
+        String s = HttpUtil.get(baseUrl + "/accessToken?account=" + ACCOUNT + "&appid=" + APPID + "&secret=" + SECRET);
+        String accessToken = JSONObject.parseObject(s).getString("accessToken");
+        log.info("【获取联通云呼token】:{}",accessToken);
+        redisUtil.set(tokenKey,accessToken,2 * 60 * 60);
+        return accessToken;
+    }
+
+
+    /**
+     * 保存云呼配置
+     */
+    public void saveConfig(String unicomIntegratedId,String unicomIntegratedType){
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        adminUser.setUnicomIntegratedId(unicomIntegratedId);
+        adminUser.setUnicomIntegratedType(unicomIntegratedType);
+        adminUser.updateById();
+    }
+
+    /**
+     * 拨打云呼
+     * @param phone
+     */
+    public void commonlnte(String phone,String orderBaseId,String flag){
+        String token = getAccessToken();
+
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        AdminUser noCacheAdminUser = adminUserService.getById(adminUser.getAdminUserId());
+        String integratedid = noCacheAdminUser.getUnicomIntegratedId();
+
+        if(StringUtils.isEmpty(integratedid))
+            throw new RemoteServiceException("检测到您暂未绑定外呼帐号，请右键点击【拨打】进行设置");
+
+        //自定义业务参数，通话记录可以回传 例如    ExternalData = main:0001 推送url的后面就会带上参数 &main=0001
+        String externalData = "orderBaseId:"+orderBaseId+",msgerName:"+adminUser.getNickName();
+        String url = baseUrl + "/commonInte?flag=104&account="
+                + ACCOUNT + "&phonenum=" + phone + "&integratedid=" + integratedid + "&accessToken=" + token
+                +"&ExternalData="+externalData;
+        log.info("【拨打外呼】request url:{}",url);
+        String s = HttpUtil.get(url);
+
+        //拨打记录
+        String liucheng = StringUtils.equals("A",flag)?"回访":"";
+        PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
+        CallSendRecord callSendRecord = new CallSendRecord();
+        callSendRecord.setName(pgOrderBase.getOrderTypeText()+"-"+liucheng);
+        callSendRecord.setOrderBaseId(orderBaseId);
+        callSendRecord.setWebsitId(pgOrderBase.getWebsitId());
+        callSendRecord.setWebsitName(pgOrderBase.getWebsitName());
+        callSendRecord.setUserName(pgOrderBase.getUserName());
+        callSendRecord.setUserMobile(pgOrderBase.getUserMobile());
+        callSendRecord.setStatus(s.equals("200")?"回访成功":"回访失败");
+        callSendRecord.setTag("");
+        callSendRecord.insert();
+
+        if(!s.equals("200")){
+            throw new RemoteServiceException("拨打云呼失败错误码【"+s+"】");
+        }
+    }
+
+
+    /**
+     * 获取云呼通话记录
+     */
+    public void syncMsgRecord(Date startTime,Date endTime){
+
+//        String ACCOUNT = "N000000015221";
+//        String APPID = "69jpgmwqxyhtcsor";
+//        String SECRET = "fe443fc0264411ec80212baafe602ea7";
+        if(startTime == null || endTime == null)
+            return;
+        String sTime = DateUtil.formatDateTime(startTime);
+        String eTime = DateUtil.formatDateTime(endTime);
+
+        String token = getAccessToken();
+        String s = HttpUtil.get(baseUrl + "/commonInte?flag=1000&accessToken=" + token + "&account=" + ACCOUNT + "&limit=1000&startTime="+sTime+"&endTime="+eTime);
+        log.info("【同步外呼通话记录】response:{}",s);
+        Integer result = JSONObject.parseObject(s).getInteger("result");
+        if(result != 0)
+            return;
+        List<CallRecord> callRecords = new ArrayList<>();
+
+        JSONArray data = JSONObject.parseObject(s).getJSONArray("data");
+        for(Object o : data){
+            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(o));
+
+            String callSheetID = jsonObject.getString("CallSheetID");
+            String callID = jsonObject.getString("CallID");
+            //String callType = jsonObject.getString("CallType");
+            String callType = "呼出";
+            String callNo = jsonObject.getString("CallNo");
+            String calledNo = jsonObject.getString("CalledNo");
+            Date ring = jsonObject.getDate("Ring");
+            Date ringingTime = jsonObject.getDate("RingingTime");
+            Date begin = jsonObject.getDate("Begin");
+            Date end = jsonObject.getDate("End");
+            String callTimeLength = jsonObject.getString("CallTimeLength");
+            String agent = jsonObject.getString("Agent");//坐席登录名
+            String agentName = jsonObject.getString("AgentName");//坐席姓名
+            String exten = jsonObject.getString("Exten");//坐席工号
+            String monitorFilename = jsonObject.getString("MonitorFilename");//录音文件
+            JSONObject interfaceData = jsonObject.getJSONObject("InterfaceData");
+            if(StringUtils.isEmpty(monitorFilename))
+                continue;
+            String filepath = ossUtil.getFilePath()+"/" + IdWorker.getIdStr() + UUID.randomUUID() + ".mp3";
+            try {
+                InputStream inputStream = commonLogic.getFileInputStreamByUrl(monitorFilename);
+                boolean b = ossUtil.uploadFile(filepath, inputStream);
+                if(!b)
+                    log.error("【外呼通话记录附件上传oss失败】:{},ossUrl:{}",monitorFilename,filepath);
+            }catch(Exception e){
+                log.error("转换通话记录附件失败");
+            }
+            CallRecord callRecord = new CallRecord();
+            callRecord.setId(callSheetID);
+            callRecord.setCallType1(callType);
+            callRecord.setWorkerMobile(callNo);
+            callRecord.setStartTime(ring);
+            callRecord.setStart(begin);
+            callRecord.setEnd(end);
+            callRecord.setPhone(calledNo);
+            if(interfaceData != null) {
+                //自定义参数
+                callRecord.setOrderBaseId(interfaceData.getString("orderBaseId"));
+                agentName = interfaceData.getString("msgerName");
+                callRecord.setCallType2(!StringUtils.isEmpty(agentName) ? "后台呼叫客户" : "服务人员呼叫客户");
+            }
+            callRecord.setPromoter(agentName+",坐席工号:"+exten);
+            callRecord.setCallTimestamp(StringUtils.isEmpty(callTimeLength)?0:Integer.parseInt(callTimeLength));
+            if(ring != null && ringingTime != null) {
+                callRecord.setRingTimestamp((int)DateUtil.betweenMs(ring,ringingTime));
+            }
+            callRecord.setFileUrl(filepath);
+            if(callRecord.getCallTimestamp() > 0){
+                callRecord.setStatus("回访成功");
+            }else{
+                callRecord.setStatus("回访失败");
+            }
+            callRecords.add(callRecord);
+
+        }
+        callRecordService.saveOrUpdateBatch(callRecords);
+
+    }
+
+
+    public IPage<CallRecordVo> list(Page page, ZfireParamBean zfireParam) {
+
+        //获取当前登录企业id
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        List<String> websitIds = adminUser.getAdminWebsitIds();
+        //1.组装查询条件
+        zfireParam = FieldUtils.supplyParam(zfireParam, CallRecordVo.class);
+
+        IPage<CallRecordVo> callRecordVoIPage = commonMapper.list(page, zfireParam,websitIds);
+        return callRecordVoIPage;
+    }
+}

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1334,6 +1334,24 @@
             is_notice=1 and is_pwd = 0
             and not exists (select 1 from com_detail_log where user_name=#{userName} and com_list_id=a.id)
     </select>
+    <select id="list" resultType="com.gree.mall.manager.bean.common.CallRecordVo">
+        SELECT
+        ${ex.selected}
+        FROM
+        call_send_record  a
+        ${ex.query}
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.create_time, a.id DESC
+        </if>
+
+    <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+        AND a.websit_number IN
+        <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </if>
+        ${ex.orderBy}
+    </select>
 
     <select id="settleRelaConfigPage"
             resultType="com.gree.mall.manager.bean.contract.SettleRelaConfigVO">