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

Fix https://www.elastic.co/guide/en/elasticsearch/reference/current/removal-of-types.html

Browse Source
This commit is contained in:
dengchao@xgtl 2020-04-21 15:46:01 +08:00
parent d2279517d6
commit 45ace80228
13 changed files with 2754 additions and 2748 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contact-center/app/src/main/java/com/chatopera/cc/model/ContactNotes.java
View File

@ -23,7 +23,7 @@ import org.springframework.data.elasticsearch.annotations.Document;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@Document(indexName = "cskefu", type = "contact_notes") @Document(indexName = "contact_notes", type = "contact_notes")
@Entity @Entity
@Table(name = "cs_contact_notes") @Table(name = "cs_contact_notes")
@org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Proxy(lazy = false)

2
contact-center/app/src/main/java/com/chatopera/cc/model/Contacts.java
View File

@ -23,7 +23,7 @@ import org.springframework.data.elasticsearch.annotations.Document;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@Document(indexName = "cskefu", type = "contacts") @Document(indexName = "contacts", type = "contacts")
@Entity @Entity
@Table(name = "uk_contacts") @Table(name = "uk_contacts")
@org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Proxy(lazy = false)

2
contact-center/app/src/main/java/com/chatopera/cc/model/EntCustomer.java
View File

@ -24,7 +24,7 @@ import org.springframework.data.elasticsearch.annotations.Document;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@Document(indexName = "cskefu", type = "entcustomer") @Document(indexName = "entcustomer", type = "entcustomer")
@Entity @Entity
@Table(name = "uk_entcustomer") @Table(name = "uk_entcustomer")
@org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Proxy(lazy = false)

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

