github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00
Code Issues Releases Wiki Activity

Replace FieldType.String with FieldType.Text

Browse Source
This commit is contained in:
dengchao@xgtl 2020-04-16 10:13:54 +08:00
parent 25d3298b71
commit 72545a9db7
3 changed files with 259 additions and 631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

202
contact-center/app/src/main/java/com/chatopera/cc/model/Favorites.java
View File

@ -1,137 +1,65 @@
/* /*
* Copyright (C) 2017 优客服-多渠道客服系统 * Copyright (C) 2017 优客服-多渠道客服系统
* Modifications copyright (C) 2018-2019 Chatopera Inc, <https://www.chatopera.com> * Modifications copyright (C) 2018-2019 Chatopera Inc, <https://www.chatopera.com>
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.chatopera.cc.model; package com.chatopera.cc.model;
import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.basic.MainUtils;
import org.hibernate.annotations.GenericGenerator; import lombok.Data;
import org.springframework.data.elasticsearch.annotations.Document; import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.FieldType; import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.Parent; import org.springframework.data.elasticsearch.annotations.FieldType;
import org.springframework.data.elasticsearch.annotations.Parent;
import javax.persistence.*;
import java.util.Date; import javax.persistence.*;
import java.util.Date;
@Document(indexName = "cskefu", type = "favorites" , createIndex = false )
@Entity @Data
@Table(name = "uk_favorites") @Document(indexName = "cskefu", type = "favorites", createIndex = false)
@org.hibernate.annotations.Proxy(lazy = false) @Entity
public class Favorites implements java.io.Serializable{ @Table(name = "uk_favorites")
@org.hibernate.annotations.Proxy(lazy = false)
/** public class Favorites implements java.io.Serializable {
* private static final long serialVersionUID = 8667838872697390231L;
*/ private String id = MainUtils.getUUID();
private static final long serialVersionUID = 8667838872697390231L; private String name;
private String id = MainUtils.getUUID(); private String code = "true";
private String name ; private String title;
private String code = "true"; private String model;
private String title ; @Field(type = FieldType.Text, store = true)
private String model ; @Parent(type = "uk_workorders")
private String orderid;
@Field(type = FieldType.String, store = true) private WorkOrders workOrders;
@Parent(type = "uk_workorders") private Date createtime = new Date();
private String orderid ; private Date updatetime = new Date();
private String creater;
private WorkOrders workOrders; private String username;
private String orgi;
private Date createtime = new Date(); @Id
@Column(length = 32)
private Date updatetime = new Date(); @GeneratedValue(generator = "paymentableGenerator")
private String creater; @GenericGenerator(name = "paymentableGenerator", strategy = "assigned")
private String username ; public String getId() {
private String orgi ; return id;
}
@Id
@Column(length = 32) @Transient
@GeneratedValue(generator= "paymentableGenerator") public WorkOrders getWorkOrders() {
@GenericGenerator(name= "paymentableGenerator",strategy = "assigned") return workOrders;
public String getId() { }
return id; }
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getModel() {
return model;
}
public void setModel(String model) {
this.model = model;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
public String getCreater() {
return creater;
}
public void setCreater(String creater) {
this.creater = creater;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public Date getUpdatetime() {
return updatetime;
}
public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime;
}
public String getOrgi() {
return orgi;
}
public void setOrgi(String orgi) {
this.orgi = orgi;
}
@Transient
public WorkOrders getWorkOrders() {
return workOrders;
}
public void setWorkOrders(WorkOrders workOrders) {
this.workOrders = workOrders;
}
public String getOrderid() {
return orderid;
}
public void setOrderid(String orderid) {
this.orderid = orderid;
}
}

328
contact-center/app/src/main/java/com/chatopera/cc/model/KbsTopicComment.java
View File

