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
5645e4d0
Commit
5645e4d0
authored
2 years ago
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改上传文件大小限制
parent
0eea5b1f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
17 deletions
+4
-17
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
...n/java/com/mortals/xhx/busiz/web/DeviceApiController.java
+3
-2
device-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
...in/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
+1
-15
No files found.
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
View file @
5645e4d0
...
...
@@ -445,8 +445,10 @@ public class DeviceApiController {
productVersionQuery
.
setOrderKind
(
OrderCol
.
DESCENDING
);
ProductVersionEntity
productVersionEntity
=
productVersionService
.
selectOne
(
productVersionQuery
);
if
(
ObjectUtils
.
isEmpty
(
productVersionEntity
))
if
(
ObjectUtils
.
isEmpty
(
productVersionEntity
)){
throw
new
AppException
(
DEVICE_VERSION_UNEXIST
,
DEVICE_VERSION_UNEXIST_CONTENT
);
}
ProductVersionInfo
productVersionInfo
=
new
ProductVersionInfo
();
BeanUtils
.
copyProperties
(
productVersionEntity
,
productVersionInfo
,
BeanUtil
.
getNullPropertyNames
(
productVersionEntity
));
...
...
@@ -456,7 +458,6 @@ public class DeviceApiController {
deviceResp
.
setContent
(
content
);
rsp
.
setData
(
deviceResp
);
}
catch
(
AppException
e
)
{
log
.
error
(
"接收数据失败"
,
e
);
rsp
.
setCode
(
e
.
getCode
());
rsp
.
setMsg
(
e
.
getMessage
());
return
JSON
.
toJSONString
(
rsp
);
...
...
This diff is collapsed.
Click to expand it.
device-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
View file @
5645e4d0
...
...
@@ -45,6 +45,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
if
(
resp
.
getCode
()
==
YesNoEnum
.
YES
.
getValue
())
{
//同步更新用户,以loginname为唯一标识,密码默认与用户相同
resp
.
getData
().
getData
().
forEach
(
user
->
{
log
.
info
(
"loginName:{}"
,
user
.
getLoginName
());
UserEntity
tempEntity
=
userService
.
selectOne
(
new
UserQuery
().
loginName
(
user
.
getLoginName
()));
if
(
ObjectUtils
.
isEmpty
(
tempEntity
))
{
UserEntity
userEntity
=
new
UserEntity
();
...
...
@@ -57,21 +58,6 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
log
.
info
(
"syncUserResp:{}"
,
JSON
.
toJSONString
(
resp
));
// return;
// UserPdu userPdu = new UserPdu();
// userPdu.setPage(1);
// userPdu.setSize(-1);
// String resp = userFeign.findAllUser(userPdu);
// log.info("resp:{}",resp);
// JSONObject jsonObject = JSONObject.parseObject(resp);
// if (jsonObject.getInteger("code") == 1) {
// List<UserPdu> userList = jsonObject.getJSONObject("data").getObject("data", new TypeReference<List<UserPdu>>() {
// });
//
// log.info("userList:{}", JSON.toJSONString(userList));
//
// }
}
...
...
This diff is collapsed.
Click to expand it.
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