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
189fe0c4
Commit
189fe0c4
authored
Aug 30, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加产品升级功能
parent
7c26f6cd
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
3 deletions
+5
-3
device-manager-ui/admin/src/views/product/version/drawershow.vue
...manager-ui/admin/src/views/product/version/drawershow.vue
+1
-1
device-manager/src/main/java/com/mortals/xhx/busiz/rsp/ProductVersionInfo.java
...in/java/com/mortals/xhx/busiz/rsp/ProductVersionInfo.java
+1
-1
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
...n/java/com/mortals/xhx/busiz/web/DeviceApiController.java
+2
-0
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
.../java/com/mortals/httpclient/device/DeviceController.http
+1
-1
No files found.
device-manager-ui/admin/src/views/product/version/drawershow.vue
View file @
189fe0c4
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
// 是否显示弹出层
// 是否显示弹出层
open
:
false
,
open
:
false
,
direction
:
"
rtl
"
,
direction
:
"
rtl
"
,
toString
:[
toString
:[
"
productId
"
],
],
toDate
:[
toDate
:[
],
],
...
...
device-manager/src/main/java/com/mortals/xhx/busiz/rsp/ProductVersionInfo.java
View file @
189fe0c4
...
@@ -24,7 +24,7 @@ public class ProductVersionInfo implements Serializable {
...
@@ -24,7 +24,7 @@ public class ProductVersionInfo implements Serializable {
/**
/**
* 版本号
* 版本号
*/
*/
private
String
version
;
private
Integer
version
;
/**
/**
* 备注信息
* 备注信息
...
...
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
View file @
189fe0c4
...
@@ -438,7 +438,9 @@ public class DeviceApiController {
...
@@ -438,7 +438,9 @@ public class DeviceApiController {
if
(
ObjectUtils
.
isEmpty
(
productVersionEntity
))
if
(
ObjectUtils
.
isEmpty
(
productVersionEntity
))
throw
new
AppException
(
DEVICE_VERSION_UNEXIST
,
DEVICE_VERSION_UNEXIST_CONTENT
);
throw
new
AppException
(
DEVICE_VERSION_UNEXIST
,
DEVICE_VERSION_UNEXIST_CONTENT
);
ProductVersionInfo
productVersionInfo
=
new
ProductVersionInfo
();
ProductVersionInfo
productVersionInfo
=
new
ProductVersionInfo
();
BeanUtils
.
copyProperties
(
productVersionEntity
,
productVersionInfo
,
BeanUtil
.
getNullPropertyNames
(
productVersionEntity
));
BeanUtils
.
copyProperties
(
productVersionEntity
,
productVersionInfo
,
BeanUtil
.
getNullPropertyNames
(
productVersionEntity
));
buildDownloadUrl
(
productVersionEntity
,
productVersionInfo
);
buildDownloadUrl
(
productVersionEntity
,
productVersionInfo
);
String
content
=
EncryptUtil
.
myEnscrt
(
JSON
.
toJSONString
(
productVersionInfo
),
9
,
DES_STR
,
ENCRYPT_STR
);
String
content
=
EncryptUtil
.
myEnscrt
(
JSON
.
toJSONString
(
productVersionInfo
),
9
,
DES_STR
,
ENCRYPT_STR
);
deviceResp
.
setContent
(
content
);
deviceResp
.
setContent
(
content
);
...
...
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
View file @
189fe0c4
...
@@ -149,7 +149,7 @@ POST {{baseUrl}}/api/checkVersion
...
@@ -149,7 +149,7 @@ POST {{baseUrl}}/api/checkVersion
Content-Type: application/json
Content-Type: application/json
{
{
"deviceCode": "
70-4A-0E-BC-EE-8A
"
"deviceCode": "
18-93-7F-C0-AD-B5
"
}
}
###设备上报
###设备上报
...
...
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