Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
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
station
YeeAmosFireAutoSysRoot
Commits
9525c2f4
Commit
9525c2f4
authored
Dec 15, 2020
by
zhengjiawei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改f_equipment_manage to f_fire_fighting_system
parent
288b2038
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
25 deletions
+31
-25
StationMaintenServiceImp.java
...s/fas/business/service/impl/StationMaintenServiceImp.java
+30
-24
dbTemplate_equipment_specific.xml
...ain/resources/db/mapper/dbTemplate_equipment_specific.xml
+1
-1
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/StationMaintenServiceImp.java
View file @
9525c2f4
...
@@ -21,30 +21,36 @@ public class StationMaintenServiceImp implements IStationMaintenService {
...
@@ -21,30 +21,36 @@ public class StationMaintenServiceImp implements IStationMaintenService {
@Override
@Override
public
void
save
(
StationInfo
stationInfo
){
public
void
save
(
StationInfo
stationInfo
){
// 状态为启用(0)下只能修改换流站名称
StringBuilder
stringBuilder
=
new
StringBuilder
();
if
(
stationInfo
.
getId
()
==
0
){
stringBuilder
.
append
(
stationInfo
.
getUseType
());
StringBuilder
stringBuilder
=
new
StringBuilder
();
stringBuilder
.
append
(
stationInfo
.
getRegionCode
());
stringBuilder
.
append
(
stationInfo
.
getUseType
());
stringBuilder
.
append
(
stationInfo
.
getCode
());
stringBuilder
.
append
(
stationInfo
.
getRegionCode
());
stationInfo
.
setStationCode
(
stringBuilder
.
toString
());
stringBuilder
.
append
(
stationInfo
.
getCode
());
stationInfo
.
setStationCode
(
stringBuilder
.
toString
());
// // 状态为启用(0)下只能修改换流站名称
}
else
{
// if(stationInfo.getId() == 0){
StationInfo
station
=
detail
();
// StringBuilder stringBuilder = new StringBuilder();
// 判断状态是否切换
// stringBuilder.append(stationInfo.getUseType());
if
(!
station
.
getStatus
().
equals
(
stationInfo
.
getStatus
())){
// stringBuilder.append(stationInfo.getRegionCode());
StringBuilder
stringBuilder
=
new
StringBuilder
();
// stringBuilder.append(stationInfo.getCode());
// stationInfo.setStationCode(stringBuilder.toString());
if
(
StringUtils
.
isEmpty
(
stationInfo
.
getRegionCode
())){
// }else{
stringBuilder
.
append
(
station
.
getStationCode
());
// StationInfo station = detail();
}
else
{
// // 判断状态是否切换
stringBuilder
.
append
(
stationInfo
.
getUseType
());
// if(!station.getStatus().equals(stationInfo.getStatus())){
stringBuilder
.
append
(
stationInfo
.
getRegionCode
());
// StringBuilder stringBuilder = new StringBuilder();
stringBuilder
.
append
(
stationInfo
.
getCode
());
//
}
// if(StringUtils.isEmpty(stationInfo.getRegionCode())){
// stringBuilder.append(station.getStationCode());
stationInfo
.
setStationCode
(
stringBuilder
.
toString
());
// }else{
}
// stringBuilder.append(stationInfo.getUseType());
}
// stringBuilder.append(stationInfo.getRegionCode());
// stringBuilder.append(stationInfo.getCode());
// }
//
// stationInfo.setStationCode(stringBuilder.toString());
// }
// }
//保存
//保存
iStationMaintenDao
.
save
(
stationInfo
);
iStationMaintenDao
.
save
(
stationInfo
);
...
...
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific.xml
View file @
9525c2f4
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
left join wl_equipment_detail as det on sto.equipment_detail_id = det.id
left join wl_equipment_detail as det on sto.equipment_detail_id = det.id
left join wl_equipment as equ on det.equipment_id = equ.id
left join wl_equipment as equ on det.equipment_id = equ.id
left join wl_equipment_category as cate on equ.category_id = cate.id
left join wl_equipment_category as cate on equ.category_id = cate.id
left join f_
equipment_manage
as manage on spe.system_id = manage.SEQUENCE_NBR
left join f_
fire_fighting_system
as manage on spe.system_id = manage.SEQUENCE_NBR
where sto.amount
<![CDATA[>]]>
0
where sto.amount
<![CDATA[>]]>
0
<if
test=
"name != null and name!='null' "
>
<if
test=
"name != null and name!='null' "
>
and det.name like CONCAT('%',#{name},'%' )
and det.name like CONCAT('%',#{name},'%' )
...
...
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