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
2f570b87
Commit
2f570b87
authored
Apr 13, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
94345de5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
PlanController.java
...ejoin/amos/patrol/business/controller/PlanController.java
+3
-1
PointController.java
...join/amos/patrol/business/controller/PointController.java
+4
-1
RouteController.java
...join/amos/patrol/business/controller/RouteController.java
+5
-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 @
2f570b87
...
@@ -11,6 +11,7 @@ import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
...
@@ -11,6 +11,7 @@ import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
import
com.yeejoin.amos.patrol.business.util.PlanPageParamUtil
;
import
com.yeejoin.amos.patrol.business.util.PlanPageParamUtil
;
import
com.yeejoin.amos.patrol.core.common.request.CommonPageable
;
import
com.yeejoin.amos.patrol.core.common.request.CommonPageable
;
import
com.yeejoin.amos.patrol.core.common.request.CommonRequest
;
import
com.yeejoin.amos.patrol.core.common.request.CommonRequest
;
import
com.yeejoin.amos.patrol.core.common.request.ToJson
;
import
com.yeejoin.amos.patrol.dao.entity.Plan
;
import
com.yeejoin.amos.patrol.dao.entity.Plan
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
...
@@ -238,7 +239,8 @@ public class PlanController extends AbstractBaseController {
...
@@ -238,7 +239,8 @@ 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
);
return
CommonResponseUtil
.
success
(
plan
);
Object
ob
=
ToJson
.
tojson
(
plan
);
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 @
2f570b87
...
@@ -1431,7 +1431,10 @@ public class PointController extends AbstractBaseController {
...
@@ -1431,7 +1431,10 @@ public class PointController extends AbstractBaseController {
ReginParams
reginParams
=
getSelectedOrgInfo
();
ReginParams
reginParams
=
getSelectedOrgInfo
();
String
companyBizOrgCode
=
reginParams
.
getPersonIdentity
().
getCompanyBizOrgCode
();
String
companyBizOrgCode
=
reginParams
.
getPersonIdentity
().
getCompanyBizOrgCode
();
return
CommonResponseUtil
.
success
(
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
);
return
CommonResponseUtil
.
success
(
ob
);
}
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
...
...
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 @
2f570b87
...
@@ -18,6 +18,7 @@ import com.yeejoin.amos.patrol.core.async.AsyncTask;
...
@@ -18,6 +18,7 @@ import com.yeejoin.amos.patrol.core.async.AsyncTask;
import
com.yeejoin.amos.patrol.core.common.request.CommonPageable
;
import
com.yeejoin.amos.patrol.core.common.request.CommonPageable
;
import
com.yeejoin.amos.patrol.core.common.request.CommonRequest
;
import
com.yeejoin.amos.patrol.core.common.request.CommonRequest
;
import
com.yeejoin.amos.patrol.core.common.request.RoutePointInputItemRequest
;
import
com.yeejoin.amos.patrol.core.common.request.RoutePointInputItemRequest
;
import
com.yeejoin.amos.patrol.core.common.request.ToJson
;
import
com.yeejoin.amos.patrol.core.common.response.RoutePointRespone
;
import
com.yeejoin.amos.patrol.core.common.response.RoutePointRespone
;
import
com.yeejoin.amos.patrol.dao.entity.InputItem
;
import
com.yeejoin.amos.patrol.dao.entity.InputItem
;
import
com.yeejoin.amos.patrol.dao.entity.Plan
;
import
com.yeejoin.amos.patrol.dao.entity.Plan
;
...
@@ -140,7 +141,10 @@ public class RouteController extends AbstractBaseController {
...
@@ -140,7 +141,10 @@ public class RouteController extends AbstractBaseController {
//2.查询
//2.查询
List
<
Route
>
routeList
=
routeService
.
queryRouteListNew
(
orgCode
);
List
<
Route
>
routeList
=
routeService
.
queryRouteListNew
(
orgCode
);
List
<
Route
>
list
=
routeList
.
stream
().
filter
(
e
->
e
.
getIsExist
().
equals
(
"true"
)).
collect
(
Collectors
.
toList
());
List
<
Route
>
list
=
routeList
.
stream
().
filter
(
e
->
e
.
getIsExist
().
equals
(
"true"
)).
collect
(
Collectors
.
toList
());
return
CommonResponseUtil
.
success
(!
Objects
.
isNull
(
isRemove
)
&&
1
==
isRemove
?
routeList
:
list
);
return
CommonResponseUtil
.
success
(!
Objects
.
isNull
(
isRemove
)
&&
1
==
isRemove
?
ToJson
.
tojson
(
routeList
)
:
ToJson
.
tojson
(
list
));
}
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