修改不兼容文件

resources/mapper/modules/call/CallDao.xml

@@ -99,7 +99,7 @@
             center_records_id
         ) VALUES
         <foreach collection="list" item="item" index="index" separator=",">
-        (   
+            (
             #{item.id},
             #{item.recordId},
             #{item.title},
@@ -182,7 +182,7 @@
 	          and r.start_time &lt;= #{endTime}
 	          ORDER BY r.start_time DESC
     </select>
-    
+
     <!-- 通过通话的电话号查询用户信息 -->
     <select id="findUserByCallPhone" resultType="com.ejweb.modules.call.entity.CallPhoneInfoListEntity">
         SELECT a.id AS userId,
@@ -244,7 +244,7 @@
                 OR s.seat_phone = #{phoneNumer}
                   OR s.seat_phone_number = #{phoneNumer}
     </select>
-    
+
     <select id="findUserInfoByNumOrId" resultType="com.ejweb.modules.call.entity.CallPhoneInfoListEntity">
         SELECT s.id AS userId,
                s.seat_name AS name,
@@ -291,7 +291,7 @@
         ORDER BY start_time DESC
         LIMIT 1
     </select>
-    
+
     <!-- 通过通话的电话号查询席位信息 -->
     <select id="getPhoneAreaByAreaCode" resultType="com.ejweb.modules.call.entity.CallPhoneAreaEntity">
         SELECT * FROM `foc_phone_area` WHERE `area_code`=#{areaCode}
@@ -351,7 +351,7 @@
             #{updateDate}
         )
     </insert>
-    
+
     <!-- 添加安科的录音记录 -->
     <insert id="addSoundRecord">
         INSERT INTO foc_callcenter_records(
@@ -394,8 +394,8 @@
             #{createDate}
         )
     </insert>
-    
-    
+
+
     <!-- 安科记录 -->
     <select id="getCallSoundList" resultType="com.ejweb.modules.call.entity.CallRecordListEntity">
 
@@ -468,7 +468,7 @@
                'SEAT' AS type,
                '' AS mobile
         FROM foc_seats s
-        WHERE s.huawei_num IN 
+        WHERE s.huawei_num IN
          <foreach collection="huweiNumList" open="(" close=")" separator="," item="item">
          #{item}
         </foreach>
@@ -480,7 +480,7 @@
                'USER' AS type,
                a.mobile
         FROM sys_user a
-        WHERE a.huawei_num IN 
+        WHERE a.huawei_num IN
         <foreach collection="huweiNumList" open="(" close=")" separator="," item="item">
          #{item}
         </foreach>

src/com/ejweb/modules/call/api/CallController.java

@@ -39,7 +39,7 @@ import com.ejweb.modules.user.service.UserService;
 
 /**
  * 电话会议记录及查询
- * 
+ *
  * @team IT Team
  * @author renmb
  * @version 1.0
@@ -55,7 +55,7 @@ public class CallController {
     private UserService userService;
     /**
      * 批量查询电话号码列表
-     * 
+     *
      * @author renmb
      * @time  2017年1月22日
      * @param requestBean
@@ -67,25 +67,25 @@ public class CallController {
         ResponseBean responseBean = new ResponseBean();
         CallPhoneAreaBean bean = requestBean.getObjectBean(CallPhoneAreaBean.class);
         String message = this.callService.validate(bean);
-        
+
         List<CallPhoneAreaEntity> searchPhoneList = bean.getCallPhoneList();
         if(message == null && searchPhoneList !=null && searchPhoneList.size()>0){
             List<CallPhoneAreaEntity> callPhoneList = new ArrayList<CallPhoneAreaEntity>();
             for (CallPhoneAreaEntity phone:searchPhoneList) {
-                
+
                 CallPhoneAreaEntity callPhone = callService.addPhoneArea(phone.getMobile());
                 if(callPhone == null){// 未查询到相关数据
-                    
+
                     callPhone = new CallPhoneAreaEntity();
                 }
                 callPhone.setMobile(phone.getMobile());
                 callPhone.setShowPhone(phone.getMobile());
-                
+
                 if("PHONE".equals(callPhone.getType())){
                     callPhone.setMobileNubmer(callPhone.getPhone());
                     callPhone.setShowPhone(callPhone.getShowPhone());
                 } else if("MOBILE".equals(callPhone.getType())){
-                    
+
                     callPhone.setShowPhone(callPhone.getMobile());
                     callPhone.setPhone(callPhone.getMobileNubmer());
                 }
@@ -99,12 +99,12 @@ public class CallController {
         responseBean.setMessage(message);
         responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
         return responseBean;
-        
+
     }
     /**
      * 格式化手机号码
      * 42.4 查询手机归属地信息接口
-     * 
+     *
      * @author renmb
      * @time  2016年12月6日
      * @param requestBean
@@ -114,29 +114,29 @@ public class CallController {
     @RequestMapping(value = "/phoneArea")
     public ResponseBean phoneArea(RequestBean requestBean) {
         ResponseBean responseBean = new ResponseBean();
-        
+
         CallPhoneAreaBean bean = requestBean.getObjectBean(CallPhoneAreaBean.class);
         String message = this.callService.validate(bean);
         CallPhoneAreaEntity callPhone = new CallPhoneAreaEntity();
-        
+
         if(message == null){
-            
+
             callPhone.setPhone(bean.getPhone());
             callPhone.setMobile(bean.getMobile());
             // 格式化手机号
             if(StringUtils.isNotBlank(bean.getMobile())){
-                
+
                 String mobile = bean.getMobile();
                 // 只使用第一个手机号
                 String[] species = mobile.split("\\s+");
                 if(species.length>1 && species[0].matches("1\\d+") && species[1].matches("1\\d+")){
-                    
+
                     mobile = species[0];
                 }
                 callPhone = callService.addPhoneArea(mobile);
                 // 未查询到相关数据
                 if(callPhone == null){
-                    
+
                     callPhone = new CallPhoneAreaEntity();
                 }
                 callPhone.setMobile(bean.getMobile());
@@ -151,7 +151,7 @@ public class CallController {
                 callPhone.setMobileNubmer(callPhone.getPhone());
                 callPhone.setShowPhone(callPhone.getShowPhone());
             } else if("MOBILE".equals(callPhone.getType())){
-                
+
                 callPhone.setShowPhone(callPhone.getMobile());
                 callPhone.setPhone(callPhone.getMobileNubmer());
             }
@@ -167,7 +167,7 @@ public class CallController {
 
     /**
      * 42.1 开始会话提交接口，在发起人拨打电话时调用 
-     * 
+     *
      * @author renmb
      * @time  2016年10月6日
      * @param requestBean
@@ -183,25 +183,25 @@ public class CallController {
         if (message == null) {// 校验通过
 
             List<CallPhoneBean> phoneList = bean.getPhoneList();
-            
+
             int userCount = phoneList.size()+1;
             CallRecordEntity record = new CallRecordEntity();
             record.setCallType(bean.getCallType());
             record.setCreateBy(bean.getCreateBy());
             if(StringUtils.isEmpty(bean.getCreateName())){
-            	String name = callService.getNameByPhoneFromSeat(bean.getCreatePhone());
-            	if(name!=null){
-            		record.setCreateName(name);
-            	}else{
-            		name = callService.getNameByPhone(bean.getCreatePhone());
-            		if(name!=null){
-            			record.setCreateName(name);
-            		}else{
-            			record.setCreateName(bean.getCreatePhone());
-            		}
-            	}
+                String name = callService.getNameByPhoneFromSeat(bean.getCreatePhone());
+                if (name != null) {
+                    record.setCreateName(name);
+                } else {
+                    name = callService.getNameByPhone(bean.getCreatePhone());
+                    if (name != null) {
+                        record.setCreateName(name);
+                    } else {
+                        record.setCreateName(bean.getCreatePhone());
+                    }
+                }
             }else{
-            	record.setCreateName(bean.getCreateName());
+                record.setCreateName(bean.getCreateName());
             }
 //            record.setCreateName(StringUtils.isEmpty(bean.getCreateName()) ? bean.getCreatePhone() : bean.getCreateName());
             record.setEndStatus(bean.getEndStatus());
@@ -213,7 +213,7 @@ public class CallController {
             record.setVersionName(bean.getVersionName());
             if("APP".equals(bean.getChannelType()) == false){// 通过系统拨打的电话记录
                 if(bean.getStartTime() != null){
-                    
+
                     record.setStartTime(bean.getStartTime());
                 }
             }
@@ -223,7 +223,7 @@ public class CallController {
             record.setPhoneType(Util.getPhoneType(bean.getCreatePhone()));
             callService.createCallRecord(record);// 添加主记录
 
-            
+
             for (CallPhoneBean phone : phoneList) {
 
                 phone.setId(IdWorker.getNextId());
@@ -236,30 +236,30 @@ public class CallController {
 
                     phone.setTitle(record.getCreateName());
                 }
-                if(StringUtils.isEmpty(phone.getUserId()) 
+                if (StringUtils.isEmpty(phone.getUserId())
                         && StringUtils.isNotEmpty(phone.getPhone())){// 如果没有匹配用户信息则通过号码匹配用户信息
-                    
+
                     CallFindPhoneInfoBean phoneBean = new CallFindPhoneInfoBean();
                     Date current = new Date();// 用于查询通话记录
                     phoneBean.setEndTime(current);// 查询时间
                     phoneBean.setStartTime(new Date(current.getTime()-3*60*1000));// 开始时间=查询时间-3分钟
                     phoneBean.setPhoneNumer(phone.getPhone());
-                    
+
                     List<CallPhoneInfoListEntity> userList = callService.findUserByCallPhone(phoneBean, true);
                     if(userList != null && userList.size() == 1){
-                        
+
                         CallPhoneInfoListEntity callPhoneInfo = userList.get(0);
                         if(StringUtils.isNotEmpty(callPhoneInfo.getUserId())){
-                            
+
                             phone.setUserId(callPhoneInfo.getUserId());
                             phone.setUsername(callPhoneInfo.getName());
                         }
                     }
                 }
             }
-            
+
             callService.addCallPhoneList(phoneList);// 添加电话列表
-            
+
             responseBean.setData(record);
             responseBean.setMessage(GConstants.OK);
             responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
@@ -272,7 +272,7 @@ public class CallController {
 
     /**
      * 42.2 结束会话提交接口
-     * 
+     *
      * @author renmb
      * @time  2016年10月6日
      * @param requestBean
@@ -292,14 +292,14 @@ public class CallController {
             record.setEndTime(bean.getEndTime());
             if("APP".equals(bean.getChannelType()) == false){// 通过系统拨打的电话记录
                 if(bean.getEndTime() != null){
-                    
+
                     record.setEndTime(bean.getEndTime());
                 }
             }
             record.setId(bean.getRecordCode());
 
             callService.updateCallRecord(record);// 添加主记录
-            
+
             responseBean.setMessage(GConstants.OK);
             responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
             return responseBean;
@@ -311,7 +311,7 @@ public class CallController {
     /**
      * 42.3 会话列表接口
      * V2.0 添加分页
-     * 
+     *
      * @author renmb
      * @time  2016年10月6日
      * @param requestBean
@@ -323,26 +323,26 @@ public class CallController {
         ResponseBean responseBean = new ResponseBean();
 
         CallRecordListBean bean = requestBean.getObjectBean(CallRecordListBean.class);
-        
+
         String message = callService.validate(bean);
         if (message == null) {// 校验通过
-           Boolean show=false;
-           UserEntity ue=new UserEntity();
-           ue.setUsercode(bean.getUserId());
-           User user = userService.getUserByUserCode(ue);
-           if(user!=null){
-               if(StringUtils.isNoneBlank(user.getPhone())){
-                   show=true;
-               }
-           }else{
-               UserSeatEntity seat= userService.getSeatsEntity(bean.getUserId());
-               if(seat != null && StringUtils.isNoneBlank(seat.getPhone())){
-                   show=true;
-               }
-           }
+            Boolean show = false;
+            UserEntity ue = new UserEntity();
+            ue.setUsercode(bean.getUserId());
+            User user = userService.getUserByUserCode(ue);
+            if (user != null) {
+                if (StringUtils.isNoneBlank(user.getPhone())) {
+                    show = true;
+                }
+            } else {
+                UserSeatEntity seat = userService.getSeatsEntity(bean.getUserId());
+                if (seat != null && StringUtils.isNoneBlank(seat.getPhone())) {
+                    show = true;
+                }
+            }
             PageEntity<CallRecordListEntity> page = callService.getCallRecordList(bean);
             if(page == null){
-                
+
                 responseBean.setMessage(GConstants.OK);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;
@@ -351,7 +351,7 @@ public class CallController {
             List<CallListEntity> callList = new ArrayList<CallListEntity>();
             List<String> huweiNumList = new ArrayList<>();
             for(CallRecordListEntity record:callRecordList){
-                
+
                 CallListEntity call = new CallListEntity();
                 call.setCallType(record.getCallType());
                 call.setEndStatus(record.getEndStatus());
@@ -361,32 +361,32 @@ public class CallController {
                 call.setTitle(record.getTitle());
                 call.setUserCount(record.getUserCount());
                 call.setFlow(record.getFlow());
-                
+
                 if(bean.getUserId().equals(record.getCreateBy())){// 是本人发起的电话，即主叫
-                    
+
                     call.setFlow("CALLING");
                     call.setUserId(record.getUserId());
-                   // call.setPhone( callService.GetPhoneById(record.getUserId()));
+                    // call.setPhone( callService.GetPhoneById(record.getUserId()));
                     call.setUsername(record.getUsername());
 //                    call.setUsername(record.getName());
                     call.setUserPhoto(Util.getAbsoluteUrl(record.getUserPhoto(), GConstants.DEFAULT_SEAT_PHOTO));
                 } else {// 他人发起的电话，电话号码显示
-                    
+
                     call.setFlow("CALLED");
                     call.setPhone(record.getCreatePhone());
-                   // call.setPhone( callService.GetPhoneById(record.getCreateBy()));
+                    // call.setPhone( callService.GetPhoneById(record.getCreateBy()));
                     call.setUserId(record.getCreateBy());
                     call.setUsername(record.getCreateName());
 //                    call.setUsername(record.getName());
                     call.setUserPhoto(Util.getAbsoluteUrl(record.getCreateByPhoto(), GConstants.DEFAULT_SEAT_PHOTO));
                 }
                 if("GROUP".equals(record.getCallType())){// 群组聊天时所有的电话均设置为群发起人电话
-                    
+
                     call.setPhone(record.getCreatePhone());
                     List<MemberEntity> memberlist = callService.getMemberList(record.getId());
                     memberlist.forEach(mEntity->huweiNumList.add(mEntity.getPhone()));
                     call.setMemberList(memberlist);
-                    
+
                 } else if(bean.getUserId().equals(record.getCreateBy())){// 非群聊，且是本人发起的电话
 //                	call.setTitle(record.getName());
                     call.setTitle(record.getUsername());
@@ -395,38 +395,38 @@ public class CallController {
 //                if(show){
 //                    call.setDownloadUrl(this.formatedDownloadUrl(record.getDownloadUrl()));
 //                }
-                
+
 
                 call.setDownloadUrl(this.formatedDownloadUrl(record.getDownloadUrl()));
 
                 huweiNumList.add(call.getPhone());
-              //  call.setDownloadUrl(this.formatedDownloadUrl(record.getDownloadUrl()));
+                //  call.setDownloadUrl(this.formatedDownloadUrl(record.getDownloadUrl()));
 
                 callList.add(call);
             }
-            
+
             Map<String, String> map = callService.findPhoneByHuaweiNum(huweiNumList);// 通过华为短号查询座机号
             for(CallListEntity record:callList){
                 if(map != null ){
                     if(StringUtils.isNotEmpty(map.get(record.getPhone()))){
                         record.setPhone(Util.formatedWorkPhone(map.get(record.getPhone())));
                     }
-                   
+
                     if("GROUP".equals(record.getCallType())){
                         record.getMemberList().forEach(entity->{
                             if(StringUtils.isNotEmpty(map.get(entity.getPhone()))){
                                 entity.setPhone(Util.formatedWorkPhone(map.get(entity.getPhone())));
-                               
+
                             }
                             entity.setShowPhone(Util.getShowPhone(entity.getPhone()));
                         });
                     }
-                    
+
                 }
                 if(StringUtils.isNotEmpty(record.getPhone())
                         && record.getPhone().startsWith("6")
-                          && record.getPhone().length() == 4){// 6开头的华为短号不展示
-                    
+                        && record.getPhone().length() == 4) {// 6开头的华为短号不展示
+
                     record.setPhone("");
                 }
                 record.setShowPhone(Util.getShowPhone(record.getPhone()));
@@ -437,7 +437,7 @@ public class CallController {
             retPage.setList(callList);
             retPage.setPageSize(page.getPageSize());
             retPage.setTotalPage(page.getTotalPage());
-            
+
             responseBean.setData(retPage);
             responseBean.setMessage(GConstants.OK);
             responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
@@ -449,7 +449,7 @@ public class CallController {
     }
     /**
      * 安科录音接口
-     * 
+     *
      * @author renmb
      * @time  2017年3月15日
      * @param requestBean
@@ -467,7 +467,7 @@ public class CallController {
             PageEntity<CallRecordListEntity> page = callService.getCallRecordList(bean);
 //            PageEntity<CallRecordListEntity> page = callService.getCallSoundList(bean);
             if(page == null){
-                
+
                 responseBean.setMessage(GConstants.OK);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
                 return responseBean;
@@ -476,7 +476,7 @@ public class CallController {
             List<CallListEntity> callList = new ArrayList<CallListEntity>();
             List<String> huweiNumList = new ArrayList<>();
             for(CallRecordListEntity record:callRecordList){
-                
+
                 CallListEntity call = new CallListEntity();
                 call.setCallType(record.getCallType());
                 call.setEndStatus(record.getEndStatus());
@@ -485,15 +485,15 @@ public class CallController {
                 call.setTitle(record.getTitle());
                 call.setUserCount(record.getUserCount());
                 call.setFlow(record.getFlow());
-                
+
                 if(bean.getUserId().equals(record.getCreateBy())){// 是本人发起的电话，即主叫
-                    
+
                     call.setFlow("CALLING");
                     call.setUserId(record.getUserId());
                     call.setUsername(record.getUsername());
                     call.setUserPhoto(Util.getAbsoluteUrl(record.getUserPhoto(), GConstants.DEFAULT_SEAT_PHOTO));
                 } else {// 他人发起的电话，电话号码显示
-                    
+
                     call.setFlow("CALLED");
                     call.setPhone(record.getCreatePhone());
                     call.setUserId(record.getCreateBy());
@@ -501,10 +501,10 @@ public class CallController {
                     call.setUserPhoto(Util.getAbsoluteUrl(record.getCreateByPhoto(), GConstants.DEFAULT_SEAT_PHOTO));
                 }
                 if("GROUP".equals(record.getCallType())){// 群组聊天时所有的电话均设置为群发起人电话
-                    
+
                     call.setPhone(record.getCreatePhone());
                 } else if(bean.getUserId().equals(record.getCreateBy())){// 非群聊，且是本人发起的电话
-                    
+
                     call.setTitle(record.getUsername());
                 }
                 huweiNumList.add(call.getPhone());
@@ -515,7 +515,7 @@ public class CallController {
             for(CallListEntity record:callList){
                 if(map != null &&
                         StringUtils.isNotEmpty(map.get(record.getPhone()))){
-                    
+
                     record.setPhone(Util.formatedWorkPhone(map.get(record.getPhone())));
                 }
 //                if(StringUtils.isNotEmpty(record.getPhone())
@@ -532,7 +532,7 @@ public class CallController {
             retPage.setList(callList);
             retPage.setPageSize(page.getPageSize());
             retPage.setTotalPage(page.getTotalPage());
-            
+
             responseBean.setData(retPage);
             responseBean.setMessage(GConstants.OK);
             responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
@@ -544,7 +544,7 @@ public class CallController {
     }
     /**
      * 根据电话号码查询电话相关的席位或者用户信息
-     * 
+     *
      * @author renmb
      * @time  2017年1月5日
      * @param requestBean
@@ -558,11 +558,11 @@ public class CallController {
         CallFindPhoneInfoBean bean = requestBean.getObjectBean(CallFindPhoneInfoBean.class);
         String message = callService.validate(bean);
         if (message == null) {// 校验通过
-            
+
             Date current = new Date();// 用于查询通话记录
             bean.setEndTime(current);// 查询时间
             bean.setStartTime(new Date(current.getTime()-3*60*1000));// 开始时间=查询时间-3分钟
-            
+
             List<CallPhoneInfoListEntity> userList = callService.findUserByCallPhone(bean, false);
             if(userList == null || userList.size() == 0){
                 responseBean.setMessage(GConstants.EMPTY);
@@ -570,11 +570,11 @@ public class CallController {
                 return responseBean;
             }
             for(CallPhoneInfoListEntity call:userList){
-                
+
                 call.setPhoto(Util.getAbsoluteUrl(call.getPhoto(), GConstants.DEFAULT_SEAT_PHOTO));
             }
 //            callService.addCallRecordByCalled(bean, userList.get(0));
-            
+
             responseBean.setData(userList);
             responseBean.setMessage(GConstants.OK);
             responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
@@ -586,9 +586,9 @@ public class CallController {
     }
     /**
      * 一次性批量提交电话会议记录
-     * 
+     *
      * 42.4 批量提交通话记录接口
-     * 
+     *
      * @author renmb
      * @time  2017年2月17日
      * @param requestBean
@@ -601,11 +601,11 @@ public class CallController {
 
         CallLogListBean callLog = requestBean.getObjectBean(CallLogListBean.class);
         if (callLog != null && callLog.getCallLogList() != null) {// 校验通过
-            
+
             List<CallRecordBean> callLogList = callLog.getCallLogList();
             for (CallRecordBean bean:callLogList) {
                 List<CallPhoneBean> phoneList = bean.getPhoneList();
-                
+
                 int userCount = phoneList.size()+1;
                 CallRecordEntity record = new CallRecordEntity();
                 record.setCallType(bean.getCallType());
@@ -617,7 +617,7 @@ public class CallController {
                 record.setAppCode(bean.getAppCode());
                 record.setPlatform(bean.getPlatform());
                 record.setVersionName(bean.getVersionName());
-                
+
                 if(bean.getStartTime() == null){
                     record.setStartTime(new Date());
                 } else{
@@ -629,7 +629,7 @@ public class CallController {
 
                 callService.createCallRecord(record);// 添加主记录
 
-                
+
                 for (CallPhoneBean phone : phoneList) {
 
                     phone.setId(IdWorker.getNextId());
@@ -642,7 +642,7 @@ public class CallController {
                         phone.setTitle(record.getCreateName());
                     }
                 }
-                
+
                 callService.addCallPhoneList(phoneList);// 添加电话列表
             }
             responseBean.setMessage(GConstants.OK);
@@ -653,16 +653,16 @@ public class CallController {
         responseBean.setStatus(ErrorCode.STATUS_CODE_4001);
         return responseBean;
     }
-    
+
     /**
      * 用于安科同步录音数据
-     * 
+     *
      * @author renmb
      * @time  2017年2月28日
      * @param requestBean
      * @return
      */
-	@ResponseBody
+    @ResponseBody
     @RequestMapping(value = "/addSoundRecord")
     public ResponseBean addSoundRecord(RequestBean requestBean) {
         ResponseBean responseBean = new ResponseBean();
@@ -670,11 +670,11 @@ public class CallController {
         CallSoundRecordBean bean = requestBean.getObjectBean(CallSoundRecordBean.class);
         String message = callService.validate(bean);
         if (message == null) {// 校验通过
-            
+
             bean.setFocTimeMillis(System.currentTimeMillis());
             Date createDate = new Date(bean.getFocTimeMillis());
             bean.setCreateDate(createDate);
-            
+
             long focDiffMillis = bean.getCurrentTimeMillis() - bean.getFocTimeMillis()+GConstants.getIntValue("add.diff.millis", 100);
 //            if(focDiffMillis<1000){
 //                focDiffMillis = 0;
@@ -683,92 +683,92 @@ public class CallController {
             Date start = new Date(bean.getBeginTime().getTime()-focDiffMillis);
             bean.setFocBeginTime(start);
             if(bean.getEndTime() != null){
-                
+
                 Date end = new Date(bean.getEndTime().getTime()-focDiffMillis);
                 bean.setFocEndTime(end);
             }
-            	//添加通话记录call_record,call_office
-            	CallRecordEntity record = new CallRecordEntity();
-                record.setCallType("USER");
-            	String name = callService.getNameByPhoneFromSeat(bean.getCallNo());
-            	String id = callService.getIdByPhoneFromSeat(bean.getCallNo());
-            	if(name!=null){
-            		record.setCreateName(name);
-            		record.setCreateBy(id);
-            	}else{
-            		name = callService.getNameByPhone(bean.getCallNo());
-            		if(name!=null){
-            			id = callService.getIdByPhone(bean.getCallNo());
-            			record.setCreateName(name);
-            			record.setCreateBy(id);
-            		}else{
-            			record.setCreateName(bean.getCallNo());
-            			record.setCreateBy("1");
-            		}
-            	}
-            	int userCount = 1;
-            	if(bean.getResult()!=null && !bean.getResult().equals("0")){
-            		record.setEndStatus("SUCCESS");
-            		userCount = 2;
-            	}else{
-            		record.setEndStatus("FAILD");
-            	}
-                record.setId(IdWorker.getNextId());
-                record.setChannelType(bean.getChannelType());
-                record.setAppCode("30011");
-                record.setPlatform("JAVA");
-                record.setVersionName("1.0");
-                record.setDownloadUrl(bean.getDownloadUrl());
-                record.setDuration(bean.getDuration());
-                record.setStartTime(bean.getBeginTime());
-                record.setEndTime(bean.getEndTime());
-                record.setUserCount(userCount);
-                record.setCreatePhone(bean.getCallNo());
-                record.setCreateShowPhone(bean.getCallNo());
-                record.setPhoneType(Util.getPhoneType(bean.getCallNo()));
+            //添加通话记录call_record,call_office
+            CallRecordEntity record = new CallRecordEntity();
+            record.setCallType("USER");
+            String name = callService.getNameByPhoneFromSeat(bean.getCallNo());
+            String id = callService.getIdByPhoneFromSeat(bean.getCallNo());
+            if (name != null) {
+                record.setCreateName(name);
+                record.setCreateBy(id);
+            } else {
+                name = callService.getNameByPhone(bean.getCallNo());
+                if (name != null) {
+                    id = callService.getIdByPhone(bean.getCallNo());
+                    record.setCreateName(name);
+                    record.setCreateBy(id);
+                } else {
+                    record.setCreateName(bean.getCallNo());
+                    record.setCreateBy("1");
+                }
+            }
+            int userCount = 1;
+            if (bean.getResult() != null && !bean.getResult().equals("0")) {
+                record.setEndStatus("SUCCESS");
+                userCount = 2;
+            } else {
+                record.setEndStatus("FAILD");
+            }
+            record.setId(IdWorker.getNextId());
+            record.setChannelType(bean.getChannelType());
+            record.setAppCode("30011");
+            record.setPlatform("JAVA");
+            record.setVersionName("1.0");
+            record.setDownloadUrl(bean.getDownloadUrl());
+            record.setDuration(bean.getDuration());
+            record.setStartTime(bean.getBeginTime());
+            record.setEndTime(bean.getEndTime());
+            record.setUserCount(userCount);
+            record.setCreatePhone(bean.getCallNo());
+            record.setCreateShowPhone(bean.getCallNo());
+            record.setPhoneType(Util.getPhoneType(bean.getCallNo()));
 //                callService.createCallRecord(record);// 添加主记录
-                //添加被叫记录
-                List<CallPhoneBean> phoneList = new ArrayList<CallPhoneBean>();
-                CallPhoneBean phone = new CallPhoneBean();
+            //添加被叫记录
+            List<CallPhoneBean> phoneList = new ArrayList<CallPhoneBean>();
+            CallPhoneBean phone = new CallPhoneBean();
 
-                phone.setId(IdWorker.getNextId());
-                phone.setPhoneType(Util.getPhoneType(phone.getPhone()));
-                phone.setRecordId(record.getId());
-                phone.setDownloadUrl(bean.getDownloadUrl());
-                phone.setCenterRecordsId(bean.getId());
-                if ("GROUP".equals(record.getCallType())) {// 群组聊天的时候记录标题
+            phone.setId(IdWorker.getNextId());
+            phone.setPhoneType(Util.getPhoneType(phone.getPhone()));
+            phone.setRecordId(record.getId());
+            phone.setDownloadUrl(bean.getDownloadUrl());
+            phone.setCenterRecordsId(bean.getId());
+            if ("GROUP".equals(record.getCallType())) {// 群组聊天的时候记录标题
 
-                    phone.setTitle("由" + record.getCreateName() + "发起电话会议");
-                } else {
+                phone.setTitle("由" + record.getCreateName() + "发起电话会议");
+            } else {
 
-                    phone.setTitle(record.getCreateName());
+                phone.setTitle(record.getCreateName());
+            }
+            String acceptName = callService.getNameByPhoneFromSeat(bean.getAcceptNo());
+            String acceptId = callService.getIdByPhoneFromSeat(bean.getAcceptNo());
+            if (acceptName != null) {
+                phone.setUserId(acceptId);
+                phone.setUsername(acceptName);
+            } else {
+                acceptName = callService.getNameByPhone(bean.getAcceptNo());
+                if (acceptName != null) {
+                    acceptId = callService.getIdByPhone(bean.getAcceptNo());
+                    phone.setUserId(acceptId);
+                    phone.setUsername(acceptName);
+                } else {
+                    phone.setUserId("1");
+                    phone.setUsername(bean.getAcceptNo());
                 }
-                String acceptName = callService.getNameByPhoneFromSeat(bean.getAcceptNo());
-            	String acceptId = callService.getIdByPhoneFromSeat(bean.getAcceptNo());
-            	if(acceptName!=null){
-            		phone.setUserId(acceptId);
-            		phone.setUsername(acceptName);
-            	}else{
-            		acceptName = callService.getNameByPhone(bean.getAcceptNo());
-            		if(acceptName!=null){
-            			acceptId = callService.getIdByPhone(bean.getAcceptNo());
-            			phone.setUserId(acceptId);
-                		phone.setUsername(acceptName);
-            		}else{
-            			phone.setUserId("1");
-                		phone.setUsername(bean.getAcceptNo());
-            		}
-            	}
-            	phone.setPhone(bean.getAcceptNo());
-            	phone.setShowPhone(bean.getAcceptNo());
-            	phone.setPhoneType(Util.getPhoneType(bean.getAcceptNo()));
-            	phone.setFlow("CALLED");
-                phoneList.add(phone);
+            }
+            phone.setPhone(bean.getAcceptNo());
+            phone.setShowPhone(bean.getAcceptNo());
+            phone.setPhoneType(Util.getPhoneType(bean.getAcceptNo()));
+            phone.setFlow("CALLED");
+            phoneList.add(phone);
 //                callService.addCallPhoneList(phoneList);// 添加电话列表
-            	
-                bean.setCallRecordId(record.getId());
+
+            bean.setCallRecordId(record.getId());
             if(callService.addSoundRecord(bean,phoneList,record)){
-            	
+
                 responseBean.setMessage(GConstants.OK);
                 responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
                 return responseBean;

src/com/ejweb/modules/call/dao/CallDao.java

@@ -17,47 +17,47 @@ import com.ejweb.modules.call.entity.MemberEntity;
 public interface CallDao extends BaseDao {
 
     public Integer createCallRecord(CallRecordEntity entity);
-    
+
     public Integer updateCallRecord(CallRecordEntity entity);
-    
+
     public Integer addCallPhoneList(List<CallPhoneBean> phoneList);
-    
+
     public List<CallRecordListEntity> getCallRecordList(CallRecordListBean bean);
-    
+
     public List<CallRecordListEntity> getCallSoundList(CallRecordListBean bean);
-    
+
     public List<CallPhoneInfoListEntity> findUserByCallPhone(CallFindPhoneInfoBean bean);
-    
+
     public List<CallPhoneInfoListEntity> findUserByCallRecord(CallFindPhoneInfoBean bean);
-    
+
     public List<CallPhoneInfoListEntity> findSeatListByCallPhone(CallFindPhoneInfoBean bean);
-    
+
     public CallPhoneInfoListEntity findUserInfoByNumOrId(CallFindPhoneInfoBean bean);
-    
+
     public CallPhoneAreaEntity getPhoneAreaByAreaCode(CallPhoneAreaEntity areaCode);
-    
+
     public CallPhoneAreaEntity getPhoneAreaByMobile(CallPhoneAreaEntity mobile);
-    
+
     public Integer addPhoneAreaRecord(CallPhoneAreaEntity entity);
-    
+
     public Integer addPhoneAreaCode(CallPhoneAreaEntity entity);
-    
+
     public Integer addSoundRecord(CallSoundRecordBean entity);
-    
+
     public List<CallPhoneInfoListEntity> findPhneListByHuaweiNum(HuaweiNumListEntity entity);
     public String GetPhoneById(String id);
-    
+
     public List<MemberEntity> getMemberList(String recordId);
 
-	public String getNameByPhone(String mobileNubmer);
+    public String getNameByPhone(String mobileNubmer);
 
-	public String getNameByPhoneFromSeat(String createPhone);
+    public String getNameByPhoneFromSeat(String createPhone);
 
-	public String getIdByPhoneFromSeat(String createPhone);
+    public String getIdByPhoneFromSeat(String createPhone);
 
-	public String getIdByPhone(String mobileNubmer);
+    public String getIdByPhone(String mobileNubmer);
 
-	public List<CallRecordListEntity> get(CallRecordListEntity callRecordListEntity);
+    public List<CallRecordListEntity> get(CallRecordListEntity callRecordListEntity);
 
-	public List<CallRecordListEntity> getList(CallRecordListEntity callRecordListEntity);
+    public List<CallRecordListEntity> getList(CallRecordListEntity callRecordListEntity);
 }

src/com/ejweb/modules/call/service/CallService.java

@@ -26,29 +26,29 @@ import java.util.*;
 public class CallService extends BaseService<CallDao> {
 
     public void createCallRecord(CallRecordEntity entity){
-        
+
         dao.createCallRecord(entity);
     }
-    
+
     public void updateCallRecord(CallRecordEntity entity){
-        
+
         dao.updateCallRecord(entity);
     }
-    
+
     public Integer addCallPhoneList(List<CallPhoneBean> phoneList){
-        
+
         return dao.addCallPhoneList(phoneList);
     }
     /**
      * 获取通话记录列表
-     * 
+     *
      * @author renmb
      * @time  2016年12月6日
      * @param bean
      * @return
      */
     public PageEntity<CallRecordListEntity> getCallRecordList(CallRecordListBean bean){
-        
+
         PageInfo<CallRecordListEntity> pageInfo = null;
         Date current = new Date();
         Date startTime = DateUtils.addDays(current, -3);
@@ -57,9 +57,9 @@ public class CallService extends BaseService<CallDao> {
         // 必须紧贴dao的查询方法
         PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
         pageInfo = new PageInfo<CallRecordListEntity>(dao.getCallRecordList(bean));
-        
+
         if(pageInfo.getPages()<bean.getPageNo()){// 页码大于总页数，则返回NULL
-            
+
             return null;
         }
         List<CallRecordListEntity> list = pageInfo.getList();
@@ -81,7 +81,7 @@ public class CallService extends BaseService<CallDao> {
             }
         }
         if(templist.size()>0){
-        	list.removeAll(templist);
+            list.removeAll(templist);
             pageInfo.setSize(list.size());
             pageInfo.setTotal(list.size());
         }
@@ -95,55 +95,55 @@ public class CallService extends BaseService<CallDao> {
         return page;
     }
     public PageEntity<CallRecordListEntity> getCallSoundList(CallRecordListBean bean){
-        
-      PageInfo<CallRecordListEntity> pageInfo = null;
-      Date current = new Date();
-      Date startTime = DateUtils.addDays(current, -6);
-      bean.setStartTime(DateFormatUtils.format(startTime, "yyyy-MM-dd 00:00:00"));
-      bean.setEndTime(DateFormatUtils.format(current, "yyyy-MM-dd 23:59:59"));
-      // 必须紧贴dao的查询方法
-      PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
-      pageInfo = new PageInfo<CallRecordListEntity>(dao.getCallSoundList(bean));
-      
-      if(pageInfo.getPages()<bean.getPageNo()){// 页码大于总页数，则返回NULL
-          
-          return null;
-      }
-      List<CallRecordListEntity> list = pageInfo.getList();
-      if (list == null || list.size() == 0) {// 如果没有数据则返回NULL
-          return null;
-      }
-      PageEntity<CallRecordListEntity> page = new PageEntity<CallRecordListEntity>();
-      page.setPageNo(pageInfo.getPageNum());
-      page.setPageSize(pageInfo.getPageSize());
-      page.setCount(pageInfo.getTotal());
-      page.setTotalPage(pageInfo.getPages());
-      page.setList(pageInfo.getList());
-
-      return page;
-  }
+
+        PageInfo<CallRecordListEntity> pageInfo = null;
+        Date current = new Date();
+        Date startTime = DateUtils.addDays(current, -6);
+        bean.setStartTime(DateFormatUtils.format(startTime, "yyyy-MM-dd 00:00:00"));
+        bean.setEndTime(DateFormatUtils.format(current, "yyyy-MM-dd 23:59:59"));
+        // 必须紧贴dao的查询方法
+        PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
+        pageInfo = new PageInfo<CallRecordListEntity>(dao.getCallSoundList(bean));
+
+        if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
+
+            return null;
+        }
+        List<CallRecordListEntity> list = pageInfo.getList();
+        if (list == null || list.size() == 0) {// 如果没有数据则返回NULL
+            return null;
+        }
+        PageEntity<CallRecordListEntity> page = new PageEntity<CallRecordListEntity>();
+        page.setPageNo(pageInfo.getPageNum());
+        page.setPageSize(pageInfo.getPageSize());
+        page.setCount(pageInfo.getTotal());
+        page.setTotalPage(pageInfo.getPages());
+        page.setList(pageInfo.getList());
+
+        return page;
+    }
     /**
      * 根据电话号码查询，通话来电号码查询用户信息
-     * 
+     *
      * 1、席位优先
      * 2、查询最近通话记录
      * 3、查询用户表，如果有多个用户就展示用户手机号或者座机号
-     * 
+     *
      * @author renmb
      * @time  2017年1月5日
      * @param bean
      * @return
      */
     public List<CallPhoneInfoListEntity> findUserByCallPhone(CallFindPhoneInfoBean bean, boolean isOnlySearch){
-        
+
         bean.setMobileNubmer0("0"+bean.getPhoneNumer());
         bean.setMobileNubmer00("00"+bean.getPhoneNumer());
         List<CallPhoneInfoListEntity> callList = dao.findUserByCallRecord(bean);
         if(callList == null || callList.size() == 0){// 没有匹配到席位信息
-            
+
             List<CallPhoneInfoListEntity> seatList = dao.findSeatListByCallPhone(bean);
             if(seatList == null || seatList.size() == 0){// 没有匹配到通话记录信息
-                
+
                 List<CallPhoneInfoListEntity> userList = dao.findUserByCallPhone(bean);
                 if(userList == null || userList.size() == 0 || userList.size() > 1){// 没有匹配到用户信息，或者匹配个数大于1
                     CallPhoneInfoListEntity entity = new CallPhoneInfoListEntity();
@@ -155,21 +155,21 @@ public class CallService extends BaseService<CallDao> {
                     phoneList.add(entity);
                     return phoneList;
                 } else{// 有用户信息直接返回
-                    
+
                     return userList;
                 }
             } else {// 有通话记录信息，直接返回
-                
+
                 return seatList;
             }
         } else{// 有席位信息直接返回
-            
+
             return callList;
         }
     }
     /**
      * 被叫方添加通话记录
-     * 
+     *
      * @author renmb
      * @time  2017年3月17日
      * @param bean
@@ -226,7 +226,7 @@ public class CallService extends BaseService<CallDao> {
 //    }
     /**
      * 综合查询手机号的归属地信息
-     * 
+     *
      * @author renmb
      * @time  2017年1月22日
      * @param mobile
@@ -235,7 +235,7 @@ public class CallService extends BaseService<CallDao> {
     @Transactional(readOnly = false)
     public CallPhoneAreaEntity addPhoneArea(String mobile){
         if(StringUtils.isEmpty(mobile) || mobile.length()<7){
-            
+
             return null;
         }
         String src = new String(mobile);
@@ -256,17 +256,17 @@ public class CallService extends BaseService<CallDao> {
             phoneArea = this.getCallPhoneAreaBy360(mobile);
             if(phoneArea != null){
                 if(StringUtils.isNotEmpty(phoneArea.getPremobile())){// 手机类型进行缓存数据库
-                    
+
                     phoneArea.setId(IdWorker.getNextId());
                     phoneArea.setUpdateDate(new Date());
                     if(phoneArea.getMobile().length()>=7){
-                        
+
                         phoneArea.setAreaCode(phoneArea.getMobile().substring(0, 7));
                         dao.addPhoneAreaCode(phoneArea);
                     }
                     dao.addPhoneAreaRecord(phoneArea);
                 } else{// 非手机号，按座机号处理
-                    
+
                     phoneArea.setShowPhone(src);
                     phoneArea.setPhone(Util.formatedWorkPhone(src));
                     phoneArea.setType("PHONE");
@@ -296,14 +296,14 @@ public class CallService extends BaseService<CallDao> {
             } else if(mobile.startsWith("0") == false){
                 PhoneAreaEntity area = PhoneAreaUtil.get360PhoneArea(mobile);
                 if(area == null){
-                    
+
                     area = PhoneAreaUtil.get360PhoneArea(mobile);
                 }
                 if(area != null && StringUtils.isNotBlank(area.getProvince())){// 能够查到省份信息
-                    
+
                     if(area.getProvince().contains("北京")
                             || (StringUtils.isNotBlank(area.getCity()) && area.getCity().contains("北京"))){// 北京前面加拨一个0
-                        
+
                         callPhone.setType("MOBILE");
                         callPhone.setMobileNubmer("0"+mobile);// 加拨1个0
                         callPhone.setPremobile("0");
@@ -312,7 +312,7 @@ public class CallService extends BaseService<CallDao> {
                         callPhone.setMobileSp(StringUtils.isBlank(area.getSp()) ? "" : area.getSp());
                         return callPhone;
                     } else {// 非北京号码加拨两个0
-                        
+
                         callPhone.setType("MOBILE");
                         callPhone.setMobileNubmer("00"+mobile);// 加拨2个0
                         callPhone.setPremobile("00");
@@ -332,32 +332,32 @@ public class CallService extends BaseService<CallDao> {
     }
     /**
      * 添加安科同步过来的数据
-     * 
+     *
      * @author renmb
      * @time  2017年2月28日
      * @param entity
      * @return
      */
     public boolean addSoundRecord(CallSoundRecordBean entity,List<CallPhoneBean> phoneList,CallRecordEntity record){
-    	dao.createCallRecord(record);
-    	dao.addCallPhoneList(phoneList);
+        dao.createCallRecord(record);
+        dao.addCallPhoneList(phoneList);
         Integer count = dao.addSoundRecord(entity);
         return count != null && count > 0;
     }
-    
+
     public Map<String, String> findPhoneByHuaweiNum(List<String> huweiNumList){
-        
+
         HuaweiNumListEntity entity = new HuaweiNumListEntity();
         entity.setHuweiNumList(huweiNumList);
-        
+
         List<CallPhoneInfoListEntity> list =  dao.findPhneListByHuaweiNum(entity);
         if(list == null || list.size() == 0){
-            
+
             return null;
         }
         Map<String, String> map = new HashMap<String, String>();
         for(CallPhoneInfoListEntity p:list){
-            
+
             map.put(p.getHuaweiNum(), p.getPhone());
         }
         return map;
@@ -367,28 +367,27 @@ public class CallService extends BaseService<CallDao> {
 //    }
 
 
-    
     public List<MemberEntity> getMemberList(String id) {
         return  dao.getMemberList( id);
     }
 
-	public String getNameByPhone(String createPhone) {
-		// TODO Auto-generated method stub
-		return dao.getNameByPhone(createPhone);
-	}
-
-	public String getNameByPhoneFromSeat(String createPhone) {
-		// TODO Auto-generated method stub
-		return dao.getNameByPhoneFromSeat(createPhone);
-	}
-
-	public String getIdByPhoneFromSeat(String callNo) {
-		// TODO Auto-generated method stub
-		return dao.getIdByPhoneFromSeat(callNo);
-	}
-
-	public String getIdByPhone(String callNo) {
-		// TODO Auto-generated method stub
-		return dao.getIdByPhone(callNo);
-	}
+    public String getNameByPhone(String createPhone) {
+        // TODO Auto-generated method stub
+        return dao.getNameByPhone(createPhone);
+    }
+
+    public String getNameByPhoneFromSeat(String createPhone) {
+        // TODO Auto-generated method stub
+        return dao.getNameByPhoneFromSeat(createPhone);
+    }
+
+    public String getIdByPhoneFromSeat(String callNo) {
+        // TODO Auto-generated method stub
+        return dao.getIdByPhoneFromSeat(callNo);
+    }
+
+    public String getIdByPhone(String callNo) {
+        // TODO Auto-generated method stub
+        return dao.getIdByPhone(callNo);
+    }
 }

src/com/ejweb/modules/im/service/HuaweiUCSyncService.java

@@ -640,7 +640,7 @@ public class HuaweiUCSyncService {
         //更新席位账号，UC状态为关闭
         SeatEntity seatEntity = huaweiUCSyncDao.getSeatById(accountId);
         if(seatEntity != null){
-            
+
             return updateSeatAccountInfo(seatEntity, personInfo, "1", ucOpen);
         }
         return false;
@@ -671,7 +671,7 @@ public class HuaweiUCSyncService {
             accountUpdateBean.setName(StringUtils.isBlank(userProfileEntity.getName()) ? "未填写" : userProfileEntity.getName());
 //            accountUpdateBean.setSex(userProfileEntity.getSex().toString().equals("M") ? "0" : "1");
             if(StringUtils.isNotEmpty(userProfileEntity.getSex())){
-                
+
                 accountUpdateBean.setSex("M".equals(userProfileEntity.getSex()) ? "0" : "1");
             }
 //          accountUpdateBean.setHomePhone(homePhone);
@@ -924,20 +924,20 @@ public class HuaweiUCSyncService {
             }
             /**
              //是否忽略系统最大的sip号码，忽略的话只根据配置进行处理，需要循环得到不存在的号码
-            if (ignoreMaxSipNum) {
-                while (true) {
-                    Boolean checkSipResult = checkSipExists(maxSipNum);
-                    if (checkSipResult == null) {
-                        return false;
-                    }
-                    if (checkSipResult) {
-                        maxSipNum++;
-                    }
-                    if (!checkSipResult) {
-                        break;
-                    }
-                }
-            }
+             if (ignoreMaxSipNum) {
+             while (true) {
+             Boolean checkSipResult = checkSipExists(maxSipNum);
+             if (checkSipResult == null) {
+             return false;
+             }
+             if (checkSipResult) {
+             maxSipNum++;
+             }
+             if (!checkSipResult) {
+             break;
+             }
+             }
+             }
              *
              */
 
@@ -1077,10 +1077,10 @@ public class HuaweiUCSyncService {
         accountInfo.getAccount().setUserState("0");
         accountInfo.getAccount().setDepartmentId(departmentId);
         if(StringUtils.isNotEmpty(userProfileEntity.getSex())){
-            
+
             accountInfo.getAccount().setSex("M".equals(userProfileEntity.getSex()) ? "0" : "1");
         }
-        
+
         accountInfo.getAccount().setCellPhone(Util.formatedMobile(userProfileEntity.getMobile()));
         accountInfo.getAccount().setWebsite(userProfileEntity.getName());
         accountInfo.getAccount().setOfficePhone(Util.formatedWorkPhone(userProfileEntity.getPhone()));
@@ -1417,7 +1417,7 @@ public class HuaweiUCSyncService {
      * @return
      */
     public boolean deleteUCAccount(String accountId) {
-        
+
         try {
             RestRequestMessage restRequestMessage = new RestRequestMessage();
             restRequestMessage.setHttpMethod("DELETE");
@@ -1425,7 +1425,7 @@ public class HuaweiUCSyncService {
             params.put("userId", userId);
             params.put("accountId", accountId);
             restRequestMessage.setParameters(params);
-            
+
             String res = restUtils.sendMessage(restRequestMessage, accountRestUrl);
             if (StringUtils.isNotBlank(res)) {
                 HuaweiQueryResponseEntity queryResponseEntity = JSONObject.parseObject(res, HuaweiQueryResponseEntity.class);