im接口临时调整

house365-hgs-web/src/main/webapp/WEB-INF/views/user/pages/list.jsp

@@ -116,9 +116,9 @@
         <div class="span12">
             <form id="filterForm" class="form-inline filterForm" action="${ctx}/user/" method="get">
                 <%--<input type="hidden" name="search_EQ_deptId" value="${sessionTreeDept}"--%>
-                       <%--class="m-wrap small span2" placeholder="deptId">--%>
+                <%--class="m-wrap small span2" placeholder="deptId">--%>
                 <%--<input type="text" name="search_EQ_id" value="${param['search_EQ_id']}"--%>
-                       <%--class="m-wrap small span2" placeholder="用户ID">--%>
+                <%--class="m-wrap small span2" placeholder="用户ID">--%>
                 <input type="text" name="search_LIKE_name" value="${param['search_LIKE_name']}"
                        class="m-wrap small span2" placeholder="用户名">
                 <input type="text" name="search_LIKE_realName" value="${param['search_LIKE_realName']}"
@@ -249,6 +249,7 @@
                     <c:if test="${user.entity.identityType eq '10'}"> <c:out value="租房房博士"/></c:if>
                     <c:if test="${user.entity.identityType eq '7'}"> <c:out value="客服"/></c:if>
                     <c:if test="${user.entity.identityType eq '20'}"> <c:out value="平台人员"/></c:if>
+                    <c:if test="${user.entity.identityType eq '13'}"> <c:out value="房博士测试"/></c:if>
                     <c:if test="${null eq user.entity.identityType || '' eq user.entity.identityType}">
                         <c:out value=""/>
                     </c:if>
@@ -310,6 +311,9 @@
                 <li class="choosemask-fbs" onclick="saveIM(1)" style="margin-left: 10px;">安家顾问</li>
                 <li class="choosemask-fbs" onclick="saveIM(20)" style="margin-left: 10px;">平台人员</li>
             </ul>
+            <%--<ul class="choosemask-twobtn clearfix">--%>
+                <%--<li class="choosemask-fbs" onclick="saveIM(13)">房博士测试</li>--%>
+            <%--</ul>--%>
         </div>
     </div>
 </div>

house365-hgs-ws/src/main/java/com/house365/ws/interfaces/rest/AppHgsLoginImpl.java

@@ -129,7 +129,9 @@ public class AppHgsLoginImpl implements IAppHgsLogin {
             }
             //查询在线客服list
             Map<String, Object> queryMap = new HashMap<>(5);
-            queryMap.put("deptUrlPath", "/1/2/69/70/71/72/77");
+            //测试临时新加部门，上线需要调整
+            queryMap.put("deptUrlPath", "/1/2/69/70/71/556/557");
+//            queryMap.put("deptUrlPath", "/1/2/69/70/71/72/77");
             queryMap.put("telephone", phone);
             List<UserEntity> userList = userMapper.queryByConditions(queryMap);
             if (CollectionUtils.isNotEmpty(userList)) {
@@ -179,7 +181,7 @@ public class AppHgsLoginImpl implements IAppHgsLogin {
         return restObject;
     }
 
-    public boolean hasKey(final String key) {
+    private boolean hasKey(final String key) {
         return (Boolean) redisTemplate.execute(new RedisCallback<Object>() {
             @Override
             public Object doInRedis(RedisConnection connection) throws DataAccessException {
@@ -189,8 +191,8 @@ public class AppHgsLoginImpl implements IAppHgsLogin {
         });
     }
 
-    public static String MD5(String s) {
-        char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+    private static String MD5(String s) {
+        char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
                 'a', 'b', 'c', 'd', 'e', 'f'};
         try {
             byte[] strTemp = s.getBytes();
@@ -237,9 +239,7 @@ public class AppHgsLoginImpl implements IAppHgsLogin {
      *
      * @author hqc
      */
-    protected void checkInterfaceParameter(
-            Map<String, Object> map, String[] checkParams
-    ) throws IllegalServiceParameterException {
+    protected void checkInterfaceParameter(Map<String, Object> map, String[] checkParams) throws IllegalServiceParameterException {
         // 方法所需参数
         for (String str : checkParams) {
             // 如果不存在跳出 同时抛出相应异常

house365-hgs-ws/src/main/java/com/house365/ws/interfaces/rest/GetNewUserInfoImpl.java

@@ -68,9 +68,14 @@ public class GetNewUserInfoImpl implements IGetNewUserInfo {
                 response.setMsg("参数不正确");
                 return JSONObject.fromObject(response).toString();
             }
+            //测试临时调整为qlt_10000
+            String defaultId = "qlt_10000";
+//            String defaultId = "qlt_527";
             //查询在线客服list
             Map<String, Object> queryMap = new HashMap<>(5);
-            queryMap.put("deptUrlPath", "/1/2/69/70/71/72/77");
+            //测试临时新加部门，上线需要调整
+            queryMap.put("deptUrlPath", "/1/2/69/70/71/556/557");
+//            queryMap.put("deptUrlPath", "/1/2/69/70/71/72/77");
             queryMap.put("onlineStatus", 1);
             List<UserEntity> userList = userMapper.queryByConditions(queryMap);
 
@@ -94,7 +99,7 @@ public class GetNewUserInfoImpl implements IGetNewUserInfo {
                         accId = userList.get(pick).getAccId();
                     } else {
                         //没有聊天 取默认值组长的的id
-                        accId = "qlt_527";
+                        accId = defaultId;
                     }
                 }
                 putMap.put("accId", accId);
@@ -106,7 +111,7 @@ public class GetNewUserInfoImpl implements IGetNewUserInfo {
                     accId = userList.get(pick).getAccId();
                 } else {
                     //没有聊天 取默认值组长的的id
-                    accId = "qlt_527";
+                    accId = defaultId;
                 }
                 putMap.put("accId", accId);
                 data.setEntity(putMap);

house365-hgs-ws/src/main/java/com/house365/ws/interfaces/rest/SaveNewMessage.java

@@ -56,7 +56,9 @@ public class SaveNewMessage implements ISaveNewMessage {
                 if (receiver.startsWith("qlt_") && sender.startsWith("tf_")) {
                     Date now = new Date();
                     Map<String, Object> queryMap = new HashMap<>(5);
-                    queryMap.put("deptUrlPath", "/1/2/69/70/71/72/77");
+                    //测试临时新加部门，上线需要调整
+                    queryMap.put("deptUrlPath", "/1/2/69/70/71/556/557");
+//                    queryMap.put("deptUrlPath", "/1/2/69/70/71/72/77");
                     queryMap.put("accId", receiver);
                     List<UserEntity> userList = userMapper.queryByConditions(queryMap);
                     if (CollectionUtils.isNotEmpty(userList)) {