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
09929453
Commit
09929453
authored
Mar 13, 2024
by
KeYong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
系统添加简介字段
parent
13bcd547
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
0 deletions
+17
-0
FireFightingSystemEntity.java
...n/equipmanage/common/entity/FireFightingSystemEntity.java
+3
-0
FireFightingSystemController.java
.../equipmanage/controller/FireFightingSystemController.java
+1
-0
wl-3.6.0.xml
...ot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
+13
-0
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/FireFightingSystemEntity.java
View file @
09929453
...
@@ -148,6 +148,9 @@ public class FireFightingSystemEntity {
...
@@ -148,6 +148,9 @@ public class FireFightingSystemEntity {
@ApiModelProperty
(
"系统运行状态"
)
@ApiModelProperty
(
"系统运行状态"
)
private
String
systemRunState
;
private
String
systemRunState
;
@ApiModelProperty
(
"系统简介"
)
private
String
systemDescribe
;
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
Integer
isAlarm
;
private
Integer
isAlarm
;
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java
View file @
09929453
...
@@ -932,6 +932,7 @@ public class FireFightingSystemController extends AbstractBaseController {
...
@@ -932,6 +932,7 @@ public class FireFightingSystemController extends AbstractBaseController {
Map
<
String
,
Object
>
state
=
new
HashMap
<>();
Map
<
String
,
Object
>
state
=
new
HashMap
<>();
state
.
put
(
"detail"
,
fireSystem
);
state
.
put
(
"detail"
,
fireSystem
);
state
.
put
(
"pageType"
,
"look"
);
state
.
put
(
"pageType"
,
"look"
);
state
.
put
(
"sysDesc"
,
fireFightingSystem
.
getSystemDescribe
());
res
.
put
(
"state"
,
state
);
res
.
put
(
"state"
,
state
);
return
res
;
return
res
;
}
}
...
...
amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
View file @
09929453
...
@@ -1066,4 +1066,16 @@
...
@@ -1066,4 +1066,16 @@
) ENGINE=InnoDB AUTO_INCREMENT=20240103 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='社会力量表';
) ENGINE=InnoDB AUTO_INCREMENT=20240103 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='社会力量表';
</sql>
</sql>
</changeSet>
</changeSet>
<changeSet
author=
"keyong"
id=
"1710319780"
>
<preConditions
onFail=
"MARK_RAN"
>
<not>
<columnExists
tableName=
"f_fire_fighting_system"
columnName=
"system_describe"
/>
</not>
</preConditions>
<comment>
f_fire_fighting_system表新增属性字段system_describe
</comment>
<sql>
alter table `f_fire_fighting_system` add column `system_describe` text DEFAULT NULL COMMENT '系统介绍';
</sql>
</changeSet>
</databaseChangeLog>
</databaseChangeLog>
\ No newline at end of file
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