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)

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

@ -24,11 +24,11 @@ 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)
public class EntCustomer extends ESBean implements java.io.Serializable{ public class EntCustomer extends ESBean implements java.io.Serializable {
/** /**
* *
@ -40,7 +40,7 @@ public class EntCustomer extends ESBean implements java.io.Serializable{
private String name; private String name;
private String etype; private String etype;
private String ekind; private String ekind;
private String maturity ; private String maturity;
private String elevel; private String elevel;
private String ecode; private String ecode;
private String nickname; private String nickname;
@ -79,7 +79,7 @@ public class EntCustomer extends ESBean implements java.io.Serializable{
private String weixin; private String weixin;
private String weibo; private String weibo;
private Date touchtime ; private Date touchtime;
private String dzip; private String dzip;
private String daddress; private String daddress;
private String darea; private String darea;
@ -105,7 +105,7 @@ public class EntCustomer extends ESBean implements java.io.Serializable{
private String datadept; private String datadept;
private String batid; private String batid;
private String pinyin ; //拼音首字母 private String pinyin; //拼音首字母
@Id @Id

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();

30
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)
@ -70,23 +70,23 @@ public class KbsTopic extends ESBean implements java.io.Serializable , UKAgg{
private boolean top ; //是否置顶 private boolean top ; //是否置顶
private boolean essence ; //是否精华 private boolean essence ; //是否精华
private boolean accept ; //是否已采纳最佳答案 private boolean accept ; //是否已采纳最佳答案
private boolean finish ; //结贴 private boolean finish; //结贴
private int answers ; //回答数量 private int answers; //回答数量
@Column(name="sviews") @Column(name = "sviews")
private int views ; //阅读数量 private int views; //阅读数量
private int followers ; //关注数量 private int followers; //关注数量
private int collections; //收藏数量 private int collections; //收藏数量
private int comments ; //评论数量 private int comments; //评论数量
private boolean frommobile ; //是否移动端提问 private boolean frommobile; //是否移动端提问
private String status ; // 状态 private String status; // 状态
private String tptype; //知识分类 private String tptype; //知识分类
private String cate ; //知识 栏目 private String cate; //知识 栏目
private String attachment ; //附件 private String attachment; //附件
private String username ; private String username;
private String orgi ; private String orgi;
private String creater; private String creater;
private Date createtime = new Date(); private Date createtime = new Date();
@ -96,10 +96,10 @@ public class KbsTopic extends ESBean implements java.io.Serializable , UKAgg{
private String organ; private String organ;
private int rowcount ; private int rowcount ;
private String key ; private String key;
private User user ; private User user;
/** /**

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)

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

@ -24,24 +24,24 @@ 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)
public class PublishedReport implements java.io.Serializable{ public class PublishedReport implements java.io.Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String id ; private String id;
private String name ; private String name;
private String code ; private String code;
private String reporttype ; private String reporttype;
private String dicid ; //目录ID private String dicid; //目录ID
private String orgi ; private String orgi;
private String dataid ; private String dataid;
private String dataflag ; private String dataflag;
private int startindex ; private int startindex;
private Date startdate ; private Date startdate;
private int dataversion; private int dataversion;
private String creater ; private String creater;
private String reportcontent; private String reportcontent;
private Date createtime; private Date createtime;
private Report report ; private Report report ;

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)

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

@ -25,43 +25,43 @@ 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)
public class Report extends ESBean implements java.io.Serializable{ public class Report extends ESBean implements java.io.Serializable {
/** /**
* *
*/ */
private static final long serialVersionUID = -5781401948807231526L; private static final long serialVersionUID = -5781401948807231526L;
private String id = MainUtils.getUUID(); private String id = MainUtils.getUUID();
private String name ; private String name;
private String reporttype ; //0 代表动态报表 1 代表自助查询报表 private String reporttype; //0 代表动态报表 1 代表自助查询报表
private String viewtype; private String viewtype;
private String code ; //变更用处，修改为 报表code private String code; //变更用处，修改为 报表code
private String orgi ; private String orgi;
private int objectcount ; //用来标记报表默认打开是否加载数据 private int objectcount; //用来标记报表默认打开是否加载数据
private String dicid ; //目录ID private String dicid; //目录ID
private String description ; private String description;
private Date createtime = new Date(); private Date createtime = new Date();
private String html ; //改变用处，用于存储 是否允许里面访问移动端报表 private String html; //改变用处，用于存储 是否允许里面访问移动端报表
private String status; private String status;
private String rolename ; //变更用处，标记为 动态报表 默认为 null 或者 0 都是 自助查询，1表示自定义报表 private String rolename; //变更用处，标记为 动态报表 默认为 null 或者 0 都是 自助查询，1表示自定义报表
private String userid ; //变更用处，标记为 仪表盘的 属主ID private String userid; //变更用处，标记为 仪表盘的 属主ID
private String blacklist ; //变更用处，用于区分是否是 仪表盘 private String blacklist; //变更用处，用于区分是否是 仪表盘
private String reportpackage ; //报表路径 private String reportpackage; //报表路径
private String useacl ; //启用权限控制 , 变更用处， 用于控制是否覆盖上级目录的权限 private String useacl; //启用权限控制 , 变更用处， 用于控制是否覆盖上级目录的权限
private String reportmodel ; //自助查询的是 保存 Model 的ID private String reportmodel; //自助查询的是 保存 Model 的ID
private Date updatetime; //修改时间 private Date updatetime; //修改时间
private boolean datastatus ; private boolean datastatus;
private String creater; private String creater;
private int reportversion ; private int reportversion;
private String publishedtype ; private String publishedtype;
private String tabtype ; private String tabtype;
private String username ; private String username;
private String useremail ; private String useremail;
private boolean cache;//1启用缓存，0不启用 private boolean cache;//1启用缓存，0不启用
private String extparam; //默认使用 player 打开 private String extparam; //默认使用 player 打开
private String targetreport;//reporttype=shortcuts 的时候的目标报表 private String targetreport;//reporttype=shortcuts 的时候的目标报表
@ -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")

24
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)
@ -73,20 +73,20 @@ public class Topic implements java.io.Serializable{
@Transient @Transient
private List<String> silimar = new ArrayList<String>(); private List<String> silimar = new ArrayList<String>();
private int answers ; //回答数量 private int answers; //回答数量
private int views ; //阅读数量 private int views; //阅读数量
private int followers ; //关注数量 private int followers; //关注数量
private int collections; //收藏数量 private int collections; //收藏数量
private int comments ; //评论数量 private int comments; //评论数量
private boolean mobile ; //是否移动端提问 private boolean mobile; //是否移动端提问
private String status ; // 状态 private String status; // 状态
private String tptype; //主题类型 问答:分享:讨论 private String tptype; //主题类型 问答:分享:讨论
private String cate ; //主题 栏目 private String cate; //主题 栏目
private String username ; private String username;
private String orgi ; private String orgi;
private String creater; private String creater;
private Date createtime = new Date(); private Date createtime = new Date();
@ -98,9 +98,7 @@ public class Topic implements java.io.Serializable{
private String aiid ; //机器人ID private String aiid ; //机器人ID
private User user ; private User user;
/** /**

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

@ -27,11 +27,11 @@ 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)
public class WorkOrders extends ESBean implements UKAgg{ public class WorkOrders extends ESBean implements UKAgg {
/** /**
* *
*/ */
@ -43,61 +43,61 @@ public class WorkOrders extends ESBean implements UKAgg{
private String id = MainUtils.getUUID(); private String id = MainUtils.getUUID();
private String orderno ; //工单编号 private String orderno; //工单编号
private String sessionid ; private String sessionid;
private String title ; //标题 private String title; //标题
private String content ; //内容 private String content; //内容
private float price ; //问题价格 private float price; //问题价格
private String keyword ; //关键词 private String keyword; //关键词
private String summary ; //摘要 private String summary; //摘要
private boolean anonymous ; //修改功能 未 是否有上传附件 private boolean anonymous; //修改功能 未 是否有上传附件
private boolean top ; //是否置顶 private boolean top; //是否置顶
private boolean essence ; //是否精华 private boolean essence; //是否精华
private boolean accept ; //是否已采纳最佳答案 private boolean accept; //是否已采纳最佳答案
private boolean finish ; //结贴 private boolean finish; //结贴
private int answers ; //回答数量 private int answers; //回答数量
private int views ; //阅读数量 private int views; //阅读数量
private int followers ; //关注数量 private int followers; //关注数量
private int collections; //收藏数量 private int collections; //收藏数量
private int comments ; //评论数量 private int comments; //评论数量
private boolean frommobile ; //是否移动端提问 private boolean frommobile; //是否移动端提问
private String status ; // 状态 private String status; // 状态
private String wotype; //工单类型 private String wotype; //工单类型
private boolean datastatus ; //数据状态，是否删除 , 逻辑删除 private boolean datastatus; //数据状态，是否删除 , 逻辑删除
private String taskid ; private String taskid;
private String orderid ; private String orderid;
private String dataid ; private String dataid;
private String eventid ; private String eventid;
private String ani ; private String ani;
private String cate ; //工单分类 private String cate; //工单分类
private String priority ; //优先级 private String priority; //优先级
private Contacts contacts ; private Contacts contacts;
private String cusid ; private String cusid;
private String initiator ; //发起人 ， 可以是多人发起的工单 private String initiator; //发起人 ， 可以是多人发起的工单
private String bpmid ; private String bpmid;
private String tags ; private String tags;
private String accdept ;// 受理部门 private String accdept;// 受理部门
private String accuser ; //受理人 private String accuser; //受理人
private boolean assigned ; //已分配 private boolean assigned; //已分配
private String username ; private String username;
private String orgi ; private String orgi;
private String creater; private String creater;
private Date createtime = new Date(); private Date createtime = new Date();
@ -107,20 +107,20 @@ public class WorkOrders extends ESBean implements UKAgg{
private String organ; // private String organ; //
private String agent ; // private String agent; //
private String shares ; private String shares;
private String skill ; private String skill;
private int rowcount ; private int rowcount;
private String key ; //变更用处，修改为 OrderID private String key; //变更用处，修改为 OrderID
private User user ; private User user;
private User current ; //当前处理人 private User current; //当前处理人
private Organ currentorgan ; //处理部门 private Organ currentorgan; //处理部门
private Favorites fav; private Favorites fav;
@ -130,18 +130,21 @@ public class WorkOrders extends ESBean implements UKAgg{
*/ */
@Id @Id
@Column(length = 32) @Column(length = 32)
@GeneratedValue(generator= "paymentableGenerator") @GeneratedValue(generator = "paymentableGenerator")
@GenericGenerator(name= "paymentableGenerator",strategy = "assigned") @GenericGenerator(name = "paymentableGenerator", strategy = "assigned")
public String getId() { public String getId() {
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;
@ -257,7 +262,7 @@ public class WorkOrders extends ESBean implements UKAgg{
this.answers = answers; this.answers = answers;
} }
@Column(name="sviews") @Column(name = "sviews")
public int getViews() { public int getViews() {
return views; return views;
} }
@ -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 {
/** /**