Skip to content

C
chuanshan_gov_platform
Commit ed872caf authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

知识库代码调整

parent 615d9fdd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2478 additions and 2250 deletions
knowledge-base/src/main/java/com/mortals/xhx/module/error/model/ErrorRecoveryEntity.java
View file @ ed872caf
...@@ -8,250 +8,268 @@ import com.mortals.framework.annotation.Excel; ...@@ -8,250 +8,268 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.error.model.vo.ErrorRecoveryVo; import com.mortals.xhx.module.error.model.vo.ErrorRecoveryVo;
/** /**
* 纠错管理实体对象 * 纠错管理实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-03-01 * @date 2023-03-13
*/ */
public class ErrorRecoveryEntity extends ErrorRecoveryVo { public class ErrorRecoveryEntity extends ErrorRecoveryVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 站点id * 站点id
*/ */
private Long siteId; private Long siteId;
/** /**
* 纠错标题 * 纠错标题
*/ */
private String errorTitle; private String errorTitle;
/** /**
* 事件位置 * 事件位置
*/ */
private String matterSite; private String matterSite;
/** /**
* 具体内容 * 关联事项名称
*/ */
private String matterName;
/**
* 具体内容
*/
private String substance; private String substance;
/** /**
* 附件地址 * 附件地址
*/ */
private String annexUrl; private String annexUrl;
/** /**
* 建议答复 * 建议答复
*/ */
private String formalReply; private String formalReply;
/** /**
* 纠错用户id * 纠错用户id
*/ */
private Long submitUserId; private Long submitUserId;
/** /**
* 纠错用户名称 * 纠错用户名称
*/ */
private String submitUserName; private String submitUserName;
/** /**
* 提交时间 * 提交时间
*/ */
private Date submitDate; private Date submitDate;
/** /**
* 处理状态，0：未处理，1：已处理 * 处理状态，0：未处理，1：已处理
*/ */
private Integer status; private Integer status;
/** /**
* 处理用户id * 处理用户id
*/ */
private Long answerUserId; private Long answerUserId;
/** /**
* 处理用户名称 * 处理用户名称
*/ */
private String answerUserName; private String answerUserName;
/** /**
* 处理时间 * 处理时间
*/ */
private Date answerDate; private Date answerDate;
public ErrorRecoveryEntity(){} public ErrorRecoveryEntity(){}
/** /**
* 获取 站点id * 获取 站点id
* @return Long * @return Long
*/ */
public Long getSiteId(){ public Long getSiteId(){
return siteId; return siteId;
} }
/** /**
* 设置 站点id * 设置 站点id
* @param siteId * @param siteId
*/ */
public void setSiteId(Long siteId){ public void setSiteId(Long siteId){
this.siteId = siteId; this.siteId = siteId;
} }
/** /**
* 获取 纠错标题 * 获取 纠错标题
* @return String * @return String
*/ */
public String getErrorTitle(){ public String getErrorTitle(){
return errorTitle; return errorTitle;
} }
/** /**
* 设置 纠错标题 * 设置 纠错标题
* @param errorTitle * @param errorTitle
*/ */
public void setErrorTitle(String errorTitle){ public void setErrorTitle(String errorTitle){
this.errorTitle = errorTitle; this.errorTitle = errorTitle;
} }
/** /**
* 获取 事件位置 * 获取 事件位置
* @return String * @return String
*/ */
public String getMatterSite(){ public String getMatterSite(){
return matterSite; return matterSite;
} }
/** /**
* 设置 事件位置 * 设置 事件位置
* @param matterSite * @param matterSite
*/ */
public void setMatterSite(String matterSite){ public void setMatterSite(String matterSite){
this.matterSite = matterSite; this.matterSite = matterSite;
} }
/** /**
* 获取 具体内容 * 获取 关联事项名称
* @return String * @return String
*/ */
public String getMatterName(){
return matterName;
}
/**
* 设置 关联事项名称
* @param matterName
*/
public void setMatterName(String matterName){
this.matterName = matterName;
}
/**
* 获取 具体内容
* @return String
*/
public String getSubstance(){ public String getSubstance(){
return substance; return substance;
} }
/** /**
* 设置 具体内容 * 设置 具体内容
* @param substance * @param substance
*/ */
public void setSubstance(String substance){ public void setSubstance(String substance){
this.substance = substance; this.substance = substance;
} }
/** /**
* 获取 附件地址 * 获取 附件地址
* @return String * @return String
*/ */
public String getAnnexUrl(){ public String getAnnexUrl(){
return annexUrl; return annexUrl;
} }
/** /**
* 设置 附件地址 * 设置 附件地址
* @param annexUrl * @param annexUrl
*/ */
public void setAnnexUrl(String annexUrl){ public void setAnnexUrl(String annexUrl){
this.annexUrl = annexUrl; this.annexUrl = annexUrl;
} }
/** /**
* 获取 建议答复 * 获取 建议答复
* @return String * @return String
*/ */
public String getFormalReply(){ public String getFormalReply(){
return formalReply; return formalReply;
} }
/** /**
* 设置 建议答复 * 设置 建议答复
* @param formalReply * @param formalReply
*/ */
public void setFormalReply(String formalReply){ public void setFormalReply(String formalReply){
this.formalReply = formalReply; this.formalReply = formalReply;
} }
/** /**
* 获取 纠错用户id * 获取 纠错用户id
* @return Long * @return Long
*/ */
public Long getSubmitUserId(){ public Long getSubmitUserId(){
return submitUserId; return submitUserId;
} }
/** /**
* 设置 纠错用户id * 设置 纠错用户id
* @param submitUserId * @param submitUserId
*/ */
public void setSubmitUserId(Long submitUserId){ public void setSubmitUserId(Long submitUserId){
this.submitUserId = submitUserId; this.submitUserId = submitUserId;
} }
/** /**
* 获取 纠错用户名称 * 获取 纠错用户名称
* @return String * @return String
*/ */
public String getSubmitUserName(){ public String getSubmitUserName(){
return submitUserName; return submitUserName;
} }
/** /**
* 设置 纠错用户名称 * 设置 纠错用户名称
* @param submitUserName * @param submitUserName
*/ */
public void setSubmitUserName(String submitUserName){ public void setSubmitUserName(String submitUserName){
this.submitUserName = submitUserName; this.submitUserName = submitUserName;
} }
/** /**
* 获取 提交时间 * 获取 提交时间
* @return Date * @return Date
*/ */
public Date getSubmitDate(){ public Date getSubmitDate(){
return submitDate; return submitDate;
} }
/** /**
* 设置 提交时间 * 设置 提交时间
* @param submitDate * @param submitDate
*/ */
public void setSubmitDate(Date submitDate){ public void setSubmitDate(Date submitDate){
this.submitDate = submitDate; this.submitDate = submitDate;
} }
/** /**
* 获取 处理状态，0：未处理，1：已处理 * 获取 处理状态，0：未处理，1：已处理
* @return Integer * @return Integer
*/ */
public Integer getStatus(){ public Integer getStatus(){
return status; return status;
} }
/** /**
* 设置 处理状态，0：未处理，1：已处理 * 设置 处理状态，0：未处理，1：已处理
* @param status * @param status
*/ */
public void setStatus(Integer status){ public void setStatus(Integer status){
this.status = status; this.status = status;
} }
/** /**
* 获取 处理用户id * 获取 处理用户id
* @return Long * @return Long
*/ */
public Long getAnswerUserId(){ public Long getAnswerUserId(){
return answerUserId; return answerUserId;
} }
/** /**
* 设置 处理用户id * 设置 处理用户id
* @param answerUserId * @param answerUserId
*/ */
public void setAnswerUserId(Long answerUserId){ public void setAnswerUserId(Long answerUserId){
this.answerUserId = answerUserId; this.answerUserId = answerUserId;
} }
/** /**
* 获取 处理用户名称 * 获取 处理用户名称
* @return String * @return String
*/ */
public String getAnswerUserName(){ public String getAnswerUserName(){
return answerUserName; return answerUserName;
} }
/** /**
* 设置 处理用户名称 * 设置 处理用户名称
* @param answerUserName * @param answerUserName
*/ */
public void setAnswerUserName(String answerUserName){ public void setAnswerUserName(String answerUserName){
this.answerUserName = answerUserName; this.answerUserName = answerUserName;
} }
/** /**
* 获取 处理时间 * 获取 处理时间
* @return Date * @return Date
*/ */
public Date getAnswerDate(){ public Date getAnswerDate(){
return answerDate; return answerDate;
} }
/** /**
* 设置 处理时间 * 设置 处理时间
* @param answerDate * @param answerDate
*/ */
public void setAnswerDate(Date answerDate){ public void setAnswerDate(Date answerDate){
this.answerDate = answerDate; this.answerDate = answerDate;
} }
...@@ -261,7 +279,7 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo { ...@@ -261,7 +279,7 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo {
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -269,7 +287,7 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo { ...@@ -269,7 +287,7 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo {
if (obj instanceof ErrorRecoveryEntity) { if (obj instanceof ErrorRecoveryEntity) {
ErrorRecoveryEntity tmp = (ErrorRecoveryEntity) obj; ErrorRecoveryEntity tmp = (ErrorRecoveryEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -280,6 +298,7 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo { ...@@ -280,6 +298,7 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo {
sb.append(",siteId:").append(getSiteId()); sb.append(",siteId:").append(getSiteId());
sb.append(",errorTitle:").append(getErrorTitle()); sb.append(",errorTitle:").append(getErrorTitle());
sb.append(",matterSite:").append(getMatterSite()); sb.append(",matterSite:").append(getMatterSite());
sb.append(",matterName:").append(getMatterName());
sb.append(",substance:").append(getSubstance()); sb.append(",substance:").append(getSubstance());
sb.append(",annexUrl:").append(getAnnexUrl()); sb.append(",annexUrl:").append(getAnnexUrl());
sb.append(",formalReply:").append(getFormalReply()); sb.append(",formalReply:").append(getFormalReply());
...@@ -295,30 +314,32 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo { ...@@ -295,30 +314,32 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo {
public void initAttrValue(){ public void initAttrValue(){
this.siteId = null; this.siteId = null;
this.errorTitle = "";
this.errorTitle = ""; this.matterSite = "";
this.matterSite = ""; this.matterName = "";
this.substance = "1"; this.substance = "1";
this.annexUrl = ""; this.annexUrl = "";
this.formalReply = ""; this.formalReply = "";
this.submitUserId = null; this.submitUserId = null;
this.submitUserName = ""; this.submitUserName = "";
this.submitDate = null; this.submitDate = null;
this.status = 0; this.status = 0;
this.answerUserId = null; this.answerUserId = null;
this.answerUserName = ""; this.answerUserName = "";
this.answerDate = null; this.answerDate = null;
} }
} }
\ No newline at end of file
knowledge-base/src/main/java/com/mortals/xhx/module/user/model/UserCollectEntity.java
View file @ ed872caf
...@@ -7,98 +7,116 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,98 +7,116 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.user.model.vo.UserCollectVo; import com.mortals.xhx.module.user.model.vo.UserCollectVo;
/** /**
* 用户收藏夹实体对象 * 用户收藏夹实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-03-09 * @date 2023-03-13
*/ */
public class UserCollectEntity extends UserCollectVo { public class UserCollectEntity extends UserCollectVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 用户id * 用户id
*/ */
private Long userId; private Long userId;
/** /**
* 收藏类型1单事项2一件事 * 收藏类型1单事项2一件事
*/ */
private Integer collectType; private Integer collectType;
/** /**
* 收藏名称 * 收藏名称
*/ */
private String collectName; private String collectName;
/** /**
* 收藏链接 * 收藏链接
*/ */
private String collectUrl; private String collectUrl;
/**
* 收藏关联业务id
*/
private String businessId;
public UserCollectEntity(){} public UserCollectEntity(){}
/** /**
* 获取 用户id * 获取 用户id
* @return Long * @return Long
*/ */
public Long getUserId(){ public Long getUserId(){
return userId; return userId;
} }
/** /**
* 设置 用户id * 设置 用户id
* @param userId * @param userId
*/ */
public void setUserId(Long userId){ public void setUserId(Long userId){
this.userId = userId; this.userId = userId;
} }
/** /**
* 获取 收藏类型1单事项2一件事 * 获取 收藏类型1单事项2一件事
* @return Integer * @return Integer
*/ */
public Integer getCollectType(){ public Integer getCollectType(){
return collectType; return collectType;
} }
/** /**
* 设置 收藏类型1单事项2一件事 * 设置 收藏类型1单事项2一件事
* @param collectType * @param collectType
*/ */
public void setCollectType(Integer collectType){ public void setCollectType(Integer collectType){
this.collectType = collectType; this.collectType = collectType;
} }
/** /**
* 获取 收藏名称 * 获取 收藏名称
* @return String * @return String
*/ */
public String getCollectName(){ public String getCollectName(){
return collectName; return collectName;
} }
/** /**
* 设置 收藏名称 * 设置 收藏名称
* @param collectName * @param collectName
*/ */
public void setCollectName(String collectName){ public void setCollectName(String collectName){
this.collectName = collectName; this.collectName = collectName;
} }
/** /**
* 获取 收藏链接 * 获取 收藏链接
* @return String * @return String
*/ */
public String getCollectUrl(){ public String getCollectUrl(){
return collectUrl; return collectUrl;
} }
/** /**
* 设置 收藏链接 * 设置 收藏链接
* @param collectUrl * @param collectUrl
*/ */
public void setCollectUrl(String collectUrl){ public void setCollectUrl(String collectUrl){
this.collectUrl = collectUrl; this.collectUrl = collectUrl;
} }
/**
* 获取 收藏关联业务id
* @return String
*/
public String getBusinessId(){
return businessId;
}
/**
* 设置 收藏关联业务id
* @param businessId
*/
public void setBusinessId(String businessId){
this.businessId = businessId;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -106,7 +124,7 @@ public class UserCollectEntity extends UserCollectVo { ...@@ -106,7 +124,7 @@ public class UserCollectEntity extends UserCollectVo {
if (obj instanceof UserCollectEntity) { if (obj instanceof UserCollectEntity) {
UserCollectEntity tmp = (UserCollectEntity) obj; UserCollectEntity tmp = (UserCollectEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -118,17 +136,20 @@ public class UserCollectEntity extends UserCollectVo { ...@@ -118,17 +136,20 @@ public class UserCollectEntity extends UserCollectVo {
sb.append(",collectType:").append(getCollectType()); sb.append(",collectType:").append(getCollectType());
sb.append(",collectName:").append(getCollectName()); sb.append(",collectName:").append(getCollectName());
sb.append(",collectUrl:").append(getCollectUrl()); sb.append(",collectUrl:").append(getCollectUrl());
sb.append(",businessId:").append(getBusinessId());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.userId = null; this.userId = null;
this.collectType = 1;
this.collectType = 1; this.collectName = "";
this.collectName = ""; this.collectUrl = "";
this.collectUrl = ""; this.businessId = "";
} }
} }
\ No newline at end of file
knowledge-base/src/main/resources/bootstrap.yml
View file @ ed872caf
...@@ -16,12 +16,6 @@ spring: ...@@ -16,12 +16,6 @@ spring:
default-property-inclusion: NON_NULL default-property-inclusion: NON_NULL
# time-zone: GMT+8 # time-zone: GMT+8
# date-format: yyyy-MM-dd HH:mm:ss # date-format: yyyy-MM-dd HH:mm:ss
rabbitmq:
host: @profiles.rabbitmq.host@
port: @profiles.rabbitmq.port@
username: @profiles.rabbitmq.username@
password: @profiles.rabbitmq.password@
virtualHost: @profiles.rabbitmq.virtualhost@
dao: dao:
exceptiontranslation: exceptiontranslation:
enabled: false enabled: false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment