Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
chuanshan_gov_platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
廖旭伟
chuanshan_gov_platform
Commits
ed872caf
Commit
ed872caf
authored
Mar 13, 2023
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
知识库代码调整
parent
615d9fdd
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
2478 additions
and
2250 deletions
+2478
-2250
knowledge-base/src/main/java/com/mortals/xhx/module/error/model/ErrorRecoveryEntity.java
...m/mortals/xhx/module/error/model/ErrorRecoveryEntity.java
+145
-124
knowledge-base/src/main/java/com/mortals/xhx/module/error/model/ErrorRecoveryQuery.java
...om/mortals/xhx/module/error/model/ErrorRecoveryQuery.java
+724
-668
knowledge-base/src/main/java/com/mortals/xhx/module/user/model/UserCollectEntity.java
.../com/mortals/xhx/module/user/model/UserCollectEntity.java
+64
-43
knowledge-base/src/main/java/com/mortals/xhx/module/user/model/UserCollectQuery.java
...a/com/mortals/xhx/module/user/model/UserCollectQuery.java
+465
-409
knowledge-base/src/main/resources/bootstrap.yml
knowledge-base/src/main/resources/bootstrap.yml
+0
-6
knowledge-base/src/main/resources/sqlmap/module/error/ErrorRecoveryMapper.xml
...ain/resources/sqlmap/module/error/ErrorRecoveryMapper.xml
+698
-658
knowledge-base/src/main/resources/sqlmap/module/user/UserCollectMapper.xml
...c/main/resources/sqlmap/module/user/UserCollectMapper.xml
+382
-342
No files found.
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;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.xhx.module.error.model.vo.ErrorRecoveryVo
;
/**
* 纠错管理实体对象
*
* @author zxfei
* @date 2023-03-01
*/
* 纠错管理实体对象
*
* @author zxfei
* @date 2023-03-13
*/
public
class
ErrorRecoveryEntity
extends
ErrorRecoveryVo
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 站点id
*/
* 站点id
*/
private
Long
siteId
;
/**
* 纠错标题
*/
* 纠错标题
*/
private
String
errorTitle
;
/**
* 事件位置
*/
* 事件位置
*/
private
String
matterSite
;
/**
* 具体内容
*/
* 关联事项名称
*/
private
String
matterName
;
/**
* 具体内容
*/
private
String
substance
;
/**
* 附件地址
*/
* 附件地址
*/
private
String
annexUrl
;
/**
* 建议答复
*/
* 建议答复
*/
private
String
formalReply
;
/**
* 纠错用户id
*/
* 纠错用户id
*/
private
Long
submitUserId
;
/**
* 纠错用户名称
*/
* 纠错用户名称
*/
private
String
submitUserName
;
/**
* 提交时间
*/
* 提交时间
*/
private
Date
submitDate
;
/**
* 处理状态,0:未处理,1:已处理
*/
* 处理状态,0:未处理,1:已处理
*/
private
Integer
status
;
/**
* 处理用户id
*/
* 处理用户id
*/
private
Long
answerUserId
;
/**
* 处理用户名称
*/
* 处理用户名称
*/
private
String
answerUserName
;
/**
* 处理时间
*/
* 处理时间
*/
private
Date
answerDate
;
public
ErrorRecoveryEntity
(){}
/**
* 获取 站点id
* @return Long
*/
* 获取 站点id
* @return Long
*/
public
Long
getSiteId
(){
return
siteId
;
}
/**
* 设置 站点id
* @param siteId
*/
* 设置 站点id
* @param siteId
*/
public
void
setSiteId
(
Long
siteId
){
this
.
siteId
=
siteId
;
}
/**
* 获取 纠错标题
* @return String
*/
* 获取 纠错标题
* @return String
*/
public
String
getErrorTitle
(){
return
errorTitle
;
}
/**
* 设置 纠错标题
* @param errorTitle
*/
* 设置 纠错标题
* @param errorTitle
*/
public
void
setErrorTitle
(
String
errorTitle
){
this
.
errorTitle
=
errorTitle
;
}
/**
* 获取 事件位置
* @return String
*/
* 获取 事件位置
* @return String
*/
public
String
getMatterSite
(){
return
matterSite
;
}
/**
* 设置 事件位置
* @param matterSite
*/
* 设置 事件位置
* @param matterSite
*/
public
void
setMatterSite
(
String
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
(){
return
substance
;
}
/**
* 设置 具体内容
* @param substance
*/
* 设置 具体内容
* @param substance
*/
public
void
setSubstance
(
String
substance
){
this
.
substance
=
substance
;
}
/**
* 获取 附件地址
* @return String
*/
* 获取 附件地址
* @return String
*/
public
String
getAnnexUrl
(){
return
annexUrl
;
}
/**
* 设置 附件地址
* @param annexUrl
*/
* 设置 附件地址
* @param annexUrl
*/
public
void
setAnnexUrl
(
String
annexUrl
){
this
.
annexUrl
=
annexUrl
;
}
/**
* 获取 建议答复
* @return String
*/
* 获取 建议答复
* @return String
*/
public
String
getFormalReply
(){
return
formalReply
;
}
/**
* 设置 建议答复
* @param formalReply
*/
* 设置 建议答复
* @param formalReply
*/
public
void
setFormalReply
(
String
formalReply
){
this
.
formalReply
=
formalReply
;
}
/**
* 获取 纠错用户id
* @return Long
*/
* 获取 纠错用户id
* @return Long
*/
public
Long
getSubmitUserId
(){
return
submitUserId
;
}
/**
* 设置 纠错用户id
* @param submitUserId
*/
* 设置 纠错用户id
* @param submitUserId
*/
public
void
setSubmitUserId
(
Long
submitUserId
){
this
.
submitUserId
=
submitUserId
;
}
/**
* 获取 纠错用户名称
* @return String
*/
* 获取 纠错用户名称
* @return String
*/
public
String
getSubmitUserName
(){
return
submitUserName
;
}
/**
* 设置 纠错用户名称
* @param submitUserName
*/
* 设置 纠错用户名称
* @param submitUserName
*/
public
void
setSubmitUserName
(
String
submitUserName
){
this
.
submitUserName
=
submitUserName
;
}
/**
* 获取 提交时间
* @return Date
*/
* 获取 提交时间
* @return Date
*/
public
Date
getSubmitDate
(){
return
submitDate
;
}
/**
* 设置 提交时间
* @param submitDate
*/
* 设置 提交时间
* @param submitDate
*/
public
void
setSubmitDate
(
Date
submitDate
){
this
.
submitDate
=
submitDate
;
}
/**
* 获取 处理状态,0:未处理,1:已处理
* @return Integer
*/
* 获取 处理状态,0:未处理,1:已处理
* @return Integer
*/
public
Integer
getStatus
(){
return
status
;
}
/**
* 设置 处理状态,0:未处理,1:已处理
* @param status
*/
* 设置 处理状态,0:未处理,1:已处理
* @param status
*/
public
void
setStatus
(
Integer
status
){
this
.
status
=
status
;
}
/**
* 获取 处理用户id
* @return Long
*/
* 获取 处理用户id
* @return Long
*/
public
Long
getAnswerUserId
(){
return
answerUserId
;
}
/**
* 设置 处理用户id
* @param answerUserId
*/
* 设置 处理用户id
* @param answerUserId
*/
public
void
setAnswerUserId
(
Long
answerUserId
){
this
.
answerUserId
=
answerUserId
;
}
/**
* 获取 处理用户名称
* @return String
*/
* 获取 处理用户名称
* @return String
*/
public
String
getAnswerUserName
(){
return
answerUserName
;
}
/**
* 设置 处理用户名称
* @param answerUserName
*/
* 设置 处理用户名称
* @param answerUserName
*/
public
void
setAnswerUserName
(
String
answerUserName
){
this
.
answerUserName
=
answerUserName
;
}
/**
* 获取 处理时间
* @return Date
*/
* 获取 处理时间
* @return Date
*/
public
Date
getAnswerDate
(){
return
answerDate
;
}
/**
* 设置 处理时间
* @param answerDate
*/
* 设置 处理时间
* @param answerDate
*/
public
void
setAnswerDate
(
Date
answerDate
){
this
.
answerDate
=
answerDate
;
}
...
...
@@ -261,7 +279,7 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo {
@Override
public
int
hashCode
()
{
return
this
.
getId
().
hashCode
();
return
this
.
getId
().
hashCode
();
}
@Override
public
boolean
equals
(
Object
obj
)
{
...
...
@@ -269,7 +287,7 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo {
if
(
obj
instanceof
ErrorRecoveryEntity
)
{
ErrorRecoveryEntity
tmp
=
(
ErrorRecoveryEntity
)
obj
;
if
(
this
.
getId
()
==
tmp
.
getId
())
{
return
true
;
return
true
;
}
}
return
false
;
...
...
@@ -280,6 +298,7 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo {
sb
.
append
(
",siteId:"
).
append
(
getSiteId
());
sb
.
append
(
",errorTitle:"
).
append
(
getErrorTitle
());
sb
.
append
(
",matterSite:"
).
append
(
getMatterSite
());
sb
.
append
(
",matterName:"
).
append
(
getMatterName
());
sb
.
append
(
",substance:"
).
append
(
getSubstance
());
sb
.
append
(
",annexUrl:"
).
append
(
getAnnexUrl
());
sb
.
append
(
",formalReply:"
).
append
(
getFormalReply
());
...
...
@@ -295,30 +314,32 @@ public class ErrorRecoveryEntity extends ErrorRecoveryVo {
public
void
initAttrValue
(){
this
.
siteId
=
null
;
this
.
siteId
=
null
;
this
.
errorTitle
=
""
;
this
.
errorTitl
e
=
""
;
this
.
matterSit
e
=
""
;
this
.
matterSit
e
=
""
;
this
.
matterNam
e
=
""
;
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/error/model/ErrorRecoveryQuery.java
View file @
ed872caf
This diff is collapsed.
Click to expand it.
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;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.xhx.module.user.model.vo.UserCollectVo
;
/**
* 用户收藏夹实体对象
*
* @author zxfei
* @date 2023-03-09
*/
* 用户收藏夹实体对象
*
* @author zxfei
* @date 2023-03-13
*/
public
class
UserCollectEntity
extends
UserCollectVo
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 用户id
*/
* 用户id
*/
private
Long
userId
;
/**
* 收藏类型1单事项2一件事
*/
* 收藏类型1单事项2一件事
*/
private
Integer
collectType
;
/**
* 收藏名称
*/
* 收藏名称
*/
private
String
collectName
;
/**
* 收藏链接
*/
* 收藏链接
*/
private
String
collectUrl
;
/**
* 收藏关联业务id
*/
private
String
businessId
;
public
UserCollectEntity
(){}
/**
* 获取 用户id
* @return Long
*/
* 获取 用户id
* @return Long
*/
public
Long
getUserId
(){
return
userId
;
}
/**
* 设置 用户id
* @param userId
*/
* 设置 用户id
* @param userId
*/
public
void
setUserId
(
Long
userId
){
this
.
userId
=
userId
;
}
/**
* 获取 收藏类型1单事项2一件事
* @return Integer
*/
* 获取 收藏类型1单事项2一件事
* @return Integer
*/
public
Integer
getCollectType
(){
return
collectType
;
}
/**
* 设置 收藏类型1单事项2一件事
* @param collectType
*/
* 设置 收藏类型1单事项2一件事
* @param collectType
*/
public
void
setCollectType
(
Integer
collectType
){
this
.
collectType
=
collectType
;
}
/**
* 获取 收藏名称
* @return String
*/
* 获取 收藏名称
* @return String
*/
public
String
getCollectName
(){
return
collectName
;
}
/**
* 设置 收藏名称
* @param collectName
*/
* 设置 收藏名称
* @param collectName
*/
public
void
setCollectName
(
String
collectName
){
this
.
collectName
=
collectName
;
}
/**
* 获取 收藏链接
* @return String
*/
* 获取 收藏链接
* @return String
*/
public
String
getCollectUrl
(){
return
collectUrl
;
}
/**
* 设置 收藏链接
* @param collectUrl
*/
* 设置 收藏链接
* @param collectUrl
*/
public
void
setCollectUrl
(
String
collectUrl
){
this
.
collectUrl
=
collectUrl
;
}
/**
* 获取 收藏关联业务id
* @return String
*/
public
String
getBusinessId
(){
return
businessId
;
}
/**
* 设置 收藏关联业务id
* @param businessId
*/
public
void
setBusinessId
(
String
businessId
){
this
.
businessId
=
businessId
;
}
@Override
public
int
hashCode
()
{
return
this
.
getId
().
hashCode
();
return
this
.
getId
().
hashCode
();
}
@Override
public
boolean
equals
(
Object
obj
)
{
...
...
@@ -106,7 +124,7 @@ public class UserCollectEntity extends UserCollectVo {
if
(
obj
instanceof
UserCollectEntity
)
{
UserCollectEntity
tmp
=
(
UserCollectEntity
)
obj
;
if
(
this
.
getId
()
==
tmp
.
getId
())
{
return
true
;
return
true
;
}
}
return
false
;
...
...
@@ -118,17 +136,20 @@ public class UserCollectEntity extends UserCollectVo {
sb
.
append
(
",collectType:"
).
append
(
getCollectType
());
sb
.
append
(
",collectName:"
).
append
(
getCollectName
());
sb
.
append
(
",collectUrl:"
).
append
(
getCollectUrl
());
sb
.
append
(
",businessId:"
).
append
(
getBusinessId
());
return
sb
.
toString
();
}
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/java/com/mortals/xhx/module/user/model/UserCollectQuery.java
View file @
ed872caf
This diff is collapsed.
Click to expand it.
knowledge-base/src/main/resources/bootstrap.yml
View file @
ed872caf
...
...
@@ -16,12 +16,6 @@ spring:
default-property-inclusion
:
NON_NULL
# time-zone: GMT+8
# 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
:
exceptiontranslation
:
enabled
:
false
...
...
knowledge-base/src/main/resources/sqlmap/module/error/ErrorRecoveryMapper.xml
View file @
ed872caf
This diff is collapsed.
Click to expand it.
knowledge-base/src/main/resources/sqlmap/module/user/UserCollectMapper.xml
View file @
ed872caf
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment