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
23c88d80
Commit
23c88d80
authored
Jan 05, 2023
by
lisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加接口
parent
d9851bcc
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
241 additions
and
2 deletions
+241
-2
EmergencyController.java
...m/yeejoin/equipmanage/controller/EmergencyController.java
+177
-2
EmergencyMapper.java
.../java/com/yeejoin/equipmanage/mapper/EmergencyMapper.java
+14
-0
IEmergencyService.java
...va/com/yeejoin/equipmanage/service/IEmergencyService.java
+10
-0
EmergencyServiceImpl.java
...eejoin/equipmanage/service/impl/EmergencyServiceImpl.java
+40
-0
EmergencyMapper.xml
...ystem-equip/src/main/resources/mapper/EmergencyMapper.xml
+0
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EmergencyController.java
View file @
23c88d80
...
...
@@ -3,6 +3,8 @@ package com.yeejoin.equipmanage.controller;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.equipmanage.common.utils.CommonResponseUtil
;
import
com.yeejoin.equipmanage.common.utils.DateUtils
;
import
com.yeejoin.equipmanage.common.vo.IotDataVO
;
import
com.yeejoin.equipmanage.service.IEmergencyService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
...
...
@@ -14,11 +16,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
org.typroject.tyboot.core.foundation.utils.DateTimeUtil
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
java.util.List
;
import
java.util.Map
;
import
java.math.BigDecimal
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
static
org
.
typroject
.
tyboot
.
core
.
foundation
.
utils
.
DateTimeUtil
.
ISO8601_DATE_HOUR_MIN_SEC
;
/**
*
...
...
@@ -171,4 +178,172 @@ public class EmergencyController extends AbstractBaseController {
return
iEmergencyService
.
selectAlarmAnalysisCount
(
bizOrgCode
,
startDate
,
endDate
);
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
"消防炮灭火系统告警分析-饼图"
)
@GetMapping
(
value
=
"/fireCannonAlarmAnalysisPie"
)
public
List
<
Map
<
String
,
Object
>>
fireCannonAlarmAnalysisPie
(
@RequestParam
(
value
=
"startDate"
)
String
startDate
,
@RequestParam
(
value
=
"endDate"
)
String
endDate
,
@RequestParam
(
value
=
"systemType"
)
String
systemType
)
{
return
iEmergencyService
.
selectFireCannonAlarmAnalysisPie
(
startDate
,
endDate
,
systemType
);
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
"消防给水系统告警分析-饼图"
)
@GetMapping
(
value
=
"/waterSystemAlarmAnalysisPie"
)
public
List
<
Map
<
String
,
Object
>>
waterSystemAlarmAnalysisPie
(
@RequestParam
(
value
=
"startDate"
)
String
startDate
,
@RequestParam
(
value
=
"endDate"
)
String
endDate
,
@RequestParam
(
value
=
"systemType"
)
String
systemType
)
{
return
iEmergencyService
.
waterSystemAlarmAnalysisPie
(
startDate
,
endDate
,
systemType
);
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
"消防给水系统告警分析-小图"
)
@GetMapping
(
value
=
"/waterSystemAlarmAnalysis"
)
public
List
<
Map
<
String
,
Object
>>
waterSystemAlarmAnalysis
(
@RequestParam
(
value
=
"startDate"
)
String
startDate
,
@RequestParam
(
value
=
"endDate"
)
String
endDate
,
@RequestParam
(
value
=
"type"
)
String
type
,
@RequestParam
(
value
=
"systemType"
)
String
systemType
)
{
ArrayList
<
Map
<
String
,
Object
>>
result
=
new
ArrayList
<>();
List
<
Map
<
String
,
Object
>>
maps
=
iEmergencyService
.
waterSystemAlarmAnalysis
(
startDate
,
endDate
,
"0"
,
""
,
systemType
);
if
(
"week"
.
equals
(
type
))
{
List
<
Map
<
String
,
String
>>
weeksMapInterval
=
DateUtils
.
getWeeksMapInterval
(
DateUtils
.
dateToStringMonth
(
startDate
));
for
(
Map
<
String
,
String
>
week
:
weeksMapInterval
)
{
Date
weekStart
=
null
;
Date
weekEnd
=
null
;
try
{
weekStart
=
DateUtils
.
dateParse
(
week
.
get
(
"weekStart"
),
DateUtils
.
DATE_PATTERN
);
weekEnd
=
DateUtils
.
dateParse
(
week
.
get
(
"weekEnd"
),
DateUtils
.
DATE_PATTERN
);
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
long
startTime
=
weekStart
.
getTime
();
long
endTime
=
weekEnd
.
getTime
();
HashMap
<
String
,
Object
>
mapData
=
new
HashMap
<>();
for
(
Map
<
String
,
Object
>
map
:
maps
)
{
Date
check
=
null
;
try
{
check
=
DateUtils
.
dateParse
(
String
.
valueOf
(
map
.
get
(
"date"
)),
DateUtils
.
DATE_PATTERN
);
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
if
(!
ObjectUtils
.
isEmpty
(
check
)
&&
check
.
getTime
()
>=
startTime
&&
check
.
getTime
()
<=
endTime
)
{
if
(!
ObjectUtils
.
isEmpty
(
mapData
))
{
BigDecimal
old
=
new
BigDecimal
(
String
.
valueOf
(
mapData
.
get
(
"controlCabinetAlarmNum"
)));
BigDecimal
add
=
new
BigDecimal
(
String
.
valueOf
(
map
.
get
(
"controlCabinetAlarmNum"
)));
BigDecimal
now
=
old
.
add
(
add
);
mapData
.
put
(
"controlCabinetAlarmNum"
,
String
.
valueOf
(
now
));
BigDecimal
firePumpsOld
=
new
BigDecimal
(
String
.
valueOf
(
mapData
.
get
(
"firePumpsAlarmNum"
)));
BigDecimal
firePumpsAdd
=
new
BigDecimal
(
String
.
valueOf
(
map
.
get
(
"firePumpsAlarmNum"
)));
BigDecimal
firePumpsNow
=
firePumpsOld
.
add
(
firePumpsAdd
);
mapData
.
put
(
"firePumpsAlarmNum"
,
String
.
valueOf
(
firePumpsNow
));
BigDecimal
stabilizedOld
=
new
BigDecimal
(
String
.
valueOf
(
mapData
.
get
(
"stabilizedPumpAlarmNum"
)));
BigDecimal
stabilizedAdd
=
new
BigDecimal
(
String
.
valueOf
(
map
.
get
(
"stabilizedPumpAlarmNum"
)));
BigDecimal
stabilizedNow
=
stabilizedOld
.
add
(
stabilizedAdd
);
mapData
.
put
(
"stabilizedPumpAlarmNum"
,
String
.
valueOf
(
stabilizedNow
));
}
else
{
mapData
.
put
(
"name"
,
week
.
get
(
"name"
));
mapData
.
put
(
"controlCabinetAlarmNum"
,
map
.
get
(
"controlCabinetAlarmNum"
));
mapData
.
put
(
"firePumpsAlarmNum"
,
map
.
get
(
"firePumpsAlarmNum"
));
mapData
.
put
(
"stabilizedPumpAlarmNum"
,
map
.
get
(
"stabilizedPumpAlarmNum"
));
}
}
}
result
.
add
(
mapData
);
}
}
else
if
(
"day"
.
equals
(
type
))
{
return
maps
;
}
else
if
(
"month"
.
equals
(
type
))
{
String
date
=
startDate
.
substring
(
0
,
4
)
+
"-01"
+
"-01"
;
return
iEmergencyService
.
waterSystemAlarmAnalysis
(
startDate
,
endDate
,
"1"
,
date
,
systemType
);
}
return
result
;
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
"消防炮系统告警分析-折线图"
)
@GetMapping
(
value
=
"/fireCannonSystemAlarmAnalysis"
)
public
List
<
Map
<
String
,
Object
>>
fireCannonSystemAlarmAnalysis
(
@RequestParam
(
value
=
"startDate"
)
String
startDate
,
@RequestParam
(
value
=
"endDate"
)
String
endDate
,
@RequestParam
(
value
=
"type"
)
String
type
,
@RequestParam
(
value
=
"systemType"
)
String
systemType
)
{
ArrayList
<
Map
<
String
,
Object
>>
result
=
new
ArrayList
<>();
List
<
Map
<
String
,
Object
>>
maps
=
iEmergencyService
.
fireCannonSystemAlarmAnalysis
(
startDate
,
endDate
,
"0"
,
""
,
systemType
);
if
(
"week"
.
equals
(
type
))
{
List
<
Map
<
String
,
String
>>
weeksMapInterval
=
DateUtils
.
getWeeksMapInterval
(
DateUtils
.
dateToStringMonth
(
startDate
));
for
(
Map
<
String
,
String
>
week
:
weeksMapInterval
)
{
Date
weekStart
=
null
;
Date
weekEnd
=
null
;
try
{
weekStart
=
DateUtils
.
dateParse
(
week
.
get
(
"weekStart"
),
DateUtils
.
DATE_PATTERN
);
weekEnd
=
DateUtils
.
dateParse
(
week
.
get
(
"weekEnd"
),
DateUtils
.
DATE_PATTERN
);
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
long
startTime
=
weekStart
.
getTime
();
long
endTime
=
weekEnd
.
getTime
();
HashMap
<
String
,
Object
>
mapData
=
new
HashMap
<>();
for
(
Map
<
String
,
Object
>
map
:
maps
)
{
Date
check
=
null
;
try
{
check
=
DateUtils
.
dateParse
(
String
.
valueOf
(
map
.
get
(
"date"
)),
DateUtils
.
DATE_PATTERN
);
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
if
(!
ObjectUtils
.
isEmpty
(
check
)
&&
check
.
getTime
()
>=
startTime
&&
check
.
getTime
()
<=
endTime
)
{
if
(!
ObjectUtils
.
isEmpty
(
mapData
))
{
BigDecimal
old
=
new
BigDecimal
(
String
.
valueOf
(
mapData
.
get
(
"powerLossNum"
)));
BigDecimal
add
=
new
BigDecimal
(
String
.
valueOf
(
map
.
get
(
"powerLossNum"
)));
BigDecimal
now
=
old
.
add
(
add
);
mapData
.
put
(
"powerLossNum"
,
String
.
valueOf
(
now
));
BigDecimal
firePumpsOld
=
new
BigDecimal
(
String
.
valueOf
(
mapData
.
get
(
"faultNum"
)));
BigDecimal
firePumpsAdd
=
new
BigDecimal
(
String
.
valueOf
(
map
.
get
(
"faultNum"
)));
BigDecimal
firePumpsNow
=
firePumpsOld
.
add
(
firePumpsAdd
);
mapData
.
put
(
"faultNum"
,
String
.
valueOf
(
firePumpsNow
));
BigDecimal
stabilizedOld
=
new
BigDecimal
(
String
.
valueOf
(
mapData
.
get
(
"fireAlarmNum"
)));
BigDecimal
stabilizedAdd
=
new
BigDecimal
(
String
.
valueOf
(
map
.
get
(
"fireAlarmNum"
)));
BigDecimal
stabilizedNow
=
stabilizedOld
.
add
(
stabilizedAdd
);
mapData
.
put
(
"fireAlarmNum"
,
String
.
valueOf
(
stabilizedNow
));
BigDecimal
shieldOld
=
new
BigDecimal
(
String
.
valueOf
(
mapData
.
get
(
"shieldNum"
)));
BigDecimal
shieldAdd
=
new
BigDecimal
(
String
.
valueOf
(
map
.
get
(
"shieldNum"
)));
BigDecimal
shieldNow
=
shieldOld
.
add
(
shieldAdd
);
mapData
.
put
(
"shieldNum"
,
String
.
valueOf
(
shieldNow
));
}
else
{
mapData
.
put
(
"name"
,
week
.
get
(
"name"
));
mapData
.
put
(
"shieldNum"
,
map
.
get
(
"shieldNum"
));
mapData
.
put
(
"fireAlarmNum"
,
map
.
get
(
"fireAlarmNum"
));
mapData
.
put
(
"faultNum"
,
map
.
get
(
"faultNum"
));
mapData
.
put
(
"powerLossNum"
,
map
.
get
(
"powerLossNum"
));
}
}
}
result
.
add
(
mapData
);
}
}
else
if
(
"day"
.
equals
(
type
))
{
return
maps
;
}
else
if
(
"month"
.
equals
(
type
))
{
String
date
=
startDate
.
substring
(
0
,
4
)
+
"-01"
+
"-01"
;
return
iEmergencyService
.
fireCannonSystemAlarmAnalysis
(
startDate
,
endDate
,
"1"
,
date
,
systemType
);
}
return
result
;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EmergencyMapper.java
View file @
23c88d80
...
...
@@ -66,4 +66,18 @@ public interface EmergencyMapper extends BaseMapper{
List
<
Map
<
String
,
Object
>>
selectAlarmAnalysisCount
(
@Param
(
"bizOrgCode"
)
String
bizOrgCode
,
@Param
(
"startDate"
)
String
startDate
,
@Param
(
"endDate"
)
String
endDate
);
Map
<
String
,
Object
>
getSystemAndCarCount
();
List
<
String
>
selectSystemCodes
(
@Param
(
"systemType"
)
String
systemType
);
List
<
Map
<
String
,
Object
>>
selectFireCannonAlarmAnalysisPie
(
@Param
(
"startDate"
)
String
startDate
,
@Param
(
"endDate"
)
String
endDate
,
@Param
(
"list"
)
List
<
String
>
codes
);
List
<
Map
<
String
,
Object
>>
waterSystemAlarmAnalysisPie
(
@Param
(
"startDate"
)
String
startDate
,
@Param
(
"endDate"
)
String
endDate
,
@Param
(
"list"
)
List
<
String
>
codes
);
List
<
Map
<
String
,
Object
>>
waterSystemAlarmAnalysis
(
@Param
(
"startDate"
)
String
startDate
,
@Param
(
"endDate"
)
String
endDate
,
@Param
(
"dataType"
)
String
dataType
,
@Param
(
"date"
)
String
date
,
@Param
(
"list"
)
List
<
String
>
codes
);
List
<
Map
<
String
,
Object
>>
fireCannonSystemAlarmAnalysis
(
@Param
(
"startDate"
)
String
startDate
,
@Param
(
"endDate"
)
String
endDate
,
@Param
(
"dataType"
)
String
dataType
,
@Param
(
"date"
)
String
date
,
@Param
(
"list"
)
List
<
String
>
codes
);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEmergencyService.java
View file @
23c88d80
...
...
@@ -39,4 +39,14 @@ public interface IEmergencyService {
List
<
Map
<
String
,
Object
>>
selectAlarmAnalysisCount
(
String
bizOrgCode
,
String
startDate
,
String
endDate
);
Map
<
String
,
Object
>
systemAndCar
();
List
<
Map
<
String
,
Object
>>
selectFireCannonAlarmAnalysisPie
(
String
startDate
,
String
endDate
,
String
systemType
);
List
<
Map
<
String
,
Object
>>
waterSystemAlarmAnalysisPie
(
String
startDate
,
String
endDate
,
String
systemType
);
List
<
Map
<
String
,
Object
>>
waterSystemAlarmAnalysis
(
String
startDate
,
String
endDate
,
String
dataType
,
String
date
,
String
systemType
);
List
<
Map
<
String
,
Object
>>
fireCannonSystemAlarmAnalysis
(
String
startDate
,
String
endDate
,
String
dataType
,
String
date
,
String
systemType
);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java
View file @
23c88d80
...
...
@@ -6,6 +6,7 @@ import com.yeejoin.equipmanage.service.IEmergencyService;
import
org.apache.commons.compress.utils.Lists
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
import
java.util.*
;
...
...
@@ -102,4 +103,43 @@ public class EmergencyServiceImpl implements IEmergencyService {
public
Map
<
String
,
Object
>
systemAndCar
()
{
return
emergencyMapper
.
getSystemAndCarCount
();
}
@Override
public
List
<
Map
<
String
,
Object
>>
selectFireCannonAlarmAnalysisPie
(
String
startDate
,
String
endDate
,
String
systemType
)
{
List
<
String
>
strings
=
emergencyMapper
.
selectSystemCodes
(
systemType
);
if
(!
CollectionUtils
.
isEmpty
(
strings
))
{
return
emergencyMapper
.
selectFireCannonAlarmAnalysisPie
(
startDate
,
endDate
,
strings
);
}
return
null
;
}
@Override
public
List
<
Map
<
String
,
Object
>>
waterSystemAlarmAnalysisPie
(
String
startDate
,
String
endDate
,
String
systemType
)
{
List
<
String
>
strings
=
emergencyMapper
.
selectSystemCodes
(
systemType
);
if
(!
CollectionUtils
.
isEmpty
(
strings
))
{
return
emergencyMapper
.
waterSystemAlarmAnalysisPie
(
startDate
,
endDate
,
strings
);
}
return
null
;
}
@Override
public
List
<
Map
<
String
,
Object
>>
waterSystemAlarmAnalysis
(
String
startDate
,
String
endDate
,
String
dataType
,
String
date
,
String
systemType
)
{
List
<
String
>
strings
=
emergencyMapper
.
selectSystemCodes
(
systemType
);
if
(!
CollectionUtils
.
isEmpty
(
strings
))
{
return
emergencyMapper
.
waterSystemAlarmAnalysis
(
startDate
,
endDate
,
dataType
,
date
,
strings
);
}
return
null
;
}
@Override
public
List
<
Map
<
String
,
Object
>>
fireCannonSystemAlarmAnalysis
(
String
startDate
,
String
endDate
,
String
dataType
,
String
date
,
String
systemType
)
{
List
<
String
>
strings
=
emergencyMapper
.
selectSystemCodes
(
systemType
);
if
(!
CollectionUtils
.
isEmpty
(
strings
))
{
return
emergencyMapper
.
fireCannonSystemAlarmAnalysis
(
startDate
,
endDate
,
dataType
,
date
,
strings
);
}
return
null
;
}
}
amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml
View file @
23c88d80
This diff is collapsed.
Click to expand it.
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