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
6f055f2d
Commit
6f055f2d
authored
Apr 17, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
63b6a374
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
PlanController.java
...ejoin/amos/patrol/business/controller/PlanController.java
+1
-1
PointController.java
...join/amos/patrol/business/controller/PointController.java
+3
-2
RouteController.java
...join/amos/patrol/business/controller/RouteController.java
+1
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanController.java
View file @
6f055f2d
...
@@ -239,7 +239,7 @@ public class PlanController extends AbstractBaseController {
...
@@ -239,7 +239,7 @@ public class PlanController extends AbstractBaseController {
public
CommonResponse
queryPointById
(
@ApiParam
(
value
=
"计划id"
,
required
=
true
)
@PathVariable
(
name
=
"id"
)
Long
id
)
{
public
CommonResponse
queryPointById
(
@ApiParam
(
value
=
"计划id"
,
required
=
true
)
@PathVariable
(
name
=
"id"
)
Long
id
)
{
Plan
plan
=
planService
.
queryPlanById
(
id
);
Plan
plan
=
planService
.
queryPlanById
(
id
);
Object
ob
=
ToJson
.
tojson
(
plan
)
;
Object
ob
=
plan
!=
null
?
ToJson
.
tojson
(
plan
):
null
;
return
CommonResponseUtil
.
success
(
ob
);
return
CommonResponseUtil
.
success
(
ob
);
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java
View file @
6f055f2d
...
@@ -119,7 +119,8 @@ public class PointController extends AbstractBaseController {
...
@@ -119,7 +119,8 @@ public class PointController extends AbstractBaseController {
try
{
try
{
List
<
Map
<
String
,
Object
>>
pointInputItemList
=
iPointService
.
queryEquipPointInputItem
(
pointId
);
List
<
Map
<
String
,
Object
>>
pointInputItemList
=
iPointService
.
queryEquipPointInputItem
(
pointId
);
Page
<
Map
<
String
,
Object
>>
pag
=
new
PageImpl
<
Map
<
String
,
Object
>>(
pointInputItemList
);
Page
<
Map
<
String
,
Object
>>
pag
=
new
PageImpl
<
Map
<
String
,
Object
>>(
pointInputItemList
);
Object
ov
=
ToJson
.
tojson
(
pag
);
Object
ov
=
pag
!=
null
?
ToJson
.
tojson
(
pag
):
null
;
return
CommonResponseUtil
.
success
(
ov
);
return
CommonResponseUtil
.
success
(
ov
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
e
.
getMessage
(),
e
);
log
.
error
(
e
.
getMessage
(),
e
);
...
@@ -1433,7 +1434,7 @@ public class PointController extends AbstractBaseController {
...
@@ -1433,7 +1434,7 @@ public class PointController extends AbstractBaseController {
String
companyBizOrgCode
=
reginParams
.
getPersonIdentity
().
getCompanyBizOrgCode
();
String
companyBizOrgCode
=
reginParams
.
getPersonIdentity
().
getCompanyBizOrgCode
();
Page
Page
=
iPointService
.
queryPointList4RouteNew
(
companyBizOrgCode
,
riskSourceId
,
pointNo
,
name
,
pageNumber
,
pageSize
,
companyId
);
Page
Page
=
iPointService
.
queryPointList4RouteNew
(
companyBizOrgCode
,
riskSourceId
,
pointNo
,
name
,
pageNumber
,
pageSize
,
companyId
);
Object
ob
=
ToJson
.
tojson
(
Page
)
;
Object
ob
=
Page
!=
null
?
ToJson
.
tojson
(
Page
):
null
;
return
CommonResponseUtil
.
success
(
ob
);
return
CommonResponseUtil
.
success
(
ob
);
}
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/RouteController.java
View file @
6f055f2d
...
@@ -144,7 +144,7 @@ public class RouteController extends AbstractBaseController {
...
@@ -144,7 +144,7 @@ public class RouteController extends AbstractBaseController {
return
CommonResponseUtil
.
success
(!
Objects
.
isNull
(
isRemove
)
&&
1
==
isRemove
?
ToJson
.
tojson
(
routeList
)
:
ToJson
.
tojson
(
list
));
return
CommonResponseUtil
.
success
(!
Objects
.
isNull
(
isRemove
)
&&
1
==
isRemove
?
(
routeList
!=
null
?
ToJson
.
tojson
(
routeList
):
null
)
:
(
list
!=
null
?
ToJson
.
tojson
(
list
):
null
));
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
e
.
getMessage
(),
e
);
log
.
error
(
e
.
getMessage
(),
e
);
return
CommonResponseUtil
.
failure
(
"查询巡检路线信息失败"
);
return
CommonResponseUtil
.
failure
(
"查询巡检路线信息失败"
);
...
...
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