Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
d645040f
Commit
d645040f
authored
Apr 08, 2024
by
张森
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
23922 设备平台卡片测试 / 项目管理-文件下载:上传文件填写的名称存在特殊字符时导致文件无法下载
23887 设备平台卡片测试 / 关键数据-消防水池接口报错
parent
3c9d9886
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
FileManageController.java
.../yeejoin/equipmanage/controller/FileManageController.java
+3
-3
SupervisionConfigureController.java
...quipmanage/controller/SupervisionConfigureController.java
+5
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FileManageController.java
View file @
d645040f
...
@@ -58,10 +58,10 @@ public class FileManageController extends BaseController {
...
@@ -58,10 +58,10 @@ public class FileManageController extends BaseController {
}
}
@PersonIdentify
@PersonIdentify
@RequestMapping
(
value
=
"/getFileManageByName"
,
method
=
RequestMethod
.
GE
T
)
@RequestMapping
(
value
=
"/getFileManageByName"
,
method
=
RequestMethod
.
POS
T
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"
GE
T"
,
value
=
"列表行点击查看按钮"
,
produces
=
"application/json;charset=UTF-8"
,
notes
=
"列表行点击查看按钮"
)
@ApiOperation
(
httpMethod
=
"
POS
T"
,
value
=
"列表行点击查看按钮"
,
produces
=
"application/json;charset=UTF-8"
,
notes
=
"列表行点击查看按钮"
)
public
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
getFileManageByName
(
FileManageDto
dto
)
{
public
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
getFileManageByName
(
@RequestBody
FileManageDto
dto
)
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
ReginParams
reginParams
=
getSelectedOrgInfo
();
dto
.
setBizOrgCode
(
reginParams
.
getPersonIdentity
().
getBizOrgCode
());
dto
.
setBizOrgCode
(
reginParams
.
getPersonIdentity
().
getBizOrgCode
());
return
CommonResponseUtil
.
success
(
fileManageService
.
getFileManageByName
(
dto
));
return
CommonResponseUtil
.
success
(
fileManageService
.
getFileManageByName
(
dto
));
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java
View file @
d645040f
...
@@ -126,10 +126,13 @@ public class SupervisionConfigureController extends AbstractBaseController {
...
@@ -126,10 +126,13 @@ public class SupervisionConfigureController extends AbstractBaseController {
for
(
String
pumpDeviceId
:
pumpDeviceIds
)
{
for
(
String
pumpDeviceId
:
pumpDeviceIds
)
{
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>();
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"pumpDeviceId"
,
pumpDeviceId
);
map
.
put
(
"pumpDeviceId"
,
pumpDeviceId
);
map
.
put
(
"outputFlowRate"
,
collect
.
getOrDefault
(
Long
.
valueOf
(
pumpDeviceId
),
"0"
));
if
(
collect
.
containsKey
(
Long
.
valueOf
(
pumpDeviceId
))
&&
StringUtil
.
isNotEmpty
(
collect
.
get
(
Long
.
valueOf
(
pumpDeviceId
))))
{
map
.
put
(
"outputFlowRate"
,
collect
.
get
(
Long
.
valueOf
(
pumpDeviceId
)));
}
else
{
map
.
put
(
"outputFlowRate"
,
0
);
}
info
.
add
(
map
);
info
.
add
(
map
);
}
}
// 按流量排序
// 按流量排序
Collections
.
sort
(
info
,
new
Comparator
<
Map
<
String
,
Object
>>()
{
Collections
.
sort
(
info
,
new
Comparator
<
Map
<
String
,
Object
>>()
{
@Override
@Override
...
...
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