@ -1,225 +1,103 @@
/* /*
* Copyright (C) 2017 优客服-多渠道客服系统 * Copyright (C) 2017 优客服-多渠道客服系统
* Modifications copyright (C) 2018-2019 Chatopera Inc, <https://www.chatopera.com> * Modifications copyright (C) 2018-2019 Chatopera Inc, <https://www.chatopera.com>
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.chatopera.cc.model; package com.chatopera.cc.model;
import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.basic.MainUtils;
import org.hibernate.annotations.GenericGenerator; import lombok.Data;
import org.springframework.data.elasticsearch.annotations.Document; import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.FieldIndex; import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType; import org.springframework.data.elasticsearch.annotations.FieldType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Transient; import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
@Document(indexName = "cskefu", type = "kbs_topiccomment")
public class KbsTopicComment implements UKAgg{ @Data
@Document(indexName = "cskefu", type = "kbs_topiccomment")
/** public class KbsTopicComment implements UKAgg {
*
*/ private static final long serialVersionUID = -4911955236794918875L;
private static final long serialVersionUID = -4911955236794918875L; private String id = MainUtils.getUUID();
private String id = MainUtils.getUUID(); private String username;
private String username; private String creater;
private String creater ;
private Date createtime = new Date();
private Date createtime = new Date() ;
@Field(index = false, type = FieldType.Text)
@Field(index = FieldIndex.not_analyzed , type = FieldType.String) private String dataid;
private String dataid ;
private String content; //评论内容
private String content ; //评论内容
private Date updatetime = new Date();
private Date updatetime = new Date() ;
private boolean optimal; //是否最佳答案
private boolean optimal ; //是否最佳答案
private int up; //点赞数量
private int up ; //点赞数量 private int comments; //回复数量
private int comments ; //回复数量
private boolean admin;
private boolean admin ;
private String cate;
private String cate ;
private String optype;
private String optype ; private String ipcode;
private String ipcode ; private String country;
private String country ; private String province;
private String province ; private String city;
private String city ; private String isp;
private String isp ; private String region;
private String region ;
private int rowcount;
private int rowcount ; private String key;
private String key ;
private Topic topic;
private Topic topic ;
private User user;
private User user ;
@Id
@Id @Column(length = 32)
@Column(length = 32) @GeneratedValue(generator = "system-uuid")
@GeneratedValue(generator = "system-uuid") @GenericGenerator(name = "system-uuid", strategy = "uuid")
@GenericGenerator(name = "system-uuid", strategy = "uuid") public String getId() {
public String getId() { return id;
return id; }
}
public void setId(String id) { @Transient
this.id = id; public Topic getTopic() {
} return topic;
public String getUsername() { }
return username;
} @Transient
public void setUsername(String username) { public User getUser() {
this.username = username; return user;
} }
public String getCreater() {
return creater; @Transient
} public int getRowcount() {
public void setCreater(String creater) { return rowcount;
this.creater = creater; }
}
public Date getCreatetime() { @Transient
return createtime; public String getKey() {
} return key;
public void setCreatetime(Date createtime) { }
this.createtime = createtime; }
}
public String getIpcode() {
return ipcode;
}
public void setIpcode(String ipcode) {
this.ipcode = ipcode;
}
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getIsp() {
return isp;
}
public void setIsp(String isp) {
this.isp = isp;
}
public String getRegion() {
return region;
}
public void setRegion(String region) {
this.region = region;
}
public String getDataid() {
return dataid;
}
public void setDataid(String dataid) {
this.dataid = dataid;
}
public String getOptype() {
return optype;
}
public void setOptype(String optype) {
this.optype = optype;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public boolean isOptimal() {
return optimal;
}
public void setOptimal(boolean optimal) {
this.optimal = optimal;
}
public boolean isAdmin() {
return admin;
}
public void setAdmin(boolean admin) {
this.admin = admin;
}
public int getUp() {
return up;
}
public void setUp(int up) {
this.up = up;
}
public int getComments() {
return comments;
}
public void setComments(int comments) {
this.comments = comments;
}
public Date getUpdatetime() {
return updatetime;
}
public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime;
}
@Transient
public Topic getTopic() {
return topic;
}
public void setTopic(Topic topic) {
this.topic = topic;
}
@Transient
public User getUser() {
return user;
}
public void setUser(User user) {
this.user = user;
}
public String getCate() {
return cate;
}
public void setCate(String cate) {
this.cate = cate;
}
@Transient
public int getRowcount() {
return rowcount;
}
public void setRowcount(int rowcount) {
this.rowcount = rowcount;
}
@Transient
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
}

360
contact-center/app/src/main/java/com/chatopera/cc/model/OrdersComment.java
View File

