落地页

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmPageBO.java

@@ -86,6 +86,16 @@ public class HmPageBO implements Serializable {
     private Date createTime;
 
     private Date updateTime;
+    private int pageType ;
+    
+
+    public int getPageType() {
+        return pageType;
+    }
+
+    public void setPageType(int pageType) {
+        this.pageType = pageType;
+    }
 
     public Long getPageId() {
         return pageId;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/GroupChatService.java

@@ -130,7 +130,7 @@ public interface GroupChatService {
      */
     public void handleHmChatFull(String params);
 
-    public void ownerDimission(String staffId) ;
+    public void ownerDimission(String staffId);
 
     /**
      * 
@@ -139,6 +139,6 @@ public interface GroupChatService {
     * @author xugh
     * @throws
      */
-    public void ownerDimission() ;
+    public void ownerDimission();
 
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java

@@ -370,9 +370,9 @@ public class GroupChatServiceImpl implements GroupChatService {
     @Override
     public void ownerDimission(String staffId) {
         logger.info("群主离职,刷新群状态,staffId={}", staffId);
-        TabGroupChatOwner owner = this.groupChatOwnerMapper.selectByStaffId(staffId) ;
+        TabGroupChatOwner owner = this.groupChatOwnerMapper.selectByStaffId(staffId);
         if (null != owner) {
-            this.groupChatOwnerMapper.updateChatCount(staffId, owner.getChatCount()) ;
+            this.groupChatOwnerMapper.updateChatCount(staffId, owner.getChatCount());
             TabHaobanStaff staff = this.staffMapper.selectByPrimaryKey(staffId);
             this.dimissionOwner(staff.getWxEnterpriseId(), staff.getWxUserId(), staff.getWxOpenUseId());
         }
@@ -382,8 +382,12 @@ public class GroupChatServiceImpl implements GroupChatService {
     public void ownerDimission() {
         List<GroupChatOwnerDTO> dimissionOwnerList = this.groupChatOwnerMapper.dimissionOwnerList();
         for (GroupChatOwnerDTO dto : dimissionOwnerList) {
+            try {
                 logger.info("群主离职,群状态处理={}", JSON.toJSONString(dto));
                 this.dimissionOwner(dto.getWxEnterpriseId(), dto.getWxUserId(), dto.getWxOpenUserId());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
     }
 
@@ -607,6 +611,7 @@ public class GroupChatServiceImpl implements GroupChatService {
             TabGroupChatUser user = userMap.get(userId);
             if (null != user) {
                 logger.info("更新用户,id={}", userId);
+                boolean updateFlag = false;
                 user.setAdminFlag(0);
                 if (member.getUserid().equals(owner)) {
                     user.setAdminFlag(1);
@@ -615,13 +620,24 @@ public class GroupChatServiceImpl implements GroupChatService {
                 }
                 if (StringUtils.isEmpty(user.getMemberId())) {
                     this.matchGicMember(wxEnterpriseId, enterpriseId, member.getUnionid(), userId, user);
+                    if (StringUtils.isNotEmpty(user.getMemberId())) {
+                        updateFlag = true;
+                    }
                 }
                 if (user.getUserType() == 3) {
                     totalMemberCount++;
                 }
                 user.setUserName(userName);
+                if (this.isDiff(user.getUserName(), userName)) {
+                    updateFlag = true;
+                }
                 user.setNickName(nickName);
+                if (this.isDiff(user.getNickName(), nickName)) {
+                    updateFlag = true;
+                }
+                if (updateFlag) {
                     this.groupChatUserMapper.update(user);
+                }
                 continue;
             }
             user = new TabGroupChatUser();
@@ -695,6 +711,16 @@ public class GroupChatServiceImpl implements GroupChatService {
                 quitMemberCount);
     }
 
+    private boolean isDiff(String a, String b) {
+        if (StringUtils.isBlank(a) && StringUtils.isBlank(b)) {
+            return false;
+        }
+        if (StringUtils.isNotBlank(a) && StringUtils.isNotBlank(b) && a.equals(b)) {
+            return false;
+        }
+        return true;
+    }
+
     private void updateData(Long groupChatId, int totalCount, int totalMemberCount, int addMemberCount, int addCount,
             int quitCount, int quitMemberCount) {
         logger.info("更新群的统计,groupChatId={}", groupChatId);

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatHmMapper.xml

@@ -101,8 +101,7 @@
 	<!-- =====================删除==================== -->
 	<update id="deleteById" parameterType="long">
 		UPDATE
-		tab_haoban_group_chat_hm SET delete_flag = 1 WHERE chat_hm_id =
-		#{chatHmId}
+		tab_haoban_group_chat_hm SET delete_flag = 1 WHERE chat_hm_id = #{chatHmId}
 	</update>
 
 
@@ -134,8 +133,7 @@
 		resultMap="result-map-tabHaobanGroupChatHm">
 		SELECT
 		<include refid="Base_Column_List" />
-		FROM tab_haoban_group_chat_hm WHERE chat_hm_id = #{chatHmId} and
-		delete_flag = 0
+		FROM tab_haoban_group_chat_hm WHERE chat_hm_id = #{chatHmId} and  delete_flag = 0
 	</select>
 	
 	<update id="updateLinkCount">