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
85f52c13
Commit
85f52c13
authored
Dec 10, 2022
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
7c2ae76d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
CarController.java
...ava/com/yeejoin/equipmanage/controller/CarController.java
+6
-1
CarMapper.xml
...boot-system-equip/src/main/resources/mapper/CarMapper.xml
+1
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java
View file @
85f52c13
...
...
@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.controller;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
...
...
@@ -1094,7 +1095,11 @@ public class CarController extends AbstractBaseController {
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"获取车辆物联信息"
,
notes
=
"获取车辆物联信息"
)
public
Map
<
Long
,
List
<
CarIndexVo
>>
getCarsIotInfo
()
{
Map
<
Long
,
List
<
CarIndexVo
>>
map
=
null
;
String
orgCode
=
getOrgCode
();
// String orgCode = getOrgCode();
ReginParams
ReginParams
=
getSelectedOrgInfo
();
String
orgCode
=
ReginParams
.
getPersonIdentity
().
getBizOrgCode
();
List
<
CarIndexVo
>
carVoList
=
iCarService
.
getCarsIotInfo
(
orgCode
);
if
(!
carVoList
.
isEmpty
())
{
map
=
carVoList
.
stream
().
collect
(
Collectors
.
groupingBy
(
vo
->
vo
.
getId
()));
...
...
amos-boot-system-equip/src/main/resources/mapper/CarMapper.xml
View file @
85f52c13
...
...
@@ -163,7 +163,7 @@
WHERE
1=1
<if
test=
"orgCode != null and orgCode != ''"
>
AND c.org_code = #{orgCode}
AND c.
biz_
org_code = #{orgCode}
</if>
AND c.id = cp.car_id
AND cp.equipment_index_id = ei.id
...
...
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