Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-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
赵啸非
device-new-platform
Commits
5d4d9cfb
Commit
5d4d9cfb
authored
Aug 28, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新资源部署
parent
68f72b83
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
2 deletions
+23
-2
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleDistributeServiceImpl.java
...evice/service/impl/DeviceModuleDistributeServiceImpl.java
+23
-2
No files found.
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleDistributeServiceImpl.java
View file @
5d4d9cfb
...
@@ -26,6 +26,7 @@ import org.springframework.util.ObjectUtils;
...
@@ -26,6 +26,7 @@ import org.springframework.util.ObjectUtils;
import
java.io.File
;
import
java.io.File
;
import
java.nio.charset.Charset
;
import
java.nio.charset.Charset
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -104,13 +105,31 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<D
...
@@ -104,13 +105,31 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<D
@Override
@Override
public
Rest
<
String
>
selected
(
DeviceModuleDistributeEntity
distributeEntity
,
Context
context
)
{
public
Rest
<
String
>
selected
(
DeviceModuleDistributeEntity
distributeEntity
,
Context
context
)
{
//选择默认资源默认分辨率
//如果选择的资源未部署,则提示先部署后才能选择
DeviceModuleDistributeEntity
deviceModuleDistributeEntity
=
this
.
get
(
distributeEntity
.
getId
(),
context
);
DeviceModuleDistributeEntity
deviceModuleDistributeEntity
=
this
.
get
(
distributeEntity
.
getId
(),
context
);
//选择默认资源默认分辨率
//如果选择的资源未部署,则提示先部署后才能选择
if
(!
ObjectUtils
.
isEmpty
(
deviceModuleDistributeEntity
)
&&
deviceModuleDistributeEntity
.
getDistribute
()
==
YesNoEnum
.
NO
.
getValue
())
{
if
(!
ObjectUtils
.
isEmpty
(
deviceModuleDistributeEntity
)
&&
deviceModuleDistributeEntity
.
getDistribute
()
==
YesNoEnum
.
NO
.
getValue
())
{
throw
new
AppException
(
"选择的默认资源需先部署后才能选择!"
);
throw
new
AppException
(
"选择的默认资源需先部署后才能选择!"
);
}
}
//如果选择默认为为否,且选择后没有默认选择,则不让他选择
if
(
YesNoEnum
.
NO
.
getValue
()
==
distributeEntity
.
getSelected
())
{
DeviceModuleDistributeQuery
query
=
new
DeviceModuleDistributeQuery
();
query
.
setProductId
(
deviceModuleDistributeEntity
.
getProductId
());
query
.
setIdNotList
(
Arrays
.
asList
(
distributeEntity
.
getId
()));
List
<
DeviceModuleDistributeEntity
>
deviceModuleDistributeEntities
=
this
.
find
(
query
,
context
);
if
(
ObjectUtils
.
isEmpty
(
deviceModuleDistributeEntities
))
throw
new
AppException
(
"当前产品选择切换后没有默认选择,不能切换!"
);
DeviceModuleDistributeEntity
moduleDistribute
=
deviceModuleDistributeEntities
.
stream
().
filter
(
f
->
f
.
getSelected
()
==
YesNoEnum
.
YES
.
getValue
()).
findFirst
().
orElseGet
(()
->
null
);
if
(
ObjectUtils
.
isEmpty
(
moduleDistribute
))
throw
new
AppException
(
"当前产品选择切换后没有默认选择,不能切换!"
);
}
//查询同类资源,变更为非默认值后 再更新
//查询同类资源,变更为非默认值后 再更新
DeviceModuleDistributeQuery
query
=
new
DeviceModuleDistributeQuery
();
DeviceModuleDistributeQuery
query
=
new
DeviceModuleDistributeQuery
();
...
@@ -128,6 +147,8 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<D
...
@@ -128,6 +147,8 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<D
distributeEntity
.
setUpdateTime
(
new
Date
());
distributeEntity
.
setUpdateTime
(
new
Date
());
distributeEntity
.
setUpdateUserId
(
this
.
getContextUserId
(
context
));
distributeEntity
.
setUpdateUserId
(
this
.
getContextUserId
(
context
));
this
.
update
(
distributeEntity
,
context
);
return
Rest
.
ok
();
return
Rest
.
ok
();
}
}
...
...
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