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
622f67d9
Commit
622f67d9
authored
Jun 25, 2022
by
zhangsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改消防车辆接口返回值格式
parent
ebfd1321
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
2 deletions
+18
-2
CarInfoVO.java
...va/com/yeejoin/amos/boot/module/ccs/api/vo/CarInfoVO.java
+1
-1
CarNumberVO.java
.../com/yeejoin/amos/boot/module/ccs/api/vo/CarNumberVO.java
+8
-0
FireStationInfoServiceImpl.java
...dule/ccs/biz/service/impl/FireStationInfoServiceImpl.java
+9
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/vo/CarInfoVO.java
View file @
622f67d9
...
...
@@ -13,5 +13,5 @@ public class CarInfoVO implements Serializable {
private
String
strCarNumber
;
private
List
<
String
>
carList
;
private
List
<
CarNumberVO
>
carList
;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/vo/CarNumberVO.java
0 → 100644
View file @
622f67d9
package
com
.
yeejoin
.
amos
.
boot
.
module
.
ccs
.
api
.
vo
;
import
lombok.Data
;
@Data
public
class
CarNumberVO
{
private
String
carNum
;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireStationInfoServiceImpl.java
View file @
622f67d9
...
...
@@ -5,6 +5,7 @@ import cn.hutool.core.date.DatePattern;
import
cn.hutool.core.date.DateTime
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.StrUtil
;
import
com.alibaba.fastjson.JSONObject
;
import
com.yeejoin.amos.boot.module.ccs.api.dto.FireStationInfoDto
;
import
com.yeejoin.amos.boot.module.ccs.api.entity.FireFightingSystem
;
import
com.yeejoin.amos.boot.module.ccs.api.entity.FireStationInfo
;
...
...
@@ -16,6 +17,7 @@ import com.yeejoin.amos.boot.module.ccs.api.mapper.FireVehicleMapper;
import
com.yeejoin.amos.boot.module.ccs.api.service.IFireStationInfoService
;
import
com.yeejoin.amos.boot.module.ccs.api.vo.AlarmCountVO
;
import
com.yeejoin.amos.boot.module.ccs.api.vo.CarInfoVO
;
import
com.yeejoin.amos.boot.module.ccs.api.vo.CarNumberVO
;
import
com.yeejoin.amos.boot.module.ccs.api.vo.DateAlarmCountVO
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -157,8 +159,14 @@ public class FireStationInfoServiceImpl extends BaseService<FireStationInfoDto,
List
<
CarInfoVO
>
carInfoByStationCode
=
fireVehicleMapper
.
getCarInfoByStationCode
(
stationCode
);
carInfoByStationCode
.
forEach
(
item
->
{
if
(
StrUtil
.
isNotEmpty
(
item
.
getStrCarNumber
()))
{
List
<
CarNumberVO
>
carNumberVOS
=
new
ArrayList
<>();
List
<
String
>
list
=
Arrays
.
asList
(
item
.
getStrCarNumber
().
split
(
","
));
item
.
setCarList
(
list
);
list
.
forEach
(
carNum
->
{
CarNumberVO
carNumberVO
=
new
CarNumberVO
();
carNumberVO
.
setCarNum
(
carNum
);
carNumberVOS
.
add
(
carNumberVO
);
});
item
.
setCarList
(
carNumberVOS
);
}
});
return
carInfoByStationCode
;
...
...
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