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
c9bba35f
Commit
c9bba35f
authored
Nov 07, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加已经部署脚本
parent
b2b488c4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
base-manager/pom.xml
base-manager/pom.xml
+1
-1
base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowBusinessServiceImpl.java
...module/window/service/impl/WindowBusinessServiceImpl.java
+6
-8
No files found.
base-manager/pom.xml
View file @
c9bba35f
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
<profiles.active>
yanyuan
</profiles.active>
<profiles.active>
yanyuan
</profiles.active>
<profiles.nacos.server-addr>
172.16.30.245:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
172.16.30.245:8848
</profiles.nacos.server-addr>
<profiles.trustedReferer>
127.0.0.1,localhost,10.233.82.175,172.16.30.245,172.16.30.246,172.16.30.247,172.16.30.248
</profiles.trustedReferer>
<profiles.trustedReferer>
127.0.0.1,localhost,10.233.82.175,172.16.30.245,172.16.30.246,172.16.30.247,172.16.30.248
</profiles.trustedReferer>
<profiles.req.json.check>
tru
e
</profiles.req.json.check>
<profiles.req.json.check>
fals
e
</profiles.req.json.check>
</properties>
</properties>
</profile>
</profile>
...
...
base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowBusinessServiceImpl.java
View file @
c9bba35f
...
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
...
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
import
com.mortals.framework.service.impl.AbstractCRUDServiceImpl
;
import
com.mortals.framework.service.impl.AbstractCRUDServiceImpl
;
import
com.mortals.xhx.module.window.dao.WindowBusinessDao
;
import
com.mortals.xhx.module.window.dao.WindowBusinessDao
;
import
com.mortals.xhx.module.window.service.WindowBusinessService
;
import
com.mortals.xhx.module.window.service.WindowBusinessService
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
java.util.*
;
import
java.util.*
;
...
@@ -133,14 +134,10 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
...
@@ -133,14 +134,10 @@ 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.findToMap(new WindowQuery(), context);
Map
<
Long
,
WindowHallEntity
>
windowHallEntityMap
=
windowHallService
.
getCacheList
().
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getWindowId
(),
y
->
y
,
(
o
,
n
)
->
n
));
Map
<
Long
,
WindowHallEntity
>
windowHallEntityMap
=
windowHallService
.
getCacheList
().
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getWindowId
(),
y
->
y
,
(
o
,
n
)
->
n
));
// 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
=
windowService
.
getCache
(
item
.
getWindowId
().
toString
());
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
());
...
@@ -189,7 +186,9 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
...
@@ -189,7 +186,9 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
}*/
}*/
/* *//**
/* */
/**
* @param entity
* @param entity
* @param context
* @param context
* @throws AppException
* @throws AppException
...
@@ -199,7 +198,6 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
...
@@ -199,7 +198,6 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
pushChangeMsg(entity);
pushChangeMsg(entity);
super.updateAfter(entity, context);
super.updateAfter(entity, context);
}*/
}*/
private
void
pushChangeMsg
(
WindowBusinessEntity
entity
)
{
private
void
pushChangeMsg
(
WindowBusinessEntity
entity
)
{
String
phpUrl
=
GlobalSysInfo
.
getParamValue
(
PARAM_SERVER_PHP_HTTP_URL
,
"http://172.15.28.116:8090"
);
String
phpUrl
=
GlobalSysInfo
.
getParamValue
(
PARAM_SERVER_PHP_HTTP_URL
,
"http://172.15.28.116:8090"
);
phpUrl
+=
"/api/window/winNameChange"
;
phpUrl
+=
"/api/window/winNameChange"
;
...
...
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