修改不兼容文件

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/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/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);