@ -1,269 +1,91 @@
/* /*
* Copyright (C) 2017 优客服-多渠道客服系统 * Copyright (C) 2017 优客服-多渠道客服系统
* Modifications copyright (C) 2018-2019 Chatopera Inc, <https://www.chatopera.com> * Modifications copyright (C) 2018-2019 Chatopera Inc, <https://www.chatopera.com>
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.chatopera.cc.model; package com.chatopera.cc.model;
import com.chatopera.cc.basic.MainUtils; import com.chatopera.cc.basic.MainUtils;
import org.hibernate.annotations.GenericGenerator; import lombok.Data;
import org.springframework.data.elasticsearch.annotations.Document; import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.FieldIndex; import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType; import org.springframework.data.elasticsearch.annotations.FieldType;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@Document(indexName = "cskefu", type = "orderscomment") @Data
@Entity @Document(indexName = "cskefu", type = "orderscomment")
@Table(name = "uk_orderscomment") @Entity
@org.hibernate.annotations.Proxy(lazy = false) @Table(name = "uk_orderscomment")
public class OrdersComment implements UKAgg{ @org.hibernate.annotations.Proxy(lazy = false)
public class OrdersComment implements UKAgg {
/**
* private static final long serialVersionUID = -4911955236794918875L;
*/ private String id = MainUtils.getUUID();
private static final long serialVersionUID = -4911955236794918875L; private String username;
private String id = MainUtils.getUUID(); private String creater;
private String username; private Date createtime = new Date();
private String creater ; @Field(index = false, type = FieldType.Text)
private String dataid;
private Date createtime = new Date() ; private String content; //评论内容
private Date updatetime = new Date();
@Field(index = FieldIndex.not_analyzed , type = FieldType.String) private boolean optimal; //变更用处，流程回复
private String dataid ; private boolean prirep; //变更用处， 是否私密回复
private int up; //点赞数量
private String content ; //评论内容 private int comments; //回复数量
private boolean admin; //变更用处 ， 是否审批流程
private Date updatetime = new Date() ; private boolean datastatus; //数据状态，是否已删除
private String orgi;
private boolean optimal ; //变更用处，流程回复 private String cate;
private String optype;
private boolean prirep ; //变更用处， 是否私密回复 private String approval; //审批结果
private String retback; //退回位置 ， 退回到 创建人
private int up ; //点赞数量 private String accdept; //转办 部门
private int comments ; //回复数量 private String accuser; //转办人
private String ipcode;
private boolean admin ; //变更用处 ， 是否审批流程 private String country;
private boolean datastatus ; //数据状态，是否已删除 private String province;
private String city;
private String orgi ; private String isp;
private String region;
private String cate ; private int rowcount;
private String key;
private String optype ; private User user;
private String approval ; //审批结果 @Id
private String retback ; //退回位置 ， 退回到 创建人 @Column(length = 32)
@GeneratedValue(generator = "paymentableGenerator")
private String accdept ; //转办 部门 @GenericGenerator(name = "paymentableGenerator", strategy = "assigned")
private String accuser ; //转办人 public String getId() {
return id;
}
private String ipcode ;
private String country ; @Transient
private String province ; public User getUser() {
private String city ; return user;
private String isp ; }
private String region ;
@Transient
private int rowcount ; public int getRowcount() {
private String key ; return rowcount;
}
private User user ;
@Transient
@Id public String getKey() {
@Column(length = 32) return key;
@GeneratedValue(generator= "paymentableGenerator") }
@GenericGenerator(name= "paymentableGenerator",strategy = "assigned") }
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getCreater() {
return creater;
}
public void setCreater(String creater) {
this.creater = creater;
}
public Date getCreatetime() {
return createtime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
public String getIpcode() {
return ipcode;
}
public void setIpcode(String ipcode) {
this.ipcode = ipcode;
}
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getIsp() {
return isp;
}
public void setIsp(String isp) {
this.isp = isp;
}
public String getRegion() {
return region;
}
public void setRegion(String region) {
this.region = region;
}
public String getDataid() {
return dataid;
}
public void setDataid(String dataid) {
this.dataid = dataid;
}
public String getOptype() {
return optype;
}
public void setOptype(String optype) {
this.optype = optype;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public boolean isOptimal() {
return optimal;
}
public void setOptimal(boolean optimal) {
this.optimal = optimal;
}
public boolean isAdmin() {
return admin;
}
public void setAdmin(boolean admin) {
this.admin = admin;
}
public int getUp() {
return up;
}
public void setUp(int up) {
this.up = up;
}
public int getComments() {
return comments;
}
public void setComments(int comments) {
this.comments = comments;
}
public Date getUpdatetime() {
return updatetime;
}
public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime;
}
@Transient
public User getUser() {
return user;
}
public void setUser(User user) {
this.user = user;
}
public String getCate() {
return cate;
}
public void setCate(String cate) {
this.cate = cate;
}
@Transient
public int getRowcount() {
return rowcount;
}
public void setRowcount(int rowcount) {
this.rowcount = rowcount;
}
@Transient
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
public boolean isPrirep() {
return prirep;
}
public void setPrirep(boolean prirep) {
this.prirep = prirep;
}
public String getOrgi() {
return orgi;
}
public void setOrgi(String orgi) {
this.orgi = orgi;
}
public boolean isDatastatus() {
return datastatus;
}
public void setDatastatus(boolean datastatus) {
this.datastatus = datastatus;
}
public String getApproval() {
return approval;
}
public void setApproval(String approval) {
this.approval = approval;
}
public String getRetback() {
return retback;
}
public void setRetback(String retback) {
this.retback = retback;
}
public String getAccdept() {
return accdept;
}
public void setAccdept(String accdept) {
this.accdept = accdept;
}
public String getAccuser() {
return accuser;
}
public void setAccuser(String accuser) {
this.accuser = accuser;
}
}