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
5a6cb04c
Commit
5a6cb04c
authored
Nov 13, 2024
by
麻笑宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
大屏-应急管理-故障原因统计数据,各项数据均分为20%
大屏-总览-一物一赋码,表格表头错误显示了纳管率 代码修改
parent
1466aa02
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
EquipmentStaticsServiceImpl.java
...atistcs/biz/service/impl/EquipmentStaticsServiceImpl.java
+1
-1
StCommonServiceImpl.java
...odule/statistcs/biz/service/impl/StCommonServiceImpl.java
+6
-1
No files found.
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/EquipmentStaticsServiceImpl.java
View file @
5a6cb04c
...
...
@@ -81,7 +81,7 @@ public class EquipmentStaticsServiceImpl {
map
.
put
(
"chartType"
,
"bar"
);
}
else
{
map
.
put
(
"dataKey"
,
"stationRate"
);
map
.
put
(
"value"
,
"
纳管
率"
);
map
.
put
(
"value"
,
"
赋码
率"
);
map
.
put
(
"chartType"
,
"line"
);
}
legendData
.
add
(
map
);
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/StCommonServiceImpl.java
View file @
5a6cb04c
...
...
@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
import
com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum
;
import
com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum
;
import
com.yeejoin.amos.boot.module.jg.api.enums.DPMapStatisticsItemEnum
;
import
com.yeejoin.amos.boot.module.statistcs.biz.FeginService
;
import
com.yeejoin.amos.boot.module.statistics.api.mapper.CommonBaseMapper
;
import
com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper
;
import
com.yeejoin.amos.boot.module.statistics.api.vo.EquCategoryVo
;
...
...
@@ -32,6 +33,7 @@ import org.elasticsearch.search.aggregations.AggregationBuilders;
import
org.elasticsearch.search.aggregations.bucket.terms.Terms
;
import
org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder
;
import
org.elasticsearch.search.builder.SearchSourceBuilder
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.io.IOException
;
...
...
@@ -77,6 +79,9 @@ public class StCommonServiceImpl {
private
static
List
<
EquipmentCategoryDto
>
equipmentCategoryDtos
;
@Autowired
private
FeginService
feginService
;
public
StCommonServiceImpl
(
CommonBaseMapper
commonMapper
,
RestHighLevelClient
restHighLevelClient
,
EquipTechParamPipelineMapper
techParamsPipelineMapper
,
EquipmentCategoryMapper
equipmentCategoryMapper
,
ZLStatisticsMapper
zlStatisticsMapper
)
{
this
.
commonMapper
=
commonMapper
;
this
.
restHighLevelClient
=
restHighLevelClient
;
...
...
@@ -104,7 +109,7 @@ public class StCommonServiceImpl {
}
private
void
initReginCode
()
{
Collection
<
RegionModel
>
result
=
Systemctl
.
regionClient
.
queryForTree
(
null
).
getResult
();
Collection
<
RegionModel
>
result
=
feginService
.
queryForTree
(
null
).
getResult
();
result
.
forEach
(
r
->
{
regionModels
.
add
(
r
);
this
.
loopSetChildRegin
(
regionModels
,
r
.
getChildren
());
...
...
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