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
126aa0f8
Commit
126aa0f8
authored
Nov 08, 2022
by
xinglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*)修改特种设备地图少数据问题
parent
84f2138a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
InspectionServiceImpl.java
...ot/module/tzs/biz/service/impl/InspectionServiceImpl.java
+7
-7
No files found.
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/InspectionServiceImpl.java
View file @
126aa0f8
...
@@ -206,7 +206,7 @@ public class InspectionServiceImpl implements InspectionService {
...
@@ -206,7 +206,7 @@ public class InspectionServiceImpl implements InspectionService {
@Override
@Override
public
Page
<
JSONObject
>
getMapByRegion
(
Long
regionSeq
,
String
tableId
,
String
type
)
{
public
Page
<
JSONObject
>
getMapByRegion
(
Long
regionSeq
,
String
tableId
,
String
type
)
{
Page
<
JSONObject
>
page
=
new
Page
<>(
1
,
10
);
Page
<
JSONObject
>
page
=
new
Page
<>(
1
,
10
);
Collection
<
RegionModel
>
result
=
Systemctl
.
regionClient
.
queryByParentId
(
regionSeq
).
getResult
();
//
Collection<RegionModel> result = Systemctl.regionClient.queryByParentId(regionSeq).getResult();
JSONObject
tableMap
=
idxFeignService
.
queryByTableId
(
tableId
).
getResult
();
JSONObject
tableMap
=
idxFeignService
.
queryByTableId
(
tableId
).
getResult
();
String
tableName
=
tableMap
.
getString
(
"tableName"
);
String
tableName
=
tableMap
.
getString
(
"tableName"
);
JSONArray
tableCols
=
tableMap
.
getJSONArray
(
"tableCols"
);
JSONArray
tableCols
=
tableMap
.
getJSONArray
(
"tableCols"
);
...
@@ -220,15 +220,15 @@ public class InspectionServiceImpl implements InspectionService {
...
@@ -220,15 +220,15 @@ public class InspectionServiceImpl implements InspectionService {
JSONObject
jsonObject
=
new
JSONObject
();
JSONObject
jsonObject
=
new
JSONObject
();
String
selectSql
=
"SELECT * FROM "
+
tableName
+
" WHERE TYPE="
+
StringUtils
.
str2sqlValue
(
type
);
String
selectSql
=
"SELECT * FROM "
+
tableName
+
" WHERE TYPE="
+
StringUtils
.
str2sqlValue
(
type
);
Map
<
String
,
Object
>
objectMap
=
bizJdbcTemplate
.
queryForMap
(
selectSql
);
Map
<
String
,
Object
>
objectMap
=
bizJdbcTemplate
.
queryForMap
(
selectSql
);
result
.
forEach
(
x
->
{
//
result.forEach(x -> {
String
regionName
=
columMap
.
get
(
x
.
getRegionName
());
//
String regionName = columMap.get(x.getRegionName());
jsonObject
.
put
(
regionName
,
objectMap
.
get
(
regionName
));
//
jsonObject.put(regionName, objectMap.get(regionName));
});
//
});
if
(!
ValidationUtil
.
isEmpty
(
jsonObject
))
{
if
(!
ValidationUtil
.
isEmpty
(
objectMap
))
{
page
.
setTotal
(
1
);
page
.
setTotal
(
1
);
List
<
JSONObject
>
list
=
new
ArrayList
();
List
<
JSONObject
>
list
=
new
ArrayList
();
list
.
add
(
jsonObject
);
list
.
add
(
JSONObject
.
parseObject
(
JSONObject
.
toJSONString
(
objectMap
))
);
page
.
setRecords
(
list
);
page
.
setRecords
(
list
);
}
}
return
page
;
return
page
;
...
...
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