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
5745f4e4
Commit
5745f4e4
authored
May 25, 2022
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
c14c914a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
BuildingVideoVO.java
...yeejoin/equipmanage/common/entity/vo/BuildingVideoVO.java
+1
-1
AlertCallePowerTransferRo.java
...os/boot/module/jcs/api/dto/AlertCallePowerTransferRo.java
+2
-2
RuleAlertCalledService.java
...t/module/jcs/biz/service/impl/RuleAlertCalledService.java
+2
-2
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/BuildingVideoVO.java
View file @
5745f4e4
...
@@ -31,7 +31,7 @@ public class BuildingVideoVO {
...
@@ -31,7 +31,7 @@ public class BuildingVideoVO {
private
String
token
;
private
String
token
;
@ApiModelProperty
(
"位置"
)
@ApiModelProperty
(
"位置"
)
private
String
location
=
"1楼202房间"
;
private
String
location
;
@ApiModelProperty
(
"设备id"
)
@ApiModelProperty
(
"设备id"
)
private
Long
specificId
;
private
Long
specificId
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCallePowerTransferRo.java
View file @
5745f4e4
...
@@ -88,7 +88,7 @@ public class AlertCallePowerTransferRo implements Serializable{
...
@@ -88,7 +88,7 @@ public class AlertCallePowerTransferRo implements Serializable{
private
String
powerTransType
;
private
String
powerTransType
;
//bug 5973
//bug 5973
@Label
(
value
=
"类别"
)
//
@Label(value = "类别")
private
Integer
category
;
//
private Integer category;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/RuleAlertCalledService.java
View file @
5745f4e4
...
@@ -266,8 +266,8 @@ public class RuleAlertCalledService {
...
@@ -266,8 +266,8 @@ public class RuleAlertCalledService {
if
(
alertCalledFormDto
==
null
)
{
if
(
alertCalledFormDto
==
null
)
{
return
false
;
return
false
;
}
}
//任务型计划 // bug 5973
/*
//任务型计划 // bug 5973
alertCallePowerTransferRo
.
setCategory
(
RuleTypeEnum
.
任务型计划生成
.
getCategory
());
alertCallePowerTransferRo.setCategory(RuleTypeEnum.任务型计划生成.getCategory());
*/
AlertCalled
alertCalled
=
alertCalledFormDto
.
getAlertCalled
();
AlertCalled
alertCalled
=
alertCalledFormDto
.
getAlertCalled
();
alertCallePowerTransferRo
alertCallePowerTransferRo
...
...
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