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
550737d4
Commit
550737d4
authored
Nov 04, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加已经部署脚本
parent
0ad9ad15
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
62 additions
and
0 deletions
+62
-0
base-manager/src/main/java/com/mortals/xhx/module/site/service/SiteService.java
...java/com/mortals/xhx/module/site/service/SiteService.java
+4
-0
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
...mortals/xhx/module/site/service/impl/SiteServiceImpl.java
+51
-0
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
.../java/com/mortals/xhx/module/site/web/SiteController.java
+7
-0
No files found.
base-manager/src/main/java/com/mortals/xhx/module/site/service/SiteService.java
View file @
550737d4
...
@@ -69,4 +69,8 @@ public interface SiteService extends ICRUDCacheService<SiteEntity, Long> {
...
@@ -69,4 +69,8 @@ public interface SiteService extends ICRUDCacheService<SiteEntity, Long> {
void
deleteBysiteIdAndSource
(
Long
siteId
,
Integer
source
,
Context
context
);
void
deleteBysiteIdAndSource
(
Long
siteId
,
Integer
source
,
Context
context
);
void
updateAllSiteTree
(
Context
context
);
void
updateAllSiteTree
(
Context
context
);
void
updateSiteInfo
(
SiteEntity
siteEntity
,
Context
context
);
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @
550737d4
...
@@ -33,6 +33,12 @@ import com.mortals.xhx.common.utils.MatterHtmlParseUtil;
...
@@ -33,6 +33,12 @@ import com.mortals.xhx.common.utils.MatterHtmlParseUtil;
import
com.mortals.xhx.common.utils.SyncTreeSiteThread
;
import
com.mortals.xhx.common.utils.SyncTreeSiteThread
;
import
com.mortals.xhx.feign.device.IDeviceFeign
;
import
com.mortals.xhx.feign.device.IDeviceFeign
;
import
com.mortals.xhx.feign.user.IUserFeign
;
import
com.mortals.xhx.feign.user.IUserFeign
;
import
com.mortals.xhx.module.app.model.AppCategoryEntity
;
import
com.mortals.xhx.module.app.model.AppCategoryQuery
;
import
com.mortals.xhx.module.app.model.AppEntity
;
import
com.mortals.xhx.module.app.model.AppQuery
;
import
com.mortals.xhx.module.app.service.AppCategoryService
;
import
com.mortals.xhx.module.app.service.AppService
;
import
com.mortals.xhx.module.area.model.AreaEntity
;
import
com.mortals.xhx.module.area.model.AreaEntity
;
import
com.mortals.xhx.module.area.model.AreaQuery
;
import
com.mortals.xhx.module.area.model.AreaQuery
;
import
com.mortals.xhx.module.area.service.AreaService
;
import
com.mortals.xhx.module.area.service.AreaService
;
...
@@ -117,6 +123,12 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
...
@@ -117,6 +123,12 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
@Autowired
@Autowired
private
IDeviceFeign
deviceFeign
;
private
IDeviceFeign
deviceFeign
;
@Autowired
private
AppService
appService
;
@Autowired
private
AppCategoryService
appCategoryService
;
private
volatile
Boolean
refresh
=
false
;
private
volatile
Boolean
refresh
=
false
;
@Override
@Override
...
@@ -904,6 +916,45 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
...
@@ -904,6 +916,45 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
ThreadPool
.
getInstance
().
execute
(
syncTreeSiteThread
);
ThreadPool
.
getInstance
().
execute
(
syncTreeSiteThread
);
}
}
/**
* 外部添加站点,更新站点相关信息
*
* @param siteEntity
* @param context
*/
@Override
public
void
updateSiteInfo
(
SiteEntity
siteEntity
,
Context
context
)
{
List
<
AppEntity
>
updateAppList
=
appService
.
find
(
new
AppQuery
().
siteId
(
siteEntity
.
getId
())).
stream
().
map
(
item
->
{
item
.
setSiteId
(
siteEntity
.
getId
());
item
.
setSiteName
(
siteEntity
.
getSiteName
());
return
item
;
}).
collect
(
Collectors
.
toList
());
if
(!
ObjectUtils
.
isEmpty
(
updateAppList
)){
appService
.
update
(
updateAppList
,
context
);
}
List
<
AppCategoryEntity
>
updateAppCategoryList
=
appCategoryService
.
find
(
new
AppCategoryQuery
().
siteId
(
siteEntity
.
getId
())).
stream
().
map
(
item
->
{
item
.
setSiteId
(
siteEntity
.
getId
());
item
.
setSiteName
(
siteEntity
.
getSiteName
());
return
item
;
}).
collect
(
Collectors
.
toList
());
if
(!
ObjectUtils
.
isEmpty
(
updateAppCategoryList
)){
appCategoryService
.
update
(
updateAppCategoryList
,
context
);
}
List
<
WindowEntity
>
updateWindowList
=
windowService
.
find
(
new
WindowQuery
().
siteId
(
siteEntity
.
getId
())).
stream
().
map
(
item
->
{
item
.
setSiteId
(
siteEntity
.
getId
());
item
.
setSiteName
(
siteEntity
.
getSiteName
());
return
item
;
}).
collect
(
Collectors
.
toList
());
if
(!
ObjectUtils
.
isEmpty
(
updateWindowList
)){
windowService
.
update
(
updateWindowList
,
context
);
}
}
public
List
<
MatterEntity
>
subList
(
List
<
MatterEntity
>
firstList
,
List
<
MatterEntity
>
secondList
)
{
public
List
<
MatterEntity
>
subList
(
List
<
MatterEntity
>
firstList
,
List
<
MatterEntity
>
secondList
)
{
Set
<
String
>
secondSet
=
secondList
.
parallelStream
().
map
(
e
->
e
.
getMatterNo
()).
collect
(
Collectors
.
toSet
());
Set
<
String
>
secondSet
=
secondList
.
parallelStream
().
map
(
e
->
e
.
getMatterNo
()).
collect
(
Collectors
.
toSet
());
...
...
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
View file @
550737d4
...
@@ -555,6 +555,10 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
...
@@ -555,6 +555,10 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
}
}
SiteEntity
save
=
this
.
service
.
save
(
siteEntity
,
getContext
());
SiteEntity
save
=
this
.
service
.
save
(
siteEntity
,
getContext
());
//todo 更新相关表中的站点名称,站点编码,站点ID
this
.
service
.
updateSiteInfo
(
siteEntity
,
getContext
());
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
recordSysLog
(
request
,
busiDesc
+
" 【成功】"
);
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
jsonObject
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
jsonObject
.
put
(
KEY_RESULT_DATA
,
save
);
jsonObject
.
put
(
KEY_RESULT_DATA
,
save
);
...
@@ -567,4 +571,7 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
...
@@ -567,4 +571,7 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
return
jsonObject
.
toJSONString
();
return
jsonObject
.
toJSONString
();
}
}
}
}
\ No newline at end of file
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