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
1e9b3d1c
Commit
1e9b3d1c
authored
Aug 01, 2024
by
刘凡
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*)新增字段
parent
a64593a3
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
6 deletions
+20
-6
AlertUseUnitStatisticsDto.java
...ot/module/elevator/api/dto/AlertUseUnitStatisticsDto.java
+3
-0
AlertUseUnitStatistics.java
...ot/module/elevator/api/entity/AlertUseUnitStatistics.java
+6
-0
AlertUseUnitStatisticsServiceImpl.java
...r/biz/service/impl/AlertUseUnitStatisticsServiceImpl.java
+1
-0
DPSubController.java
...boot/module/statistcs/biz/controller/DPSubController.java
+8
-6
emergency.json
...ule-statistics-biz/src/main/resources/json/emergency.json
+1
-0
registration.json
...-statistics-biz/src/main/resources/json/registration.json
+1
-0
No files found.
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/AlertUseUnitStatisticsDto.java
View file @
1e9b3d1c
...
...
@@ -48,6 +48,9 @@ public class AlertUseUnitStatisticsDto extends BaseDto {
@ApiModelProperty
(
value
=
"电梯总量"
)
private
Integer
equipNum
;
@ApiModelProperty
(
value
=
"使用单位统一信用代码"
)
private
String
useUnitCode
;
@ApiModelProperty
(
value
=
"使用单位"
)
private
String
useUnit
;
...
...
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/entity/AlertUseUnitStatistics.java
View file @
1e9b3d1c
...
...
@@ -76,6 +76,12 @@ public class AlertUseUnitStatistics extends BaseEntity {
private
Integer
equipNum
;
/**
* 使用单位统一信用代码
*/
@TableField
(
"use_unit_code"
)
private
String
useUnitCode
;
/**
* 使用单位
*/
@TableField
(
"use_unit"
)
...
...
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertUseUnitStatisticsServiceImpl.java
View file @
1e9b3d1c
...
...
@@ -55,6 +55,7 @@ public class AlertUseUnitStatisticsServiceImpl extends BaseService<AlertUseUnitS
useUnitMessage
.
setStartDate
(
format
.
format
(
firstDayOfMonth
));
useUnitMessage
.
setEndDate
(
format
.
format
(
lastDayOfMonth
));
useUnitMessage
.
setStatisticsDate
(
format
.
format
(
lastDayOfMonth
).
substring
(
0
,
7
));
useUnitMessage
.
setUseUnitCode
(
item
.
get
(
"unitCode"
));
list
.
add
(
useUnitMessage
);
}
});
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/DPSubController.java
View file @
1e9b3d1c
...
...
@@ -37,9 +37,9 @@ public class DPSubController {
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"动态详情页"
,
notes
=
"动态详情页"
)
@PostMapping
(
value
=
"/{template}"
)
public
ResponseModel
<
JSONObject
>
commonQuery
(
@PathVariable
String
template
,
@RequestBody
Map
<
String
,
Object
>
param
)
{
if
(
template
.
equals
(
"company"
))
{
if
(
template
.
equals
(
"company"
))
{
// 企业
Assert
.
notNull
(
param
.
get
(
"useUnitCode"
),
"企业统一信用代码不能为空"
);
}
else
if
(
template
.
equals
(
"equip"
))
{
}
else
if
(
template
.
equals
(
"equip"
))
{
// 设备
if
(
ValidationUtil
.
isEmpty
(
param
.
get
(
"record"
))){
param
.
put
(
"record"
,
param
.
get
(
"SEQUENCE_NBR"
));
}
...
...
@@ -54,15 +54,17 @@ public class DPSubController {
Assert
.
notNull
(
param
.
get
(
"record"
),
"设备ID不能为空"
);
Assert
.
notNull
(
param
.
get
(
"equList"
),
"设备种类不能为空"
);
template
=
template
+
"_"
+
param
.
get
(
"equList"
);
}
else
if
(
template
.
equals
(
"emergency"
)
||
template
.
equals
(
"registration"
))
{
}
else
if
(
template
.
equals
(
"emergency"
))
{
// 应急
if
(!
ValidationUtil
.
isEmpty
(
param
.
get
(
"alertId"
))){
param
.
put
(
"sequenceNbr"
,
param
.
get
(
"alertId"
));
}
Assert
.
notNull
(
param
.
get
(
"sequenceNbr"
),
"sequenceNbr不能为空"
);
}
else
if
(
template
.
equals
(
"problem"
))
{
}
else
if
(
template
.
equals
(
"problem"
))
{
// 隐患
if
(
ValidationUtil
.
isEmpty
(
param
.
get
(
"sequenceNbr"
))){
param
.
put
(
"sequenceNbr"
,
param
.
get
(
"alertId"
));
}
Assert
.
notNull
(
param
.
get
(
"sequenceNbr"
),
"sequenceNbr不能为空"
);
}
else
if
(
template
.
equals
(
"cylinderProblem"
))
{
template
=
"problem_cylinder"
;
}
else
if
(
template
.
equals
(
"registration"
))
{
// 登记证
Assert
.
notNull
(
param
.
get
(
"sequenceNbr"
),
"sequenceNbr不能为空"
);
}
else
{
throw
new
RuntimeException
(
"暂无模板"
);
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/emergency.json
View file @
1e9b3d1c
{
"name"
:
"应急模板"
,
"tabs"
:
[
{
"key"
:
"keyinfo"
,
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/registration.json
View file @
1e9b3d1c
{
"name"
:
"登记证模板"
,
"tabs"
:
[
{
"key"
:
"keyinfo"
,
...
...
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