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
8c0c6c2b
Commit
8c0c6c2b
authored
Apr 06, 2021
by
田涛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug-768 电力设备添加配套设备分页
parent
bf2b428d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
EquipmentSpecificServiceImpl.java
...s/business/service/impl/EquipmentSpecificServiceImpl.java
+1
-1
application.properties
...ireAutoSysStart/src/main/resources/application.properties
+3
-3
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentSpecificServiceImpl.java
View file @
8c0c6c2b
...
...
@@ -84,7 +84,7 @@ public class EquipmentSpecificServiceImpl implements EquipmentSpecificService {
allChildren
.
forEach
(
cate
->
finalEquipmentIdList
.
add
(
cate
.
getId
()));
}
}
List
<
EquipmentSpecificVo
>
equipmentBySpe
=
equipmentSpecificMapper
.
getEquipmentBySpe
(
pageNumber
,
pageSize
,
name
,
null
,
null
,
equipmentIdList
);
List
<
EquipmentSpecificVo
>
equipmentBySpe
=
equipmentSpecificMapper
.
getEquipmentBySpe
(
pageNumber
*
pageSize
,
pageSize
,
name
,
null
,
null
,
equipmentIdList
);
int
equipmentBySpeCount
=
equipmentSpecificMapper
.
getEquipmentBySpeCount
(
name
,
null
,
null
,
equipmentIdList
);
map
.
put
(
"content"
,
equipmentBySpe
);
map
.
put
(
"totalElements"
,
equipmentBySpeCount
);
...
...
YeeAmosFireAutoSysStart/src/main/resources/application.properties
View file @
8c0c6c2b
spring.application.name
=
AMOS-AUTOSYS
spring.application.name
=
AMOS-AUTOSYS
-TT
server.servlet.context-path
=
/fireAutoSys
server.port
=
8085
server.port
=
11024
spring.profiles.active
=
dev
#应用product appkey
security.productWeb
=
STUDIO_APP_WEB
...
...
@@ -50,7 +50,7 @@ visual.fegin.name=maas-visual
#值班系统
dutyMode.fegin.name
=
AMOS-DUTYMODE
#队站装备管理名称,主要用于风险区域同步至仓库货位和订阅装备信息系统
equipManage.fegin.name
=
AMOS-EQUIPMANAGE
equipManage.fegin.name
=
AMOS-EQUIPMANAGE
-TT
#feginName
number.plan.projectName
=
换流站消防专项预案
...
...
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