Skip to content

H
haoban-manage3.0
Commit 267edf59 by xiongjiangtao
Options

Merge branch '202411_fix_dup_code' into 'master' 

202411 fix dup code

See merge request !2315
parents 6e3912b3 2be2eeb4
Showing with 264 additions and 747 deletions
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/ChatBaseReq.java 0 → 100644
package com.gic.haoban.manage.web.qo.chat;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
/**
* @author shangfeng
* @date 2024-11-21 10:43:04
*/
public class ChatBaseReq implements Serializable {
private static final long serialVersionUID = -118495816040228153L;
/**
* yyyy-MM-dd
*/
private String startDate;
/**
* yyyy-MM-dd
*/
private String endDate;
/**
* 排序类型 1 正序 2 倒序
*/
private Integer orderByType;
/**
* 排序字段名称
*/
private String orderByFields;
/**
* 当前页
*/
private Integer pageNum;
/**
* 每页条数
*/
private Integer pageSize;
/**
* 下载导出参数：数据脱敏 1:脱敏 2:完整
*/
private Integer dataType = 1;
/**
* 处理请求参数
* *
* @param jsonObject
*/
public void dealWithParam(JSONObject jsonObject) {
if (jsonObject == null) {
jsonObject = new JSONObject();
}
if (StringUtils.isNotBlank(startDate)) {
jsonObject.put("startDate", startDate);
}
if (StringUtils.isNotBlank(endDate)) {
jsonObject.put("endDate", endDate);
}
if (orderByType != null) {
jsonObject.put("orderByType", orderByType);
}
jsonObject.put("pageNum", pageNum);
jsonObject.put("pageSize", pageSize);
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public Integer getOrderByType() {
return orderByType;
}
public void setOrderByType(Integer orderByType) {
this.orderByType = orderByType;
}
public String getOrderByFields() {
return orderByFields;
}
public void setOrderByFields(String orderByFields) {
this.orderByFields = orderByFields;
}
public Integer getPageNum() {
return pageNum;
}
public void setPageNum(Integer pageNum) {
this.pageNum = pageNum;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/GroupChatChatDetailReq.java
......@@ -11,22 +11,12 @@ import java.util.Map;
* @author shangfeng
* @date 2024-06-20 16:02:41
*/
public class GroupChatChatDetailReq implements Serializable {
public class GroupChatChatDetailReq extends ChatBaseReq implements Serializable {
private static final long serialVersionUID = -6843739232435242253L;
/**
* yyyy-MM-dd
*/
private String startDate;
/**
* yyyy-MM-dd
*/
private String endDate;
/**
* 导购模糊查询
*/
private String vagueQueryClerk;
......@@ -48,26 +38,6 @@ public class GroupChatChatDetailReq implements Serializable {
private String msgType;
/**
* 排序类型 1 正序 2 倒序
*/
private Integer orderByType;
/**
* 排序字段名称
*/
private String orderByFields;
private Integer pageNum;
private Integer pageSize;
/**
* 下载导出参数：数据脱敏 1:脱敏 2:完整
*/
private Integer dataType = 1;
/**
* 下载导出参数：为了兼容前端传参
*/
private String requestProject;
......@@ -77,7 +47,9 @@ public class GroupChatChatDetailReq implements Serializable {
*/
private String groupSearchParams ;
/**
* 聊天内容
*/
private String content ;
public String getContent() {
......@@ -96,33 +68,30 @@ public class GroupChatChatDetailReq implements Serializable {
this.groupSearchParams = groupSearchParams;
}
/**
* 获取排序
* * *
* @return
*/
public Integer getDataApiOrderField() {
Map<String, Integer> map = new HashMap<>(4);
map.put("joinTime", 1);
return map.get(orderByFields) == null ? 1 : map.get(orderByFields);
return map.get(getOrderByFields()) == null ? 1 : map.get(getOrderByFields());
}
/**
* 处理请求参数
* * *
* @param jsonObject
*/
public void dealWithParam(JSONObject jsonObject) {
if (jsonObject == null) {
jsonObject = new JSONObject();
}
if (StringUtils.isNotBlank(startDate)) {
jsonObject.put("startDate", startDate);
}
if (StringUtils.isNotBlank(endDate)) {
jsonObject.put("endDate", endDate);
}
if (orderByType != null) {
jsonObject.put("orderByType", orderByType);
}
super.dealWithParam(jsonObject);
if (msgType != null) {
jsonObject.put("msgType", msgType);
}
if (orderByFields != null) {
if (getOrderByFields() != null) {
jsonObject.put("orderByFields", getDataApiOrderField());
}
jsonObject.put("pageNum", pageNum);
jsonObject.put("pageSize", pageSize);
if (StringUtils.isNotBlank(vagueQueryClerk)) {
jsonObject.put("vagueQueryClerk", vagueQueryClerk);
}
......@@ -141,23 +110,6 @@ public class GroupChatChatDetailReq implements Serializable {
}
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public String getVagueQueryClerk() {
return vagueQueryClerk;
}
......@@ -182,46 +134,6 @@ public class GroupChatChatDetailReq implements Serializable {
this.userType = userType;
}
public Integer getOrderByType() {
return orderByType;
}
public void setOrderByType(Integer orderByType) {
this.orderByType = orderByType;
}
public String getOrderByFields() {
return orderByFields;
}
public void setOrderByFields(String orderByFields) {
this.orderByFields = orderByFields;
}
public Integer getPageNum() {
return pageNum;
}
public void setPageNum(Integer pageNum) {
this.pageNum = pageNum;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
public String getMsgType() {
return msgType;
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/GroupChatClerkReq.java
......@@ -12,21 +12,11 @@ import java.util.Map;
* @author shangfeng
* @date 2024-06-20 13:58:17
*/
public class GroupChatClerkReq implements Serializable {
public class GroupChatClerkReq extends ChatBaseReq implements Serializable {
private static final long serialVersionUID = 1280733007919174215L;
/**
* yyyy-MM-dd
*/
private String startDate;
/**
* yyyy-MM-dd
*/
private String endDate;
/**
* 门店名称/code
*/
private String vagueQueryStore;
......@@ -36,59 +26,39 @@ public class GroupChatClerkReq implements Serializable {
*/
private String vagueQueryClerk;
/**
* 排序类型 1 正序 2 倒序
*/
private Integer orderByType;
/**
* 排序字段名称
*/
private String orderByFields;
private Integer pageNum;
private Integer pageSize;
/**
* 下载导出参数：数据脱敏 1:脱敏 2:完整
*/
private Integer dataType = 1;
/**
* 下载导出参数：为了兼容前端传参
*/
private String requestProject;
/**
* 排序处理
* * *
* @return
*/
public Integer getDataApiOrderField() {
Map<String, Integer> map = new HashMap<>(8);
map.put("onewayFriendNum", 1);
map.put("totalLostNum", 2);
map.put("deleteSalesNum", 3);
map.put("salesDeleteNum", 4);
return map.get(orderByFields) == null ? 1 : map.get(orderByFields);
map.put("newGroupNum", 1);
map.put("actGroupNum", 2);
map.put("groupCustNum", 3);
map.put("newGroupCustNum", 4);
map.put("actGroupCustNum", 5);
map.put("newExitGroupCustNum", 6);
map.put("groupSessionsNum", 7);
map.put("groupNum", 8);
return map.get(getOrderByFields()) == null ? 1 : map.get(getOrderByFields());
}
/**
* 处理请求参数
* * *
* @param jsonObject
*/
public void dealWithParam(JSONObject jsonObject) {
if (jsonObject == null) {
jsonObject = new JSONObject();
}
if (StringUtils.isNotBlank(startDate)) {
jsonObject.put("startDate", startDate);
}
if (StringUtils.isNotBlank(endDate)) {
jsonObject.put("endDate", endDate);
}
if (orderByType != null) {
jsonObject.put("orderByType", orderByType);
}
if (orderByFields != null) {
super.dealWithParam(jsonObject);
if (getOrderByFields() != null) {
jsonObject.put("orderByFields", getDataApiOrderField());
}
jsonObject.put("pageNum", pageNum);
jsonObject.put("pageSize", pageSize);
if (StringUtils.isNotBlank(vagueQueryClerk)) {
jsonObject.put("vagueQueryClerk", vagueQueryClerk);
}
......@@ -97,22 +67,6 @@ public class GroupChatClerkReq implements Serializable {
}
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public String getVagueQueryStore() {
return vagueQueryStore;
}
......@@ -129,46 +83,6 @@ public class GroupChatClerkReq implements Serializable {
this.vagueQueryClerk = vagueQueryClerk;
}
public Integer getOrderByType() {
return orderByType;
}
public void setOrderByType(Integer orderByType) {
this.orderByType = orderByType;
}
public String getOrderByFields() {
return orderByFields;
}
public void setOrderByFields(String orderByFields) {
this.orderByFields = orderByFields;
}
public Integer getPageNum() {
return pageNum;
}
public void setPageNum(Integer pageNum) {
this.pageNum = pageNum;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
public String getRequestProject() {
return requestProject;
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/GroupChatDetailReq.java
......@@ -11,20 +11,10 @@ import java.util.Map;
* @author shangfeng
* @date 2024-06-20 14:30:30
*/
public class GroupChatDetailReq implements Serializable {
public class GroupChatDetailReq extends ChatBaseReq implements Serializable {
private static final long serialVersionUID = -7059200818173428309L;
/**
* yyyy-MM-dd
*/
private String startDate;
/**
* yyyy-MM-dd
*/
private String endDate;
/**
* 门店模糊
*/
private String vagueQueryStore;
......@@ -39,32 +29,16 @@ public class GroupChatDetailReq implements Serializable {
*/
private String vagueQueryStaff;
/**
* 排序类型 1 正序 2 倒序
*/
private Integer orderByType;
/**
* 排序字段名称
*/
private String orderByFields;
private Integer pageNum;
private Integer pageSize;
/**
* 下载导出参数：数据脱敏 1:脱敏 2:完整
*/
private Integer dataType = 1;
/**
* 下载导出参数：为了兼容前端传参
*/
private String requestProject;
/**
* 获取排序
* * *
* @return
*/
public Integer getDataApiOrderField() {
Map<String, Integer> map = new HashMap<>(8);
map.put("groupCustNum", 1);
......@@ -72,27 +46,19 @@ public class GroupChatDetailReq implements Serializable {
map.put("actGroupCustNum", 3);
map.put("newExitGroupCustNum", 4);
map.put("groupSessionsNum", 5);
return map.get(orderByFields) == null ? 1 : map.get(orderByFields);
return map.get(getOrderByFields()) == null ? 1 : map.get(getOrderByFields());
}
/**
* 处理请求参数
* * *
* @param jsonObject
*/
public void dealWithParam(JSONObject jsonObject) {
if (jsonObject == null) {
jsonObject = new JSONObject();
}
if (StringUtils.isNotBlank(startDate)) {
jsonObject.put("startDate", startDate);
}
if (StringUtils.isNotBlank(endDate)) {
jsonObject.put("endDate", endDate);
}
if (orderByType != null) {
jsonObject.put("orderByType", orderByType);
}
if (orderByFields != null) {
super.dealWithParam(jsonObject);
if (getOrderByFields() != null) {
jsonObject.put("orderByFields", getDataApiOrderField());
}
jsonObject.put("pageNum", pageNum);
jsonObject.put("pageSize", pageSize);
if (StringUtils.isNotBlank(vagueQueryClerk)) {
jsonObject.put("vagueQueryClerk", vagueQueryClerk);
}
......@@ -104,23 +70,6 @@ public class GroupChatDetailReq implements Serializable {
}
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public String getVagueQueryStore() {
return vagueQueryStore;
}
......@@ -145,46 +94,6 @@ public class GroupChatDetailReq implements Serializable {
this.vagueQueryStaff = vagueQueryStaff;
}
public Integer getOrderByType() {
return orderByType;
}
public void setOrderByType(Integer orderByType) {
this.orderByType = orderByType;
}
public String getOrderByFields() {
return orderByFields;
}
public void setOrderByFields(String orderByFields) {
this.orderByFields = orderByFields;
}
public Integer getPageNum() {
return pageNum;
}
public void setPageNum(Integer pageNum) {
this.pageNum = pageNum;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
public String getRequestProject() {
return requestProject;
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/GroupChatExitDetailReq.java
......@@ -11,21 +11,10 @@ import java.util.Map;
* @author shangfeng
* @date 2024-06-20 16:01:33
*/
public class GroupChatExitDetailReq implements Serializable {
public class GroupChatExitDetailReq extends ChatBaseReq implements Serializable {
private static final long serialVersionUID = -7061919686854969449L;
/**
* yyyy-MM-dd
*/
private String startDate;
/**
* yyyy-MM-dd
*/
private String endDate;
/**
* 群查询模糊
*/
......@@ -37,54 +26,31 @@ public class GroupChatExitDetailReq implements Serializable {
private String userType;
/**
* 排序类型 1 正序 2 倒序
*/
private Integer orderByType;
/**
* 排序字段名称
*/
private String orderByFields;
private Integer pageNum;
private Integer pageSize;
/**
* 下载导出参数：数据脱敏 1:脱敏 2:完整
*/
private Integer dataType = 1;
/**
* 下载导出参数：为了兼容前端传参
*/
private String requestProject;
/**
* 获取排序
* * *
* @return
*/
public Integer getDataApiOrderField() {
Map<String, Integer> map = new HashMap<>(4);
map.put("userQuitTime", 1);
return map.get(orderByFields) == null ? 1 : map.get(orderByFields);
return map.get(getOrderByFields()) == null ? 1 : map.get(getOrderByFields());
}
/**
* 处理请求参数
* * *
* @param jsonObject
*/
public void dealWithParam(JSONObject jsonObject) {
if (jsonObject == null) {
jsonObject = new JSONObject();
}
if (StringUtils.isNotBlank(startDate)) {
jsonObject.put("startDate", startDate);
}
if (StringUtils.isNotBlank(endDate)) {
jsonObject.put("endDate", endDate);
}
if (orderByType != null) {
jsonObject.put("orderByType", orderByType);
}
if (orderByFields != null) {
super.dealWithParam(jsonObject);
if (getOrderByFields() != null) {
jsonObject.put("orderByFields", getDataApiOrderField());
}
jsonObject.put("pageNum", pageNum);
jsonObject.put("pageSize", pageSize);
if (StringUtils.isNotBlank(vagueQueryGroup)) {
jsonObject.put("vagueQueryGroup", vagueQueryGroup);
}
......@@ -93,22 +59,6 @@ public class GroupChatExitDetailReq implements Serializable {
}
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public String getVagueQueryGroup() {
return vagueQueryGroup;
}
......@@ -125,46 +75,6 @@ public class GroupChatExitDetailReq implements Serializable {
this.userType = userType;
}
public Integer getOrderByType() {
return orderByType;
}
public void setOrderByType(Integer orderByType) {
this.orderByType = orderByType;
}
public String getOrderByFields() {
return orderByFields;
}
public void setOrderByFields(String orderByFields) {
this.orderByFields = orderByFields;
}
public Integer getPageNum() {
return pageNum;
}
public void setPageNum(Integer pageNum) {
this.pageNum = pageNum;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
public String getRequestProject() {
return requestProject;
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/GroupChatJoinDetailReq.java
......@@ -11,21 +11,11 @@ import java.util.Map;
* @author shangfeng
* @date 2024-06-20 15:56:45
*/
public class GroupChatJoinDetailReq implements Serializable {
public class GroupChatJoinDetailReq extends ChatBaseReq implements Serializable {
private static final long serialVersionUID = 7925103932910960454L;
/**
* yyyy-MM-dd
*/
private String startDate;
/**
* yyyy-MM-dd
*/
private String endDate;
/**
* 群查询模糊
*/
private String vagueQueryGroup;
......@@ -40,56 +30,32 @@ public class GroupChatJoinDetailReq implements Serializable {
*/
private String joinScene;
/**
* 排序类型 1 正序 2 倒序
*/
private Integer orderByType;
/**
* 排序字段名称
*/
private String orderByFields;
private Integer pageNum;
private Integer pageSize;
/**
* 下载导出参数：数据脱敏 1:脱敏 2:完整
*/
private Integer dataType = 1;
/**
* 下载导出参数：为了兼容前端传参
*/
private String requestProject;
/**
* 获取排序
* * *
* @return
*/
public Integer getDataApiOrderField() {
Map<String, Integer> map = new HashMap<>(4);
map.put("joinTime", 1);
return map.get(orderByFields) == null ? 1 : map.get(orderByFields);
return map.get(getOrderByFields()) == null ? 1 : map.get(getOrderByFields());
}
/**
* 处理请求参数
* * *
* @param jsonObject
*/
public void dealWithParam(JSONObject jsonObject) {
if (jsonObject == null) {
jsonObject = new JSONObject();
}
if (StringUtils.isNotBlank(startDate)) {
jsonObject.put("startDate", startDate);
}
if (StringUtils.isNotBlank(endDate)) {
jsonObject.put("endDate", endDate);
}
if (orderByType != null) {
jsonObject.put("orderByType", orderByType);
}
if (orderByFields != null) {
super.dealWithParam(jsonObject);
if (getOrderByFields() != null) {
jsonObject.put("orderByFields", getDataApiOrderField());
}
jsonObject.put("pageNum", pageNum);
jsonObject.put("pageSize", pageSize);
if (StringUtils.isNotBlank(vagueQueryGroup)) {
jsonObject.put("vagueQueryGroup", vagueQueryGroup);
}
......@@ -101,23 +67,6 @@ public class GroupChatJoinDetailReq implements Serializable {
}
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public String getVagueQueryGroup() {
return vagueQueryGroup;
}
......@@ -142,46 +91,6 @@ public class GroupChatJoinDetailReq implements Serializable {
this.joinScene = joinScene;
}
public Integer getOrderByType() {
return orderByType;
}
public void setOrderByType(Integer orderByType) {
this.orderByType = orderByType;
}
public String getOrderByFields() {
return orderByFields;
}
public void setOrderByFields(String orderByFields) {
this.orderByFields = orderByFields;
}
public Integer getPageNum() {
return pageNum;
}
public void setPageNum(Integer pageNum) {
this.pageNum = pageNum;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
public String getRequestProject() {
return requestProject;
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/GroupChatOverviewReq.java
......@@ -7,6 +7,7 @@ import java.io.Serializable;
* @date 2024-06-20 13:40:12
*/
public class GroupChatOverviewReq implements Serializable {
private static final long serialVersionUID = -4434065817211771929L;
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/GroupChatStoreGroupReq.java
......@@ -35,8 +35,14 @@ public class GroupChatStoreGroupReq extends StoreGroupCommonQO implements Serial
*/
private String orderByFields;
/**
* 当前页*
*/
private Integer pageNum;
/**
* 每页条数*
*/
private Integer pageSize;
......@@ -50,15 +56,29 @@ public class GroupChatStoreGroupReq extends StoreGroupCommonQO implements Serial
*/
private String requestProject;
/**
* 排序*
* 1新增群数2活跃群数3群总人数4新增群人数5活跃群人数6新退群人数7群会话总条数8群总数
* @return
*/
public Integer getDataApiOrderField() {
Map<String, Integer> map = new HashMap<>(8);
map.put("onewayFriendNum", 1);
map.put("totalLostNum", 2);
map.put("deleteSalesNum", 3);
map.put("salesDeleteNum", 4);
map.put("newGroupNum", 1);
map.put("actGroupNum", 2);
map.put("groupCustNum", 3);
map.put("newGroupCustNum", 4);
map.put("actGroupCustNum", 5);
map.put("newExitGroupCustNum", 6);
map.put("groupSessionsNum", 7);
map.put("groupNum", 8);
return map.get(orderByFields) == null ? 1 : map.get(orderByFields);
}
/**
* 处理请求参数
* * *
* @param jsonObject
*/
public void dealWithParam(JSONObject jsonObject) {
if (jsonObject == null) {
jsonObject = new JSONObject();
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/SingleChatClerkReq.java
......@@ -13,21 +13,11 @@ import java.util.Map;
* @date 2024-06-20 10:24:21
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class SingleChatClerkReq implements Serializable {
public class SingleChatClerkReq extends ChatBaseReq implements Serializable {
private static final long serialVersionUID = 2524730645905160886L;
/**
* yyyy-MM-dd
*/
private String startDate;
/**
* yyyy-MM-dd
*/
private String endDate;
/**
* 门店名称/code
*/
private String vagueQueryStore;
......@@ -37,39 +27,16 @@ public class SingleChatClerkReq implements Serializable {
*/
private String vagueQueryClerk;
/**
* 排序类型 1 正序 2 倒序
*/
private Integer orderByType;
/**
* 排序字段名称
*/
private String orderByFields;
/**
* 当前页
*/
private Integer pageNum;
/**
* 每页条数
*/
private Integer pageSize;
/**
* 下载导出参数：数据脱敏 1:脱敏 2:完整
*/
private Integer dataType = 1;
/**
* 下载导出参数：为了兼容前端传参
*/
private String requestProject;
/**
* 获取排序
* * *
* @return
*/
public Integer getDataApiOrderField() {
Map<String, Integer> map = new HashMap<>(16);
map.put("activeSessionsNum", 1);
......@@ -81,27 +48,19 @@ public class SingleChatClerkReq implements Serializable {
map.put("launchSessionsCustNum", 7);
map.put("launchSessionsSalesNum", 8);
map.put("sendNewsNum", 9);
return map.get(orderByFields) == null ? 1 : map.get(orderByFields);
return map.get(getOrderByFields()) == null ? 1 : map.get(getOrderByFields());
}
/**
* 处理请求参数
* * *
* @param jsonObject
*/
public void dealWithParam(JSONObject jsonObject) {
if (jsonObject == null) {
jsonObject = new JSONObject();
}
if (StringUtils.isNotBlank(startDate)) {
jsonObject.put("startDate", startDate);
}
if (StringUtils.isNotBlank(endDate)) {
jsonObject.put("endDate", endDate);
}
if (orderByType != null) {
jsonObject.put("orderByType", orderByType);
}
if (orderByFields != null) {
super.dealWithParam(jsonObject);
if (getOrderByFields() != null) {
jsonObject.put("orderByFields", getDataApiOrderField());
}
jsonObject.put("pageNum", pageNum);
jsonObject.put("pageSize", pageSize);
if (StringUtils.isNotBlank(vagueQueryClerk)) {
jsonObject.put("vagueQueryClerk", vagueQueryClerk);
}
......@@ -110,23 +69,6 @@ public class SingleChatClerkReq implements Serializable {
}
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public String getVagueQueryStore() {
return vagueQueryStore;
}
......@@ -143,46 +85,6 @@ public class SingleChatClerkReq implements Serializable {
this.vagueQueryClerk = vagueQueryClerk;
}
public Integer getOrderByType() {
return orderByType;
}
public void setOrderByType(Integer orderByType) {
this.orderByType = orderByType;
}
public String getOrderByFields() {
return orderByFields;
}
public void setOrderByFields(String orderByFields) {
this.orderByFields = orderByFields;
}
public Integer getPageNum() {
return pageNum;
}
public void setPageNum(Integer pageNum) {
this.pageNum = pageNum;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
public String getRequestProject() {
return requestProject;
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/SingleChatDetailReq.java
......@@ -13,20 +13,10 @@ import java.util.Map;
* @date 2024-06-20 10:44:55
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class SingleChatDetailReq implements Serializable {
public class SingleChatDetailReq extends ChatBaseReq implements Serializable {
private static final long serialVersionUID = -1939493530776069432L;
/**
* yyyy-MM-dd
*/
private String startDate;
/**
* yyyy-MM-dd
*/
private String endDate;
/**
* 用户模糊
*/
private String vagueQueryUser;
......@@ -52,56 +42,32 @@ public class SingleChatDetailReq implements Serializable {
*/
private String content;
/**
* 排序类型 1 正序 2 倒序
*/
private Integer orderByType;
/**
* 排序字段名称
*/
private String orderByFields;
private Integer pageNum;
private Integer pageSize;
/**
* 下载导出参数：数据脱敏 1:脱敏 2:完整
*/
private Integer dataType = 1;
/**
* 下载导出参数：为了兼容前端传参
*/
private String requestProject;
/**
* 获取排序
* * *
* @return
*/
public Integer getDataApiOrderField() {
Map<String, Integer> map = new HashMap<>(4);
map.put("sendTime", 1);
return map.get(orderByFields) == null ? 1 : map.get(orderByFields);
return map.get(getOrderByFields()) == null ? 1 : map.get(getOrderByFields());
}
/**
* 处理请求参数
* * *
* @param jsonObject
*/
public void dealWithParam(JSONObject jsonObject) {
if (jsonObject == null) {
jsonObject = new JSONObject();
}
if (StringUtils.isNotBlank(startDate)) {
jsonObject.put("startDate", startDate);
}
if (StringUtils.isNotBlank(endDate)) {
jsonObject.put("endDate", endDate);
}
if (orderByType != null) {
jsonObject.put("orderByType", orderByType);
}
if (orderByFields != null) {
super.dealWithParam(jsonObject);
if (getOrderByFields() != null) {
jsonObject.put("orderByFields", getDataApiOrderField());
}
jsonObject.put("pageNum", pageNum);
jsonObject.put("pageSize", pageSize);
if (StringUtils.isNotBlank(vagueQueryClerk)) {
jsonObject.put("vagueQueryClerk", vagueQueryClerk);
}
......@@ -121,22 +87,6 @@ public class SingleChatDetailReq implements Serializable {
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public String getVagueQueryUser() {
return vagueQueryUser;
}
......@@ -161,46 +111,6 @@ public class SingleChatDetailReq implements Serializable {
this.content = content;
}
public Integer getOrderByType() {
return orderByType;
}
public void setOrderByType(Integer orderByType) {
this.orderByType = orderByType;
}
public String getOrderByFields() {
return orderByFields;
}
public void setOrderByFields(String orderByFields) {
this.orderByFields = orderByFields;
}
public Integer getPageNum() {
return pageNum;
}
public void setPageNum(Integer pageNum) {
this.pageNum = pageNum;
}
public Integer getPageSize() {
return pageSize;
}
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
public String getRequestProject() {
return requestProject;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment