Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_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
赵啸非
smart_gov_platform
Commits
35d4afc3
Commit
35d4afc3
authored
Jan 16, 2024
by
“yiyousong”
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.scsmile.cn/zxf/smart_gov_platform
parents
10a9ec99
98daeee4
Changes
17
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
1204 additions
and
757 deletions
+1204
-757
base-manager/db/add.sql
base-manager/db/add.sql
+9
-0
base-manager/src/main/java/com/mortals/xhx/base/system/upload/web/UploadController.java
.../mortals/xhx/base/system/upload/web/UploadController.java
+1
-1
base-manager/src/main/java/com/mortals/xhx/common/utils/MatterHtmlParseUtil.java
...ava/com/mortals/xhx/common/utils/MatterHtmlParseUtil.java
+4
-4
base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java
...m/mortals/xhx/common/utils/SyncGovMatterDetailThread.java
+7
-2
base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncHolidayTaskImpl.java
...java/com/mortals/xhx/daemon/task/SyncHolidayTaskImpl.java
+2
-1
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterEntity.java
...a/com/mortals/xhx/module/site/model/SiteMatterEntity.java
+31
-213
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterQuery.java
...va/com/mortals/xhx/module/site/model/SiteMatterQuery.java
+639
-321
base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteBusinessVo.java
.../com/mortals/xhx/module/site/model/vo/SiteBusinessVo.java
+6
-0
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
...mortals/xhx/module/site/service/impl/SiteServiceImpl.java
+0
-2
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
.../java/com/mortals/xhx/module/site/web/SiteController.java
+2
-11
base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java
...als/xhx/module/skin/service/impl/SkinBaseServiceImpl.java
+6
-2
base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowBusinessServiceImpl.java
...module/window/service/impl/WindowBusinessServiceImpl.java
+5
-5
base-manager/src/main/resources/config/mybatis-sqlmap-config.xml
...nager/src/main/resources/config/mybatis-sqlmap-config.xml
+1
-1
base-manager/src/main/resources/sqlmap/module/site/SiteMatterMapper.xml
...rc/main/resources/sqlmap/module/site/SiteMatterMapper.xml
+484
-182
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
...test/java/com/mortals/httpclient/site/SiteController.http
+3
-3
base-manager/src/test/java/com/mortals/httpclient/window/WindowBusinessController.http
...m/mortals/httpclient/window/WindowBusinessController.http
+1
-1
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/AccessLogFilter.java
...om/mortals/xhx/base/framework/filter/AccessLogFilter.java
+3
-8
No files found.
base-manager/db/add.sql
View file @
35d4afc3
...
@@ -218,3 +218,12 @@ ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN `serviceApiParams` v
...
@@ -218,3 +218,12 @@ ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN `serviceApiParams` v
-- ----------------------------
-- ----------------------------
ALTER
TABLE
mortals_sys_window_hall
ADD
COLUMN
`siteId`
bigint
(
20
)
default
'1'
COMMENT
'站点Id'
;
ALTER
TABLE
mortals_sys_window_hall
ADD
COLUMN
`siteId`
bigint
(
20
)
default
'1'
COMMENT
'站点Id'
;
-- ----------------------------
2024
-
01
-
03
-- ----------------------------
ALTER
TABLE
mortals_sys_site_matter
ADD
COLUMN
`agent`
tinyint
(
2
)
DEFAULT
'0'
COMMENT
'代办帮办(0.否,1.是)'
;
ALTER
TABLE
mortals_sys_site_matter
ADD
COLUMN
`agentName`
varchar
(
64
)
COMMENT
'代办姓名'
;
ALTER
TABLE
mortals_sys_site_matter
ADD
COLUMN
`agentPhone`
varchar
(
32
)
COMMENT
'代办电话'
;
ALTER
TABLE
mortals_sys_site_matter
ADD
COLUMN
`agentPost`
varchar
(
64
)
COMMENT
'职务'
;
base-manager/src/main/java/com/mortals/xhx/base/system/upload/web/UploadController.java
View file @
35d4afc3
...
@@ -52,7 +52,7 @@ public class UploadController extends BaseController {
...
@@ -52,7 +52,7 @@ public class UploadController extends BaseController {
@RequestMapping
(
value
=
"commonupload"
)
@RequestMapping
(
value
=
"commonupload"
)
public
String
doFileUpload
(
MultipartFile
file
,
@RequestParam
(
value
=
"prePath"
,
defaultValue
=
"file/fileupload"
)
String
prePath
)
{
public
String
doFileUpload
(
MultipartFile
file
,
@RequestParam
(
value
=
"prePath"
,
defaultValue
=
"
/
file/fileupload"
)
String
prePath
)
{
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
String
jsonStr
=
""
;
String
jsonStr
=
""
;
try
{
try
{
...
...
base-manager/src/main/java/com/mortals/xhx/common/utils/MatterHtmlParseUtil.java
View file @
35d4afc3
...
@@ -237,13 +237,13 @@ public class MatterHtmlParseUtil {
...
@@ -237,13 +237,13 @@ public class MatterHtmlParseUtil {
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
/*
String url = "http://www.sczwfw.gov.cn/jiq/interface/item/tags";
String
url
=
"http://www.sczwfw.gov.cn/jiq/interface/item/tags"
;
HashMap
<
String
,
String
>
params
=
new
HashMap
<>();
HashMap
<
String
,
String
>
params
=
new
HashMap
<>();
params.put("dxType", "
21
");
params
.
put
(
"dxType"
,
"
54
"
);
params.put("areaCode", "51
0107000000
");
params
.
put
(
"areaCode"
,
"51
1503003999
"
);
params
.
put
(
"deptCode"
,
""
);
params
.
put
(
"deptCode"
,
""
);
params
.
put
(
"searchtext"
,
""
);
params
.
put
(
"searchtext"
,
""
);
params.put("pageno", "
5
");
params
.
put
(
"pageno"
,
"
1
"
);
params
.
put
(
"taskType"
,
""
);
params
.
put
(
"taskType"
,
""
);
Rest
<
List
<
MatterEntity
>>
rest
=
MatterHtmlParseUtil
.
getMatterList
(
params
,
url
);
Rest
<
List
<
MatterEntity
>>
rest
=
MatterHtmlParseUtil
.
getMatterList
(
params
,
url
);
...
...
base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java
View file @
35d4afc3
...
@@ -152,8 +152,13 @@ public class SyncGovMatterDetailThread implements Runnable {
...
@@ -152,8 +152,13 @@ public class SyncGovMatterDetailThread implements Runnable {
Rest
<
String
>
townThemeRest
=
siteThemeMatterService
.
syncTownThemeMatterBySiteId
(
siteEntity
,
dxType
,
context
);
Rest
<
String
>
townThemeRest
=
siteThemeMatterService
.
syncTownThemeMatterBySiteId
(
siteEntity
,
dxType
,
context
);
log
.
info
(
"同步站点乡镇主题事项:"
+
JSON
.
toJSONString
(
townThemeRest
));
log
.
info
(
"同步站点乡镇主题事项:"
+
JSON
.
toJSONString
(
townThemeRest
));
}
else
{
}
else
{
cacheService
.
hdel
(
RedisCacheKeys
.
getSyncMatterLockKey
()
+
siteEntity
.
getAreaCode
(),
siteEntity
.
getAreaCode
());
try
{
cacheService
.
del
(
RedisCacheKeys
.
getSyncMatterLockKey
()
+
siteEntity
.
getAreaCode
(),
siteEntity
.
getAreaCode
());
log
.
info
(
"同步站点乡镇主题事项失败:"
+
themeTownRest
.
getData
());
log
.
info
(
"同步站点乡镇主题事项失败:"
+
themeTownRest
.
getData
());
}
catch
(
Exception
e
){
log
.
error
(
"同步站点乡镇主题事项失败"
,
e
);
}
}
}
}
}
log
.
info
(
"同步站点事项结束....."
);
log
.
info
(
"同步站点事项结束....."
);
...
...
base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncHolidayTaskImpl.java
View file @
35d4afc3
...
@@ -50,7 +50,7 @@ public class SyncHolidayTaskImpl implements ITaskExcuteService {
...
@@ -50,7 +50,7 @@ public class SyncHolidayTaskImpl implements ITaskExcuteService {
@Autowired
@Autowired
private
HolidayService
holidayService
;
private
HolidayService
holidayService
;
@Value
(
"${holidayUrl:https://timor.tech/api/holiday/year/202
3
}"
)
@Value
(
"${holidayUrl:https://timor.tech/api/holiday/year/202
4
}"
)
private
String
holidayUrl
;
private
String
holidayUrl
;
...
@@ -63,6 +63,7 @@ public class SyncHolidayTaskImpl implements ITaskExcuteService {
...
@@ -63,6 +63,7 @@ public class SyncHolidayTaskImpl implements ITaskExcuteService {
private
void
syncHoliday
()
throws
AppException
{
private
void
syncHoliday
()
throws
AppException
{
holidayUrl
+=
DateUtil
.
year
(
new
Date
());
holidayUrl
+=
DateUtil
.
year
(
new
Date
());
log
.
info
(
"holidayUrl:{}"
,
holidayUrl
);
String
holidayJson
=
HttpUtil
.
get
(
holidayUrl
);
String
holidayJson
=
HttpUtil
.
get
(
holidayUrl
);
ObjectMapper
mapper
=
new
ObjectMapper
();
ObjectMapper
mapper
=
new
ObjectMapper
();
...
...
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterEntity.java
View file @
35d4afc3
package
com.mortals.xhx.module.site.model
;
package
com.mortals.xhx.module.site.model
;
import
java.util.List
;
import
java.util.List
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.math.BigDecimal
;
import
cn.hutool.core.date.DateUtil
;
import
java.util.Date
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.mortals.framework.annotation.Excel
;
import
com.mortals.framework.annotation.Excel
;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.xhx.module.site.model.vo.SiteMatterVo
;
import
com.mortals.xhx.module.site.model.vo.SiteMatterVo
;
import
lombok.Data
;
/**
/**
* 站点事项实体对象
* 站点事项实体对象
*
*
* @author zxfei
* @author zxfei
* @date 202
3-04-12
* @date 202
4-01-04
*/
*/
@Data
public
class
SiteMatterEntity
extends
SiteMatterVo
{
public
class
SiteMatterEntity
extends
SiteMatterVo
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
@@ -32,10 +35,6 @@ public class SiteMatterEntity extends SiteMatterVo {
...
@@ -32,10 +35,6 @@ public class SiteMatterEntity extends SiteMatterVo {
* 事项名称
* 事项名称
*/
*/
private
String
matterName
;
private
String
matterName
;
/**
* 事项编码
*/
private
String
matterCode
;
/**
/**
* 部门ID
* 部门ID
*/
*/
...
@@ -44,6 +43,10 @@ public class SiteMatterEntity extends SiteMatterVo {
...
@@ -44,6 +43,10 @@ public class SiteMatterEntity extends SiteMatterVo {
* 部门名称
* 部门名称
*/
*/
private
String
deptName
;
private
String
deptName
;
/**
* 事项编码
*/
private
String
matterCode
;
/**
/**
* 事项类型
* 事项类型
*/
*/
...
@@ -52,10 +55,6 @@ public class SiteMatterEntity extends SiteMatterVo {
...
@@ -52,10 +55,6 @@ public class SiteMatterEntity extends SiteMatterVo {
* 事项来源
* 事项来源
*/
*/
private
Integer
source
;
private
Integer
source
;
/**
* 部门编号
*/
private
String
deptCode
;
/**
/**
* 热门(0.否,1.是)
* 热门(0.否,1.是)
*/
*/
...
@@ -64,182 +63,26 @@ public class SiteMatterEntity extends SiteMatterVo {
...
@@ -64,182 +63,26 @@ public class SiteMatterEntity extends SiteMatterVo {
* 显示(0.否,1.是)
* 显示(0.否,1.是)
*/
*/
private
Integer
display
;
private
Integer
display
;
public
SiteMatterEntity
(){}
/**
* 获取 站点ID
* @return Long
*/
public
Long
getSiteId
(){
return
siteId
;
}
/**
* 设置 站点ID
* @param siteId
*/
public
void
setSiteId
(
Long
siteId
){
this
.
siteId
=
siteId
;
}
/**
* 获取 站点名称
* @return String
*/
public
String
getSiteName
(){
return
siteName
;
}
/**
* 设置 站点名称
* @param siteName
*/
public
void
setSiteName
(
String
siteName
){
this
.
siteName
=
siteName
;
}
/**
* 获取 事项ID
* @return Long
*/
public
Long
getMatterId
(){
return
matterId
;
}
/**
* 设置 事项ID
* @param matterId
*/
public
void
setMatterId
(
Long
matterId
){
this
.
matterId
=
matterId
;
}
/**
* 获取 事项名称
* @return String
*/
public
String
getMatterName
(){
return
matterName
;
}
/**
* 设置 事项名称
* @param matterName
*/
public
void
setMatterName
(
String
matterName
){
this
.
matterName
=
matterName
;
}
/**
* 获取 事项编码
* @return String
*/
public
String
getMatterCode
(){
return
matterCode
;
}
/**
* 设置 事项编码
* @param matterCode
*/
public
void
setMatterCode
(
String
matterCode
){
this
.
matterCode
=
matterCode
;
}
/**
* 获取 部门ID
* @return Long
*/
public
Long
getDeptId
(){
return
deptId
;
}
/**
/**
* 设置 部门ID
* 部门编号
* @param deptId
*/
public
void
setDeptId
(
Long
deptId
){
this
.
deptId
=
deptId
;
}
/**
* 获取 部门名称
* @return String
*/
public
String
getDeptName
(){
return
deptName
;
}
/**
* 设置 部门名称
* @param deptName
*/
public
void
setDeptName
(
String
deptName
){
this
.
deptName
=
deptName
;
}
/**
* 获取 事项类型
* @return String
*/
public
String
getEventTypeShow
(){
return
eventTypeShow
;
}
/**
* 设置 事项类型
* @param eventTypeShow
*/
public
void
setEventTypeShow
(
String
eventTypeShow
){
this
.
eventTypeShow
=
eventTypeShow
;
}
/**
* 获取 事项来源
* @return Integer
*/
public
Integer
getSource
(){
return
source
;
}
/**
* 设置 事项来源
* @param source
*/
public
void
setSource
(
Integer
source
){
this
.
source
=
source
;
}
/**
* 获取 部门编号
* @return String
*/
public
String
getDeptCode
(){
return
deptCode
;
}
/**
* 设置 部门编号
* @param deptCode
*/
*/
public
void
setDeptCode
(
String
deptCode
){
private
String
deptCode
;
this
.
deptCode
=
deptCode
;
}
/**
/**
* 获取 热门(0.否,1.是)
* 代办帮办(0.否,1.是)
* @return Integer
*/
*/
public
Integer
getHot
(){
private
Integer
agent
;
return
hot
;
}
/**
/**
* 设置 热门(0.否,1.是)
* 代办姓名
* @param hot
*/
*/
public
void
setHot
(
Integer
hot
){
private
String
agentName
;
this
.
hot
=
hot
;
}
/**
/**
* 获取 显示(0.否,1.是)
* 代办电话
* @return Integer
*/
*/
public
Integer
getDisplay
(){
private
String
agentPhone
;
return
display
;
}
/**
/**
* 设置 显示(0.否,1.是)
* 职务
* @param display
*/
*/
public
void
setDisplay
(
Integer
display
){
private
String
agentPost
;
this
.
display
=
display
;
}
@Override
@Override
public
int
hashCode
()
{
public
int
hashCode
()
{
return
this
.
getId
().
hashCode
();
return
this
.
getId
().
hashCode
();
...
@@ -256,47 +99,22 @@ public class SiteMatterEntity extends SiteMatterVo {
...
@@ -256,47 +99,22 @@ public class SiteMatterEntity extends SiteMatterVo {
return
false
;
return
false
;
}
}
public
String
toString
(){
StringBuilder
sb
=
new
StringBuilder
(
""
);
sb
.
append
(
",siteId:"
).
append
(
getSiteId
());
sb
.
append
(
",siteName:"
).
append
(
getSiteName
());
sb
.
append
(
",matterId:"
).
append
(
getMatterId
());
sb
.
append
(
",matterName:"
).
append
(
getMatterName
());
sb
.
append
(
",matterCode:"
).
append
(
getMatterCode
());
sb
.
append
(
",deptId:"
).
append
(
getDeptId
());
sb
.
append
(
",deptName:"
).
append
(
getDeptName
());
sb
.
append
(
",eventTypeShow:"
).
append
(
getEventTypeShow
());
sb
.
append
(
",source:"
).
append
(
getSource
());
sb
.
append
(
",deptCode:"
).
append
(
getDeptCode
());
sb
.
append
(
",hot:"
).
append
(
getHot
());
sb
.
append
(
",display:"
).
append
(
getDisplay
());
return
sb
.
toString
();
}
public
void
initAttrValue
(){
public
void
initAttrValue
(){
this
.
siteId
=
null
;
this
.
siteId
=
null
;
this
.
siteName
=
""
;
this
.
siteName
=
null
;
this
.
matterId
=
null
;
this
.
matterId
=
null
;
this
.
matterName
=
""
;
this
.
matterName
=
null
;
this
.
matterCode
=
null
;
this
.
deptId
=
null
;
this
.
deptId
=
null
;
this
.
deptName
=
""
;
this
.
deptName
=
null
;
this
.
matterCode
=
""
;
this
.
eventTypeShow
=
""
;
this
.
eventTypeShow
=
null
;
this
.
source
=
0
;
this
.
source
=
0
;
this
.
deptCode
=
null
;
this
.
hot
=
0
;
this
.
hot
=
0
;
this
.
display
=
0
;
this
.
display
=
1
;
this
.
deptCode
=
""
;
this
.
agent
=
0
;
this
.
agentName
=
""
;
this
.
agentPhone
=
""
;
this
.
agentPost
=
""
;
}
}
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterQuery.java
View file @
35d4afc3
This diff is collapsed.
Click to expand it.
base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteBusinessVo.java
View file @
35d4afc3
...
@@ -53,4 +53,10 @@ public class SiteBusinessVo extends BaseEntityLong {
...
@@ -53,4 +53,10 @@ public class SiteBusinessVo extends BaseEntityLong {
private
List
<
Long
>
idNotList
;
private
List
<
Long
>
idNotList
;
/** 业务ID列表 */
private
List
<
Long
>
businessIdList
;
/** 业务ID排除列表 */
private
List
<
Long
>
businessIdNotList
;
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @
35d4afc3
...
@@ -435,8 +435,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
...
@@ -435,8 +435,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
PageInfo
pageInfo
=
new
PageInfo
();
PageInfo
pageInfo
=
new
PageInfo
();
pageInfo
.
setCurrPage
(
1
);
pageInfo
.
setCurrPage
(
1
);
pageInfo
.
setPrePageResult
(
10
);
pageInfo
.
setPrePageResult
(
10
);
return
siteEntities
;
return
siteEntities
;
}
}
...
...
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
View file @
35d4afc3
...
@@ -160,27 +160,18 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
...
@@ -160,27 +160,18 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
String
busiDesc
=
"根据区域编码查询站点列表"
+
this
.
getModuleDesc
();
String
busiDesc
=
"根据区域编码查询站点列表"
+
this
.
getModuleDesc
();
try
{
try
{
if
(!
ObjectUtils
.
isEmpty
(
site
.
getSiteName
()))
{
if
(!
ObjectUtils
.
isEmpty
(
site
.
getSiteName
()))
{
// SiteEntity siteEntity = this.service.selectOne(new SiteQuery().siteName(site.getSiteName()));
List
<
SiteEntity
>
siteEntities
=
this
.
service
.
find
(
new
SiteQuery
().
siteName
(
site
.
getSiteName
()));
List
<
SiteEntity
>
siteEntities
=
this
.
service
.
find
(
new
SiteQuery
().
siteName
(
site
.
getSiteName
()));
if
(!
ObjectUtils
.
isEmpty
(
siteEntities
))
{
if
(!
ObjectUtils
.
isEmpty
(
siteEntities
))
{
site
.
setAreaCodeList
(
siteEntities
.
stream
().
map
(
i
->
i
.
getAreaCode
()).
collect
(
Collectors
.
toList
()));
site
.
setAreaCodeList
(
siteEntities
.
stream
().
map
(
i
->
i
.
getAreaCode
()).
collect
(
Collectors
.
toList
()));
}
}
/* if (!ObjectUtils.isEmpty(siteEntity)) {
site.setAreaCode(siteEntity.getAreaCode());
}*/
}
}
if
(!
ObjectUtils
.
isEmpty
(
site
.
getAreaName
()))
{
if
(!
ObjectUtils
.
isEmpty
(
site
.
getAreaName
()))
{
//AreaEntity areaEntity = areaService.selectOne(new AreaQuery().name(site.getAreaName()));
List
<
AreaEntity
>
areaEntities
=
areaService
.
find
(
new
AreaQuery
().
name
(
site
.
getAreaName
()));
List
<
AreaEntity
>
areaEntities
=
areaService
.
find
(
new
AreaQuery
().
name
(
site
.
getAreaName
()));
if
(!
ObjectUtils
.
isEmpty
(
areaEntities
))
{
if
(!
ObjectUtils
.
isEmpty
(
areaEntities
))
{
// site.setAreaCode(areaEntity.getAreaCode());
site
.
setAreaCodeList
(
areaEntities
.
stream
().
map
(
i
->
i
.
getAreaCode
()).
collect
(
Collectors
.
toList
()));
site
.
setAreaCodeList
(
areaEntities
.
stream
().
map
(
i
->
i
.
getAreaCode
()).
collect
(
Collectors
.
toList
()));
}
}
}
}
if
(
ObjectUtils
.
isEmpty
(
site
.
getAreaCodeList
()))
{
if
(
ObjectUtils
.
isEmpty
(
site
.
getAreaCodeList
()))
{
site
.
setAreaCodeList
(
Arrays
.
asList
(
site
.
getAreaCode
()));
site
.
setAreaCodeList
(
Arrays
.
asList
(
site
.
getAreaCode
()));
}
}
...
@@ -189,9 +180,9 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
...
@@ -189,9 +180,9 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
}).
distinct
().
collect
(
Collectors
.
toList
());
}).
distinct
().
collect
(
Collectors
.
toList
());
//List<SiteEntity> siteEntityList = this.service.getFlatSitesByAreaCode(site.getAreaCode(), getContext());
//List<SiteEntity> siteEntityList = this.service.getFlatSitesByAreaCode(site.getAreaCode(), getContext());
if
(!
ObjectUtils
.
isEmpty
(
site
.
getSiteName
()))
{
/*
if (!ObjectUtils.isEmpty(site.getSiteName())) {
siteEntityList = siteEntityList.stream().filter(item -> site.getSiteName().equals(item.getSiteName())).collect(Collectors.toList());
siteEntityList = siteEntityList.stream().filter(item -> site.getSiteName().equals(item.getSiteName())).collect(Collectors.toList());
}
}
*/
if
(!
ObjectUtils
.
isEmpty
(
getContext
())
&&
!
ObjectUtils
.
isEmpty
(
getContext
().
getUser
()))
{
if
(!
ObjectUtils
.
isEmpty
(
getContext
())
&&
!
ObjectUtils
.
isEmpty
(
getContext
().
getUser
()))
{
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
}
}
...
...
base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java
View file @
35d4afc3
...
@@ -155,7 +155,9 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
...
@@ -155,7 +155,9 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
@Override
@Override
protected
void
updateAfter
(
SkinBaseEntity
entity
,
Context
context
)
throws
AppException
{
protected
void
updateAfter
(
SkinBaseEntity
entity
,
Context
context
)
throws
AppException
{
saveSkinFields
(
entity
,
context
);
saveSkinFields
(
entity
,
context
);
super
.
updateBefore
(
entity
,
context
);
SendSkinRefreshTask
sendSkinRefreshTask
=
new
SendSkinRefreshTask
();
ThreadPool
.
getInstance
().
execute
(
sendSkinRefreshTask
);
}
}
private
void
saveSkinFields
(
SkinBaseEntity
entity
,
Context
context
)
{
private
void
saveSkinFields
(
SkinBaseEntity
entity
,
Context
context
)
{
...
@@ -202,6 +204,8 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
...
@@ -202,6 +204,8 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
}
}
private
void
genTemplateCss
(
SkinBaseEntity
entity
,
Context
context
)
{
private
void
genTemplateCss
(
SkinBaseEntity
entity
,
Context
context
)
{
//加载模板,合成模板数据
//加载模板,合成模板数据
Map
data
=
new
HashMap
();
Map
data
=
new
HashMap
();
...
@@ -222,7 +226,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
...
@@ -222,7 +226,7 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
InputStream
inputStream
=
new
ByteArrayInputStream
(
sw
.
toString
().
getBytes
(
Constant
.
UTF8
));
InputStream
inputStream
=
new
ByteArrayInputStream
(
sw
.
toString
().
getBytes
(
Constant
.
UTF8
));
MultipartFile
file
=
getMultipartFile
(
inputStream
,
"file.css"
);
MultipartFile
file
=
getMultipartFile
(
inputStream
,
"file.css"
);
String
filePath
=
uploadService
.
saveFileUpload
(
file
,
"file/fileupload"
,
context
.
getUser
());
String
filePath
=
uploadService
.
saveFileUpload
(
file
,
"
/
file/fileupload"
,
context
.
getUser
());
entity
.
setCssFilePath
(
filePath
);
entity
.
setCssFilePath
(
filePath
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowBusinessServiceImpl.java
View file @
35d4afc3
...
@@ -93,7 +93,6 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
...
@@ -93,7 +93,6 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
this
.
findAfter
(
entity
,
pageInfo
,
context
,
result
.
getList
());
this
.
findAfter
(
entity
,
pageInfo
,
context
,
result
.
getList
());
if
(!
ObjectUtils
.
isEmpty
(
result
.
getList
()))
{
if
(!
ObjectUtils
.
isEmpty
(
result
.
getList
()))
{
cacheService
.
set
(
KEY_SEARCH_SITEBUSINESSID_CACHE
+
siteBusinessId
,
JSON
.
toJSONString
(
result
),
KEY_SEARCH_TIMEOUTT_CACHE
);
cacheService
.
set
(
KEY_SEARCH_SITEBUSINESSID_CACHE
+
siteBusinessId
,
JSON
.
toJSONString
(
result
),
KEY_SEARCH_TIMEOUTT_CACHE
);
}
}
}
}
}
else
if
(!
ObjectUtils
.
isEmpty
(
query
.
getWindowId
()))
{
}
else
if
(!
ObjectUtils
.
isEmpty
(
query
.
getWindowId
()))
{
...
@@ -134,14 +133,15 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
...
@@ -134,14 +133,15 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
@Override
@Override
protected
void
findAfter
(
WindowBusinessEntity
entity
,
PageInfo
pageInfo
,
Context
context
,
List
<
WindowBusinessEntity
>
list
)
throws
AppException
{
protected
void
findAfter
(
WindowBusinessEntity
entity
,
PageInfo
pageInfo
,
Context
context
,
List
<
WindowBusinessEntity
>
list
)
throws
AppException
{
Map
<
Long
,
WindowEntity
>
collect
=
windowService
.
getCacheList
().
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
(),
y
->
y
,
(
o
,
n
)
->
n
));
//
Map<Long, WindowEntity> collect = windowService.getCacheList().stream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
//Map<Long, WindowEntity> collect = windowService.findToMap(new WindowQuery(), context);
//Map<Long, WindowEntity> collect = windowService.findToMap(new WindowQuery(), context);
Map
<
Long
,
WindowHallEntity
>
windowHallEntityMap
=
windowHallService
.
getCacheList
().
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
(),
y
->
y
,
(
o
,
n
)
->
n
));
Map
<
Long
,
WindowHallEntity
>
windowHallEntityMap
=
windowHallService
.
getCacheList
().
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
get
Window
Id
(),
y
->
y
,
(
o
,
n
)
->
n
));
//
Map<Long, WindowHallEntity> windowHallEntityMap = windowHallService.find(new WindowHallQuery(), context).parallelStream().collect(Collectors.toMap(x -> x.getWindowId(), Function.identity()));
//
Map<Long, WindowHallEntity> windowHallEntityMap = windowHallService.find(new WindowHallQuery(), context).parallelStream().collect(Collectors.toMap(x -> x.getWindowId(), Function.identity()));
Iterator
iterator
=
list
.
iterator
();
Iterator
iterator
=
list
.
iterator
();
while
(
iterator
.
hasNext
())
{
while
(
iterator
.
hasNext
())
{
WindowBusinessEntity
item
=
(
WindowBusinessEntity
)
iterator
.
next
();
WindowBusinessEntity
item
=
(
WindowBusinessEntity
)
iterator
.
next
();
WindowEntity
windowEntity
=
collect
.
get
(
item
.
getWindowId
());
//WindowEntity windowEntity = collect.get(item.getWindowId());
WindowEntity
windowEntity
=
windowService
.
getCache
(
item
.
getWindowId
().
toString
());
if
(!
ObjectUtils
.
isEmpty
(
item
.
getWindowId
())
&&
!
ObjectUtils
.
isEmpty
(
windowEntity
))
{
if
(!
ObjectUtils
.
isEmpty
(
item
.
getWindowId
())
&&
!
ObjectUtils
.
isEmpty
(
windowEntity
))
{
item
.
setDeptId
(
windowEntity
.
getDeptId
());
item
.
setDeptId
(
windowEntity
.
getDeptId
());
item
.
setDeptName
(
windowEntity
.
getDeptName
());
item
.
setDeptName
(
windowEntity
.
getDeptName
());
...
...
base-manager/src/main/resources/config/mybatis-sqlmap-config.xml
View file @
35d4afc3
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
</plugin>
</plugin>
<plugin
interceptor=
"com.mortals.framework.thirty.mybatis.LogInterceptor"
>
<plugin
interceptor=
"com.mortals.framework.thirty.mybatis.LogInterceptor"
>
<property
name=
"enableExecutorTime"
value=
"true"
/>
<property
name=
"enableExecutorTime"
value=
"true"
/>
<property
name=
"showSql"
value=
"
tru
e"
/>
<property
name=
"showSql"
value=
"
fals
e"
/>
</plugin>
</plugin>
</plugins>
</plugins>
</configuration>
</configuration>
\ No newline at end of file
base-manager/src/main/resources/sqlmap/module/site/SiteMatterMapper.xml
View file @
35d4afc3
This diff is collapsed.
Click to expand it.
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
View file @
35d4afc3
...
@@ -90,7 +90,7 @@ POST {{baseUrl}}/site/getFlatSitesByAreaCode
...
@@ -90,7 +90,7 @@ POST {{baseUrl}}/site/getFlatSitesByAreaCode
Content-Type: application/json
Content-Type: application/json
{
{
"
areaCode":"511502000000
"
"
siteName": "%高新%
"
}
}
###根据区域等级获取站点列表
###根据区域等级获取站点列表
...
@@ -98,7 +98,7 @@ POST {{baseUrl}}/site/getAreaSitesByAreaLevel
...
@@ -98,7 +98,7 @@ POST {{baseUrl}}/site/getAreaSitesByAreaLevel
Content-Type: application/json
Content-Type: application/json
{
{
"siteName":"
徐州区办事处
"
"siteName":"
%高新%
"
}
}
###站点列表
###站点列表
...
@@ -115,7 +115,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
...
@@ -115,7 +115,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
Content-Type: application/json
Content-Type: application/json
{
{
"id":
1
"id":
23
}
}
...
...
base-manager/src/test/java/com/mortals/httpclient/window/WindowBusinessController.http
View file @
35d4afc3
...
@@ -11,7 +11,7 @@ Content-Type: application/json
...
@@ -11,7 +11,7 @@ Content-Type: application/json
POST {{baseUrl}}/window/business/interlist
POST {{baseUrl}}/window/business/interlist
Content-Type: application/json
Content-Type: application/json
{"siteBusinessId":2
,"size":-1
,"searchCache": 1}
{"siteBusinessId":2
12
,"searchCache": 1}
###窗口业务列表缓存2
###窗口业务列表缓存2
POST {{baseUrl}}/window/business/interlist
POST {{baseUrl}}/window/business/interlist
...
...
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/AccessLogFilter.java
View file @
35d4afc3
package
com.mortals.xhx.base.framework.filter
;
package
com.mortals.xhx.base.framework.filter
;
import
cn.hutool.core.net.NetUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.StrUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.model.AccessLogPdu
;
import
com.mortals.framework.model.AccessLogPdu
;
...
@@ -22,8 +20,6 @@ import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
...
@@ -22,8 +20,6 @@ import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
import
org.springframework.core.Ordered
;
import
org.springframework.core.Ordered
;
import
org.springframework.core.io.buffer.DataBuffer
;
import
org.springframework.core.io.buffer.DataBuffer
;
import
org.springframework.core.io.buffer.DataBufferFactory
;
import
org.springframework.core.io.buffer.DataBufferFactory
;
import
org.springframework.core.io.buffer.DataBufferUtils
;
import
org.springframework.core.io.buffer.DefaultDataBufferFactory
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.MediaType
;
import
org.springframework.http.MediaType
;
...
@@ -42,7 +38,6 @@ import org.springframework.web.server.ServerWebExchange;
...
@@ -42,7 +38,6 @@ import org.springframework.web.server.ServerWebExchange;
import
reactor.core.publisher.Flux
;
import
reactor.core.publisher.Flux
;
import
reactor.core.publisher.Mono
;
import
reactor.core.publisher.Mono
;
import
java.nio.charset.StandardCharsets
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -53,7 +48,7 @@ import java.util.Map;
...
@@ -53,7 +48,7 @@ import java.util.Map;
* @description:
* @description:
**/
**/
@Slf4j
@Slf4j
//
@Component
@Component
public
class
AccessLogFilter
implements
GlobalFilter
,
Ordered
{
public
class
AccessLogFilter
implements
GlobalFilter
,
Ordered
{
@Value
(
"${spring.application.name:gateway}"
)
@Value
(
"${spring.application.name:gateway}"
)
private
String
appName
;
private
String
appName
;
...
@@ -106,7 +101,7 @@ public class AccessLogFilter implements GlobalFilter, Ordered {
...
@@ -106,7 +101,7 @@ public class AccessLogFilter implements GlobalFilter, Ordered {
accessLogPdu
.
setLogTime
(
new
Date
());
accessLogPdu
.
setLogTime
(
new
Date
());
accessLogPdu
.
setMethod
(
request
.
getMethodValue
());
accessLogPdu
.
setMethod
(
request
.
getMethodValue
());
log
.
info
(
"origin uri:{} host:{} port:{},contentLens"
,
requestPath
,
request
.
getHeaders
().
getHost
().
getHostName
(),
request
.
getHeaders
().
getHost
().
getPort
(),
request
.
getHeaders
().
getContentLength
());
//
log.info("origin uri:{} host:{} port:{},contentLens", requestPath, request.getHeaders().getHost().getHostName(), request.getHeaders().getHost().getPort(),request.getHeaders().getContentLength());
MediaType
mediaType
=
request
.
getHeaders
().
getContentType
();
MediaType
mediaType
=
request
.
getHeaders
().
getContentType
();
if
(
request
.
getHeaders
().
getContentLength
()
>
1024
*
64
)
{
if
(
request
.
getHeaders
().
getContentLength
()
>
1024
*
64
)
{
...
@@ -226,7 +221,7 @@ public class AccessLogFilter implements GlobalFilter, Ordered {
...
@@ -226,7 +221,7 @@ public class AccessLogFilter implements GlobalFilter, Ordered {
@Override
@Override
public
Flux
<
DataBuffer
>
getBody
()
{
public
Flux
<
DataBuffer
>
getBody
()
{
log
.
info
(
"outputMessage.getBody() contentLength:"
);
//
log.info("outputMessage.getBody() contentLength:");
return
outputMessage
.
getBody
();
return
outputMessage
.
getBody
();
}
}
};
};
...
...
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