群统计

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatDataController.java

@@ -9,17 +9,20 @@ import org.springframework.web.bind.annotation.RestController;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.chat.GroupChatDataDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.ChatDataSearchQDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatDataApiService;
+import com.gic.haoban.manage.web.vo.chat.GroupChatDataVO;
 
 /**
  * 
-* @ClassName: GroupChatController
-* @Description: 群
+* @ClassName: GroupChatDataController
+* @Description: 群统计
 * @author xugh
 * @date 2022年11月26日 上午9:32:56
 *
@@ -37,7 +40,8 @@ public class GroupChatDataController {
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         qdto.setWxEnterpriseId(wxEnterpriseId);
         ServiceResponse<GroupChatDataDTO> resp = this.groupChatDataApiService.listTotalData(qdto);
-        return RestResponse.successResult(resp.getResult());
+        GroupChatDataVO vo = EntityUtil.changeEntityByJSON(GroupChatDataVO.class, resp.getResult());
+        return RestResponse.successResult(vo);
     }
 
     @RequestMapping("list-chat")
@@ -46,7 +50,8 @@ public class GroupChatDataController {
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         qdto.setWxEnterpriseId(wxEnterpriseId);
         ServiceResponse<List<GroupChatDataDTO>> resp = this.groupChatDataApiService.listForChat(qdto);
-        return RestResponse.successResult(resp.getResult());
+        List<GroupChatDataVO> list = EntityUtil.changeEntityListByJSON(GroupChatDataVO.class, resp.getResult());
+        return RestResponse.successResult(list);
     }
 
     @RequestMapping("list-staff")
@@ -55,7 +60,10 @@ public class GroupChatDataController {
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         qdto.setWxEnterpriseId(wxEnterpriseId);
         ServiceResponse<Page<GroupChatDataDTO>> resp = this.groupChatDataApiService.listStaffData(qdto, basePageInfo);
-        return RestResponse.successResult(resp.getResult());
+        Page<GroupChatDataDTO> page = resp.getResult();
+        Page<GroupChatDataVO> retPage = PageHelperUtils.changePageHelperToCurrentPage(page.getResult(),
+                GroupChatDataVO.class);
+        return RestResponse.successResult(retPage);
     }
 
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatDataVO.java

 package com.gic.haoban.manage.web.vo.chat;
 
-import java.io.Serializable ;
+import java.io.Serializable;
 
 /**
  * 
@@ -11,122 +11,118 @@ import java.io.Serializable ;
  * @Modify
  * @CopyRight 
  */
