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
07fb0caf
Commit
07fb0caf
authored
Sep 23, 2021
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
87482ed6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
8 deletions
+24
-8
OrgusrDataxDto.java
...ejoin/amos/boot/module/common/api/dto/OrgusrDataxDto.java
+4
-3
CommandController.java
...boot/module/command/biz/controller/CommandController.java
+20
-5
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgusrDataxDto.java
View file @
07fb0caf
...
@@ -18,10 +18,11 @@ public class OrgusrDataxDto {
...
@@ -18,10 +18,11 @@ public class OrgusrDataxDto {
@ApiModelProperty
(
value
=
"单位基本信息"
)
@ApiModelProperty
(
value
=
"单位基本信息"
)
private
OrgUsrzhDto
OrgUsrzhDto
;
private
OrgUsrzhDto
OrgUsrzhDto
;
@ApiModelProperty
(
value
=
"
现场图片
"
)
@ApiModelProperty
(
value
=
"
消防通道布置图
"
)
private
List
<
String
>
scenePicture
;
private
List
<
String
>
scenePicture
;
@ApiModelProperty
(
value
=
"平面图"
)
@ApiModelProperty
(
value
=
"
建筑
平面图"
)
private
List
<
String
>
planePicture
;
private
List
<
String
>
planePicture
;
@ApiModelProperty
(
value
=
"建筑立面图"
)
private
List
<
String
>
facadePicture
;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @
07fb0caf
...
@@ -845,11 +845,7 @@ public class CommandController extends BaseController {
...
@@ -845,11 +845,7 @@ public class CommandController extends BaseController {
buildId
=
orgUsrzhDto
.
get
(
0
).
getBuildId
();
buildId
=
orgUsrzhDto
.
get
(
0
).
getBuildId
();
}
}
}
}
if
(
buildId
!=
null
)
{
//现场照片 待完成,
//平面图。待完成orgUsrzhDto.getBuildId()
if
(
buildId
!=
null
)
{
List
<
Map
<
String
,
Object
>>
list
=
equipFeignClient
.
findImgByFileCategory
(
buildId
,
"fourImg"
).
getResult
();
List
<
Map
<
String
,
Object
>>
list
=
equipFeignClient
.
findImgByFileCategory
(
buildId
,
"fourImg"
).
getResult
();
List
<
String
>
url
=
new
ArrayList
<>();
List
<
String
>
url
=
new
ArrayList
<>();
if
(
list
!=
null
&&
list
.
size
()
>
0
)
{
if
(
list
!=
null
&&
list
.
size
()
>
0
)
{
...
@@ -857,7 +853,26 @@ public class CommandController extends BaseController {
...
@@ -857,7 +853,26 @@ public class CommandController extends BaseController {
url
.
add
(
map
.
get
(
"filePath"
).
toString
());
url
.
add
(
map
.
get
(
"filePath"
).
toString
());
});
});
}
}
//通道
List
<
Map
<
String
,
Object
>>
list1
=
equipFeignClient
.
findImgByFileCategory
(
buildId
,
"secondImg"
).
getResult
();
List
<
String
>
url1
=
new
ArrayList
<>();
if
(
list1
!=
null
&&
list1
.
size
()
>
0
)
{
list1
.
stream
().
forEach
(
map
->
{
url1
.
add
(
map
.
get
(
"filePath"
).
toString
());
});
}
//立面
List
<
Map
<
String
,
Object
>>
list2
=
equipFeignClient
.
findImgByFileCategory
(
buildId
,
"threeImg"
).
getResult
();
List
<
String
>
url2
=
new
ArrayList
<>();
if
(
list2
!=
null
&&
list2
.
size
()
>
0
)
{
list2
.
stream
().
forEach
(
map
->
{
url2
.
add
(
map
.
get
(
"filePath"
).
toString
());
});
}
orgusrDataxDto
.
setPlanePicture
(
url
);
orgusrDataxDto
.
setPlanePicture
(
url
);
orgusrDataxDto
.
setScenePicture
(
url1
);
orgusrDataxDto
.
setFacadePicture
(
url2
);
}
}
return
ResponseHelper
.
buildResponse
(
orgusrDataxDto
);
return
ResponseHelper
.
buildResponse
(
orgusrDataxDto
);
}
}
...
...
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