@ -23,13 +23,12 @@ import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType; import org.springframework.data.elasticsearch.annotations.FieldType;
import org.springframework.data.elasticsearch.annotations.Parent;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@Data @Data
@Document(indexName = "cskefu", type = "favorites", createIndex = false) @Document(indexName = "favorites", type = "favorites", createIndex = false)
@Entity @Entity
@Table(name = "uk_favorites") @Table(name = "uk_favorites")
@org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Proxy(lazy = false)
@ -41,7 +40,7 @@ public class Favorites implements java.io.Serializable {
private String title; private String title;
private String model; private String model;
@Field(type = FieldType.Text, store = true) @Field(type = FieldType.Text, store = true)
@Parent(type = "uk_workorders") // @Parent(type = "uk_workorders")
private String orderid; private String orderid;
private WorkOrders workOrders; private WorkOrders workOrders;
private Date createtime = new Date(); private Date createtime = new Date();

2
contact-center/app/src/main/java/com/chatopera/cc/model/KbsTopic.java
View File

@ -28,7 +28,7 @@ import java.util.Date;
/** /**
* *
*/ */
@Document(indexName = "cskefu", type = "kbs_topic") @Document(indexName = "kbs_topic", type = "kbs_topic")
@Entity @Entity
@Table(name = "uk_kbs_topic") @Table(name = "uk_kbs_topic")
@org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Proxy(lazy = false)

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

@ -32,7 +32,7 @@ import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
@Data @Data
@Document(indexName = "cskefu", type = "kbs_topiccomment") @Document(indexName = "kbs_topiccomment", type = "kbs_topiccomment")
public class KbsTopicComment implements UKAgg { public class KbsTopicComment implements UKAgg {
private static final long serialVersionUID = -4911955236794918875L; private static final long serialVersionUID = -4911955236794918875L;

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

@ -28,7 +28,7 @@ import javax.persistence.*;
import java.util.Date; import java.util.Date;
@Data @Data
@Document(indexName = "cskefu", type = "orderscomment") @Document(indexName = "orderscomment", type = "orderscomment")
@Entity @Entity
@Table(name = "uk_orderscomment") @Table(name = "uk_orderscomment")
@org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Proxy(lazy = false)

2
contact-center/app/src/main/java/com/chatopera/cc/model/PublishedReport.java
View File

@ -24,7 +24,7 @@ import org.springframework.data.elasticsearch.annotations.Document;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@Document(indexName = "cskefu", type = "publishedreport") @Document(indexName = "publishedreport", type = "publishedreport")
@Entity @Entity
@Table(name = "uk_publishedreport") @Table(name = "uk_publishedreport")
@org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Proxy(lazy = false)

2
contact-center/app/src/main/java/com/chatopera/cc/model/QuickReply.java
View File

@ -23,7 +23,7 @@ import org.springframework.data.elasticsearch.annotations.Document;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@Document(indexName = "cskefu", type = "quickreply") @Document(indexName = "quickreply", type = "quickreply")
@Entity @Entity
@Table(name = "uk_quickreply") @Table(name = "uk_quickreply")
@org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Proxy(lazy = false)

3
contact-center/app/src/main/java/com/chatopera/cc/model/Report.java
View File

@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@Document(indexName = "cskefu", type = "report") @Document(indexName = "report", type = "report")
@Entity @Entity
@Table(name = "uk_report") @Table(name = "uk_report")
@org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Proxy(lazy = false)
@ -70,6 +70,7 @@ public class Report extends ESBean implements java.io.Serializable{
private List<ReportModel> reportModels = new ArrayList<ReportModel>(); private List<ReportModel> reportModels = new ArrayList<ReportModel>();
private List<ReportFilter> reportFilters = new ArrayList<ReportFilter>(); private List<ReportFilter> reportFilters = new ArrayList<ReportFilter>();
@Id @Id
@Column(length = 32) @Column(length = 32)
@GeneratedValue(generator = "system-uuid") @GeneratedValue(generator = "system-uuid")

4
contact-center/app/src/main/java/com/chatopera/cc/model/Topic.java
View File

@ -29,7 +29,7 @@ import java.util.List;
/** /**
* 表 uk_xiaoe_topic * 表 uk_xiaoe_topic
*/ */
@Document(indexName = "cskefu", type = "xiaoe_topic") @Document(indexName = "xiaoe_topic", type = "xiaoe_topic")
@Entity @Entity
@Table(name = "uk_xiaoe_topic") @Table(name = "uk_xiaoe_topic")
@org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Proxy(lazy = false)
@ -101,8 +101,6 @@ public class Topic implements java.io.Serializable{
private User user; private User user;
/** /**
* @return the id * @return the id
*/ */

20
contact-center/app/src/main/java/com/chatopera/cc/model/WorkOrders.java
View File

@ -27,7 +27,7 @@ import java.util.Date;
/** /**
* *
*/ */
@Document(indexName = "cskefu", type = "workorders" , createIndex = false ) @Document(indexName = "workorders", type = "workorders", createIndex = false)
@Entity @Entity
@Table(name = "uk_workorders") @Table(name = "uk_workorders")
@org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Proxy(lazy = false)
@ -136,12 +136,15 @@ public class WorkOrders extends ESBean implements UKAgg{
return id; return id;
} }
public void setId(String id) {
this.id = id;
}
@Transient @Transient
public String getSessionid() { public String getSessionid() {
return sessionid; return sessionid;
} }
public void setSessionid(String sessionid) { public void setSessionid(String sessionid) {
this.sessionid = sessionid; this.sessionid = sessionid;
} }
@ -193,6 +196,7 @@ public class WorkOrders extends ESBean implements UKAgg{
public void setAnonymous(boolean anonymous) { public void setAnonymous(boolean anonymous) {
this.anonymous = anonymous; this.anonymous = anonymous;
} }
public String getWotype() { public String getWotype() {
return wotype; return wotype;
} }
@ -208,6 +212,7 @@ public class WorkOrders extends ESBean implements UKAgg{
public void setPriority(String priority) { public void setPriority(String priority) {
this.priority = priority; this.priority = priority;
} }
@Transient @Transient
public Contacts getContacts() { public Contacts getContacts() {
return contacts; return contacts;
@ -378,10 +383,6 @@ public class WorkOrders extends ESBean implements UKAgg{
this.skill = skill; this.skill = skill;
} }
public void setId(String id) {
this.id = id;
}
public String getCate() { public String getCate() {
return cate; return cate;
} }
@ -421,6 +422,7 @@ public class WorkOrders extends ESBean implements UKAgg{
public void setFinish(boolean finish) { public void setFinish(boolean finish) {
this.finish = finish; this.finish = finish;
} }
@Transient @Transient
public User getUser() { public User getUser() {
return user; return user;
@ -429,6 +431,7 @@ public class WorkOrders extends ESBean implements UKAgg{
public void setUser(User user) { public void setUser(User user) {
this.user = user; this.user = user;
} }
@Transient @Transient
public int getRowcount() { public int getRowcount() {
return rowcount; return rowcount;
@ -442,6 +445,7 @@ public class WorkOrders extends ESBean implements UKAgg{
public String getKey() { public String getKey() {
return key; return key;
} }
public void setKey(String key) { public void setKey(String key) {
this.key = key; this.key = key;
} }
@ -502,6 +506,7 @@ public class WorkOrders extends ESBean implements UKAgg{
public void setFav(Favorites fav) { public void setFav(Favorites fav) {
this.fav = fav; this.fav = fav;
} }
@Transient @Transient
public User getCurrent() { public User getCurrent() {
return current; return current;
@ -510,6 +515,7 @@ public class WorkOrders extends ESBean implements UKAgg{
public void setCurrent(User current) { public void setCurrent(User current) {
this.current = current; this.current = current;
} }
@Transient @Transient
public Organ getCurrentorgan() { public Organ getCurrentorgan() {
return currentorgan; return currentorgan;
@ -518,6 +524,7 @@ public class WorkOrders extends ESBean implements UKAgg{
public void setCurrentorgan(Organ currentorgan) { public void setCurrentorgan(Organ currentorgan) {
this.currentorgan = currentorgan; this.currentorgan = currentorgan;
} }
@Transient @Transient
public String getTaskid() { public String getTaskid() {
return taskid; return taskid;
@ -526,6 +533,7 @@ public class WorkOrders extends ESBean implements UKAgg{
public void setTaskid(String taskid) { public void setTaskid(String taskid) {
this.taskid = taskid; this.taskid = taskid;
} }
@Transient @Transient
public String getOrderid() { public String getOrderid() {
return orderid; return orderid;

2
contact-center/app/src/main/java/com/chatopera/cc/socketio/message/ChatMessage.java
View File

@ -29,7 +29,7 @@ import java.util.List;
@Entity @Entity
@Table(name = "uk_chat_message") @Table(name = "uk_chat_message")
@Document(indexName = "cskefu", type = "chat_message") @Document(indexName = "chat_message", type = "chat_message")
@org.hibernate.annotations.Proxy(lazy = false) @org.hibernate.annotations.Proxy(lazy = false)
public class ChatMessage implements java.io.Serializable { public class ChatMessage implements java.io.Serializable {
/** /**