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
438003ec
Commit
438003ec
authored
Dec 27, 2021
by
helinlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
31987463
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
MaintenanceResourceDataController.java
...pmanage/controller/MaintenanceResourceDataController.java
+6
-0
LatentDangerServiceImpl.java
...patrol/business/service/impl/LatentDangerServiceImpl.java
+7
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/MaintenanceResourceDataController.java
View file @
438003ec
...
@@ -91,6 +91,7 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
...
@@ -91,6 +91,7 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
/**
/**
* 获取维保设施资源数据详细信息
* 获取维保设施资源数据详细信息
*/
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/{id}"
)
@GetMapping
(
value
=
"/{id}"
)
public
ResponseModel
getInfo
(
@PathVariable
(
"id"
)
Long
id
)
{
public
ResponseModel
getInfo
(
@PathVariable
(
"id"
)
Long
id
)
{
return
CommonResponseUtil
.
success
(
maintenanceResourceDataService
.
selectMaintenanceResourceDataById
(
id
));
return
CommonResponseUtil
.
success
(
maintenanceResourceDataService
.
selectMaintenanceResourceDataById
(
id
));
...
@@ -99,6 +100,7 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
...
@@ -99,6 +100,7 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
/**
/**
* 新增维保设施资源数据
* 新增维保设施资源数据
*/
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
@PostMapping
public
ResponseModel
add
(
@RequestBody
MaintenanceResourceData
maintenanceResource
)
{
public
ResponseModel
add
(
@RequestBody
MaintenanceResourceData
maintenanceResource
)
{
return
CommonResponseUtil
.
success
(
maintenanceResourceDataService
.
insertMaintenanceResourceData
(
maintenanceResource
));
return
CommonResponseUtil
.
success
(
maintenanceResourceDataService
.
insertMaintenanceResourceData
(
maintenanceResource
));
...
@@ -107,6 +109,7 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
...
@@ -107,6 +109,7 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
/**
/**
* 修改维保设施资源数据
* 修改维保设施资源数据
*/
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PutMapping
@PutMapping
public
ResponseModel
edit
(
@RequestBody
MaintenanceResourceData
maintenanceResource
)
{
public
ResponseModel
edit
(
@RequestBody
MaintenanceResourceData
maintenanceResource
)
{
return
CommonResponseUtil
.
success
(
maintenanceResourceDataService
.
updateMaintenanceResourceData
(
maintenanceResource
));
return
CommonResponseUtil
.
success
(
maintenanceResourceDataService
.
updateMaintenanceResourceData
(
maintenanceResource
));
...
@@ -115,6 +118,7 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
...
@@ -115,6 +118,7 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
/**
/**
* 获取维保消防设施选择列表
* 获取维保消防设施选择列表
*/
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/getMaintenanceResourceDataList"
)
@GetMapping
(
value
=
"/getMaintenanceResourceDataList"
)
public
ResponseModel
getMaintenanceResourceDataList
()
{
public
ResponseModel
getMaintenanceResourceDataList
()
{
String
orgCode
=
getOrgCode
();
String
orgCode
=
getOrgCode
();
...
@@ -124,6 +128,7 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
...
@@ -124,6 +128,7 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
/**
/**
* 删除维保设施资源数据
* 删除维保设施资源数据
*/
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@DeleteMapping
(
"/{ids}"
)
@DeleteMapping
(
"/{ids}"
)
public
ResponseModel
remove
(
@PathVariable
Long
[]
ids
)
{
public
ResponseModel
remove
(
@PathVariable
Long
[]
ids
)
{
return
CommonResponseUtil
.
success
(
maintenanceResourceDataService
.
deleteMaintenanceResourceDataByIds
(
ids
));
return
CommonResponseUtil
.
success
(
maintenanceResourceDataService
.
deleteMaintenanceResourceDataByIds
(
ids
));
...
@@ -132,6 +137,7 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
...
@@ -132,6 +137,7 @@ public class MaintenanceResourceDataController extends AbstractBaseController {
/**
/**
* 业主单位批量关联消防设施,反推已有消防系统
* 业主单位批量关联消防设施,反推已有消防系统
*/
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
"/relationMainResData"
)
@PostMapping
(
"/relationMainResData"
)
public
ResponseModel
relationMainResData
(
@RequestBody
List
<
MaintenanceResourceData
>
list
)
{
public
ResponseModel
relationMainResData
(
@RequestBody
List
<
MaintenanceResourceData
>
list
)
{
return
CommonResponseUtil
.
success
(
maintenanceResourceDataService
.
relationMainResData
(
getAppKey
(),
getProduct
(),
getToken
(),
list
));
return
CommonResponseUtil
.
success
(
maintenanceResourceDataService
.
relationMainResData
(
getAppKey
(),
getProduct
(),
getToken
(),
list
));
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/LatentDangerServiceImpl.java
View file @
438003ec
...
@@ -558,7 +558,13 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
...
@@ -558,7 +558,13 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
}
}
@Override
@Override
public
CommonResponse
list
(
String
toke
,
String
product
,
String
appKey
,
LatentDangerListParam
latentDangerListParam
,
AgencyUserModel
user
,
String
loginOrgCode
,
String
deptId
)
{
public
CommonResponse
list
(
String
toke
,
String
product
,
String
appKey
,
LatentDangerListParam
latentDangerListParam
,
AgencyUserModel
user
,
String
loginOrgCode
,
String
deptId
)
{
JSONObject
respBody
;
JSONObject
respBody
;
Date
startDate
=
new
Date
();
Date
startDate
=
new
Date
();
if
(
latentDangerListParam
.
getIsHandle
())
{
if
(
latentDangerListParam
.
getIsHandle
())
{
...
...
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