-public class GroupChatDataVO implements Serializable{
-
-	private static final long serialVersionUID = 21417308241400L;
-	
-	private Long dataId;
-	private String wxEnterpriseId;
-	private String staffId;
-	/**统计日期*/
-	private java.util.Date date;
-	/**新增客户群数量*/
-	private Integer newChatCnt;
-	/**截至当天客户群总数量*/
-	private Integer chatTotal;
-	/**截至当天有发过消息的客户群数量*/
-	private Integer chatHasMsg;
-	/**客户群新增群人数*/
-	private Integer newMemberCnt;
-	/**截至当天客户群总人数*/
-	private Integer memberTotal;
-	/**截至当天有发过消息的群成员数*/
-	private Integer memberHasMsg;
-	/**截至当天客户群消息总数*/
-	private Integer msgTotal;
-	/**截至当天新增迁移群数(仅教培行业返回)*/
-	private Integer migrateTraineeChatCnt;
-	private java.util.Date createTime;
-	
-	public void setDataId(Long dataId){
-		this.dataId = dataId;
-	}
-	
-	public Long getDataId(){
-		return dataId;
-	}
-	public void setWxEnterpriseId(String wxEnterpriseId){
-		this.wxEnterpriseId = wxEnterpriseId;
-	}
-	
-	public String getWxEnterpriseId(){
-		return wxEnterpriseId;
-	}
-	public void setStaffId(String staffId){
-		this.staffId = staffId;
-	}
-	
-	public String getStaffId(){
-		return staffId;
-	}
-	public void setDate(java.util.Date date){
-		this.date = date;
-	}
-	
-	public java.util.Date getDate(){
-		return date;
-	}
-	public void setNewChatCnt(Integer newChatCnt){
-		this.newChatCnt = newChatCnt;
-	}
-	
-	public Integer getNewChatCnt(){
-		return newChatCnt;
-	}
-	public void setChatTotal(Integer chatTotal){
-		this.chatTotal = chatTotal;
-	}
-	
-	public Integer getChatTotal(){
-		return chatTotal;
-	}
-	public void setChatHasMsg(Integer chatHasMsg){
-		this.chatHasMsg = chatHasMsg;
-	}
-	
-	public Integer getChatHasMsg(){
-		return chatHasMsg;
-	}
-	public void setNewMemberCnt(Integer newMemberCnt){
-		this.newMemberCnt = newMemberCnt;
-	}
-	
-	public Integer getNewMemberCnt(){
-		return newMemberCnt;
-	}
-	public void setMemberTotal(Integer memberTotal){
-		this.memberTotal = memberTotal;
-	}
-	
-	public Integer getMemberTotal(){
-		return memberTotal;
-	}
-	public void setMemberHasMsg(Integer memberHasMsg){
-		this.memberHasMsg = memberHasMsg;
-	}
-	
-	public Integer getMemberHasMsg(){
-		return memberHasMsg;
-	}
-	public void setMsgTotal(Integer msgTotal){
-		this.msgTotal = msgTotal;
-	}
-	
-	public Integer getMsgTotal(){
-		return msgTotal;
-	}
-	public void setMigrateTraineeChatCnt(Integer migrateTraineeChatCnt){
-		this.migrateTraineeChatCnt = migrateTraineeChatCnt;
-	}
-	
-	public Integer getMigrateTraineeChatCnt(){
-		return migrateTraineeChatCnt;
-	}
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return createTime;
-	}
+public class GroupChatDataVO implements Serializable {
+
+    private static final long serialVersionUID = 21417308241400L;
+
+    private String staffName;
+    /**统计日期*/
+    private java.util.Date date;
+    /**新增客户群数量*/
+    private Integer newChatCnt;
+    /**截至当天客户群总数量*/
+    private Integer chatTotal;
+    /**截至当天有发过消息的客户群数量*/
+    private Integer chatHasMsg;
+    /**客户群新增群人数*/
+    private Integer newMemberCnt;
+    /**截至当天客户群总人数*/
+    private Integer memberTotal;
+    /**截至当天有发过消息的群成员数*/
+    private Integer memberHasMsg;
+    /**截至当天客户群消息总数*/
+    private Integer msgTotal;
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public void setDate(java.util.Date date) {
+        this.date = date;
+    }
+
+    public java.util.Date getDate() {
+        return date;
+    }
+
+    public void setNewChatCnt(Integer newChatCnt) {
+        this.newChatCnt = newChatCnt;
+    }
+
+    public Integer getNewChatCnt() {
+        if (null == newChatCnt) {
+            return 0;
+        }
+        return newChatCnt;
+    }
+
+    public void setChatTotal(Integer chatTotal) {
+        this.chatTotal = chatTotal;
+    }
+
+    public Integer getChatTotal() {
+        if (null == chatTotal) {
+            return 0;
+        }
+        return chatTotal;
+    }
+
+    public void setChatHasMsg(Integer chatHasMsg) {
+        this.chatHasMsg = chatHasMsg;
+    }
+
+    public Integer getChatHasMsg() {
+        if (null == chatHasMsg) {
+            return 0;
+        }
+        return chatHasMsg;
+    }
+
+    public void setNewMemberCnt(Integer newMemberCnt) {
+        this.newMemberCnt = newMemberCnt;
+    }
+
+    public Integer getNewMemberCnt() {
+        if (null == newMemberCnt) {
+            return 0;
+        }
+        return newMemberCnt;
+    }
+
+    public void setMemberTotal(Integer memberTotal) {
+        this.memberTotal = memberTotal;
+    }
+
+    public Integer getMemberTotal() {
+        if (null == memberTotal) {
+            return 0;
+        }
+        return memberTotal;
+    }
+
+    public void setMemberHasMsg(Integer memberHasMsg) {
+        this.memberHasMsg = memberHasMsg;
+    }
+
+    public Integer getMemberHasMsg() {
+        if (null == memberHasMsg) {
+            return 0;
+        }
+        return memberHasMsg;
+    }
+
+    public void setMsgTotal(Integer msgTotal) {
+        this.msgTotal = msgTotal;
+    }
+
+    public Integer getMsgTotal() {
+        if (null == msgTotal) {
+            return 0;
+        }
+        return msgTotal;
+    }
 }
\ No newline at end of file