Skip to content

E
easy-affair-show
Commit b56732a6 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

问答管理，建议管理，帮助管理，消息推送等后端接口

parent a576e758
Expand all Show whitespace changes
Inline Side-by-side
Showing with 17534 additions and 2231 deletions
eas-manager/src/main/java/com/mortals/xhx/common/code/EvaluateLevelEnum.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.common.code;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.IBaseEnum;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 评价等级
*/
public enum EvaluateLevelEnum implements IBaseEnum {
LEVEL_0(0,"未评价",SysConstains.STYLE_DEFAULT),
LEVEL_1(1,"非常不满意",SysConstains.STYLE_DEFAULT),
LEVEL_2(2,"不满意", SysConstains.STYLE_DEFAULT),
LEVEL_3(3,"基本满意",SysConstains.STYLE_DEFAULT),
LEVEL_4(4,"满意", SysConstains.STYLE_DEFAULT),
LEVEL_5(5,"完美解决问题", SysConstains.STYLE_DEFAULT),
;
private int value;
private String desc;
private String style;
EvaluateLevelEnum(int value, String desc, String style) {
this.value = value;
this.desc = desc;
this.style = style;
}
@Override
public int getValue() {
return this.value;
}
@Override
public String getDesc() {
return this.desc;
}
@Override
public String getStyle() {
return this.style;
}
public static EvaluateLevelEnum getByValue(int value) {
for (EvaluateLevelEnum e : EvaluateLevelEnum.values()) {
if (e.getValue() == value) {
return e;
}
}
return null;
}
public static Map<String,String> getEnumMap(int... eItem) {
Map<String,String> resultMap= new LinkedHashMap<String,String>();
for (EvaluateLevelEnum item : EvaluateLevelEnum.values()) {
try{
boolean hasE = false;
for (int e : eItem){
if(item.getValue()==e){
hasE = true;
break;
}
}
if(!hasE){
resultMap.put(item.getValue()+"", item.getDesc());
}
}catch(Exception ex){
}
}
return resultMap;
}
}
eas-manager/src/main/java/com/mortals/xhx/common/code/EvaluateType.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.common.code;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.IBaseEnum;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 评价类型
*/
public enum EvaluateType implements IBaseEnum {
USEFUL(1,"有用", SysConstains.STYLE_DEFAULT),
USELESS(2,"没用", SysConstains.STYLE_DEFAULT),
;
private int value;
private String desc;
private String style;
EvaluateType(int value, String desc, String style) {
this.value = value;
this.desc = desc;
this.style = style;
}
@Override
public int getValue() {
return this.value;
}
@Override
public String getDesc() {
return this.desc;
}
@Override
public String getStyle() {
return this.style;
}
public static EvaluateType getByValue(int value) {
for (EvaluateType e : EvaluateType.values()) {
if (e.getValue() == value) {
return e;
}
}
return null;
}
public static Map<String,String> getEnumMap(int... eItem) {
Map<String,String> resultMap= new LinkedHashMap<String,String>();
for (EvaluateType item : EvaluateType.values()) {
try{
boolean hasE = false;
for (int e : eItem){
if(item.getValue()==e){
hasE = true;
break;
}
}
if(!hasE){
resultMap.put(item.getValue()+"", item.getDesc());
}
}catch(Exception ex){
}
}
return resultMap;
}
}
eas-manager/src/main/java/com/mortals/xhx/common/code/MessageTypeEnum.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.common.code;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.IBaseEnum;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 消息类型
*/
public enum MessageTypeEnum implements IBaseEnum {
TITLE(1,"提标题消息", SysConstains.STYLE_DEFAULT),
DYNAMIC(2,"动态消息", SysConstains.STYLE_DEFAULT),
;
private int value;
private String desc;
private String style;
MessageTypeEnum(int value, String desc, String style) {
this.value = value;
this.desc = desc;
this.style = style;
}
@Override
public int getValue() {
return this.value;
}
@Override
public String getDesc() {
return this.desc;
}
@Override
public String getStyle() {
return this.style;
}
public static MessageTypeEnum getByValue(int value) {
for (MessageTypeEnum e : MessageTypeEnum.values()) {
if (e.getValue() == value) {
return e;
}
}
return null;
}
public static Map<String,String> getEnumMap(int... eItem) {
Map<String,String> resultMap= new LinkedHashMap<String,String>();
for (MessageTypeEnum item : MessageTypeEnum.values()) {
try{
boolean hasE = false;
for (int e : eItem){
if(item.getValue()==e){
hasE = true;
break;
}
}
if(!hasE){
resultMap.put(item.getValue()+"", item.getDesc());
}
}catch(Exception ex){
}
}
return resultMap;
}
}
eas-manager/src/main/java/com/mortals/xhx/common/code/QuestionRecordType.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.common.code;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.IBaseEnum;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 问题记录类型
*/
public enum QuestionRecordType implements IBaseEnum {
QUESTION(1,"提问", SysConstains.STYLE_DEFAULT),
ANSWER(2,"答复", SysConstains.STYLE_DEFAULT),
;
private int value;
private String desc;
private String style;
QuestionRecordType(int value, String desc, String style) {
this.value = value;
this.desc = desc;
this.style = style;
}
@Override
public int getValue() {
return this.value;
}
@Override
public String getDesc() {
return this.desc;
}
@Override
public String getStyle() {
return this.style;
}
public static QuestionRecordType getByValue(int value) {
for (QuestionRecordType e : QuestionRecordType.values()) {
if (e.getValue() == value) {
return e;
}
}
return null;
}
public static Map<String,String> getEnumMap(int... eItem) {
Map<String,String> resultMap= new LinkedHashMap<String,String>();
for (QuestionRecordType item : QuestionRecordType.values()) {
try{
boolean hasE = false;
for (int e : eItem){
if(item.getValue()==e){
hasE = true;
break;
}
}
if(!hasE){
resultMap.put(item.getValue()+"", item.getDesc());
}
}catch(Exception ex){
}
}
return resultMap;
}
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/common/code/QuestionStatusEnum.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.common.code;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.IBaseEnum;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 问答状态
*/
public enum QuestionStatusEnum implements IBaseEnum {
NOT_FINISHED(0,"未完成", SysConstains.STYLE_DEFAULT),
Finished(1,"已完成", SysConstains.STYLE_DEFAULT),
;
private int value;
private String desc;
private String style;
QuestionStatusEnum(int value, String desc, String style) {
this.value = value;
this.desc = desc;
this.style = style;
}
@Override
public int getValue() {
return this.value;
}
@Override
public String getDesc() {
return this.desc;
}
@Override
public String getStyle() {
return this.style;
}
public static QuestionStatusEnum getByValue(int value) {
for (QuestionStatusEnum e : QuestionStatusEnum.values()) {
if (e.getValue() == value) {
return e;
}
}
return null;
}
public static Map<String,String> getEnumMap(int... eItem) {
Map<String,String> resultMap= new LinkedHashMap<String,String>();
for (QuestionStatusEnum item : QuestionStatusEnum.values()) {
try{
boolean hasE = false;
for (int e : eItem){
if(item.getValue()==e){
hasE = true;
break;
}
}
if(!hasE){
resultMap.put(item.getValue()+"", item.getDesc());
}
}catch(Exception ex){
}
}
return resultMap;
}
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/common/code/ReadStatusEnum.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.common.code;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.IBaseEnum;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 查阅状态
*/
public enum ReadStatusEnum implements IBaseEnum {
READ(1,"已读", SysConstains.STYLE_DEFAULT),
UN_READ(0,"未读", SysConstains.STYLE_DEFAULT),
;
private int value;
private String desc;
private String style;
ReadStatusEnum(int value, String desc, String style) {
this.value = value;
this.desc = desc;
this.style = style;
}
@Override
public int getValue() {
return this.value;
}
@Override
public String getDesc() {
return this.desc;
}
@Override
public String getStyle() {
return this.style;
}
public static ReadStatusEnum getByValue(int value) {
for (ReadStatusEnum e : ReadStatusEnum.values()) {
if (e.getValue() == value) {
return e;
}
}
return null;
}
public static Map<String,String> getEnumMap(int... eItem) {
Map<String,String> resultMap= new LinkedHashMap<String,String>();
for (ReadStatusEnum item : ReadStatusEnum.values()) {
try{
boolean hasE = false;
for (int e : eItem){
if(item.getValue()==e){
hasE = true;
break;
}
}
if(!hasE){
resultMap.put(item.getValue()+"", item.getDesc());
}
}catch(Exception ex){
}
}
return resultMap;
}
}
eas-manager/src/main/java/com/mortals/xhx/common/code/ReplyStatusEnum.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.common.code;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.IBaseEnum;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 客户建议回复状态
*/
public enum ReplyStatusEnum implements IBaseEnum {
UN_REPLY(0,"未回复", SysConstains.STYLE_DEFAULT),
REPLY(1,"已回复", SysConstains.STYLE_DEFAULT),
;
private int value;
private String desc;
private String style;
ReplyStatusEnum(int value, String desc, String style) {
this.value = value;
this.desc = desc;
this.style = style;
}
@Override
public int getValue() {
return this.value;
}
@Override
public String getDesc() {
return this.desc;
}
@Override
public String getStyle() {
return this.style;
}
public static ReplyStatusEnum getByValue(int value) {
for (ReplyStatusEnum e : ReplyStatusEnum.values()) {
if (e.getValue() == value) {
return e;
}
}
return null;
}
public static Map<String,String> getEnumMap(int... eItem) {
Map<String,String> resultMap= new LinkedHashMap<String,String>();
for (ReplyStatusEnum item : ReplyStatusEnum.values()) {
try{
boolean hasE = false;
for (int e : eItem){
if(item.getValue()==e){
hasE = true;
break;
}
}
if(!hasE){
resultMap.put(item.getValue()+"", item.getDesc());
}
}catch(Exception ex){
}
}
return resultMap;
}
}
eas-manager/src/main/java/com/mortals/xhx/common/code/SendModeEnum.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.common.code;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.IBaseEnum;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 发送方式
*/
public enum SendModeEnum implements IBaseEnum {
ON_SITE(1,"站内发送", SysConstains.STYLE_DEFAULT),
ON_SMS(2,"短信发送", SysConstains.STYLE_DEFAULT),
ALL(3,"同时发送", SysConstains.STYLE_DEFAULT),
;
private int value;
private String desc;
private String style;
SendModeEnum(int value, String desc, String style) {
this.value = value;
this.desc = desc;
this.style = style;
}
@Override
public int getValue() {
return this.value;
}
@Override
public String getDesc() {
return this.desc;
}
@Override
public String getStyle() {
return this.style;
}
public static SendModeEnum getByValue(int value) {
for (SendModeEnum e : SendModeEnum.values()) {
if (e.getValue() == value) {
return e;
}
}
return null;
}
public static Map<String,String> getEnumMap(int... eItem) {
Map<String,String> resultMap= new LinkedHashMap<String,String>();
for (SendModeEnum item : SendModeEnum.values()) {
try{
boolean hasE = false;
for (int e : eItem){
if(item.getValue()==e){
hasE = true;
break;
}
}
if(!hasE){
resultMap.put(item.getValue()+"", item.getDesc());
}
}catch(Exception ex){
}
}
return resultMap;
}
}
eas-manager/src/main/java/com/mortals/xhx/common/code/SendScopeEnum.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.common.code;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.IBaseEnum;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 发送范围
*/
public enum SendScopeEnum implements IBaseEnum {
ALL(1,"所有人可见", SysConstains.STYLE_DEFAULT),
VIP(2,"VIP可见", SysConstains.STYLE_DEFAULT),
ORDINARY(3,"普通用户可见", SysConstains.STYLE_DEFAULT),
;
private int value;
private String desc;
private String style;
SendScopeEnum(int value, String desc, String style) {
this.value = value;
this.desc = desc;
this.style = style;
}
@Override
public int getValue() {
return this.value;
}
@Override
public String getDesc() {
return this.desc;
}
@Override
public String getStyle() {
return this.style;
}
public static SendScopeEnum getByValue(int value) {
for (SendScopeEnum e : SendScopeEnum.values()) {
if (e.getValue() == value) {
return e;
}
}
return null;
}
public static Map<String,String> getEnumMap(int... eItem) {
Map<String,String> resultMap= new LinkedHashMap<String,String>();
for (SendScopeEnum item : SendScopeEnum.values()) {
try{
boolean hasE = false;
for (int e : eItem){
if(item.getValue()==e){
hasE = true;
break;
}
}
if(!hasE){
resultMap.put(item.getValue()+"", item.getDesc());
}
}catch(Exception ex){
}
}
return resultMap;
}
}
eas-manager/src/main/java/com/mortals/xhx/common/code/SendStatusEnum.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.common.code;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.IBaseEnum;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 发送状态
*/
public enum SendStatusEnum implements IBaseEnum {
UNSENT(0,"未发送", SysConstains.STYLE_DEFAULT),
SENT(1,"已发送", SysConstains.STYLE_DEFAULT),
;
private int value;
private String desc;
private String style;
SendStatusEnum(int value, String desc, String style) {
this.value = value;
this.desc = desc;
this.style = style;
}
@Override
public int getValue() {
return this.value;
}
@Override
public String getDesc() {
return this.desc;
}
@Override
public String getStyle() {
return this.style;
}
public static SendStatusEnum getByValue(int value) {
for (SendStatusEnum e : SendStatusEnum.values()) {
if (e.getValue() == value) {
return e;
}
}
return null;
}
public static Map<String,String> getEnumMap(int... eItem) {
Map<String,String> resultMap= new LinkedHashMap<String,String>();
for (SendStatusEnum item : SendStatusEnum.values()) {
try{
boolean hasE = false;
for (int e : eItem){
if(item.getValue()==e){
hasE = true;
break;
}
}
if(!hasE){
resultMap.put(item.getValue()+"", item.getDesc());
}
}catch(Exception ex){
}
}
return resultMap;
}
}
eas-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerEntity.java
View file @ b56732a6
...@@ -3,8 +3,6 @@ package com.mortals.xhx.module.customer.model; ...@@ -3,8 +3,6 @@ package com.mortals.xhx.module.customer.model;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
...@@ -15,7 +13,7 @@ import com.mortals.xhx.module.customer.model.vo.CustomerVo; ...@@ -15,7 +13,7 @@ import com.mortals.xhx.module.customer.model.vo.CustomerVo;
* 客户管理实体对象 * 客户管理实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-13 * @date 2022-07-01
*/ */
public class CustomerEntity extends CustomerVo implements IUser { public class CustomerEntity extends CustomerVo implements IUser {
...@@ -65,6 +63,10 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -65,6 +63,10 @@ public class CustomerEntity extends CustomerVo implements IUser {
* 职位 * 职位
*/ */
private String job; private String job;
/**
* 头像图片地址
*/
private String avatar;
/** /**
* 客户来源 * 客户来源
*/ */
...@@ -76,7 +78,6 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -76,7 +78,6 @@ public class CustomerEntity extends CustomerVo implements IUser {
/** /**
* 最后一次登录时间 * 最后一次登录时间
*/ */
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date lastLoginTime; private Date lastLoginTime;
/** /**
* 最后一次登录地址 * 最后一次登录地址
...@@ -90,7 +91,6 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -90,7 +91,6 @@ public class CustomerEntity extends CustomerVo implements IUser {
* 获取 用户登录账号 * 获取 用户登录账号
* @return String * @return String
*/ */
@Override
public String getLoginName(){ public String getLoginName(){
return loginName; return loginName;
} }
...@@ -241,6 +241,20 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -241,6 +241,20 @@ public class CustomerEntity extends CustomerVo implements IUser {
public void setJob(String job){ public void setJob(String job){
this.job = job; this.job = job;
} }
/**
* 获取 头像图片地址
* @return String
*/
public String getAvatar(){
return avatar;
}
/**
* 设置 头像图片地址
* @param avatar
*/
public void setAvatar(String avatar){
this.avatar = avatar;
}
/** /**
* 获取 客户来源 * 获取 客户来源
* @return Long * @return Long
...@@ -330,6 +344,7 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -330,6 +344,7 @@ public class CustomerEntity extends CustomerVo implements IUser {
sb.append(",sex:").append(getSex()); sb.append(",sex:").append(getSex());
sb.append(",mailbox:").append(getMailbox()); sb.append(",mailbox:").append(getMailbox());
sb.append(",job:").append(getJob()); sb.append(",job:").append(getJob());
sb.append(",avatar:").append(getAvatar());
sb.append(",customerSrc:").append(getCustomerSrc()); sb.append(",customerSrc:").append(getCustomerSrc());
sb.append(",status:").append(getStatus()); sb.append(",status:").append(getStatus());
sb.append(",lastLoginTime:").append(getLastLoginTime()); sb.append(",lastLoginTime:").append(getLastLoginTime());
...@@ -361,6 +376,8 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -361,6 +376,8 @@ public class CustomerEntity extends CustomerVo implements IUser {
this.job = ""; this.job = "";
this.avatar = "";
this.customerSrc = null; this.customerSrc = null;
this.status = 0; this.status = 0;
...@@ -431,5 +448,4 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -431,5 +448,4 @@ public class CustomerEntity extends CustomerVo implements IUser {
public String getMenuUrl() { public String getMenuUrl() {
return null; return null;
} }
} }
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerQuery.java
View file @ b56732a6
package com.mortals.xhx.module.customer.model; package com.mortals.xhx.module.customer.model;
import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.customer.model.CustomerEntity; import com.mortals.xhx.module.customer.model.CustomerEntity;
/** /**
* 客户管理查询对象 * 客户管理查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-08 * @date 2022-07-01
*/ */
public class CustomerQuery extends CustomerEntity { public class CustomerQuery extends CustomerEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -81,6 +82,9 @@ public class CustomerQuery extends CustomerEntity { ...@@ -81,6 +82,9 @@ public class CustomerQuery extends CustomerEntity {
/** 职位 */ /** 职位 */
private List<String> jobList; private List<String> jobList;
/** 头像图片地址 */
private List<String> avatarList;
/** 开始 客户来源 */ /** 开始 客户来源 */
private Long customerSrcStart; private Long customerSrcStart;
...@@ -129,6 +133,15 @@ public class CustomerQuery extends CustomerEntity { ...@@ -129,6 +133,15 @@ public class CustomerQuery extends CustomerEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 最后一次登录时间 */
private String lastLoginTimeStart;
/** 结束 最后一次登录时间 */
private String lastLoginTimeEnd;
/** 最后一次登录地址 */
private List<String> lastLoginAddressList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CustomerQuery> orConditionList; private List<CustomerQuery> orConditionList;
...@@ -513,6 +526,21 @@ public class CustomerQuery extends CustomerEntity { ...@@ -513,6 +526,21 @@ public class CustomerQuery extends CustomerEntity {
public void setJobList(List<String> jobList){ public void setJobList(List<String> jobList){
this.jobList = jobList; this.jobList = jobList;
} }
/**
* 获取 头像图片地址
* @return avatarList
*/
public List<String> getAvatarList(){
return this.avatarList;
}
/**
* 设置 头像图片地址
* @param avatarList
*/
public void setAvatarList(List<String> avatarList){
this.avatarList = avatarList;
}
/** /**
* 获取 开始 客户来源 * 获取 开始 客户来源
* @return customerSrcStart * @return customerSrcStart
...@@ -769,6 +797,53 @@ public class CustomerQuery extends CustomerEntity { ...@@ -769,6 +797,53 @@ public class CustomerQuery extends CustomerEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 最后一次登录时间
* @return lastLoginTimeStart
*/
public String getLastLoginTimeStart(){
return this.lastLoginTimeStart;
}
/**
* 设置 开始 最后一次登录时间
* @param lastLoginTimeStart
*/
public void setLastLoginTimeStart(String lastLoginTimeStart){
this.lastLoginTimeStart = lastLoginTimeStart;
}
/**
* 获取 结束 最后一次登录时间
* @return lastLoginTimeEnd
*/
public String getLastLoginTimeEnd(){
return this.lastLoginTimeEnd;
}
/**
* 设置 结束 最后一次登录时间
* @param lastLoginTimeEnd
*/
public void setLastLoginTimeEnd(String lastLoginTimeEnd){
this.lastLoginTimeEnd = lastLoginTimeEnd;
}
/**
* 获取 最后一次登录地址
* @return lastLoginAddressList
*/
public List<String> getLastLoginAddressList(){
return this.lastLoginAddressList;
}
/**
* 设置 最后一次登录地址
* @param lastLoginAddressList
*/
public void setLastLoginAddressList(List<String> lastLoginAddressList){
this.lastLoginAddressList = lastLoginAddressList;
}
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
...@@ -1101,6 +1176,25 @@ public class CustomerQuery extends CustomerEntity { ...@@ -1101,6 +1176,25 @@ public class CustomerQuery extends CustomerEntity {
return this; return this;
} }
/**
* 设置 头像图片地址
* @param avatar
*/
public CustomerQuery avatar(String avatar){
setAvatar(avatar);
return this;
}
/**
* 设置 头像图片地址
* @param avatarList
*/
public CustomerQuery avatarList(List<String> avatarList){
this.avatarList = avatarList;
return this;
}
/** /**
* 设置 客户来源 * 设置 客户来源
* @param customerSrc * @param customerSrc
...@@ -1238,6 +1332,26 @@ public class CustomerQuery extends CustomerEntity { ...@@ -1238,6 +1332,26 @@ public class CustomerQuery extends CustomerEntity {
/**
* 设置 最后一次登录地址
* @param lastLoginAddress
*/
public CustomerQuery lastLoginAddress(String lastLoginAddress){
setLastLoginAddress(lastLoginAddress);
return this;
}
/**
* 设置 最后一次登录地址
* @param lastLoginAddressList
*/
public CustomerQuery lastLoginAddressList(List<String> lastLoginAddressList){
this.lastLoginAddressList = lastLoginAddressList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
eas-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerWorkDesignEntity.java
View file @ b56732a6
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.customer.model.vo.CustomerWorkDesignVo; import com.mortals.xhx.module.customer.model.vo.CustomerWorkDesignVo;
/** /**
* 客户作品信息实体对象 * 客户作品信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-14 * @date 2022-07-01
*/ */
public class CustomerWorkDesignEntity extends CustomerWorkDesignVo { public class CustomerWorkDesignEntity extends CustomerWorkDesignVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -48,6 +48,10 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo { ...@@ -48,6 +48,10 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo {
* 作品引用的字体 * 作品引用的字体
*/ */
private String fontIds; private String fontIds;
/**
* 作品图片预览地址（相对地址）
*/
private String previewUrl;
...@@ -164,6 +168,20 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo { ...@@ -164,6 +168,20 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo {
public void setFontIds(String fontIds){ public void setFontIds(String fontIds){
this.fontIds = fontIds; this.fontIds = fontIds;
} }
/**
* 获取 作品图片预览地址（相对地址）
* @return String
*/
public String getPreviewUrl(){
return previewUrl;
}
/**
* 设置 作品图片预览地址（相对地址）
* @param previewUrl
*/
public void setPreviewUrl(String previewUrl){
this.previewUrl = previewUrl;
}
...@@ -194,6 +212,7 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo { ...@@ -194,6 +212,7 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo {
sb.append(",pictureSrcIds:").append(getPictureSrcIds()); sb.append(",pictureSrcIds:").append(getPictureSrcIds());
sb.append(",pictureBackgroundIds:").append(getPictureBackgroundIds()); sb.append(",pictureBackgroundIds:").append(getPictureBackgroundIds());
sb.append(",fontIds:").append(getFontIds()); sb.append(",fontIds:").append(getFontIds());
sb.append(",previewUrl:").append(getPreviewUrl());
return sb.toString(); return sb.toString();
} }
...@@ -214,5 +233,7 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo { ...@@ -214,5 +233,7 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo {
this.pictureBackgroundIds = ""; this.pictureBackgroundIds = "";
this.fontIds = ""; this.fontIds = "";
this.previewUrl = "";
} }
} }
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerWorkDesignQuery.java
View file @ b56732a6
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.customer.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.customer.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.customer.model.CustomerWorkDesignEntity; import com.mortals.xhx.module.customer.model.CustomerWorkDesignEntity;
/** /**
* 客户作品信息查询对象 * 客户作品信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-14 * @date 2022-07-01
*/ */
public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -33,12 +33,6 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -33,12 +33,6 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
/** 客户ID列表 */ /** 客户ID列表 */
private List <Long> customerIdList; private List <Long> customerIdList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 作品名称 */ /** 作品名称 */
private List<String> workDesignNameList; private List<String> workDesignNameList;
...@@ -57,6 +51,12 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -57,6 +51,12 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
/** 作品描述 */ /** 作品描述 */
private List<String> workDesignDescList; private List<String> workDesignDescList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
...@@ -75,6 +75,9 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -75,6 +75,9 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
/** 作品引用的字体 */ /** 作品引用的字体 */
private List<String> fontIdsList; private List<String> fontIdsList;
/** 作品图片预览地址（相对地址） */
private List<String> previewUrlList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CustomerWorkDesignQuery> orConditionList; private List<CustomerWorkDesignQuery> orConditionList;
...@@ -211,38 +214,6 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -211,38 +214,6 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
this.customerIdList = customerIdList; this.customerIdList = customerIdList;
} }
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/** /**
* 获取 作品名称 * 获取 作品名称
* @return workDesignNameList * @return workDesignNameList
...@@ -337,6 +308,38 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -337,6 +308,38 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
public void setWorkDesignDescList(List<String> workDesignDescList){ public void setWorkDesignDescList(List<String> workDesignDescList){
this.workDesignDescList = workDesignDescList; this.workDesignDescList = workDesignDescList;
} }
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -429,6 +432,21 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -429,6 +432,21 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
public void setFontIdsList(List<String> fontIdsList){ public void setFontIdsList(List<String> fontIdsList){
this.fontIdsList = fontIdsList; this.fontIdsList = fontIdsList;
} }
/**
* 获取 作品图片预览地址（相对地址）
* @return previewUrlList
*/
public List<String> getPreviewUrlList(){
return this.previewUrlList;
}
/**
* 设置 作品图片预览地址（相对地址）
* @param previewUrlList
*/
public void setPreviewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList;
}
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
...@@ -520,7 +538,6 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -520,7 +538,6 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
} }
/** /**
* 设置 作品名称 * 设置 作品名称
* @param workDesignName * @param workDesignName
...@@ -605,6 +622,7 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -605,6 +622,7 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
/** /**
* 设置 模版引用的图片 * 设置 模版引用的图片
* @param pictureIds * @param pictureIds
...@@ -680,6 +698,25 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -680,6 +698,25 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
return this; return this;
} }
/**
* 设置 作品图片预览地址（相对地址）
* @param previewUrl
*/
public CustomerWorkDesignQuery previewUrl(String previewUrl){
setPreviewUrl(previewUrl);
return this;
}
/**
* 设置 作品图片预览地址（相对地址）
* @param previewUrlList
*/
public CustomerWorkDesignQuery previewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
eas-manager/src/main/java/com/mortals/xhx/module/design/model/DesignMasterplateEntity.java
View file @ b56732a6
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.design.model.vo.DesignMasterplateVo; import com.mortals.xhx.module.design.model.vo.DesignMasterplateVo;
/** /**
* 模版管理实体对象 * 模版管理实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-14 * @date 2022-07-01
*/ */
public class DesignMasterplateEntity extends DesignMasterplateVo { public class DesignMasterplateEntity extends DesignMasterplateVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -41,10 +41,6 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -41,10 +41,6 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
*/ */
private String masterplatePath; private String masterplatePath;
/** /**
* 模版被引用的次数。默认：0
*/
private Integer masterplateUseNum;
/**
* 模版引用的图片 * 模版引用的图片
*/ */
private String pictureIds; private String pictureIds;
...@@ -60,6 +56,14 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -60,6 +56,14 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
* 模版引用的字体 * 模版引用的字体
*/ */
private String fontIds; private String fontIds;
/**
* 模版被引用的次数。默认：0
*/
private Integer masterplateUseNum;
/**
* 作品图片预览地址（相对地址）
*/
private String previewUrl;
...@@ -149,20 +153,6 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -149,20 +153,6 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
this.masterplatePath = masterplatePath; this.masterplatePath = masterplatePath;
} }
/** /**
* 获取 模版被引用的次数。默认：0
* @return Integer
*/
public Integer getMasterplateUseNum(){
return masterplateUseNum;
}
/**
* 设置 模版被引用的次数。默认：0
* @param masterplateUseNum
*/
public void setMasterplateUseNum(Integer masterplateUseNum){
this.masterplateUseNum = masterplateUseNum;
}
/**
* 获取 模版引用的图片 * 获取 模版引用的图片
* @return String * @return String
*/ */
...@@ -218,6 +208,34 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -218,6 +208,34 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
public void setFontIds(String fontIds){ public void setFontIds(String fontIds){
this.fontIds = fontIds; this.fontIds = fontIds;
} }
/**
* 获取 模版被引用的次数。默认：0
* @return Integer
*/
public Integer getMasterplateUseNum(){
return masterplateUseNum;
}
/**
* 设置 模版被引用的次数。默认：0
* @param masterplateUseNum
*/
public void setMasterplateUseNum(Integer masterplateUseNum){
this.masterplateUseNum = masterplateUseNum;
}
/**
* 获取 作品图片预览地址（相对地址）
* @return String
*/
public String getPreviewUrl(){
return previewUrl;
}
/**
* 设置 作品图片预览地址（相对地址）
* @param previewUrl
*/
public void setPreviewUrl(String previewUrl){
this.previewUrl = previewUrl;
}
...@@ -246,11 +264,12 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -246,11 +264,12 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
sb.append(",customerName:").append(getCustomerName()); sb.append(",customerName:").append(getCustomerName());
sb.append(",masterplateDesc:").append(getMasterplateDesc()); sb.append(",masterplateDesc:").append(getMasterplateDesc());
sb.append(",masterplatePath:").append(getMasterplatePath()); sb.append(",masterplatePath:").append(getMasterplatePath());
sb.append(",masterplateUseNum:").append(getMasterplateUseNum());
sb.append(",pictureIds:").append(getPictureIds()); sb.append(",pictureIds:").append(getPictureIds());
sb.append(",pictureSrcIds:").append(getPictureSrcIds()); sb.append(",pictureSrcIds:").append(getPictureSrcIds());
sb.append(",pictureBackgroundIds:").append(getPictureBackgroundIds()); sb.append(",pictureBackgroundIds:").append(getPictureBackgroundIds());
sb.append(",fontIds:").append(getFontIds()); sb.append(",fontIds:").append(getFontIds());
sb.append(",masterplateUseNum:").append(getMasterplateUseNum());
sb.append(",previewUrl:").append(getPreviewUrl());
return sb.toString(); return sb.toString();
} }
...@@ -268,8 +287,6 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -268,8 +287,6 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
this.masterplatePath = ""; this.masterplatePath = "";
this.masterplateUseNum = null;
this.pictureIds = ""; this.pictureIds = "";
this.pictureSrcIds = ""; this.pictureSrcIds = "";
...@@ -277,5 +294,9 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -277,5 +294,9 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
this.pictureBackgroundIds = ""; this.pictureBackgroundIds = "";
this.fontIds = ""; this.fontIds = "";
this.masterplateUseNum = null;
this.previewUrl = "";
} }
} }
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/design/model/DesignMasterplateQuery.java
View file @ b56732a6
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.design.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.design.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.design.model.DesignMasterplateEntity; import com.mortals.xhx.module.design.model.DesignMasterplateEntity;
/** /**
* 模版管理查询对象 * 模版管理查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-14 * @date 2022-07-01
*/ */
public class DesignMasterplateQuery extends DesignMasterplateEntity { public class DesignMasterplateQuery extends DesignMasterplateEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -63,6 +63,18 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -63,6 +63,18 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
/** 模版下载地址（相对地址） */ /** 模版下载地址（相对地址） */
private List<String> masterplatePathList; private List<String> masterplatePathList;
/** 模版引用的图片 */
private List<String> pictureIdsList;
/** 模版引用的素材 */
private List<String> pictureSrcIdsList;
/** 模版引用的背景 */
private List<String> pictureBackgroundIdsList;
/** 模版引用的字体 */
private List<String> fontIdsList;
/** 开始 模版被引用的次数。默认：0 */ /** 开始 模版被引用的次数。默认：0 */
private Integer masterplateUseNumStart; private Integer masterplateUseNumStart;
...@@ -75,17 +87,8 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -75,17 +87,8 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
/** 模版被引用的次数。默认：0列表 */ /** 模版被引用的次数。默认：0列表 */
private List <Integer> masterplateUseNumList; private List <Integer> masterplateUseNumList;
/** 模版引用的图片 */ /** 作品图片预览地址（相对地址） */
private List<String> pictureIdsList; private List<String> previewUrlList;
/** 模版引用的素材 */
private List<String> pictureSrcIdsList;
/** 模版引用的背景 */
private List<String> pictureBackgroundIdsList;
/** 模版引用的字体 */
private List<String> fontIdsList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<DesignMasterplateQuery> orConditionList; private List<DesignMasterplateQuery> orConditionList;
...@@ -379,6 +382,66 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -379,6 +382,66 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
public void setMasterplatePathList(List<String> masterplatePathList){ public void setMasterplatePathList(List<String> masterplatePathList){
this.masterplatePathList = masterplatePathList; this.masterplatePathList = masterplatePathList;
} }
/**
* 获取 模版引用的图片
* @return pictureIdsList
*/
public List<String> getPictureIdsList(){
return this.pictureIdsList;
}
/**
* 设置 模版引用的图片
* @param pictureIdsList
*/
public void setPictureIdsList(List<String> pictureIdsList){
this.pictureIdsList = pictureIdsList;
}
/**
* 获取 模版引用的素材
* @return pictureSrcIdsList
*/
public List<String> getPictureSrcIdsList(){
return this.pictureSrcIdsList;
}
/**
* 设置 模版引用的素材
* @param pictureSrcIdsList
*/
public void setPictureSrcIdsList(List<String> pictureSrcIdsList){
this.pictureSrcIdsList = pictureSrcIdsList;
}
/**
* 获取 模版引用的背景
* @return pictureBackgroundIdsList
*/
public List<String> getPictureBackgroundIdsList(){
return this.pictureBackgroundIdsList;
}
/**
* 设置 模版引用的背景
* @param pictureBackgroundIdsList
*/
public void setPictureBackgroundIdsList(List<String> pictureBackgroundIdsList){
this.pictureBackgroundIdsList = pictureBackgroundIdsList;
}
/**
* 获取 模版引用的字体
* @return fontIdsList
*/
public List<String> getFontIdsList(){
return this.fontIdsList;
}
/**
* 设置 模版引用的字体
* @param fontIdsList
*/
public void setFontIdsList(List<String> fontIdsList){
this.fontIdsList = fontIdsList;
}
/** /**
* 获取 开始 模版被引用的次数。默认：0 * 获取 开始 模版被引用的次数。默认：0
* @return masterplateUseNumStart * @return masterplateUseNumStart
...@@ -444,64 +507,19 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -444,64 +507,19 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
} }
/** /**
* 获取 模版引用的图片 * 获取 作品图片预览地址（相对地址）
* @return pictureIdsList * @return previewUrlList
*/
public List<String> getPictureIdsList(){
return this.pictureIdsList;
}
/**
* 设置 模版引用的图片
* @param pictureIdsList
*/
public void setPictureIdsList(List<String> pictureIdsList){
this.pictureIdsList = pictureIdsList;
}
/**
* 获取 模版引用的素材
* @return pictureSrcIdsList
*/
public List<String> getPictureSrcIdsList(){
return this.pictureSrcIdsList;
}
/**
* 设置 模版引用的素材
* @param pictureSrcIdsList
*/
public void setPictureSrcIdsList(List<String> pictureSrcIdsList){
this.pictureSrcIdsList = pictureSrcIdsList;
}
/**
* 获取 模版引用的背景
* @return pictureBackgroundIdsList
*/
public List<String> getPictureBackgroundIdsList(){
return this.pictureBackgroundIdsList;
}
/**
* 设置 模版引用的背景
* @param pictureBackgroundIdsList
*/ */
public void setPictureBackgroundIdsList(List<String> pictureBackgroundIdsList){ public List<String> getPreviewUrlList(){
this.pictureBackgroundIdsList = pictureBackgroundIdsList; return this.previewUrlList;
}
/**
* 获取 模版引用的字体
* @return fontIdsList
*/
public List<String> getFontIdsList(){
return this.fontIdsList;
} }
/** /**
* 设置 模版引用的字体 * 设置 作品图片预览地址（相对地址）
* @param fontIdsList * @param previewUrlList
*/ */
public void setFontIdsList(List<String> fontIdsList){ public void setPreviewUrlList(List<String> previewUrlList){
this.fontIdsList = fontIdsList; this.previewUrlList = previewUrlList;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
...@@ -715,51 +733,6 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -715,51 +733,6 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
return this; return this;
} }
/**
* 设置 模版被引用的次数。默认：0
* @param masterplateUseNum
*/
public DesignMasterplateQuery masterplateUseNum(Integer masterplateUseNum){
setMasterplateUseNum(masterplateUseNum);
return this;
}
/**
* 设置 开始 模版被引用的次数。默认：0
* @param masterplateUseNumStart
*/
public DesignMasterplateQuery masterplateUseNumStart(Integer masterplateUseNumStart){
this.masterplateUseNumStart = masterplateUseNumStart;
return this;
}
/**
* 设置 结束 模版被引用的次数。默认：0
* @param masterplateUseNumEnd
*/
public DesignMasterplateQuery masterplateUseNumEnd(Integer masterplateUseNumEnd){
this.masterplateUseNumEnd = masterplateUseNumEnd;
return this;
}
/**
* 设置 增加 模版被引用的次数。默认：0
* @param masterplateUseNumIncrement
*/
public DesignMasterplateQuery masterplateUseNumIncrement(Integer masterplateUseNumIncrement){
this.masterplateUseNumIncrement = masterplateUseNumIncrement;
return this;
}
/**
* 设置 模版被引用的次数。默认：0
* @param masterplateUseNumList
*/
public DesignMasterplateQuery masterplateUseNumList(List<Integer> masterplateUseNumList){
this.masterplateUseNumList = masterplateUseNumList;
return this;
}
/** /**
* 设置 模版引用的图片 * 设置 模版引用的图片
...@@ -836,6 +809,70 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -836,6 +809,70 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
return this; return this;
} }
/**
* 设置 模版被引用的次数。默认：0
* @param masterplateUseNum
*/
public DesignMasterplateQuery masterplateUseNum(Integer masterplateUseNum){
setMasterplateUseNum(masterplateUseNum);
return this;
}
/**
* 设置 开始 模版被引用的次数。默认：0
* @param masterplateUseNumStart
*/
public DesignMasterplateQuery masterplateUseNumStart(Integer masterplateUseNumStart){
this.masterplateUseNumStart = masterplateUseNumStart;
return this;
}
/**
* 设置 结束 模版被引用的次数。默认：0
* @param masterplateUseNumEnd
*/
public DesignMasterplateQuery masterplateUseNumEnd(Integer masterplateUseNumEnd){
this.masterplateUseNumEnd = masterplateUseNumEnd;
return this;
}
/**
* 设置 增加 模版被引用的次数。默认：0
* @param masterplateUseNumIncrement
*/
public DesignMasterplateQuery masterplateUseNumIncrement(Integer masterplateUseNumIncrement){
this.masterplateUseNumIncrement = masterplateUseNumIncrement;
return this;
}
/**
* 设置 模版被引用的次数。默认：0
* @param masterplateUseNumList
*/
public DesignMasterplateQuery masterplateUseNumList(List<Integer> masterplateUseNumList){
this.masterplateUseNumList = masterplateUseNumList;
return this;
}
/**
* 设置 作品图片预览地址（相对地址）
* @param previewUrl
*/
public DesignMasterplateQuery previewUrl(String previewUrl){
setPreviewUrl(previewUrl);
return this;
}
/**
* 设置 作品图片预览地址（相对地址）
* @param previewUrlList
*/
public DesignMasterplateQuery previewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
eas-manager/src/main/java/com/mortals/xhx/module/help/dao/HelpDao.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.help.model.HelpEntity;
import java.util.List;
/**
* 帮助信息Dao
* 帮助信息 DAO接口
*
* @author zxfei
* @date 2022-06-28
*/
public interface HelpDao extends ICRUDDao<HelpEntity,Long>{
}
eas-manager/src/main/java/com/mortals/xhx/module/help/dao/HelpEvaluateDao.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.help.model.HelpEvaluateEntity;
import java.util.List;
/**
* 帮助评价信息Dao
* 帮助评价信息 DAO接口
*
* @author zxfei
* @date 2022-06-29
*/
public interface HelpEvaluateDao extends ICRUDDao<HelpEvaluateEntity,Long>{
}
eas-manager/src/main/java/com/mortals/xhx/module/help/dao/ibatis/HelpDaoImpl.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.help.dao.HelpDao;
import com.mortals.xhx.module.help.model.HelpEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 帮助信息DaoImpl DAO接口
*
* @author zxfei
* @date 2022-06-28
*/
@Repository("helpDao")
public class HelpDaoImpl extends BaseCRUDDaoMybatis<HelpEntity,Long> implements HelpDao {
}
eas-manager/src/main/java/com/mortals/xhx/module/help/dao/ibatis/HelpEvaluateDaoImpl.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.dao.ibatis;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.help.dao.HelpEvaluateDao;
import com.mortals.xhx.module.help.model.HelpEvaluateEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
/**
* 帮助评价信息DaoImpl DAO接口
*
* @author zxfei
* @date 2022-06-29
*/
@Repository("helpEvaluateDao")
public class HelpEvaluateDaoImpl extends BaseCRUDDaoMybatis<HelpEvaluateEntity,Long> implements HelpEvaluateDao {
}
eas-manager/src/main/java/com/mortals/xhx/module/help/model/HelpEntity.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.model;
import com.mortals.xhx.module.help.model.vo.HelpVo;
/**
* 帮助信息实体对象
*
* @author zxfei
* @date 2022-06-29
*/
public class HelpEntity extends HelpVo {
private static final long serialVersionUID = 1L;
/**
* 排序号
*/
private Integer sortNum;
/**
* 问题标题
*/
private String title;
/**
* 问题内容
*/
private String content;
/**
* 问题回复
*/
private String answerContent;
/**
* 问题类型备用字段
*/
private Integer questionType;
/**
* 状态备用字段
*/
private Integer status;
/**
* 有用统计
*/
private Integer useful;
/**
* 无用统计
*/
private Integer useless;
/**
* 创建用户名称
*/
private String createUserName;
/**
* 修改用户名称
*/
private String updateUserName;
public HelpEntity(){}
/**
* 获取 排序号
* @return Integer
*/
public Integer getSortNum(){
return sortNum;
}
/**
* 设置 排序号
* @param sortNum
*/
public void setSortNum(Integer sortNum){
this.sortNum = sortNum;
}
/**
* 获取 问题标题
* @return String
*/
public String getTitle(){
return title;
}
/**
* 设置 问题标题
* @param title
*/
public void setTitle(String title){
this.title = title;
}
/**
* 获取 问题内容
* @return String
*/
public String getContent(){
return content;
}
/**
* 设置 问题内容
* @param content
*/
public void setContent(String content){
this.content = content;
}
/**
* 获取 问题回复
* @return String
*/
public String getAnswerContent(){
return answerContent;
}
/**
* 设置 问题回复
* @param answerContent
*/
public void setAnswerContent(String answerContent){
this.answerContent = answerContent;
}
/**
* 获取 问题类型备用字段
* @return Integer
*/
public Integer getQuestionType(){
return questionType;
}
/**
* 设置 问题类型备用字段
* @param questionType
*/
public void setQuestionType(Integer questionType){
this.questionType = questionType;
}
/**
* 获取 状态备用字段
* @return Integer
*/
public Integer getStatus(){
return status;
}
/**
* 设置 状态备用字段
* @param status
*/
public void setStatus(Integer status){
this.status = status;
}
/**
* 获取 有用统计
* @return Integer
*/
public Integer getUseful(){
return useful;
}
/**
* 设置 有用统计
* @param useful
*/
public void setUseful(Integer useful){
this.useful = useful;
}
/**
* 获取 无用统计
* @return Integer
*/
public Integer getUseless(){
return useless;
}
/**
* 设置 无用统计
* @param useless
*/
public void setUseless(Integer useless){
this.useless = useless;
}
/**
* 获取 创建用户名称
* @return String
*/
public String getCreateUserName(){
return createUserName;
}
/**
* 设置 创建用户名称
* @param createUserName
*/
public void setCreateUserName(String createUserName){
this.createUserName = createUserName;
}
/**
* 获取 修改用户名称
* @return String
*/
public String getUpdateUserName(){
return updateUserName;
}
/**
* 设置 修改用户名称
* @param updateUserName
*/
public void setUpdateUserName(String updateUserName){
this.updateUserName = updateUserName;
}
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof HelpEntity) {
HelpEntity tmp = (HelpEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",sortNum:").append(getSortNum());
sb.append(",title:").append(getTitle());
sb.append(",content:").append(getContent());
sb.append(",answerContent:").append(getAnswerContent());
sb.append(",questionType:").append(getQuestionType());
sb.append(",status:").append(getStatus());
sb.append(",useful:").append(getUseful());
sb.append(",useless:").append(getUseless());
sb.append(",createUserName:").append(getCreateUserName());
sb.append(",updateUserName:").append(getUpdateUserName());
return sb.toString();
}
public void initAttrValue(){
this.sortNum = null;
this.title = "";
this.content = "";
this.answerContent = "";
this.questionType = null;
this.status = null;
this.useful = 0;
this.useless = 0;
this.createUserName = "";
this.updateUserName = "";
}
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/help/model/HelpEvaluateEntity.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.model;
import com.mortals.xhx.module.help.model.vo.HelpEvaluateVo;
import java.util.Date;
/**
* 帮助评价信息实体对象
*
* @author zxfei
* @date 2022-06-29
*/
public class HelpEvaluateEntity extends HelpEvaluateVo {
private static final long serialVersionUID = 1L;
/**
* 帮助ID
*/
private Long helpId;
/**
* 客户id
*/
private Long customerId;
/**
* 客户真实名称
*/
private String custName;
/**
* 单位名称
*/
private String organization;
/**
* 联系电话
*/
private String contactTelphone;
/**
* 评价结果1有用2没用
*/
private Integer evaluateType;
/**
* 评价时间
*/
private Date evaluateTime;
public HelpEvaluateEntity(){}
/**
* 获取 帮助ID
* @return Long
*/
public Long getHelpId(){
return helpId;
}
/**
* 设置 帮助ID
* @param helpId
*/
public void setHelpId(Long helpId){
this.helpId = helpId;
}
/**
* 获取 客户id
* @return Long
*/
public Long getCustomerId(){
return customerId;
}
/**
* 设置 客户id
* @param customerId
*/
public void setCustomerId(Long customerId){
this.customerId = customerId;
}
/**
* 获取 客户真实名称
* @return String
*/
public String getCustName(){
return custName;
}
/**
* 设置 客户真实名称
* @param custName
*/
public void setCustName(String custName){
this.custName = custName;
}
/**
* 获取 单位名称
* @return String
*/
public String getOrganization(){
return organization;
}
/**
* 设置 单位名称
* @param organization
*/
public void setOrganization(String organization){
this.organization = organization;
}
/**
* 获取 联系电话
* @return String
*/
public String getContactTelphone(){
return contactTelphone;
}
/**
* 设置 联系电话
* @param contactTelphone
*/
public void setContactTelphone(String contactTelphone){
this.contactTelphone = contactTelphone;
}
/**
* 获取 评价结果1有用2没用
* @return Integer
*/
public Integer getEvaluateType(){
return evaluateType;
}
/**
* 设置 评价结果1有用2没用
* @param evaluateType
*/
public void setEvaluateType(Integer evaluateType){
this.evaluateType = evaluateType;
}
/**
* 获取 评价时间
* @return Date
*/
public Date getEvaluateTime(){
return evaluateTime;
}
/**
* 设置 评价时间
* @param evaluateTime
*/
public void setEvaluateTime(Date evaluateTime){
this.evaluateTime = evaluateTime;
}
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof HelpEvaluateEntity) {
HelpEvaluateEntity tmp = (HelpEvaluateEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",helpId:").append(getHelpId());
sb.append(",customerId:").append(getCustomerId());
sb.append(",custName:").append(getCustName());
sb.append(",organization:").append(getOrganization());
sb.append(",contactTelphone:").append(getContactTelphone());
sb.append(",evaluateType:").append(getEvaluateType());
sb.append(",evaluateTime:").append(getEvaluateTime());
return sb.toString();
}
public void initAttrValue(){
this.helpId = null;
this.customerId = null;
this.custName = "";
this.organization = "";
this.contactTelphone = "";
this.evaluateType = 1;
this.evaluateTime = null;
}
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/help/model/vo/HelpEvaluateVo.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.model.vo;
import com.mortals.framework.model.BaseEntityLong;
/**
* 帮助评价信息视图对象
*
* @author zxfei
* @date 2022-06-29
*/
public class HelpEvaluateVo extends BaseEntityLong {
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/help/model/vo/HelpVo.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import lombok.Data;
/**
* 帮助信息视图对象
*
* @author zxfei
* @date 2022-06-28
*/
@Data
public class HelpVo extends BaseEntityLong {
/** 查询条件 */
private String query;
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/help/service/HelpEvaluateService.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.help.model.HelpEvaluateEntity;
/**
* HelpEvaluateService
*
* 帮助评价信息 service接口
*
* @author zxfei
* @date 2022-06-29
*/
public interface HelpEvaluateService extends ICRUDService<HelpEvaluateEntity,Long>{
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/help/service/HelpService.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.help.model.HelpEntity;
/**
* HelpService
*
* 帮助信息 service接口
*
* @author zxfei
* @date 2022-06-28
*/
public interface HelpService extends ICRUDService<HelpEntity,Long>{
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/help/service/impl/HelpEvaluateServiceImpl.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.service.impl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.module.help.dao.HelpEvaluateDao;
import com.mortals.xhx.module.help.model.HelpEvaluateEntity;
import com.mortals.xhx.module.help.service.HelpEvaluateService;
/**
* HelpEvaluateService
* 帮助评价信息 service实现
*
* @author zxfei
* @date 2022-06-29
*/
@Service("helpEvaluateService")
public class HelpEvaluateServiceImpl extends AbstractCRUDServiceImpl<HelpEvaluateDao, HelpEvaluateEntity, Long> implements HelpEvaluateService {
@Override
protected HelpEvaluateEntity findBefore(HelpEvaluateEntity params, PageInfo pageInfo, Context context) throws AppException {
pageInfo.setPrePageResult(-1);
return super.findBefore(params, pageInfo, context);
}
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/help/service/impl/HelpServiceImpl.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.service.impl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.common.code.EvaluateType;
import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.help.dao.HelpDao;
import com.mortals.xhx.module.help.model.HelpEntity;
import com.mortals.xhx.module.help.model.HelpEvaluateEntity;
import com.mortals.xhx.module.help.service.HelpEvaluateService;
import com.mortals.xhx.module.help.service.HelpService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* HelpService
* 帮助信息 service实现
*
* @author zxfei
* @date 2022-06-28
*/
@Service("helpService")
public class HelpServiceImpl extends AbstractCRUDServiceImpl<HelpDao, HelpEntity, Long> implements HelpService {
@Autowired
private HelpEvaluateService helpEvaluateService;
@Override
protected HelpEntity findBefore(HelpEntity entity, PageInfo pageInfo, Context context) throws AppException {
if(StringUtils.isNotEmpty(entity.getQuery())){
StringBuffer condition = new StringBuffer("%");
condition.append(entity.getQuery()).append("%");
entity.setContent(condition.toString());
}
return entity;
}
@Override
protected void findAfter(HelpEntity params, PageInfo pageInfo, Context context, List<HelpEntity> list) throws AppException {
if(CollectionUtils.isNotEmpty(list)) {
list.stream().forEach(item -> {
HelpEvaluateEntity query = new HelpEvaluateEntity();
query.setHelpId(item.getId());
List<HelpEvaluateEntity> evaluateEntities = helpEvaluateService.find(query);
if(CollectionUtils.isNotEmpty(evaluateEntities)){
Map<Integer, List<HelpEvaluateEntity>> map = evaluateEntities.stream().collect(Collectors.groupingBy(HelpEvaluateEntity::getEvaluateType));
item.setUseful(CollectionUtils.isNotEmpty(map.get(EvaluateType.USEFUL.getValue()))?map.get(EvaluateType.USEFUL.getValue()).size():0);
item.setUseless(CollectionUtils.isNotEmpty(map.get(EvaluateType.USELESS.getValue()))?map.get(EvaluateType.USELESS.getValue()).size():0);
}else {
item.setUseful(0);
item.setUseless(0);
}
});
}
}
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/help/web/HelpController.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.web;
import com.mortals.framework.common.IBaseEnum;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.QuestionStatusEnum;
import com.mortals.xhx.module.help.model.HelpEntity;
import com.mortals.xhx.module.help.service.HelpService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
/**
*
* 帮助信息
*
* @author zxfei
* @date 2022-06-28
*/
@RestController
@RequestMapping("help")
public class HelpController extends BaseCRUDJsonBodyMappingController<HelpService,HelpEntity,Long> {
public HelpController(){
super.setModuleDesc( "帮助信息");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model,"status", IBaseEnum.getEnumMap(QuestionStatusEnum.class));
super.init(model, context);
}
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/help/web/HelpEvaluateController.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.help.web;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.RepeatSubmit;
import com.mortals.framework.common.IBaseEnum;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.common.code.EvaluateType;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.module.customer.model.CustomerEntity;
import com.mortals.xhx.module.customer.service.CustomerService;
import com.mortals.xhx.module.help.model.HelpEvaluateEntity;
import com.mortals.xhx.module.help.service.HelpEvaluateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
*
* 帮助评价信息
*
* @author zxfei
* @date 2022-06-29
*/
@RestController
@RequestMapping("help/evaluate")
public class HelpEvaluateController extends BaseCRUDJsonBodyMappingController<HelpEvaluateService,HelpEvaluateEntity,Long> {
@Autowired
private CustomerService customerService;
public HelpEvaluateController(){
super.setModuleDesc( "帮助评价信息");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "evaluateType", IBaseEnum.getEnumMap(EvaluateType.class));
super.init(model, context);
}
@Override
protected void saveBefore(HelpEvaluateEntity entity, Map<String, Object> model, Context context) throws AppException {
if(this.getCurUser()==null||this.getCurUser().getUserType()!= Constant.CUSTOMER_USER){
throw new AppException("非法用户,不可访问");
}
CustomerEntity customerEntity = customerService.get(this.getCurUser().getId());
entity.setCustomerId(this.getCurUser().getId());
entity.setCustName(customerEntity.getCustName());
entity.setContactTelphone(customerEntity.getContactTelphone());
entity.setOrganization(customerEntity.getOrganization());
}
protected int doListAfter(HelpEvaluateEntity query, Map<String, Object> model, Context context) throws AppException {
List<HelpEvaluateEntity> evaluateEntities = (List<HelpEvaluateEntity>)model.get("data");
Map<Integer, List<HelpEvaluateEntity>> map = evaluateEntities.stream().collect(Collectors.groupingBy(HelpEvaluateEntity::getEvaluateType));
Map<String, Object> dataMap = new HashMap<>();
dataMap.put("useful",map.get(EvaluateType.USEFUL.getValue()));
dataMap.put("useless",map.get(EvaluateType.USELESS.getValue()));
model.put("data",dataMap);
return 1;
}
/**
* 新增有用评价
* @return
*/
@GetMapping({"useful"})
public String useful(Long helpId) {
Map<String, Object> model = new HashMap();
Context context = this.getContext();
int code = 1;
String busiDesc = "保存有用" + this.getModuleDesc();
HelpEvaluateEntity entity = new HelpEvaluateEntity();
entity.setHelpId(helpId);
entity.setEvaluateType(EvaluateType.USEFUL.getValue());
entity.setEvaluateTime(new Date());
try {
this.saveBefore(entity, model, context);
this.service.save(entity, context);
model.put("id", entity.getId());
code = this.saveAfter(entity, model, context);
model.put("entity", entity);
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
} catch (Exception var7) {
this.doException(this.request, busiDesc, model, var7);
model.put("entity", entity);
this.init(model, context);
code = this.saveException(entity, model, context, var7);
}
this.init(model, context);
JSONObject ret = new JSONObject();
ret.put("code", code);
ret.put("msg", model.remove("message_info"));
ret.put("data", model);
return ret.toJSONString();
}
/**
* 新增有用评价
* @return
*/
@GetMapping({"useless"})
public String useless(Long helpId) {
Map<String, Object> model = new HashMap();
Context context = this.getContext();
int code = 1;
String busiDesc = "保存无用" + this.getModuleDesc();
HelpEvaluateEntity entity = new HelpEvaluateEntity();
entity.setHelpId(helpId);
entity.setEvaluateType(EvaluateType.USELESS.getValue());
entity.setEvaluateTime(new Date());
try {
this.saveBefore(entity, model, context);
this.service.save(entity, context);
model.put("id", entity.getId());
code = this.saveAfter(entity, model, context);
model.put("entity", entity);
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
} catch (Exception var7) {
this.doException(this.request, busiDesc, model, var7);
model.put("entity", entity);
this.init(model, context);
code = this.saveException(entity, model, context, var7);
}
this.init(model, context);
JSONObject ret = new JSONObject();
ret.put("code", code);
ret.put("msg", model.remove("message_info"));
ret.put("data", model);
return ret.toJSONString();
}
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/masterplate/web/MasterplateUseInfoController.java
View file @ b56732a6
package com.mortals.xhx.module.masterplate.web; package com.mortals.xhx.module.masterplate.web;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.module.customer.model.CustomerEntity; import com.mortals.xhx.module.customer.model.CustomerEntity;
import com.mortals.xhx.module.customer.model.CustomerWorkDesignEntity;
import com.mortals.xhx.module.customer.service.CustomerService; import com.mortals.xhx.module.customer.service.CustomerService;
import com.mortals.xhx.module.masterplate.model.MasterplateUseInfoEntity;
import com.mortals.xhx.module.masterplate.service.MasterplateUseInfoService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.masterplate.model.MasterplateUseInfoEntity;
import com.mortals.xhx.module.masterplate.model.MasterplateUseInfoQuery;
import com.mortals.xhx.module.masterplate.service.MasterplateUseInfoService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/** /**
* *
* 模版使用信息 * 模版使用信息
...@@ -39,8 +24,6 @@ import static com.mortals.framework.ap.SysConstains.*; ...@@ -39,8 +24,6 @@ import static com.mortals.framework.ap.SysConstains.*;
@RequestMapping("masterplate/use/info") @RequestMapping("masterplate/use/info")
public class MasterplateUseInfoController extends BaseCRUDJsonBodyMappingController<MasterplateUseInfoService,MasterplateUseInfoEntity,Long> { public class MasterplateUseInfoController extends BaseCRUDJsonBodyMappingController<MasterplateUseInfoService,MasterplateUseInfoEntity,Long> {
@Autowired
private ParamService paramService;
@Autowired @Autowired
private CustomerService customerService; private CustomerService customerService;
......
eas-manager/src/main/java/com/mortals/xhx/module/message/dao/MessageDao.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.message.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.message.model.MessageEntity;
/**
* 客户建议信息Dao
* 客户建议信息 DAO接口
*
* @author zxfei
* @date 2022-06-28
*/
public interface MessageDao extends ICRUDDao<MessageEntity,Long>{
}
eas-manager/src/main/java/com/mortals/xhx/module/message/dao/ibatis/MessageDaoImpl.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.message.dao.ibatis;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.message.dao.MessageDao;
import com.mortals.xhx.module.message.model.MessageEntity;
import org.springframework.stereotype.Repository;
/**
* 客户建议信息DaoImpl DAO接口
*
* @author zxfei
* @date 2022-06-28
*/
@Repository("messageDao")
public class MessageDaoImpl extends BaseCRUDDaoMybatis<MessageEntity,Long> implements MessageDao {
}
eas-manager/src/main/java/com/mortals/xhx/module/message/model/MessageEntity.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.message.model;
import com.mortals.xhx.module.message.model.vo.MessageVo;
import java.util.Date;
/**
* 客户建议信息实体对象
*
* @author zxfei
* @date 2022-06-29
*/
public class MessageEntity extends MessageVo {
private static final long serialVersionUID = 1L;
/**
* 消息标题
*/
private String title;
/**
* 消息内容
*/
private String content;
/**
* 发送方式1站内发送2短信发送3同时发送
*/
private Integer sendMode;
/**
* 可见范围1所有人可见2VIP可见3普通用户可见
*/
private Integer scope;
/**
* 发送状态0未发送1已发送
*/
private Integer sendStatus;
/**
* 发送时间
*/
private Date sendTime;
/**
* 创建用户名称
*/
private String createUserName;
/**
* 消息类型1标题消息2动态消息
*/
private Integer messageType;
public MessageEntity(){}
/**
* 获取 消息标题
* @return String
*/
public String getTitle(){
return title;
}
/**
* 设置 消息标题
* @param title
*/
public void setTitle(String title){
this.title = title;
}
/**
* 获取 消息内容
* @return String
*/
public String getContent(){
return content;
}
/**
* 设置 消息内容
* @param content
*/
public void setContent(String content){
this.content = content;
}
/**
* 获取 发送方式1站内发送2短信发送3同时发送
* @return Integer
*/
public Integer getSendMode(){
return sendMode;
}
/**
* 设置 发送方式1站内发送2短信发送3同时发送
* @param sendMode
*/
public void setSendMode(Integer sendMode){
this.sendMode = sendMode;
}
/**
* 获取 可见范围1所有人可见2VIP可见3普通用户可见
* @return Integer
*/
public Integer getScope(){
return scope;
}
/**
* 设置 可见范围1所有人可见2VIP可见3普通用户可见
* @param scope
*/
public void setScope(Integer scope){
this.scope = scope;
}
/**
* 获取 发送状态0未发送1已发送
* @return Integer
*/
public Integer getSendStatus(){
return sendStatus;
}
/**
* 设置 发送状态0未发送1已发送
* @param sendStatus
*/
public void setSendStatus(Integer sendStatus){
this.sendStatus = sendStatus;
}
/**
* 获取 发送时间
* @return Date
*/
public Date getSendTime(){
return sendTime;
}
/**
* 设置 发送时间
* @param sendTime
*/
public void setSendTime(Date sendTime){
this.sendTime = sendTime;
}
/**
* 获取 创建用户名称
* @return String
*/
public String getCreateUserName(){
return createUserName;
}
/**
* 设置 创建用户名称
* @param createUserName
*/
public void setCreateUserName(String createUserName){
this.createUserName = createUserName;
}
/**
* 获取 消息类型1标题消息2动态消息
* @return Integer
*/
public Integer getMessageType(){
return messageType;
}
/**
* 设置 消息类型1标题消息2动态消息
* @param messageType
*/
public void setMessageType(Integer messageType){
this.messageType = messageType;
}
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof MessageEntity) {
MessageEntity tmp = (MessageEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",title:").append(getTitle());
sb.append(",content:").append(getContent());
sb.append(",sendMode:").append(getSendMode());
sb.append(",scope:").append(getScope());
sb.append(",sendStatus:").append(getSendStatus());
sb.append(",sendTime:").append(getSendTime());
sb.append(",createUserName:").append(getCreateUserName());
sb.append(",messageType:").append(getMessageType());
return sb.toString();
}
public void initAttrValue(){
this.title = "";
this.content = "";
this.sendMode = 1;
this.scope = 1;
this.sendStatus = 0;
this.sendTime = null;
this.createUserName = "";
this.messageType = 1;
}
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/message/model/vo/MessageVo.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.message.model.vo;
import com.mortals.framework.model.BaseEntityLong;
/**
* 客户建议信息视图对象
*
* @author zxfei
* @date 2022-06-28
*/
public class MessageVo extends BaseEntityLong {
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/message/service/MessageService.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.message.service;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.message.model.MessageEntity;
/**
* MessageService
*
* 客户建议信息 service接口
*
* @author zxfei
* @date 2022-06-28
*/
public interface MessageService extends ICRUDService<MessageEntity,Long>{
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/message/service/impl/MessageServiceImpl.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.message.service.impl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.common.code.MemberLevelEnum;
import com.mortals.xhx.common.code.ReadStatusEnum;
import com.mortals.xhx.common.code.SendScopeEnum;
import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.customer.model.CustomerEntity;
import com.mortals.xhx.module.customer.model.CustomerQuery;
import com.mortals.xhx.module.customer.service.CustomerService;
import com.mortals.xhx.module.message.dao.MessageDao;
import com.mortals.xhx.module.message.model.MessageEntity;
import com.mortals.xhx.module.message.service.MessageService;
import com.mortals.xhx.module.news.model.NewsEntity;
import com.mortals.xhx.module.news.model.NewsQuery;
import com.mortals.xhx.module.news.service.NewsService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* MessageService
* 客户建议信息 service实现
*
* @author zxfei
* @date 2022-06-28
*/
@Service("messageService")
public class MessageServiceImpl extends AbstractCRUDServiceImpl<MessageDao, MessageEntity, Long> implements MessageService {
@Autowired
private NewsService newsService;
@Autowired
private CustomerService customerService;
@Override
protected MessageEntity findBefore(MessageEntity entity, PageInfo pageInfo, Context context) throws AppException {
if(StringUtils.isNotEmpty(entity.getContent())){
StringBuffer condition = new StringBuffer("%");
condition.append(entity.getContent()).append("%");
entity.setContent(condition.toString());
}
return entity;
}
@Override
protected void saveAfter(MessageEntity entity, Context context) throws AppException {
CustomerQuery customerQuery = new CustomerQuery();
List<Integer> memberLevel = new ArrayList<>();
if(entity.getScope()== SendScopeEnum.VIP.getValue()){
memberLevel.add(MemberLevelEnum.VIP.getValue());
}
if(entity.getScope()== SendScopeEnum.ORDINARY.getValue()){
memberLevel.add(MemberLevelEnum.NOT_OPEN.getValue());
}else {
memberLevel.add(MemberLevelEnum.VIP.getValue());
memberLevel.add(MemberLevelEnum.NOT_OPEN.getValue());
}
List<CustomerEntity> customerEntities = customerService.find(customerQuery,context);
if(CollectionUtils.isNotEmpty(customerEntities)){
List<NewsEntity> newsEntities = new ArrayList<>();
Date now = new Date();
customerEntities.stream().forEach(item->{
NewsEntity newsEntity = new NewsEntity();
newsEntity.setMessageId(entity.getId());
newsEntity.setCustomerId(item.getId());
newsEntity.setTitle(entity.getTitle());
newsEntity.setContent(entity.getContent());
newsEntity.setMessageType(entity.getMessageType());
newsEntity.setReadStatus(ReadStatusEnum.UN_READ.getValue());
newsEntity.setReceiveTime(now);
newsEntities.add(newsEntity);
});
newsService.save(newsEntities,context);
}
}
@Override
protected void removeBefore(Long[] ids, Context context) throws AppException {
List<MessageEntity> entities = this.get(ids,context);
Date now = new Date();
for(MessageEntity messageEntity:entities){
long between = now.getTime()-messageEntity.getCreateTime().getTime();
if(between>600000){
throw new AppException("超过十分钟，不能撤回");
}
}
}
@Override
protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
NewsQuery condition = new NewsQuery();
List<Long> messageIds = Arrays.asList(ids);
condition.setMessageIdList(messageIds);
newsService.remove(condition,context);
}
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/message/web/MessageController.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.message.web;
import com.mortals.framework.common.IBaseEnum;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.common.code.MessageTypeEnum;
import com.mortals.xhx.common.code.SendModeEnum;
import com.mortals.xhx.common.code.SendScopeEnum;
import com.mortals.xhx.common.code.SendStatusEnum;
import com.mortals.xhx.module.message.model.MessageEntity;
import com.mortals.xhx.module.message.service.MessageService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
/**
*
* 客户建议信息
*
* @author zxfei
* @date 2022-06-28
*/
@RestController
@RequestMapping("message")
public class MessageController extends BaseCRUDJsonBodyMappingController<MessageService,MessageEntity,Long> {
public MessageController(){
super.setModuleDesc( "客户建议信息");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "sendMode", IBaseEnum.getEnumMap(SendModeEnum.class));
this.addDict(model, "scope", IBaseEnum.getEnumMap(SendScopeEnum.class));
this.addDict(model, "sendStatus", IBaseEnum.getEnumMap(SendStatusEnum.class));
this.addDict(model, "messageType", IBaseEnum.getEnumMap(MessageTypeEnum.class));
super.init(model, context);
}
}
\ No newline at end of file
eas-manager/src/main/java/com/mortals/xhx/module/news/dao/NewsDao.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.news.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.news.model.NewsEntity;
/**
* 用户消息Dao
* 用户消息 DAO接口
*
* @author zxfei
* @date 2022-06-29
*/
public interface NewsDao extends ICRUDDao<NewsEntity,Long>{
}
eas-manager/src/main/java/com/mortals/xhx/module/news/dao/ibatis/NewsDaoImpl.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.news.dao.ibatis;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.news.dao.NewsDao;
import com.mortals.xhx.module.news.model.NewsEntity;
import org.springframework.stereotype.Repository;
/**
* 用户消息DaoImpl DAO接口
*
* @author zxfei
* @date 2022-06-29
*/
@Repository("newsDao")
public class NewsDaoImpl extends BaseCRUDDaoMybatis<NewsEntity,Long> implements NewsDao {
}
eas-manager/src/main/java/com/mortals/xhx/module/news/model/vo/NewsVo.java 0 → 100644
View file @ b56732a6
package com.mortals.xhx.module.news.model.vo;
import com.mortals.framework.model.BaseEntityLong;
/**
* 用户消息视图对象
*
* @author zxfei
* @date 2022-06-29
*/
public class NewsVo extends BaseEntityLong {
}
\ No newline at end of file
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