From 45ace802285dc19c6d7b1dee6182e301a01b0f7d Mon Sep 17 00:00:00 2001 From: "dengchao@xgtl" <2325690622@qq.com> Date: Tue, 21 Apr 2020 15:46:01 +0800 Subject: [PATCH] Fix https://www.elastic.co/guide/en/elasticsearch/reference/current/removal-of-types.html --- .../com/chatopera/cc/model/ContactNotes.java | 2 +- .../java/com/chatopera/cc/model/Contacts.java | 1156 ++++++++--------- .../com/chatopera/cc/model/EntCustomer.java | 988 +++++++------- .../com/chatopera/cc/model/Favorites.java | 5 +- .../java/com/chatopera/cc/model/KbsTopic.java | 82 +- .../chatopera/cc/model/KbsTopicComment.java | 2 +- .../com/chatopera/cc/model/OrdersComment.java | 2 +- .../chatopera/cc/model/PublishedReport.java | 298 ++--- .../com/chatopera/cc/model/QuickReply.java | 226 ++-- .../java/com/chatopera/cc/model/Report.java | 545 ++++---- .../java/com/chatopera/cc/model/Topic.java | 80 +- .../com/chatopera/cc/model/WorkOrders.java | 1066 +++++++-------- .../cc/socketio/message/ChatMessage.java | 1050 +++++++-------- 13 files changed, 2754 insertions(+), 2748 deletions(-) diff --git a/contact-center/app/src/main/java/com/chatopera/cc/model/ContactNotes.java b/contact-center/app/src/main/java/com/chatopera/cc/model/ContactNotes.java index 636d74f8..2c8f5e5e 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/model/ContactNotes.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/model/ContactNotes.java @@ -23,7 +23,7 @@ import org.springframework.data.elasticsearch.annotations.Document; import javax.persistence.*; import java.util.Date; -@Document(indexName = "cskefu", type = "contact_notes") +@Document(indexName = "contact_notes", type = "contact_notes") @Entity @Table(name = "cs_contact_notes") @org.hibernate.annotations.Proxy(lazy = false) diff --git a/contact-center/app/src/main/java/com/chatopera/cc/model/Contacts.java b/contact-center/app/src/main/java/com/chatopera/cc/model/Contacts.java index 3febc256..aeb09944 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/model/Contacts.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/model/Contacts.java @@ -1,578 +1,578 @@ -/* - * Copyright (C) 2017 优客服-多渠道客服系统 - * Modifications copyright (C) 2018-2019 Chatopera Inc, - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.chatopera.cc.model; - -import com.chatopera.cc.basic.MainUtils; -import org.hibernate.annotations.GenericGenerator; -import org.springframework.data.elasticsearch.annotations.Document; - -import javax.persistence.*; -import java.util.Date; - -@Document(indexName = "cskefu", type = "contacts") -@Entity -@Table(name = "uk_contacts") -@org.hibernate.annotations.Proxy(lazy = false) -public class Contacts extends ESBean implements java.io.Serializable{ - /** - * - */ - private static final long serialVersionUID = -5781401948807231526L; - private String id = MainUtils.getUUID(); - private String gender; - private String cusbirthday; - private String ctype; - private String ckind; - private String clevel; - private String ccode; - private String nickname; - private String sarea; - private String csource; - private String language; - - public String getWluid() { - return wluid; - } - - public void setWluid(String wluid) { - this.wluid = wluid; - } - - private String wluid; - - public String getWlusername() { - return wlusername; - } - - public void setWlusername(String wlusername) { - this.wlusername = wlusername; - } - - private String wlusername; - - public String getWlcid() { - return wlcid; - } - - public void setWlcid(String wlcid) { - this.wlcid = wlcid; - } - - private String wlcid; - - public String getWlcompany_name() { - return wlcompany_name; - } - - public void setWlcompany_name(String wlcompany_name) { - this.wlcompany_name = wlcompany_name; - } - - private String wlcompany_name; - - public String getWlsid() { - return wlsid; - } - - public void setWlsid(String wlsid) { - this.wlsid = wlsid; - } - - public String getWlsystem_name() { - return wlsystem_name; - } - - public void setWlsystem_name(String wlsystem_name) { - this.wlsystem_name = wlsystem_name; - } - - private String wlsid; - - private String wlsystem_name; - - - private String organ ; - - private String marriage; - - private String entcusid; //客户ID - - private String education; - private String identifytype; - private String identifynumber; - private String website; - private String email; - private String emailalt; - private String skypeid; - private String mobileno; - private String mobilealt; - private String phone; - private String extension; - private String phonealt; - private String extensionalt; - private String familyphone; - private String familyphonealt; - private String fax; - private String faxalt; - private String country; - private String province; - private String city; - private String address; - private String postcode; - private String enterpriseid; - private String company; - private String department; - private String duty; - private String deptpr; - private String validstatus; - private String weixin; - private String weixinname; - private String weixinid; - private String weibo; - private String weiboid; - private String qqcode; - - private Date touchtime; - private boolean datastatus; - private String processid; - private String creater; - private String username; - private String updateuser; - private String memo; - private String updateusername; - - private Date updatetime = new Date(); - private String orgi; - private String compper; - - private Date createtime = new Date(); - private String name; - private String assignedto; - private String wfstatus; - private String shares; - private String owner; - private String datadept; - - private String pinyin ; //拼音首字母 - - @Id - @Column(length = 32) - @GeneratedValue(generator = "system-uuid") - @GenericGenerator(name = "system-uuid", strategy = "assigned") - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getGender() { - return gender; - } - public void setGender(String gender) { - this.gender = gender; - } - public String getCusbirthday() { - return cusbirthday; - } - public void setCusbirthday(String cusbirthday) { - this.cusbirthday = cusbirthday; - } - public String getCtype() { - return ctype; - } - public void setCtype(String ctype) { - this.ctype = ctype; - } - public String getCkind() { - return ckind; - } - public void setCkind(String ckind) { - this.ckind = ckind; - } - public String getClevel() { - return clevel; - } - public void setClevel(String clevel) { - this.clevel = clevel; - } - public String getCcode() { - return ccode; - } - public void setCcode(String ccode) { - this.ccode = ccode; - } - public String getNickname() { - return nickname; - } - public void setNickname(String nickname) { - this.nickname = nickname; - } - public String getSarea() { - return sarea; - } - public void setSarea(String sarea) { - this.sarea = sarea; - } - public String getCsource() { - return csource; - } - public void setCsource(String csource) { - this.csource = csource; - } - public String getLanguage() { - return language; - } - public void setLanguage(String language) { - this.language = language; - } - public String getMarriage() { - return marriage; - } - public void setMarriage(String marriage) { - this.marriage = marriage; - } - public String getEducation() { - return education; - } - public void setEducation(String education) { - this.education = education; - } - public String getIdentifytype() { - return identifytype; - } - public void setIdentifytype(String identifytype) { - this.identifytype = identifytype; - } - public String getIdentifynumber() { - return identifynumber; - } - public void setIdentifynumber(String identifynumber) { - this.identifynumber = identifynumber; - } - public String getWebsite() { - return website; - } - public void setWebsite(String website) { - this.website = website; - } - public String getSkypeid() { - return skypeid; - } - public void setSkypeid(String skypeid) { - this.skypeid = skypeid; - } - public String getEmail() { - return email; - } - public void setEmail(String email) { - this.email = email; - } - public String getEmailalt() { - return emailalt; - } - public void setEmailalt(String emailalt) { - this.emailalt = emailalt; - } - public String getMobileno() { - return mobileno; - } - public void setMobileno(String mobileno) { - this.mobileno = mobileno; - } - public String getMobilealt() { - return mobilealt; - } - public void setMobilealt(String mobilealt) { - this.mobilealt = mobilealt; - } - public String getPhone() { - return phone; - } - public void setPhone(String phone) { - this.phone = phone; - } - public String getExtension() { - return extension; - } - public void setExtension(String extension) { - this.extension = extension; - } - public String getPhonealt() { - return phonealt; - } - public void setPhonealt(String phonealt) { - this.phonealt = phonealt; - } - public String getExtensionalt() { - return extensionalt; - } - public void setExtensionalt(String extensionalt) { - this.extensionalt = extensionalt; - } - public String getFamilyphone() { - return familyphone; - } - public void setFamilyphone(String familyphone) { - this.familyphone = familyphone; - } - public String getFamilyphonealt() { - return familyphonealt; - } - public void setFamilyphonealt(String familyphonealt) { - this.familyphonealt = familyphonealt; - } - public String getFax() { - return fax; - } - public void setFax(String fax) { - this.fax = fax; - } - public String getFaxalt() { - return faxalt; - } - public void setFaxalt(String faxalt) { - this.faxalt = faxalt; - } - 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 getAddress() { - return address; - } - public void setAddress(String address) { - this.address = address; - } - public String getPostcode() { - return postcode; - } - public void setPostcode(String postcode) { - this.postcode = postcode; - } - public String getEnterpriseid() { - return enterpriseid; - } - public void setEnterpriseid(String enterpriseid) { - this.enterpriseid = enterpriseid; - } - public String getCompany() { - return company; - } - public void setCompany(String company) { - this.company = company; - } - public String getDepartment() { - return department; - } - public void setDepartment(String department) { - this.department = department; - } - public String getDuty() { - return duty; - } - public void setDuty(String duty) { - this.duty = duty; - } - public String getDeptpr() { - return deptpr; - } - public void setDeptpr(String deptpr) { - this.deptpr = deptpr; - } - public String getValidstatus() { - return validstatus; - } - public void setValidstatus(String validstatus) { - this.validstatus = validstatus; - } - public String getWeixin() { - return weixin; - } - public void setWeixin(String weixin) { - this.weixin = weixin; - } - public String getWeixinname() { - return weixinname; - } - public void setWeixinname(String weixinname) { - this.weixinname = weixinname; - } - public String getWeixinid() { - return weixinid; - } - public void setWeixinid(String weixinid) { - this.weixinid = weixinid; - } - public String getWeibo() { - return weibo; - } - public void setWeibo(String weibo) { - this.weibo = weibo; - } - public String getWeiboid() { - return weiboid; - } - public void setWeiboid(String weiboid) { - this.weiboid = weiboid; - } - public String getQqcode() { - return qqcode; - } - public void setQqcode(String qqcode) { - this.qqcode = qqcode; - } - public Date getTouchtime() { - return touchtime; - } - public void setTouchtime(Date touchtime) { - this.touchtime = touchtime; - } - public boolean isDatastatus() { - return datastatus; - } - public void setDatastatus(boolean datastatus) { - this.datastatus = datastatus; - } - public String getProcessid() { - return processid; - } - public void setProcessid(String processid) { - this.processid = processid; - } - 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 String getUpdateuser() { - return updateuser; - } - public void setUpdateuser(String updateuser) { - this.updateuser = updateuser; - } - public String getMemo() { - return memo; - } - public void setMemo(String memo) { - this.memo = memo; - } - public String getUpdateusername() { - return updateusername; - } - public void setUpdateusername(String updateusername) { - this.updateusername = updateusername; - } - 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; - } - public String getCompper() { - return compper; - } - public void setCompper(String compper) { - this.compper = compper; - } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getAssignedto() { - return assignedto; - } - public void setAssignedto(String assignedto) { - this.assignedto = assignedto; - } - public String getWfstatus() { - return wfstatus; - } - public void setWfstatus(String wfstatus) { - this.wfstatus = wfstatus; - } - public String getShares() { - return shares; - } - public void setShares(String shares) { - this.shares = shares; - } - public String getOwner() { - return owner; - } - public void setOwner(String owner) { - this.owner = owner; - } - public String getDatadept() { - return datadept; - } - public void setDatadept(String datadept) { - this.datadept = datadept; - } - public String getEntcusid() { - return entcusid; - } - public void setEntcusid(String entcusid) { - this.entcusid = entcusid; - } - public String getOrgan() { - return organ; - } - public void setOrgan(String organ) { - this.organ = organ; - } - public String getPinyin() { - return pinyin; - } - public void setPinyin(String pinyin) { - this.pinyin = pinyin; - } -} +/* + * Copyright (C) 2017 优客服-多渠道客服系统 + * Modifications copyright (C) 2018-2019 Chatopera Inc, + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.chatopera.cc.model; + +import com.chatopera.cc.basic.MainUtils; +import org.hibernate.annotations.GenericGenerator; +import org.springframework.data.elasticsearch.annotations.Document; + +import javax.persistence.*; +import java.util.Date; + +@Document(indexName = "contacts", type = "contacts") +@Entity +@Table(name = "uk_contacts") +@org.hibernate.annotations.Proxy(lazy = false) +public class Contacts extends ESBean implements java.io.Serializable{ + /** + * + */ + private static final long serialVersionUID = -5781401948807231526L; + private String id = MainUtils.getUUID(); + private String gender; + private String cusbirthday; + private String ctype; + private String ckind; + private String clevel; + private String ccode; + private String nickname; + private String sarea; + private String csource; + private String language; + + public String getWluid() { + return wluid; + } + + public void setWluid(String wluid) { + this.wluid = wluid; + } + + private String wluid; + + public String getWlusername() { + return wlusername; + } + + public void setWlusername(String wlusername) { + this.wlusername = wlusername; + } + + private String wlusername; + + public String getWlcid() { + return wlcid; + } + + public void setWlcid(String wlcid) { + this.wlcid = wlcid; + } + + private String wlcid; + + public String getWlcompany_name() { + return wlcompany_name; + } + + public void setWlcompany_name(String wlcompany_name) { + this.wlcompany_name = wlcompany_name; + } + + private String wlcompany_name; + + public String getWlsid() { + return wlsid; + } + + public void setWlsid(String wlsid) { + this.wlsid = wlsid; + } + + public String getWlsystem_name() { + return wlsystem_name; + } + + public void setWlsystem_name(String wlsystem_name) { + this.wlsystem_name = wlsystem_name; + } + + private String wlsid; + + private String wlsystem_name; + + + private String organ ; + + private String marriage; + + private String entcusid; //客户ID + + private String education; + private String identifytype; + private String identifynumber; + private String website; + private String email; + private String emailalt; + private String skypeid; + private String mobileno; + private String mobilealt; + private String phone; + private String extension; + private String phonealt; + private String extensionalt; + private String familyphone; + private String familyphonealt; + private String fax; + private String faxalt; + private String country; + private String province; + private String city; + private String address; + private String postcode; + private String enterpriseid; + private String company; + private String department; + private String duty; + private String deptpr; + private String validstatus; + private String weixin; + private String weixinname; + private String weixinid; + private String weibo; + private String weiboid; + private String qqcode; + + private Date touchtime; + private boolean datastatus; + private String processid; + private String creater; + private String username; + private String updateuser; + private String memo; + private String updateusername; + + private Date updatetime = new Date(); + private String orgi; + private String compper; + + private Date createtime = new Date(); + private String name; + private String assignedto; + private String wfstatus; + private String shares; + private String owner; + private String datadept; + + private String pinyin ; //拼音首字母 + + @Id + @Column(length = 32) + @GeneratedValue(generator = "system-uuid") + @GenericGenerator(name = "system-uuid", strategy = "assigned") + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getGender() { + return gender; + } + public void setGender(String gender) { + this.gender = gender; + } + public String getCusbirthday() { + return cusbirthday; + } + public void setCusbirthday(String cusbirthday) { + this.cusbirthday = cusbirthday; + } + public String getCtype() { + return ctype; + } + public void setCtype(String ctype) { + this.ctype = ctype; + } + public String getCkind() { + return ckind; + } + public void setCkind(String ckind) { + this.ckind = ckind; + } + public String getClevel() { + return clevel; + } + public void setClevel(String clevel) { + this.clevel = clevel; + } + public String getCcode() { + return ccode; + } + public void setCcode(String ccode) { + this.ccode = ccode; + } + public String getNickname() { + return nickname; + } + public void setNickname(String nickname) { + this.nickname = nickname; + } + public String getSarea() { + return sarea; + } + public void setSarea(String sarea) { + this.sarea = sarea; + } + public String getCsource() { + return csource; + } + public void setCsource(String csource) { + this.csource = csource; + } + public String getLanguage() { + return language; + } + public void setLanguage(String language) { + this.language = language; + } + public String getMarriage() { + return marriage; + } + public void setMarriage(String marriage) { + this.marriage = marriage; + } + public String getEducation() { + return education; + } + public void setEducation(String education) { + this.education = education; + } + public String getIdentifytype() { + return identifytype; + } + public void setIdentifytype(String identifytype) { + this.identifytype = identifytype; + } + public String getIdentifynumber() { + return identifynumber; + } + public void setIdentifynumber(String identifynumber) { + this.identifynumber = identifynumber; + } + public String getWebsite() { + return website; + } + public void setWebsite(String website) { + this.website = website; + } + public String getSkypeid() { + return skypeid; + } + public void setSkypeid(String skypeid) { + this.skypeid = skypeid; + } + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + public String getEmailalt() { + return emailalt; + } + public void setEmailalt(String emailalt) { + this.emailalt = emailalt; + } + public String getMobileno() { + return mobileno; + } + public void setMobileno(String mobileno) { + this.mobileno = mobileno; + } + public String getMobilealt() { + return mobilealt; + } + public void setMobilealt(String mobilealt) { + this.mobilealt = mobilealt; + } + public String getPhone() { + return phone; + } + public void setPhone(String phone) { + this.phone = phone; + } + public String getExtension() { + return extension; + } + public void setExtension(String extension) { + this.extension = extension; + } + public String getPhonealt() { + return phonealt; + } + public void setPhonealt(String phonealt) { + this.phonealt = phonealt; + } + public String getExtensionalt() { + return extensionalt; + } + public void setExtensionalt(String extensionalt) { + this.extensionalt = extensionalt; + } + public String getFamilyphone() { + return familyphone; + } + public void setFamilyphone(String familyphone) { + this.familyphone = familyphone; + } + public String getFamilyphonealt() { + return familyphonealt; + } + public void setFamilyphonealt(String familyphonealt) { + this.familyphonealt = familyphonealt; + } + public String getFax() { + return fax; + } + public void setFax(String fax) { + this.fax = fax; + } + public String getFaxalt() { + return faxalt; + } + public void setFaxalt(String faxalt) { + this.faxalt = faxalt; + } + 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 getAddress() { + return address; + } + public void setAddress(String address) { + this.address = address; + } + public String getPostcode() { + return postcode; + } + public void setPostcode(String postcode) { + this.postcode = postcode; + } + public String getEnterpriseid() { + return enterpriseid; + } + public void setEnterpriseid(String enterpriseid) { + this.enterpriseid = enterpriseid; + } + public String getCompany() { + return company; + } + public void setCompany(String company) { + this.company = company; + } + public String getDepartment() { + return department; + } + public void setDepartment(String department) { + this.department = department; + } + public String getDuty() { + return duty; + } + public void setDuty(String duty) { + this.duty = duty; + } + public String getDeptpr() { + return deptpr; + } + public void setDeptpr(String deptpr) { + this.deptpr = deptpr; + } + public String getValidstatus() { + return validstatus; + } + public void setValidstatus(String validstatus) { + this.validstatus = validstatus; + } + public String getWeixin() { + return weixin; + } + public void setWeixin(String weixin) { + this.weixin = weixin; + } + public String getWeixinname() { + return weixinname; + } + public void setWeixinname(String weixinname) { + this.weixinname = weixinname; + } + public String getWeixinid() { + return weixinid; + } + public void setWeixinid(String weixinid) { + this.weixinid = weixinid; + } + public String getWeibo() { + return weibo; + } + public void setWeibo(String weibo) { + this.weibo = weibo; + } + public String getWeiboid() { + return weiboid; + } + public void setWeiboid(String weiboid) { + this.weiboid = weiboid; + } + public String getQqcode() { + return qqcode; + } + public void setQqcode(String qqcode) { + this.qqcode = qqcode; + } + public Date getTouchtime() { + return touchtime; + } + public void setTouchtime(Date touchtime) { + this.touchtime = touchtime; + } + public boolean isDatastatus() { + return datastatus; + } + public void setDatastatus(boolean datastatus) { + this.datastatus = datastatus; + } + public String getProcessid() { + return processid; + } + public void setProcessid(String processid) { + this.processid = processid; + } + 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 String getUpdateuser() { + return updateuser; + } + public void setUpdateuser(String updateuser) { + this.updateuser = updateuser; + } + public String getMemo() { + return memo; + } + public void setMemo(String memo) { + this.memo = memo; + } + public String getUpdateusername() { + return updateusername; + } + public void setUpdateusername(String updateusername) { + this.updateusername = updateusername; + } + 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; + } + public String getCompper() { + return compper; + } + public void setCompper(String compper) { + this.compper = compper; + } + public Date getCreatetime() { + return createtime; + } + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getAssignedto() { + return assignedto; + } + public void setAssignedto(String assignedto) { + this.assignedto = assignedto; + } + public String getWfstatus() { + return wfstatus; + } + public void setWfstatus(String wfstatus) { + this.wfstatus = wfstatus; + } + public String getShares() { + return shares; + } + public void setShares(String shares) { + this.shares = shares; + } + public String getOwner() { + return owner; + } + public void setOwner(String owner) { + this.owner = owner; + } + public String getDatadept() { + return datadept; + } + public void setDatadept(String datadept) { + this.datadept = datadept; + } + public String getEntcusid() { + return entcusid; + } + public void setEntcusid(String entcusid) { + this.entcusid = entcusid; + } + public String getOrgan() { + return organ; + } + public void setOrgan(String organ) { + this.organ = organ; + } + public String getPinyin() { + return pinyin; + } + public void setPinyin(String pinyin) { + this.pinyin = pinyin; + } +} diff --git a/contact-center/app/src/main/java/com/chatopera/cc/model/EntCustomer.java b/contact-center/app/src/main/java/com/chatopera/cc/model/EntCustomer.java index 21b97c2b..84ee84c4 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/model/EntCustomer.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/model/EntCustomer.java @@ -1,494 +1,494 @@ -/* - * Copyright (C) 2017 优客服-多渠道客服系统 - * Modifications copyright (C) 2018-2019 Chatopera Inc, - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.chatopera.cc.model; - -import com.chatopera.cc.basic.MainUtils; -import org.hibernate.annotations.GenericGenerator; -import org.springframework.data.elasticsearch.annotations.Document; - -import javax.persistence.*; -import java.util.Date; - -@Document(indexName = "cskefu", type = "entcustomer") -@Entity -@Table(name = "uk_entcustomer") -@org.hibernate.annotations.Proxy(lazy = false) -public class EntCustomer extends ESBean implements java.io.Serializable{ - - /** - * - */ - private static final long serialVersionUID = 1L; - - private String id = MainUtils.getUUID(); - - private String name; - private String etype; - private String ekind; - private String maturity ; - private String elevel; - private String ecode; - private String nickname; - private String esource; - private String organ; - private String corporation; - private String leadername; - private String leadermobile; - private String leadermobile2; - private String leaderphone; - private String leaderemail; - private String website; - private String email; - private String emailalt; - private String phone; - private String phonealt; - private String fax; - private String faxalt; - private String country; - private String province; - - private String entcusid; //客户ID - - private String city; - private String sarea; - private String address; - private String postcode; - private String businessscope; - private String capital; - private String stockcode; - private String bankaccount; - private String registeredaddress; - private String esize; - private String industry; - private String validstatus; - private String weixin; - private String weibo; - - private Date touchtime ; - private String dzip; - private String daddress; - private String darea; - private String dcity; - private String dprovince; - private boolean datastatus; - private String processid; - private String description; - - private String creater; - private String username; - private String updateuser; - private String updateusername; - - private Date updatetime = new Date(); - private String orgi; - - private Date createtime = new Date(); - private String assignedto; - private String wfstatus; - private String shares; - private String owner; - private String datadept; - private String batid; - - private String pinyin ; //拼音首字母 - - - @Id - @Column(length = 32) - @GeneratedValue(generator = "system-uuid") - @GenericGenerator(name = "system-uuid", strategy = "assigned") - 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 getEtype() { - return etype; - } - public void setEtype(String etype) { - this.etype = etype; - } - public String getEkind() { - return ekind; - } - public void setEkind(String ekind) { - this.ekind = ekind; - } - public String getElevel() { - return elevel; - } - public void setElevel(String elevel) { - this.elevel = elevel; - } - public String getEcode() { - return ecode; - } - public void setEcode(String ecode) { - this.ecode = ecode; - } - public String getNickname() { - return nickname; - } - public void setNickname(String nickname) { - this.nickname = nickname; - } - public String getEsource() { - return esource; - } - public void setEsource(String esource) { - this.esource = esource; - } - public String getOrgan() { - return organ; - } - public void setOrgan(String organ) { - this.organ = organ; - } - public String getCorporation() { - return corporation; - } - public void setCorporation(String corporation) { - this.corporation = corporation; - } - public String getLeadername() { - return leadername; - } - public void setLeadername(String leadername) { - this.leadername = leadername; - } - public String getLeadermobile() { - return leadermobile; - } - public void setLeadermobile(String leadermobile) { - this.leadermobile = leadermobile; - } - public String getLeadermobile2() { - return leadermobile2; - } - public void setLeadermobile2(String leadermobile2) { - this.leadermobile2 = leadermobile2; - } - public String getLeaderphone() { - return leaderphone; - } - public void setLeaderphone(String leaderphone) { - this.leaderphone = leaderphone; - } - public String getLeaderemail() { - return leaderemail; - } - public void setLeaderemail(String leaderemail) { - this.leaderemail = leaderemail; - } - public String getWebsite() { - return website; - } - public void setWebsite(String website) { - this.website = website; - } - public String getEmail() { - return email; - } - public void setEmail(String email) { - this.email = email; - } - public String getEmailalt() { - return emailalt; - } - public void setEmailalt(String emailalt) { - this.emailalt = emailalt; - } - public String getPhone() { - return phone; - } - public void setPhone(String phone) { - this.phone = phone; - } - public String getPhonealt() { - return phonealt; - } - public void setPhonealt(String phonealt) { - this.phonealt = phonealt; - } - public String getFax() { - return fax; - } - public void setFax(String fax) { - this.fax = fax; - } - public String getFaxalt() { - return faxalt; - } - public void setFaxalt(String faxalt) { - this.faxalt = faxalt; - } - 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 getSarea() { - return sarea; - } - public void setSarea(String sarea) { - this.sarea = sarea; - } - public String getAddress() { - return address; - } - public void setAddress(String address) { - this.address = address; - } - public String getPostcode() { - return postcode; - } - public void setPostcode(String postcode) { - this.postcode = postcode; - } - public String getBusinessscope() { - return businessscope; - } - public void setBusinessscope(String businessscope) { - this.businessscope = businessscope; - } - public String getCapital() { - return capital; - } - public void setCapital(String capital) { - this.capital = capital; - } - public String getStockcode() { - return stockcode; - } - public void setStockcode(String stockcode) { - this.stockcode = stockcode; - } - public String getBankaccount() { - return bankaccount; - } - public void setBankaccount(String bankaccount) { - this.bankaccount = bankaccount; - } - public String getRegisteredaddress() { - return registeredaddress; - } - public void setRegisteredaddress(String registeredaddress) { - this.registeredaddress = registeredaddress; - } - public String getEsize() { - return esize; - } - public void setEsize(String esize) { - this.esize = esize; - } - public String getIndustry() { - return industry; - } - public void setIndustry(String industry) { - this.industry = industry; - } - public String getValidstatus() { - return validstatus; - } - public void setValidstatus(String validstatus) { - this.validstatus = validstatus; - } - public String getWeixin() { - return weixin; - } - public void setWeixin(String weixin) { - this.weixin = weixin; - } - public String getWeibo() { - return weibo; - } - public void setWeibo(String weibo) { - this.weibo = weibo; - } - public Date getTouchtime() { - return touchtime; - } - public void setTouchtime(Date touchtime) { - this.touchtime = touchtime; - } - public String getDzip() { - return dzip; - } - public void setDzip(String dzip) { - this.dzip = dzip; - } - public String getDaddress() { - return daddress; - } - public void setDaddress(String daddress) { - this.daddress = daddress; - } - public String getDarea() { - return darea; - } - public void setDarea(String darea) { - this.darea = darea; - } - public String getDcity() { - return dcity; - } - public void setDcity(String dcity) { - this.dcity = dcity; - } - public String getDprovince() { - return dprovince; - } - public void setDprovince(String dprovince) { - this.dprovince = dprovince; - } - public boolean isDatastatus() { - return datastatus; - } - public void setDatastatus(boolean datastatus) { - this.datastatus = datastatus; - } - public String getProcessid() { - return processid; - } - public void setProcessid(String processid) { - this.processid = processid; - } - public String getDescription() { - return description; - } - public void setDescription(String description) { - this.description = description; - } - 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 String getUpdateuser() { - return updateuser; - } - public void setUpdateuser(String updateuser) { - this.updateuser = updateuser; - } - public String getUpdateusername() { - return updateusername; - } - public void setUpdateusername(String updateusername) { - this.updateusername = updateusername; - } - 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; - } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - public String getAssignedto() { - return assignedto; - } - public void setAssignedto(String assignedto) { - this.assignedto = assignedto; - } - public String getWfstatus() { - return wfstatus; - } - public void setWfstatus(String wfstatus) { - this.wfstatus = wfstatus; - } - public String getShares() { - return shares; - } - public void setShares(String shares) { - this.shares = shares; - } - public String getOwner() { - return owner; - } - public void setOwner(String owner) { - this.owner = owner; - } - public String getDatadept() { - return datadept; - } - public void setDatadept(String datadept) { - this.datadept = datadept; - } - public String getBatid() { - return batid; - } - public void setBatid(String batid) { - this.batid = batid; - } - public String getMaturity() { - return maturity; - } - public void setMaturity(String maturity) { - this.maturity = maturity; - } - public String getEntcusid() { - return entcusid!=null ? entcusid : id ; - } - public void setEntcusid(String entcusid) { - this.entcusid = entcusid; - } - public String getPinyin() { - return pinyin; - } - public void setPinyin(String pinyin) { - this.pinyin = pinyin; - } - -} +/* + * Copyright (C) 2017 优客服-多渠道客服系统 + * Modifications copyright (C) 2018-2019 Chatopera Inc, + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.chatopera.cc.model; + +import com.chatopera.cc.basic.MainUtils; +import org.hibernate.annotations.GenericGenerator; +import org.springframework.data.elasticsearch.annotations.Document; + +import javax.persistence.*; +import java.util.Date; + +@Document(indexName = "entcustomer", type = "entcustomer") +@Entity +@Table(name = "uk_entcustomer") +@org.hibernate.annotations.Proxy(lazy = false) +public class EntCustomer extends ESBean implements java.io.Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + + private String id = MainUtils.getUUID(); + + private String name; + private String etype; + private String ekind; + private String maturity; + private String elevel; + private String ecode; + private String nickname; + private String esource; + private String organ; + private String corporation; + private String leadername; + private String leadermobile; + private String leadermobile2; + private String leaderphone; + private String leaderemail; + private String website; + private String email; + private String emailalt; + private String phone; + private String phonealt; + private String fax; + private String faxalt; + private String country; + private String province; + + private String entcusid; //客户ID + + private String city; + private String sarea; + private String address; + private String postcode; + private String businessscope; + private String capital; + private String stockcode; + private String bankaccount; + private String registeredaddress; + private String esize; + private String industry; + private String validstatus; + private String weixin; + private String weibo; + + private Date touchtime; + private String dzip; + private String daddress; + private String darea; + private String dcity; + private String dprovince; + private boolean datastatus; + private String processid; + private String description; + + private String creater; + private String username; + private String updateuser; + private String updateusername; + + private Date updatetime = new Date(); + private String orgi; + + private Date createtime = new Date(); + private String assignedto; + private String wfstatus; + private String shares; + private String owner; + private String datadept; + private String batid; + + private String pinyin; //拼音首字母 + + + @Id + @Column(length = 32) + @GeneratedValue(generator = "system-uuid") + @GenericGenerator(name = "system-uuid", strategy = "assigned") + 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 getEtype() { + return etype; + } + public void setEtype(String etype) { + this.etype = etype; + } + public String getEkind() { + return ekind; + } + public void setEkind(String ekind) { + this.ekind = ekind; + } + public String getElevel() { + return elevel; + } + public void setElevel(String elevel) { + this.elevel = elevel; + } + public String getEcode() { + return ecode; + } + public void setEcode(String ecode) { + this.ecode = ecode; + } + public String getNickname() { + return nickname; + } + public void setNickname(String nickname) { + this.nickname = nickname; + } + public String getEsource() { + return esource; + } + public void setEsource(String esource) { + this.esource = esource; + } + public String getOrgan() { + return organ; + } + public void setOrgan(String organ) { + this.organ = organ; + } + public String getCorporation() { + return corporation; + } + public void setCorporation(String corporation) { + this.corporation = corporation; + } + public String getLeadername() { + return leadername; + } + public void setLeadername(String leadername) { + this.leadername = leadername; + } + public String getLeadermobile() { + return leadermobile; + } + public void setLeadermobile(String leadermobile) { + this.leadermobile = leadermobile; + } + public String getLeadermobile2() { + return leadermobile2; + } + public void setLeadermobile2(String leadermobile2) { + this.leadermobile2 = leadermobile2; + } + public String getLeaderphone() { + return leaderphone; + } + public void setLeaderphone(String leaderphone) { + this.leaderphone = leaderphone; + } + public String getLeaderemail() { + return leaderemail; + } + public void setLeaderemail(String leaderemail) { + this.leaderemail = leaderemail; + } + public String getWebsite() { + return website; + } + public void setWebsite(String website) { + this.website = website; + } + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + public String getEmailalt() { + return emailalt; + } + public void setEmailalt(String emailalt) { + this.emailalt = emailalt; + } + public String getPhone() { + return phone; + } + public void setPhone(String phone) { + this.phone = phone; + } + public String getPhonealt() { + return phonealt; + } + public void setPhonealt(String phonealt) { + this.phonealt = phonealt; + } + public String getFax() { + return fax; + } + public void setFax(String fax) { + this.fax = fax; + } + public String getFaxalt() { + return faxalt; + } + public void setFaxalt(String faxalt) { + this.faxalt = faxalt; + } + 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 getSarea() { + return sarea; + } + public void setSarea(String sarea) { + this.sarea = sarea; + } + public String getAddress() { + return address; + } + public void setAddress(String address) { + this.address = address; + } + public String getPostcode() { + return postcode; + } + public void setPostcode(String postcode) { + this.postcode = postcode; + } + public String getBusinessscope() { + return businessscope; + } + public void setBusinessscope(String businessscope) { + this.businessscope = businessscope; + } + public String getCapital() { + return capital; + } + public void setCapital(String capital) { + this.capital = capital; + } + public String getStockcode() { + return stockcode; + } + public void setStockcode(String stockcode) { + this.stockcode = stockcode; + } + public String getBankaccount() { + return bankaccount; + } + public void setBankaccount(String bankaccount) { + this.bankaccount = bankaccount; + } + public String getRegisteredaddress() { + return registeredaddress; + } + public void setRegisteredaddress(String registeredaddress) { + this.registeredaddress = registeredaddress; + } + public String getEsize() { + return esize; + } + public void setEsize(String esize) { + this.esize = esize; + } + public String getIndustry() { + return industry; + } + public void setIndustry(String industry) { + this.industry = industry; + } + public String getValidstatus() { + return validstatus; + } + public void setValidstatus(String validstatus) { + this.validstatus = validstatus; + } + public String getWeixin() { + return weixin; + } + public void setWeixin(String weixin) { + this.weixin = weixin; + } + public String getWeibo() { + return weibo; + } + public void setWeibo(String weibo) { + this.weibo = weibo; + } + public Date getTouchtime() { + return touchtime; + } + public void setTouchtime(Date touchtime) { + this.touchtime = touchtime; + } + public String getDzip() { + return dzip; + } + public void setDzip(String dzip) { + this.dzip = dzip; + } + public String getDaddress() { + return daddress; + } + public void setDaddress(String daddress) { + this.daddress = daddress; + } + public String getDarea() { + return darea; + } + public void setDarea(String darea) { + this.darea = darea; + } + public String getDcity() { + return dcity; + } + public void setDcity(String dcity) { + this.dcity = dcity; + } + public String getDprovince() { + return dprovince; + } + public void setDprovince(String dprovince) { + this.dprovince = dprovince; + } + public boolean isDatastatus() { + return datastatus; + } + public void setDatastatus(boolean datastatus) { + this.datastatus = datastatus; + } + public String getProcessid() { + return processid; + } + public void setProcessid(String processid) { + this.processid = processid; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + 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 String getUpdateuser() { + return updateuser; + } + public void setUpdateuser(String updateuser) { + this.updateuser = updateuser; + } + public String getUpdateusername() { + return updateusername; + } + public void setUpdateusername(String updateusername) { + this.updateusername = updateusername; + } + 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; + } + public Date getCreatetime() { + return createtime; + } + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + public String getAssignedto() { + return assignedto; + } + public void setAssignedto(String assignedto) { + this.assignedto = assignedto; + } + public String getWfstatus() { + return wfstatus; + } + public void setWfstatus(String wfstatus) { + this.wfstatus = wfstatus; + } + public String getShares() { + return shares; + } + public void setShares(String shares) { + this.shares = shares; + } + public String getOwner() { + return owner; + } + public void setOwner(String owner) { + this.owner = owner; + } + public String getDatadept() { + return datadept; + } + public void setDatadept(String datadept) { + this.datadept = datadept; + } + public String getBatid() { + return batid; + } + public void setBatid(String batid) { + this.batid = batid; + } + public String getMaturity() { + return maturity; + } + public void setMaturity(String maturity) { + this.maturity = maturity; + } + public String getEntcusid() { + return entcusid!=null ? entcusid : id ; + } + public void setEntcusid(String entcusid) { + this.entcusid = entcusid; + } + public String getPinyin() { + return pinyin; + } + public void setPinyin(String pinyin) { + this.pinyin = pinyin; + } + +} diff --git a/contact-center/app/src/main/java/com/chatopera/cc/model/Favorites.java b/contact-center/app/src/main/java/com/chatopera/cc/model/Favorites.java index 36d8acdd..5abffa0d 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/model/Favorites.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/model/Favorites.java @@ -23,13 +23,12 @@ import org.hibernate.annotations.GenericGenerator; import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.FieldType; -import org.springframework.data.elasticsearch.annotations.Parent; import javax.persistence.*; import java.util.Date; @Data -@Document(indexName = "cskefu", type = "favorites", createIndex = false) +@Document(indexName = "favorites", type = "favorites", createIndex = false) @Entity @Table(name = "uk_favorites") @org.hibernate.annotations.Proxy(lazy = false) @@ -41,7 +40,7 @@ public class Favorites implements java.io.Serializable { private String title; private String model; @Field(type = FieldType.Text, store = true) - @Parent(type = "uk_workorders") + // @Parent(type = "uk_workorders") private String orderid; private WorkOrders workOrders; private Date createtime = new Date(); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/model/KbsTopic.java b/contact-center/app/src/main/java/com/chatopera/cc/model/KbsTopic.java index 1e247b22..fe128df9 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/model/KbsTopic.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/model/KbsTopic.java @@ -26,89 +26,89 @@ import java.util.Date; /** - * + * */ -@Document(indexName = "cskefu", type = "kbs_topic") +@Document(indexName = "kbs_topic", type = "kbs_topic") @Entity @Table(name = "uk_kbs_topic") @org.hibernate.annotations.Proxy(lazy = false) public class KbsTopic extends ESBean implements java.io.Serializable , UKAgg{ /** - * + * */ private static final long serialVersionUID = 1L; /** - * + * */ - + private String id = MainUtils.getUUID(); - + private String sessionid ; - + private String title ; //标题 private String content ; //内容 private String weixin; //微信渠道回复 private String email ; //邮件渠道回复 private String sms ; //短信回复 private String tts ; //语音播报回复 - + private float price ; //问题价格 private String keyword ; //关键词 private String summary ; //摘要 private String tags ; //标签 private boolean anonymous ; //是否匿名提问 private boolean datastatus ; //逻辑删除 - + private boolean approval ; //是否已经审批通过 - - + + private Date begintime ; //有效期开始 - + private Date endtime ; //有效期结束 - + private boolean top ; //是否置顶 private boolean essence ; //是否精华 private boolean accept ; //是否已采纳最佳答案 - private boolean finish ; //结贴 - - private int answers ; //回答数量 - - @Column(name="sviews") - private int views ; //阅读数量 - private int followers ; //关注数量 - private int collections; //收藏数量 - private int comments ; //评论数量 - private boolean frommobile ; //是否移动端提问 - private String status ; // 状态 - private String tptype; //知识分类 - private String cate ; //知识 栏目 - private String attachment ; //附件 - - private String username ; - private String orgi ; + private boolean finish; //结贴 + + private int answers; //回答数量 + + @Column(name = "sviews") + private int views; //阅读数量 + private int followers; //关注数量 + private int collections; //收藏数量 + private int comments; //评论数量 + private boolean frommobile; //是否移动端提问 + private String status; // 状态 + private String tptype; //知识分类 + private String cate; //知识 栏目 + private String attachment; //附件 + + private String username; + private String orgi; private String creater; - + private Date createtime = new Date(); - + private Date updatetime = new Date(); private String memo; private String organ; - + private int rowcount ; - private String key ; - - - private User user ; - - + private String key; + + + private User user; + + /** * @return the id */ @Id @Column(length = 32) @GeneratedValue(generator = "system-uuid") - @GenericGenerator(name = "system-uuid", strategy = "assigned") + @GenericGenerator(name = "system-uuid", strategy = "assigned") public String getId() { return id; } @@ -162,7 +162,7 @@ public class KbsTopic extends ESBean implements java.io.Serializable , UKAgg{ public void setSummary(String summary) { this.summary = summary; } - + public boolean isAnonymous() { return anonymous; } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/model/KbsTopicComment.java b/contact-center/app/src/main/java/com/chatopera/cc/model/KbsTopicComment.java index 95d54ae2..14a41dec 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/model/KbsTopicComment.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/model/KbsTopicComment.java @@ -32,7 +32,7 @@ import javax.persistence.Transient; import java.util.Date; @Data -@Document(indexName = "cskefu", type = "kbs_topiccomment") +@Document(indexName = "kbs_topiccomment", type = "kbs_topiccomment") public class KbsTopicComment implements UKAgg { private static final long serialVersionUID = -4911955236794918875L; diff --git a/contact-center/app/src/main/java/com/chatopera/cc/model/OrdersComment.java b/contact-center/app/src/main/java/com/chatopera/cc/model/OrdersComment.java index 3fb236c7..847530fa 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/model/OrdersComment.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/model/OrdersComment.java @@ -28,7 +28,7 @@ import javax.persistence.*; import java.util.Date; @Data -@Document(indexName = "cskefu", type = "orderscomment") +@Document(indexName = "orderscomment", type = "orderscomment") @Entity @Table(name = "uk_orderscomment") @org.hibernate.annotations.Proxy(lazy = false) diff --git a/contact-center/app/src/main/java/com/chatopera/cc/model/PublishedReport.java b/contact-center/app/src/main/java/com/chatopera/cc/model/PublishedReport.java index 0505a308..89cda7ab 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/model/PublishedReport.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/model/PublishedReport.java @@ -1,149 +1,149 @@ -/* - * Copyright (C) 2017 优客服-多渠道客服系统 - * Modifications copyright (C) 2018-2019 Chatopera Inc, - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.chatopera.cc.model; - -import com.chatopera.cc.basic.MainUtils; -import org.apache.commons.codec.binary.Base64; -import org.hibernate.annotations.GenericGenerator; -import org.springframework.data.elasticsearch.annotations.Document; - -import javax.persistence.*; -import java.util.Date; -@Document(indexName = "cskefu", type = "publishedreport") -@Entity -@Table(name = "uk_publishedreport") -@org.hibernate.annotations.Proxy(lazy = false) -public class PublishedReport implements java.io.Serializable{ - private static final long serialVersionUID = 1L; - private String id ; - private String name ; - private String code ; - private String reporttype ; - private String dicid ; //目录ID - private String orgi ; - private String dataid ; - private String dataflag ; - private int startindex ; - private Date startdate ; - private int dataversion; - private String creater ; - private String reportcontent; - private Date createtime; - private Report report ; - - @Id - @Column(length = 32) - @GeneratedValue(generator = "system-uuid") - @GenericGenerator(name = "system-uuid", strategy = "uuid") - 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 getReporttype() { - return reporttype; - } - public void setReporttype(String reporttype) { - this.reporttype = reporttype; - } - public String getDicid() { - return dicid; - } - public void setDicid(String dicid) { - this.dicid = dicid; - } - public String getOrgi() { - return orgi; - } - public void setOrgi(String orgi) { - this.orgi = orgi; - } - public String getDataid() { - return dataid; - } - public void setDataid(String dataid) { - this.dataid = dataid; - } - public String getDataflag() { - return dataflag; - } - public void setDataflag(String dataflag) { - this.dataflag = dataflag; - } - public int getStartindex() { - return startindex; - } - public void setStartindex(int startindex) { - this.startindex = startindex; - } - public Date getStartdate() { - return startdate; - } - public void setStartdate(Date startdate) { - this.startdate = startdate; - } - public int getDataversion() { - return dataversion; - } - public void setDataversion(int dataversion) { - this.dataversion = dataversion; - } - public String getCreater() { - return creater; - } - public void setCreater(String creater) { - this.creater = creater; - } - public String getReportcontent() { - return reportcontent; - } - public void setReportcontent(String reportcontent) { - this.reportcontent = reportcontent; - } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - @Transient - public Report getReport() { - Base64 base64 = new Base64(); - try { - return report!=null ? report : (report = (this.reportcontent==null?null:(Report) MainUtils.toObject(base64.decode(this.reportcontent)))); - } catch (Exception e) { - e.printStackTrace(); - } - return report; - } - -} +/* + * Copyright (C) 2017 优客服-多渠道客服系统 + * Modifications copyright (C) 2018-2019 Chatopera Inc, + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.chatopera.cc.model; + +import com.chatopera.cc.basic.MainUtils; +import org.apache.commons.codec.binary.Base64; +import org.hibernate.annotations.GenericGenerator; +import org.springframework.data.elasticsearch.annotations.Document; + +import javax.persistence.*; +import java.util.Date; +@Document(indexName = "publishedreport", type = "publishedreport") +@Entity +@Table(name = "uk_publishedreport") +@org.hibernate.annotations.Proxy(lazy = false) +public class PublishedReport implements java.io.Serializable { + private static final long serialVersionUID = 1L; + private String id; + private String name; + private String code; + private String reporttype; + private String dicid; //目录ID + private String orgi; + private String dataid; + private String dataflag; + private int startindex; + private Date startdate; + private int dataversion; + private String creater; + private String reportcontent; + private Date createtime; + private Report report ; + + @Id + @Column(length = 32) + @GeneratedValue(generator = "system-uuid") + @GenericGenerator(name = "system-uuid", strategy = "uuid") + 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 getReporttype() { + return reporttype; + } + public void setReporttype(String reporttype) { + this.reporttype = reporttype; + } + public String getDicid() { + return dicid; + } + public void setDicid(String dicid) { + this.dicid = dicid; + } + public String getOrgi() { + return orgi; + } + public void setOrgi(String orgi) { + this.orgi = orgi; + } + public String getDataid() { + return dataid; + } + public void setDataid(String dataid) { + this.dataid = dataid; + } + public String getDataflag() { + return dataflag; + } + public void setDataflag(String dataflag) { + this.dataflag = dataflag; + } + public int getStartindex() { + return startindex; + } + public void setStartindex(int startindex) { + this.startindex = startindex; + } + public Date getStartdate() { + return startdate; + } + public void setStartdate(Date startdate) { + this.startdate = startdate; + } + public int getDataversion() { + return dataversion; + } + public void setDataversion(int dataversion) { + this.dataversion = dataversion; + } + public String getCreater() { + return creater; + } + public void setCreater(String creater) { + this.creater = creater; + } + public String getReportcontent() { + return reportcontent; + } + public void setReportcontent(String reportcontent) { + this.reportcontent = reportcontent; + } + public Date getCreatetime() { + return createtime; + } + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + @Transient + public Report getReport() { + Base64 base64 = new Base64(); + try { + return report!=null ? report : (report = (this.reportcontent==null?null:(Report) MainUtils.toObject(base64.decode(this.reportcontent)))); + } catch (Exception e) { + e.printStackTrace(); + } + return report; + } + +} diff --git a/contact-center/app/src/main/java/com/chatopera/cc/model/QuickReply.java b/contact-center/app/src/main/java/com/chatopera/cc/model/QuickReply.java index 174a5c34..72577fb7 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/model/QuickReply.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/model/QuickReply.java @@ -1,113 +1,113 @@ -/* - * Copyright (C) 2017 优客服-多渠道客服系统 - * Modifications copyright (C) 2018-2019 Chatopera Inc, - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.chatopera.cc.model; - -import com.chatopera.cc.basic.MainUtils; -import org.hibernate.annotations.GenericGenerator; -import org.springframework.data.elasticsearch.annotations.Document; - -import javax.persistence.*; -import java.util.Date; - -@Document(indexName = "cskefu", type = "quickreply") -@Entity -@Table(name = "uk_quickreply") -@org.hibernate.annotations.Proxy(lazy = false) -public class QuickReply { - - private String id = MainUtils.getUUID(); - - private String title ; //标题 - private String content ; //内容 - - private String type ; //公用 /私有 - private String creater; //创建人 - private Date createtime = new Date(); //创建时间 - - private String orgi ; // - - private String cate ; //所属分类 - - - @Id - @Column(length = 32) - @GeneratedValue(generator = "system-uuid") - @GenericGenerator(name = "system-uuid", strategy = "assigned") - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - 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 getCate() { - return cate; - } - - public void setCate(String cate) { - this.cate = cate; - } - - public String getOrgi() { - return orgi; - } - - public void setOrgi(String orgi) { - this.orgi = orgi; - } -} +/* + * Copyright (C) 2017 优客服-多渠道客服系统 + * Modifications copyright (C) 2018-2019 Chatopera Inc, + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.chatopera.cc.model; + +import com.chatopera.cc.basic.MainUtils; +import org.hibernate.annotations.GenericGenerator; +import org.springframework.data.elasticsearch.annotations.Document; + +import javax.persistence.*; +import java.util.Date; + +@Document(indexName = "quickreply", type = "quickreply") +@Entity +@Table(name = "uk_quickreply") +@org.hibernate.annotations.Proxy(lazy = false) +public class QuickReply { + + private String id = MainUtils.getUUID(); + + private String title ; //标题 + private String content ; //内容 + + private String type ; //公用 /私有 + private String creater; //创建人 + private Date createtime = new Date(); //创建时间 + + private String orgi ; // + + private String cate ; //所属分类 + + + @Id + @Column(length = 32) + @GeneratedValue(generator = "system-uuid") + @GenericGenerator(name = "system-uuid", strategy = "assigned") + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + 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 getCate() { + return cate; + } + + public void setCate(String cate) { + this.cate = cate; + } + + public String getOrgi() { + return orgi; + } + + public void setOrgi(String orgi) { + this.orgi = orgi; + } +} diff --git a/contact-center/app/src/main/java/com/chatopera/cc/model/Report.java b/contact-center/app/src/main/java/com/chatopera/cc/model/Report.java index 849bb088..487ff697 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/model/Report.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/model/Report.java @@ -1,272 +1,273 @@ -/* - * Copyright (C) 2017 优客服-多渠道客服系统 - * Modifications copyright (C) 2018-2019 Chatopera Inc, - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.chatopera.cc.model; - -import com.chatopera.cc.basic.MainUtils; -import org.hibernate.annotations.GenericGenerator; -import org.springframework.data.elasticsearch.annotations.Document; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -@Document(indexName = "cskefu", type = "report") -@Entity -@Table(name = "uk_report") -@org.hibernate.annotations.Proxy(lazy = false) -public class Report extends ESBean implements java.io.Serializable{ - /** - * - */ - private static final long serialVersionUID = -5781401948807231526L; - private String id = MainUtils.getUUID(); - private String name ; - private String reporttype ; //0 代表动态报表 1 代表自助查询报表 - private String viewtype; - private String code ; //变更用处，修改为 报表code - private String orgi ; - private int objectcount ; //用来标记报表默认打开是否加载数据 - private String dicid ; //目录ID - private String description ; - private Date createtime = new Date(); - private String html ; //改变用处，用于存储 是否允许里面访问移动端报表 - private String status; - private String rolename ; //变更用处，标记为 动态报表 默认为 null 或者 0 都是 自助查询，1表示自定义报表 - private String userid ; //变更用处，标记为 仪表盘的 属主ID - private String blacklist ; //变更用处，用于区分是否是 仪表盘 - private String reportpackage ; //报表路径 - private String useacl ; //启用权限控制 , 变更用处， 用于控制是否覆盖上级目录的权限 - private String reportmodel ; //自助查询的是 保存 Model 的ID - private Date updatetime; //修改时间 - - - private boolean datastatus ; - private String creater; - private int reportversion ; - private String publishedtype ; - private String tabtype ; - private String username ; - private String useremail ; - private boolean cache;//1启用缓存，0不启用 - private String extparam; //默认使用 player 打开 - private String targetreport;//reporttype=shortcuts 的时候的目标报表 - private String source ; //报表来源，如果是在 事件设计器里创建的 报表，则此字段不为空，无法保存 - - private List reportModels = new ArrayList(); - - private List reportFilters = new ArrayList(); - @Id - @Column(length = 32) - @GeneratedValue(generator = "system-uuid") - @GenericGenerator(name = "system-uuid", strategy = "assigned") - 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 getReporttype() { - return reporttype; - } - public void setReporttype(String reporttype) { - this.reporttype = reporttype; - } - public String getViewtype() { - return viewtype; - } - public void setViewtype(String viewtype) { - this.viewtype = viewtype; - } - public String getCode() { - return code; - } - public void setCode(String code) { - this.code = code; - } - public String getOrgi() { - return orgi; - } - public void setOrgi(String orgi) { - this.orgi = orgi; - } - public int getObjectcount() { - return objectcount; - } - public void setObjectcount(int objectcount) { - this.objectcount = objectcount; - } - public String getDicid() { - return dicid; - } - public void setDicid(String dicid) { - this.dicid = dicid; - } - public String getDescription() { - return description; - } - public void setDescription(String description) { - this.description = description; - } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - public String getHtml() { - return html; - } - public void setHtml(String html) { - this.html = html; - } - public String getStatus() { - return status; - } - public void setStatus(String status) { - this.status = status; - } - public String getRolename() { - return rolename; - } - public void setRolename(String rolename) { - this.rolename = rolename; - } - public String getUserid() { - return userid; - } - public void setUserid(String userid) { - this.userid = userid; - } - public String getBlacklist() { - return blacklist; - } - public void setBlacklist(String blacklist) { - this.blacklist = blacklist; - } - public String getReportpackage() { - return reportpackage; - } - public void setReportpackage(String reportpackage) { - this.reportpackage = reportpackage; - } - public String getUseacl() { - return useacl; - } - public void setUseacl(String useacl) { - this.useacl = useacl; - } - public String getReportmodel() { - return reportmodel; - } - public void setReportmodel(String reportmodel) { - this.reportmodel = reportmodel; - } - public Date getUpdatetime() { - return updatetime; - } - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; - } - public boolean isDatastatus() { - return datastatus; - } - public void setDatastatus(boolean datastatus) { - this.datastatus = datastatus; - } - public String getCreater() { - return creater; - } - public void setCreater(String creater) { - this.creater = creater; - } - public int getReportversion() { - return reportversion; - } - public void setReportversion(int reportversion) { - this.reportversion = reportversion; - } - public String getPublishedtype() { - return publishedtype; - } - public void setPublishedtype(String publishedtype) { - this.publishedtype = publishedtype; - } - public String getTabtype() { - return tabtype; - } - public void setTabtype(String tabtype) { - this.tabtype = tabtype; - } - public String getUsername() { - return username; - } - public void setUsername(String username) { - this.username = username; - } - public String getUseremail() { - return useremail; - } - public void setUseremail(String useremail) { - this.useremail = useremail; - } - public boolean isCache() { - return cache; - } - public void setCache(boolean cache) { - this.cache = cache; - } - public String getExtparam() { - return extparam; - } - public void setExtparam(String extparam) { - this.extparam = extparam; - } - public String getTargetreport() { - return targetreport; - } - public void setTargetreport(String targetreport) { - this.targetreport = targetreport; - } - public String getSource() { - return source; - } - public void setSource(String source) { - this.source = source; - } - @Transient - public List getReportModels() { - return reportModels; - } - public void setReportModels(List reportModels) { - this.reportModels = reportModels; - } - @Transient - public List getReportFilters() { - return reportFilters; - } - public void setReportFilters(List reportFilters) { - this.reportFilters = reportFilters; - } - -} +/* + * Copyright (C) 2017 优客服-多渠道客服系统 + * Modifications copyright (C) 2018-2019 Chatopera Inc, + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.chatopera.cc.model; + +import com.chatopera.cc.basic.MainUtils; +import org.hibernate.annotations.GenericGenerator; +import org.springframework.data.elasticsearch.annotations.Document; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Document(indexName = "report", type = "report") +@Entity +@Table(name = "uk_report") +@org.hibernate.annotations.Proxy(lazy = false) +public class Report extends ESBean implements java.io.Serializable { + /** + * + */ + private static final long serialVersionUID = -5781401948807231526L; + private String id = MainUtils.getUUID(); + private String name; + private String reporttype; //0 代表动态报表 1 代表自助查询报表 + private String viewtype; + private String code; //变更用处，修改为 报表code + private String orgi; + private int objectcount; //用来标记报表默认打开是否加载数据 + private String dicid; //目录ID + private String description; + private Date createtime = new Date(); + private String html; //改变用处，用于存储 是否允许里面访问移动端报表 + private String status; + private String rolename; //变更用处，标记为 动态报表 默认为 null 或者 0 都是 自助查询，1表示自定义报表 + private String userid; //变更用处，标记为 仪表盘的 属主ID + private String blacklist; //变更用处，用于区分是否是 仪表盘 + private String reportpackage; //报表路径 + private String useacl; //启用权限控制 , 变更用处， 用于控制是否覆盖上级目录的权限 + private String reportmodel; //自助查询的是 保存 Model 的ID + private Date updatetime; //修改时间 + + + private boolean datastatus; + private String creater; + private int reportversion; + private String publishedtype; + private String tabtype; + private String username; + private String useremail; + private boolean cache;//1启用缓存，0不启用 + private String extparam; //默认使用 player 打开 + private String targetreport;//reporttype=shortcuts 的时候的目标报表 + private String source ; //报表来源，如果是在 事件设计器里创建的 报表，则此字段不为空，无法保存 + + private List reportModels = new ArrayList(); + + private List reportFilters = new ArrayList(); + + @Id + @Column(length = 32) + @GeneratedValue(generator = "system-uuid") + @GenericGenerator(name = "system-uuid", strategy = "assigned") + 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 getReporttype() { + return reporttype; + } + public void setReporttype(String reporttype) { + this.reporttype = reporttype; + } + public String getViewtype() { + return viewtype; + } + public void setViewtype(String viewtype) { + this.viewtype = viewtype; + } + public String getCode() { + return code; + } + public void setCode(String code) { + this.code = code; + } + public String getOrgi() { + return orgi; + } + public void setOrgi(String orgi) { + this.orgi = orgi; + } + public int getObjectcount() { + return objectcount; + } + public void setObjectcount(int objectcount) { + this.objectcount = objectcount; + } + public String getDicid() { + return dicid; + } + public void setDicid(String dicid) { + this.dicid = dicid; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public Date getCreatetime() { + return createtime; + } + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + public String getHtml() { + return html; + } + public void setHtml(String html) { + this.html = html; + } + public String getStatus() { + return status; + } + public void setStatus(String status) { + this.status = status; + } + public String getRolename() { + return rolename; + } + public void setRolename(String rolename) { + this.rolename = rolename; + } + public String getUserid() { + return userid; + } + public void setUserid(String userid) { + this.userid = userid; + } + public String getBlacklist() { + return blacklist; + } + public void setBlacklist(String blacklist) { + this.blacklist = blacklist; + } + public String getReportpackage() { + return reportpackage; + } + public void setReportpackage(String reportpackage) { + this.reportpackage = reportpackage; + } + public String getUseacl() { + return useacl; + } + public void setUseacl(String useacl) { + this.useacl = useacl; + } + public String getReportmodel() { + return reportmodel; + } + public void setReportmodel(String reportmodel) { + this.reportmodel = reportmodel; + } + public Date getUpdatetime() { + return updatetime; + } + public void setUpdatetime(Date updatetime) { + this.updatetime = updatetime; + } + public boolean isDatastatus() { + return datastatus; + } + public void setDatastatus(boolean datastatus) { + this.datastatus = datastatus; + } + public String getCreater() { + return creater; + } + public void setCreater(String creater) { + this.creater = creater; + } + public int getReportversion() { + return reportversion; + } + public void setReportversion(int reportversion) { + this.reportversion = reportversion; + } + public String getPublishedtype() { + return publishedtype; + } + public void setPublishedtype(String publishedtype) { + this.publishedtype = publishedtype; + } + public String getTabtype() { + return tabtype; + } + public void setTabtype(String tabtype) { + this.tabtype = tabtype; + } + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } + public String getUseremail() { + return useremail; + } + public void setUseremail(String useremail) { + this.useremail = useremail; + } + public boolean isCache() { + return cache; + } + public void setCache(boolean cache) { + this.cache = cache; + } + public String getExtparam() { + return extparam; + } + public void setExtparam(String extparam) { + this.extparam = extparam; + } + public String getTargetreport() { + return targetreport; + } + public void setTargetreport(String targetreport) { + this.targetreport = targetreport; + } + public String getSource() { + return source; + } + public void setSource(String source) { + this.source = source; + } + @Transient + public List getReportModels() { + return reportModels; + } + public void setReportModels(List reportModels) { + this.reportModels = reportModels; + } + @Transient + public List getReportFilters() { + return reportFilters; + } + public void setReportFilters(List reportFilters) { + this.reportFilters = reportFilters; + } + +} diff --git a/contact-center/app/src/main/java/com/chatopera/cc/model/Topic.java b/contact-center/app/src/main/java/com/chatopera/cc/model/Topic.java index bb4c29d8..99617a0d 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/model/Topic.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/model/Topic.java @@ -29,87 +29,85 @@ import java.util.List; /** * 表 uk_xiaoe_topic */ -@Document(indexName = "cskefu", type = "xiaoe_topic") +@Document(indexName = "xiaoe_topic", type = "xiaoe_topic") @Entity @Table(name = "uk_xiaoe_topic") @org.hibernate.annotations.Proxy(lazy = false) public class Topic implements java.io.Serializable{ /** - * + * */ private static final long serialVersionUID = 1L; /** - * + * */ - + private String id = MainUtils.getUUID(); - + private String sessionid ; - + private String title ; //标题 private String content ; //内容 private String weixin; //微信渠道回复 private String email ; //邮件渠道回复 private String sms ; //短信回复 private String tts ; //语音播报回复 - + private float price ; //问题价格 private String keyword ; //关键词 private String summary ; //摘要 private boolean anonymous ; //是否匿名提问 - - + + private Date begintime ; //有效期开始 - + private Date endtime ; //有效期结束 - + private boolean top ; //是否置顶 private boolean essence ; //是否精华 private boolean accept ; //是否已采纳最佳答案 private boolean finish ; //结贴 - - + + @Transient private List silimar = new ArrayList(); - - private int answers ; //回答数量 - - - private int views ; //阅读数量 - private int followers ; //关注数量 - private int collections; //收藏数量 - private int comments ; //评论数量 - private boolean mobile ; //是否移动端提问 - private String status ; // 状态 - private String tptype; //主题类型 问答:分享:讨论 - private String cate ; //主题 栏目 - - private String username ; - private String orgi ; + + private int answers; //回答数量 + + + private int views; //阅读数量 + private int followers; //关注数量 + private int collections; //收藏数量 + private int comments; //评论数量 + private boolean mobile; //是否移动端提问 + private String status; // 状态 + private String tptype; //主题类型 问答:分享:讨论 + private String cate; //主题 栏目 + + private String username; + private String orgi; private String creater; - + private Date createtime = new Date(); - + private Date updatetime = new Date(); private String memo; private String organ; - - private String aiid ; //机器人ID - - - private User user ; - - - + private String aiid ; //机器人ID + + + private User user; + + /** * @return the id */ @Id @Column(length = 32) @GeneratedValue(generator = "system-uuid") - @GenericGenerator(name = "system-uuid", strategy = "assigned") + @GenericGenerator(name = "system-uuid", strategy = "assigned") public String getId() { return id; } @@ -163,7 +161,7 @@ public class Topic implements java.io.Serializable{ public void setSummary(String summary) { this.summary = summary; } - + public boolean isAnonymous() { return anonymous; } @@ -409,5 +407,5 @@ public class Topic implements java.io.Serializable{ public void setAiid(String aiid) { this.aiid = aiid; } - + } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/model/WorkOrders.java b/contact-center/app/src/main/java/com/chatopera/cc/model/WorkOrders.java index 13910240..720eab04 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/model/WorkOrders.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/model/WorkOrders.java @@ -25,537 +25,545 @@ import java.util.Date; /** - * + * */ -@Document(indexName = "cskefu", type = "workorders" , createIndex = false ) +@Document(indexName = "workorders", type = "workorders", createIndex = false) @Entity @Table(name = "uk_workorders") @org.hibernate.annotations.Proxy(lazy = false) -public class WorkOrders extends ESBean implements UKAgg{ - /** - * - */ - private static final long serialVersionUID = 1L; - - /** - * - */ - - private String id = MainUtils.getUUID(); - - private String orderno ; //工单编号 - private String sessionid ; - - private String title ; //标题 - private String content ; //内容 - private float price ; //问题价格 - private String keyword ; //关键词 - private String summary ; //摘要 - private boolean anonymous ; //修改功能 未 是否有上传附件 - - private boolean top ; //是否置顶 - private boolean essence ; //是否精华 - private boolean accept ; //是否已采纳最佳答案 - private boolean finish ; //结贴 - - private int answers ; //回答数量 - - - private int views ; //阅读数量 - private int followers ; //关注数量 - private int collections; //收藏数量 - private int comments ; //评论数量 - private boolean frommobile ; //是否移动端提问 - private String status ; // 状态 - private String wotype; //工单类型 - private boolean datastatus ; //数据状态，是否删除 , 逻辑删除 - - private String taskid ; - private String orderid ; - - private String dataid ; - private String eventid ; - - private String ani ; - - private String cate ; //工单分类 - - private String priority ; //优先级 - - private Contacts contacts ; - private String cusid ; - - private String initiator ; //发起人 ， 可以是多人发起的工单 - - private String bpmid ; - - private String tags ; - - private String accdept ;// 受理部门 - private String accuser ; //受理人 - - private boolean assigned ; //已分配 - - private String username ; - private String orgi ; - private String creater; - - private Date createtime = new Date(); - - private Date updatetime = new Date(); - private String memo; - - - private String organ; // - private String agent ; // - - private String shares ; - - private String skill ; - private int rowcount ; - private String key ; //变更用处，修改为 OrderID - - - private User user ; - - private User current ; //当前处理人 - - private Organ currentorgan ; //处理部门 - - private Favorites fav; - - - /** - * @return the id - */ - @Id - @Column(length = 32) - @GeneratedValue(generator= "paymentableGenerator") - @GenericGenerator(name= "paymentableGenerator",strategy = "assigned") - public String getId() { - return id; - } - - @Transient - public String getSessionid() { - return sessionid; - } - - - public void setSessionid(String sessionid) { - this.sessionid = sessionid; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public float getPrice() { - return price; - } - - public void setPrice(float price) { - this.price = price; - } - - public String getKeyword() { - return keyword; - } - - public void setKeyword(String keyword) { - this.keyword = keyword; - } - - public String getSummary() { - return summary; - } - - public void setSummary(String summary) { - this.summary = summary; - } - - public boolean isAnonymous() { - return anonymous; - } - - public void setAnonymous(boolean anonymous) { - this.anonymous = anonymous; - } - public String getWotype() { - return wotype; - } - - public void setWotype(String wotype) { - this.wotype = wotype; - } - - public String getPriority() { - return priority; - } - - public void setPriority(String priority) { - this.priority = priority; - } - @Transient - public Contacts getContacts() { - return contacts; - } - - public void setContacts(Contacts contacts) { - this.contacts = contacts; - } - - public String getCusid() { - return cusid; - } - - public void setCusid(String cusid) { - this.cusid = cusid; - } - - 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; - } - - public boolean isAssigned() { - return assigned; - } - - public void setAssigned(boolean assigned) { - this.assigned = assigned; - } - - public int getAnswers() { - return answers; - } - - public void setAnswers(int answers) { - this.answers = answers; - } - - @Column(name="sviews") - public int getViews() { - return views; - } - - public void setViews(int views) { - this.views = views; - } - - public int getFollowers() { - return followers; - } - - public void setFollowers(int followers) { - this.followers = followers; - } - - public int getCollections() { - return collections; - } - - public void setCollections(int collections) { - this.collections = collections; - } - - public int getComments() { - return comments; - } - - public void setComments(int comments) { - this.comments = comments; - } - - public boolean isFrommobile() { - return frommobile; - } - - public void setFrommobile(boolean frommobile) { - this.frommobile = frommobile; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getOrgi() { - return orgi; - } - - public void setOrgi(String orgi) { - this.orgi = orgi; - } - - 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 Date getUpdatetime() { - return updatetime; - } - - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; - } - - public String getMemo() { - return memo; - } - - public void setMemo(String memo) { - this.memo = memo; - } - - public String getOrgan() { - return organ; - } - - public void setOrgan(String organ) { - this.organ = organ; - } - - public String getAgent() { - return agent; - } - - public void setAgent(String agent) { - this.agent = agent; - } - - public String getSkill() { - return skill; - } - - public void setSkill(String skill) { - this.skill = skill; - } - - public void setId(String id) { - this.id = id; - } - - public String getCate() { - return cate; - } - - public void setCate(String cate) { - this.cate = cate; - } - - public boolean isTop() { - return top; - } - - public void setTop(boolean top) { - this.top = top; - } - - public boolean isEssence() { - return essence; - } - - public void setEssence(boolean essence) { - this.essence = essence; - } - - public boolean isAccept() { - return accept; - } - - public void setAccept(boolean accept) { - this.accept = accept; - } - - public boolean isFinish() { - return finish; - } - - public void setFinish(boolean finish) { - this.finish = finish; - } - @Transient - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - @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 String getOrderno() { - return orderno; - } - - public void setOrderno(String orderno) { - this.orderno = orderno; - } - - public String getShares() { - return shares; - } - - public void setShares(String shares) { - this.shares = shares; - } - - public String getInitiator() { - return initiator; - } - - public void setInitiator(String initiator) { - this.initiator = initiator; - } - - public boolean isDatastatus() { - return datastatus; - } - - public void setDatastatus(boolean datastatus) { - this.datastatus = datastatus; - } - - public String getTags() { - return tags; - } - - public void setTags(String tags) { - this.tags = tags; - } - - public String getBpmid() { - return bpmid; - } - - public void setBpmid(String bpmid) { - this.bpmid = bpmid; - } - - @Transient - public Favorites getFav() { - return fav; - } - - public void setFav(Favorites fav) { - this.fav = fav; - } - @Transient - public User getCurrent() { - return current; - } - - public void setCurrent(User current) { - this.current = current; - } - @Transient - public Organ getCurrentorgan() { - return currentorgan; - } - - public void setCurrentorgan(Organ currentorgan) { - this.currentorgan = currentorgan; - } - @Transient - public String getTaskid() { - return taskid; - } - - public void setTaskid(String taskid) { - this.taskid = taskid; - } - @Transient - public String getOrderid() { - return orderid; - } - - public void setOrderid(String orderid) { - this.orderid = orderid; - } - - public String getDataid() { - return dataid; - } - - public void setDataid(String dataid) { - this.dataid = dataid; - } - - public String getEventid() { - return eventid; - } - - public void setEventid(String eventid) { - this.eventid = eventid; - } - - public String getAni() { - return ani; - } - - public void setAni(String ani) { - this.ani = ani; - } +public class WorkOrders extends ESBean implements UKAgg { + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * + */ + + private String id = MainUtils.getUUID(); + + private String orderno; //工单编号 + private String sessionid; + + private String title; //标题 + private String content; //内容 + private float price; //问题价格 + private String keyword; //关键词 + private String summary; //摘要 + private boolean anonymous; //修改功能 未 是否有上传附件 + + private boolean top; //是否置顶 + private boolean essence; //是否精华 + private boolean accept; //是否已采纳最佳答案 + private boolean finish; //结贴 + + private int answers; //回答数量 + + + private int views; //阅读数量 + private int followers; //关注数量 + private int collections; //收藏数量 + private int comments; //评论数量 + private boolean frommobile; //是否移动端提问 + private String status; // 状态 + private String wotype; //工单类型 + private boolean datastatus; //数据状态，是否删除 , 逻辑删除 + + private String taskid; + private String orderid; + + private String dataid; + private String eventid; + + private String ani; + + private String cate; //工单分类 + + private String priority; //优先级 + + private Contacts contacts; + private String cusid; + + private String initiator; //发起人 ， 可以是多人发起的工单 + + private String bpmid; + + private String tags; + + private String accdept;// 受理部门 + private String accuser; //受理人 + + private boolean assigned; //已分配 + + private String username; + private String orgi; + private String creater; + + private Date createtime = new Date(); + + private Date updatetime = new Date(); + private String memo; + + + private String organ; // + private String agent; // + + private String shares; + + private String skill; + private int rowcount; + private String key; //变更用处，修改为 OrderID + + + private User user; + + private User current; //当前处理人 + + private Organ currentorgan; //处理部门 + + private Favorites fav; + + + /** + * @return the id + */ + @Id + @Column(length = 32) + @GeneratedValue(generator = "paymentableGenerator") + @GenericGenerator(name = "paymentableGenerator", strategy = "assigned") + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + @Transient + public String getSessionid() { + return sessionid; + } + + public void setSessionid(String sessionid) { + this.sessionid = sessionid; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public float getPrice() { + return price; + } + + public void setPrice(float price) { + this.price = price; + } + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + + public String getSummary() { + return summary; + } + + public void setSummary(String summary) { + this.summary = summary; + } + + public boolean isAnonymous() { + return anonymous; + } + + public void setAnonymous(boolean anonymous) { + this.anonymous = anonymous; + } + + public String getWotype() { + return wotype; + } + + public void setWotype(String wotype) { + this.wotype = wotype; + } + + public String getPriority() { + return priority; + } + + public void setPriority(String priority) { + this.priority = priority; + } + + @Transient + public Contacts getContacts() { + return contacts; + } + + public void setContacts(Contacts contacts) { + this.contacts = contacts; + } + + public String getCusid() { + return cusid; + } + + public void setCusid(String cusid) { + this.cusid = cusid; + } + + 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; + } + + public boolean isAssigned() { + return assigned; + } + + public void setAssigned(boolean assigned) { + this.assigned = assigned; + } + + public int getAnswers() { + return answers; + } + + public void setAnswers(int answers) { + this.answers = answers; + } + + @Column(name = "sviews") + public int getViews() { + return views; + } + + public void setViews(int views) { + this.views = views; + } + + public int getFollowers() { + return followers; + } + + public void setFollowers(int followers) { + this.followers = followers; + } + + public int getCollections() { + return collections; + } + + public void setCollections(int collections) { + this.collections = collections; + } + + public int getComments() { + return comments; + } + + public void setComments(int comments) { + this.comments = comments; + } + + public boolean isFrommobile() { + return frommobile; + } + + public void setFrommobile(boolean frommobile) { + this.frommobile = frommobile; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getOrgi() { + return orgi; + } + + public void setOrgi(String orgi) { + this.orgi = orgi; + } + + 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 Date getUpdatetime() { + return updatetime; + } + + public void setUpdatetime(Date updatetime) { + this.updatetime = updatetime; + } + + public String getMemo() { + return memo; + } + + public void setMemo(String memo) { + this.memo = memo; + } + + public String getOrgan() { + return organ; + } + + public void setOrgan(String organ) { + this.organ = organ; + } + + public String getAgent() { + return agent; + } + + public void setAgent(String agent) { + this.agent = agent; + } + + public String getSkill() { + return skill; + } + + public void setSkill(String skill) { + this.skill = skill; + } + + public String getCate() { + return cate; + } + + public void setCate(String cate) { + this.cate = cate; + } + + public boolean isTop() { + return top; + } + + public void setTop(boolean top) { + this.top = top; + } + + public boolean isEssence() { + return essence; + } + + public void setEssence(boolean essence) { + this.essence = essence; + } + + public boolean isAccept() { + return accept; + } + + public void setAccept(boolean accept) { + this.accept = accept; + } + + public boolean isFinish() { + return finish; + } + + public void setFinish(boolean finish) { + this.finish = finish; + } + + @Transient + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + @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 String getOrderno() { + return orderno; + } + + public void setOrderno(String orderno) { + this.orderno = orderno; + } + + public String getShares() { + return shares; + } + + public void setShares(String shares) { + this.shares = shares; + } + + public String getInitiator() { + return initiator; + } + + public void setInitiator(String initiator) { + this.initiator = initiator; + } + + public boolean isDatastatus() { + return datastatus; + } + + public void setDatastatus(boolean datastatus) { + this.datastatus = datastatus; + } + + public String getTags() { + return tags; + } + + public void setTags(String tags) { + this.tags = tags; + } + + public String getBpmid() { + return bpmid; + } + + public void setBpmid(String bpmid) { + this.bpmid = bpmid; + } + + @Transient + public Favorites getFav() { + return fav; + } + + public void setFav(Favorites fav) { + this.fav = fav; + } + + @Transient + public User getCurrent() { + return current; + } + + public void setCurrent(User current) { + this.current = current; + } + + @Transient + public Organ getCurrentorgan() { + return currentorgan; + } + + public void setCurrentorgan(Organ currentorgan) { + this.currentorgan = currentorgan; + } + + @Transient + public String getTaskid() { + return taskid; + } + + public void setTaskid(String taskid) { + this.taskid = taskid; + } + + @Transient + public String getOrderid() { + return orderid; + } + + public void setOrderid(String orderid) { + this.orderid = orderid; + } + + public String getDataid() { + return dataid; + } + + public void setDataid(String dataid) { + this.dataid = dataid; + } + + public String getEventid() { + return eventid; + } + + public void setEventid(String eventid) { + this.eventid = eventid; + } + + public String getAni() { + return ani; + } + + public void setAni(String ani) { + this.ani = ani; + } } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/socketio/message/ChatMessage.java b/contact-center/app/src/main/java/com/chatopera/cc/socketio/message/ChatMessage.java index b67b33fe..4716dff7 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/socketio/message/ChatMessage.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/socketio/message/ChatMessage.java @@ -1,525 +1,525 @@ -/* - * Copyright (C) 2017 优客服-多渠道客服系统 - * Modifications copyright (C) 2019 Chatopera Inc, - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.chatopera.cc.socketio.message; - -import com.chatopera.cc.basic.MainUtils; -import com.chatopera.cc.proxy.OnlineUserProxy; -import org.apache.commons.lang3.StringUtils; -import org.hibernate.annotations.GenericGenerator; -import org.springframework.data.elasticsearch.annotations.Document; - -import javax.persistence.*; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -@Entity -@Table(name = "uk_chat_message") -@Document(indexName = "cskefu", type = "chat_message") -@org.hibernate.annotations.Proxy(lazy = false) -public class ChatMessage implements java.io.Serializable { - /** - * - */ - private static final long serialVersionUID = 3520656734252136303L; - - private String id = MainUtils.getUUID(); - private String appid; - private String userid; - private String username; - - private String aiid; - private String touser; - - private boolean cooperation; - - private String msgtype; - private String creater; - private String usession; - private String agentserviceid; - - private String sessionid; //增加记录 AI 的 Client Session ID - - private String topicid; //命中的 知识库 ID - private String topicatid; //命中的知识库分类ID - private boolean topic; //是否命中知识库 - private boolean aichat; //是否和AI提问 - - private String message; - private String expmsg; // 语音消息时，显示为ASR的识别结果，文字消息时，显示为附带的动态业务字段 - - private String orgi; - private String channel; - private String model; //消息所属模块， WebIM/EntIM - private String chatype; //对话类型，是私聊还是群聊 或者是智能机器人对话 - private Date lastagentmsgtime; //前一条的坐席发送消息时间 - private Date lastmsgtime; //前一条的访客发送消息时间 - private int agentreplytime; //坐席回复消息时长 单位：秒 - private int agentreplyinterval;//坐席回复消息时间间隔 ， 单位：秒 - - private String batid; //变更用处，修改为是否有协作保存的图片 - - private String headimgurl; //用户头像 ，临时用 - - private String filename; //文件名 - private int filesize; //文件尺寸 - private String attachmentid; //附件ID - - private boolean datastatus; //数据状态，是否已撤回消息 - - private String mediaid; - private String locx; //location x - private String locy; //location y - - private long updatetime = System.currentTimeMillis(); - - private int duration; //音频时长 - - private String scale; //地图级别 - private String suggestmsg; //推荐消息 - - private int tokenum; //当前未读消息数量 - private String agentuser; - - /** - * 在发送消息 intervented = true 时 - * 代表该消息时会话监控人员发送的 - * supervisorname: 坐席监控人员名字 - * creater: 坐席监控人员的ID - */ - private boolean intervented; // 是否是会话监控发出的干预消息 - // 坐席监控人员的名字 - private String supervisorname; - - private boolean islabel; //是否添加标记 - - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getUserid() { - return userid; - } - - public String getUserid(String userid) { - return userid; - } - - public void setUserid(String userid) { - this.userid = userid; - } - - public String getUsession() { - return usession; - } - - public void setUsession(String usession) { - this.usession = usession; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public String getOrgi() { - return orgi; - } - - public void setOrgi(String orgi) { - this.orgi = orgi; - } - - public String getTouser() { - return touser; - } - - public void setTouser(String touser) { - this.touser = touser; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getChannel() { - return channel; - } - - public void setChannel(String channel) { - this.channel = channel; - } - - private String type; // 类型有两种 ， 一种 message ， 一种 writing - private String contextid; - private String calltype; - - // @Field(type = FieldType.Date, format = DateFormat.custom,pattern = "yyyy-MM-dd") -// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd",timezone="GMT+8") - private Date createtime = new Date(); - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getContextid() { - return contextid; - } - - public void setContextid(String contextid) { - this.contextid = contextid; - } - - public String getCalltype() { - return calltype; - } - - public void setCalltype(String calltype) { - this.calltype = calltype; - } - - public Date getCreatetime() { - return createtime; - } - - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - - @Id - @Column(length = 32) - @GeneratedValue(generator = "system-uuid") - @GenericGenerator(name = "system-uuid", strategy = "assigned") - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getModel() { - return model; - } - - public void setModel(String model) { - this.model = model; - } - - public String getChatype() { - return chatype; - } - - public void setChatype(String chatype) { - this.chatype = chatype; - } - - public String getAgentserviceid() { - return agentserviceid; - } - - public void setAgentserviceid(String agentserviceid) { - this.agentserviceid = agentserviceid; - } - - @Transient - public int getTokenum() { - return tokenum; - } - - public void setTokenum(int tokenum) { - this.tokenum = tokenum; - } - - public boolean isIslabel() { - return islabel; - } - - public void setIslabel(boolean islabel) { - this.islabel = islabel; - } - - @Transient - public String getAgentuser() { - return agentuser; - } - - public void setAgentuser(String agentuser) { - this.agentuser = agentuser; - } - - @Transient - public String getHeadimgurl() { - return headimgurl; - } - - public void setHeadimgurl(String headimgurl) { - this.headimgurl = headimgurl; - } - - public String getMsgtype() { - return msgtype; - } - - public void setMsgtype(String msgtype) { - this.msgtype = msgtype; - } - - public String getCreater() { - return creater; - } - - public void setCreater(String creater) { - this.creater = creater; - } - - public String getMediaid() { - return mediaid; - } - - public void setMediaid(String mediaid) { - this.mediaid = mediaid; - } - - public String getLocx() { - return locx; - } - - public void setLocx(String locx) { - this.locx = locx; - } - - public String getLocy() { - return locy; - } - - public void setLocy(String locy) { - this.locy = locy; - } - - public int getDuration() { - return duration; - } - - public void setDuration(int duration) { - this.duration = duration; - } - - public String getScale() { - return scale; - } - - public void setScale(String scale) { - this.scale = scale; - } - - public long getUpdatetime() { - return updatetime; - } - - public void setUpdatetime(long updatetime) { - this.updatetime = updatetime; - } - - public String getFilename() { - return filename; - } - - public void setFilename(String filename) { - this.filename = filename; - } - - public int getFilesize() { - return filesize; - } - - public void setFilesize(int filesize) { - this.filesize = filesize; - } - - public String getAttachmentid() { - return attachmentid; - } - - public void setAttachmentid(String attachmentid) { - this.attachmentid = attachmentid; - } - - public Date getLastagentmsgtime() { - return lastagentmsgtime; - } - - public void setLastagentmsgtime(Date lastagentmsgtime) { - this.lastagentmsgtime = lastagentmsgtime; - } - - public int getAgentreplytime() { - return agentreplytime; - } - - public void setAgentreplytime(int agentreplytime) { - this.agentreplytime = agentreplytime; - } - - public Date getLastmsgtime() { - return lastmsgtime; - } - - public void setLastmsgtime(Date lastmsgtime) { - this.lastmsgtime = lastmsgtime; - } - - public int getAgentreplyinterval() { - return agentreplyinterval; - } - - public void setAgentreplyinterval(int agentreplyinterval) { - this.agentreplyinterval = agentreplyinterval; - } - - public String getSessionid() { - return sessionid; - } - - public void setSessionid(String sessionid) { - this.sessionid = sessionid; - } - - public String getBatid() { - return batid; - } - - public void setBatid(String batid) { - this.batid = batid; - } - - public boolean isCooperation() { - return cooperation; - } - - public void setCooperation(boolean cooperation) { - this.cooperation = cooperation; - } - - public boolean isDatastatus() { - return datastatus; - } - - public void setDatastatus(boolean datastatus) { - this.datastatus = datastatus; - } - - public String getTopicid() { - return topicid; - } - - public void setTopicid(String topicid) { - this.topicid = topicid; - } - - public String getTopicatid() { - return topicatid; - } - - public void setTopicatid(String topicatid) { - this.topicatid = topicatid; - } - - public boolean isTopic() { - return topic; - } - - public void setTopic(boolean topic) { - this.topic = topic; - } - - public boolean isAichat() { - return aichat; - } - - public void setAichat(boolean aichat) { - this.aichat = aichat; - } - - public String getAiid() { - return aiid; - } - - public void setAiid(String aiid) { - this.aiid = aiid; - } - - public String getExpmsg() { - return expmsg; - } - - public void setExpmsg(String expmsg) { - this.expmsg = expmsg; - } - - public String getSuggestmsg() { - return suggestmsg; - } - - public void setSuggestmsg(String suggestmsg) { - this.suggestmsg = suggestmsg; - } - - public String getSupervisorname() { - return supervisorname; - } - - public void setSupervisorname(String supervisorname) { - this.supervisorname = supervisorname; - } - - @Transient - public List getSuggest() { - List otherMessageItemList = null; - if (StringUtils.isNotBlank(this.getSuggestmsg())) { - try { - otherMessageItemList = OnlineUserProxy.objectMapper.readValue(this.getSuggestmsg(), OnlineUserProxy.getCollectionType(ArrayList.class, OtherMessageItem.class)); - } catch (Exception e) { - e.printStackTrace(); - } - } - return otherMessageItemList; - } - - public boolean isIntervented() { - return intervented; - } - - public void setIntervented(boolean intervented) { - this.intervented = intervented; - } -} +/* + * Copyright (C) 2017 优客服-多渠道客服系统 + * Modifications copyright (C) 2019 Chatopera Inc, + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.chatopera.cc.socketio.message; + +import com.chatopera.cc.basic.MainUtils; +import com.chatopera.cc.proxy.OnlineUserProxy; +import org.apache.commons.lang3.StringUtils; +import org.hibernate.annotations.GenericGenerator; +import org.springframework.data.elasticsearch.annotations.Document; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Entity +@Table(name = "uk_chat_message") +@Document(indexName = "chat_message", type = "chat_message") +@org.hibernate.annotations.Proxy(lazy = false) +public class ChatMessage implements java.io.Serializable { + /** + * + */ + private static final long serialVersionUID = 3520656734252136303L; + + private String id = MainUtils.getUUID(); + private String appid; + private String userid; + private String username; + + private String aiid; + private String touser; + + private boolean cooperation; + + private String msgtype; + private String creater; + private String usession; + private String agentserviceid; + + private String sessionid; //增加记录 AI 的 Client Session ID + + private String topicid; //命中的 知识库 ID + private String topicatid; //命中的知识库分类ID + private boolean topic; //是否命中知识库 + private boolean aichat; //是否和AI提问 + + private String message; + private String expmsg; // 语音消息时，显示为ASR的识别结果，文字消息时，显示为附带的动态业务字段 + + private String orgi; + private String channel; + private String model; //消息所属模块， WebIM/EntIM + private String chatype; //对话类型，是私聊还是群聊 或者是智能机器人对话 + private Date lastagentmsgtime; //前一条的坐席发送消息时间 + private Date lastmsgtime; //前一条的访客发送消息时间 + private int agentreplytime; //坐席回复消息时长 单位：秒 + private int agentreplyinterval;//坐席回复消息时间间隔 ， 单位：秒 + + private String batid; //变更用处，修改为是否有协作保存的图片 + + private String headimgurl; //用户头像 ，临时用 + + private String filename; //文件名 + private int filesize; //文件尺寸 + private String attachmentid; //附件ID + + private boolean datastatus; //数据状态，是否已撤回消息 + + private String mediaid; + private String locx; //location x + private String locy; //location y + + private long updatetime = System.currentTimeMillis(); + + private int duration; //音频时长 + + private String scale; //地图级别 + private String suggestmsg; //推荐消息 + + private int tokenum; //当前未读消息数量 + private String agentuser; + + /** + * 在发送消息 intervented = true 时 + * 代表该消息时会话监控人员发送的 + * supervisorname: 坐席监控人员名字 + * creater: 坐席监控人员的ID + */ + private boolean intervented; // 是否是会话监控发出的干预消息 + // 坐席监控人员的名字 + private String supervisorname; + + private boolean islabel; //是否添加标记 + + public String getAppid() { + return appid; + } + + public void setAppid(String appid) { + this.appid = appid; + } + + public String getUserid() { + return userid; + } + + public String getUserid(String userid) { + return userid; + } + + public void setUserid(String userid) { + this.userid = userid; + } + + public String getUsession() { + return usession; + } + + public void setUsession(String usession) { + this.usession = usession; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public String getOrgi() { + return orgi; + } + + public void setOrgi(String orgi) { + this.orgi = orgi; + } + + public String getTouser() { + return touser; + } + + public void setTouser(String touser) { + this.touser = touser; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getChannel() { + return channel; + } + + public void setChannel(String channel) { + this.channel = channel; + } + + private String type; // 类型有两种 ， 一种 message ， 一种 writing + private String contextid; + private String calltype; + + // @Field(type = FieldType.Date, format = DateFormat.custom,pattern = "yyyy-MM-dd") +// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd",timezone="GMT+8") + private Date createtime = new Date(); + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getContextid() { + return contextid; + } + + public void setContextid(String contextid) { + this.contextid = contextid; + } + + public String getCalltype() { + return calltype; + } + + public void setCalltype(String calltype) { + this.calltype = calltype; + } + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + @Id + @Column(length = 32) + @GeneratedValue(generator = "system-uuid") + @GenericGenerator(name = "system-uuid", strategy = "assigned") + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getModel() { + return model; + } + + public void setModel(String model) { + this.model = model; + } + + public String getChatype() { + return chatype; + } + + public void setChatype(String chatype) { + this.chatype = chatype; + } + + public String getAgentserviceid() { + return agentserviceid; + } + + public void setAgentserviceid(String agentserviceid) { + this.agentserviceid = agentserviceid; + } + + @Transient + public int getTokenum() { + return tokenum; + } + + public void setTokenum(int tokenum) { + this.tokenum = tokenum; + } + + public boolean isIslabel() { + return islabel; + } + + public void setIslabel(boolean islabel) { + this.islabel = islabel; + } + + @Transient + public String getAgentuser() { + return agentuser; + } + + public void setAgentuser(String agentuser) { + this.agentuser = agentuser; + } + + @Transient + public String getHeadimgurl() { + return headimgurl; + } + + public void setHeadimgurl(String headimgurl) { + this.headimgurl = headimgurl; + } + + public String getMsgtype() { + return msgtype; + } + + public void setMsgtype(String msgtype) { + this.msgtype = msgtype; + } + + public String getCreater() { + return creater; + } + + public void setCreater(String creater) { + this.creater = creater; + } + + public String getMediaid() { + return mediaid; + } + + public void setMediaid(String mediaid) { + this.mediaid = mediaid; + } + + public String getLocx() { + return locx; + } + + public void setLocx(String locx) { + this.locx = locx; + } + + public String getLocy() { + return locy; + } + + public void setLocy(String locy) { + this.locy = locy; + } + + public int getDuration() { + return duration; + } + + public void setDuration(int duration) { + this.duration = duration; + } + + public String getScale() { + return scale; + } + + public void setScale(String scale) { + this.scale = scale; + } + + public long getUpdatetime() { + return updatetime; + } + + public void setUpdatetime(long updatetime) { + this.updatetime = updatetime; + } + + public String getFilename() { + return filename; + } + + public void setFilename(String filename) { + this.filename = filename; + } + + public int getFilesize() { + return filesize; + } + + public void setFilesize(int filesize) { + this.filesize = filesize; + } + + public String getAttachmentid() { + return attachmentid; + } + + public void setAttachmentid(String attachmentid) { + this.attachmentid = attachmentid; + } + + public Date getLastagentmsgtime() { + return lastagentmsgtime; + } + + public void setLastagentmsgtime(Date lastagentmsgtime) { + this.lastagentmsgtime = lastagentmsgtime; + } + + public int getAgentreplytime() { + return agentreplytime; + } + + public void setAgentreplytime(int agentreplytime) { + this.agentreplytime = agentreplytime; + } + + public Date getLastmsgtime() { + return lastmsgtime; + } + + public void setLastmsgtime(Date lastmsgtime) { + this.lastmsgtime = lastmsgtime; + } + + public int getAgentreplyinterval() { + return agentreplyinterval; + } + + public void setAgentreplyinterval(int agentreplyinterval) { + this.agentreplyinterval = agentreplyinterval; + } + + public String getSessionid() { + return sessionid; + } + + public void setSessionid(String sessionid) { + this.sessionid = sessionid; + } + + public String getBatid() { + return batid; + } + + public void setBatid(String batid) { + this.batid = batid; + } + + public boolean isCooperation() { + return cooperation; + } + + public void setCooperation(boolean cooperation) { + this.cooperation = cooperation; + } + + public boolean isDatastatus() { + return datastatus; + } + + public void setDatastatus(boolean datastatus) { + this.datastatus = datastatus; + } + + public String getTopicid() { + return topicid; + } + + public void setTopicid(String topicid) { + this.topicid = topicid; + } + + public String getTopicatid() { + return topicatid; + } + + public void setTopicatid(String topicatid) { + this.topicatid = topicatid; + } + + public boolean isTopic() { + return topic; + } + + public void setTopic(boolean topic) { + this.topic = topic; + } + + public boolean isAichat() { + return aichat; + } + + public void setAichat(boolean aichat) { + this.aichat = aichat; + } + + public String getAiid() { + return aiid; + } + + public void setAiid(String aiid) { + this.aiid = aiid; + } + + public String getExpmsg() { + return expmsg; + } + + public void setExpmsg(String expmsg) { + this.expmsg = expmsg; + } + + public String getSuggestmsg() { + return suggestmsg; + } + + public void setSuggestmsg(String suggestmsg) { + this.suggestmsg = suggestmsg; + } + + public String getSupervisorname() { + return supervisorname; + } + + public void setSupervisorname(String supervisorname) { + this.supervisorname = supervisorname; + } + + @Transient + public List getSuggest() { + List otherMessageItemList = null; + if (StringUtils.isNotBlank(this.getSuggestmsg())) { + try { + otherMessageItemList = OnlineUserProxy.objectMapper.readValue(this.getSuggestmsg(), OnlineUserProxy.getCollectionType(ArrayList.class, OtherMessageItem.class)); + } catch (Exception e) { + e.printStackTrace(); + } + } + return otherMessageItemList; + } + + public boolean isIntervented() { + return intervented; + } + + public void setIntervented(boolean intervented) { + this.intervented = intervented; + } +}