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
fbef470f
Commit
fbef470f
authored
Aug 03, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加客户端资源部署
parent
e50bf81a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
1 deletion
+37
-1
device-manager-ui/admin/src/views/device/module/distribute/list.vue
...ager-ui/admin/src/views/device/module/distribute/list.vue
+14
-1
device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceModuleDistributeVo.java
.../xhx/module/device/model/vo/DeviceModuleDistributeVo.java
+4
-0
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceModuleDistributeController.java
...x/module/device/web/DeviceModuleDistributeController.java
+19
-0
No files found.
device-manager-ui/admin/src/views/device/module/distribute/list.vue
View file @
fbef470f
...
...
@@ -29,8 +29,21 @@ export default {
},
/** 重写查看方法 */
toView
(
row
)
{
this
.
$refs
.
dialogform
.
view
(
row
);
this
.
$get
(
"
/device/module/distribute/view
"
,{
id
:
row
.
id
})
.
then
((
res
)
=>
{
if
(
res
.
code
==
1
)
{
window
.
open
(
res
.
data
.
entity
.
filePath
,
"
_blank
"
)
}
})
.
catch
((
error
)
=>
{
this
.
$message
.
error
(
error
.
message
);
});
},
distribute
(
row
)
{
this
.
$post
(
"
/device/module/distribute/active
"
,
row
)
...
...
device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceModuleDistributeVo.java
View file @
fbef470f
package
com.mortals.xhx.module.device.model.vo
;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.xhx.module.device.model.DeviceModuleDistributeEntity
;
import
lombok.Data
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
...
...
@@ -9,6 +11,8 @@ import java.util.List;
* @author zxfei
* @date 2022-08-02
*/
@Data
public
class
DeviceModuleDistributeVo
extends
BaseEntityLong
{
private
String
homeUrl
;
}
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceModuleDistributeController.java
View file @
fbef470f
package
com.mortals.xhx.module.device.web
;
import
cn.hutool.core.net.url.UrlBuilder
;
import
com.mortals.framework.ap.GlobalSysInfo
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.common.code.ImageReEnum
;
...
...
@@ -8,6 +11,7 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
import
com.mortals.xhx.module.product.model.ProductEntity
;
import
com.mortals.xhx.module.product.service.ProductService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -28,6 +32,8 @@ import java.util.Arrays;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
static
com
.
mortals
.
framework
.
ap
.
SysConstains
.*;
import
static
com
.
mortals
.
xhx
.
common
.
key
.
Constant
.
PARAM_SERVER_HTTP_URL
;
/**
*
* 设备前端模块部署
...
...
@@ -74,4 +80,17 @@ public class DeviceModuleDistributeController extends BaseCRUDJsonBodyMappingCon
return
rest
;
}
@Override
protected
int
viewAfter
(
Long
id
,
Map
<
String
,
Object
>
model
,
DeviceModuleDistributeEntity
entity
,
Context
context
)
throws
AppException
{
String
homeUrl
=
""
;
ProductEntity
productEntity
=
productService
.
get
(
entity
.
getProductId
(),
context
);
if
(!
ObjectUtils
.
isEmpty
(
productEntity
.
getHomeUrl
())){
homeUrl
=
productEntity
.
getHomeUrl
();
}
String
domain
=
GlobalSysInfo
.
getParamValue
(
PARAM_SERVER_HTTP_URL
,
"http://192.168.0.98:11091"
);
entity
.
setFilePath
(
UrlBuilder
.
of
(
domain
).
addPath
(
homeUrl
).
toString
());
return
super
.
viewAfter
(
id
,
model
,
entity
,
context
);
}
}
\ 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