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
25bfa1b3
Commit
25bfa1b3
authored
Feb 19, 2020
by
xukaiqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
de7570c0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
9 deletions
+14
-9
RiskSourceController.java
...in/amos/fas/business/controller/RiskSourceController.java
+0
-1
RiskSourceServiceImpl.java
...amos/fas/business/service/impl/RiskSourceServiceImpl.java
+14
-8
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/RiskSourceController.java
View file @
25bfa1b3
...
@@ -569,7 +569,6 @@ public class RiskSourceController extends BaseController {
...
@@ -569,7 +569,6 @@ public class RiskSourceController extends BaseController {
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"上传巡检数据"
,
notes
=
"上传巡检数据"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"上传巡检数据"
,
notes
=
"上传巡检数据"
)
@RequestMapping
(
value
=
"/data/patroldata"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
PUT
)
@RequestMapping
(
value
=
"/data/patroldata"
,
produces
=
"application/json;charset=UTF-8"
,
method
=
RequestMethod
.
PUT
)
public
CommonResponse
postPatrolData
(
@RequestBody
ProtalDataRo
protalData
)
throws
Exception
{
public
CommonResponse
postPatrolData
(
@RequestBody
ProtalDataRo
protalData
)
throws
Exception
{
return
CommonResponseUtil
.
success
(
riskSourceService
.
processProtalData
(
protalData
));
return
CommonResponseUtil
.
success
(
riskSourceService
.
processProtalData
(
protalData
));
}
}
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
View file @
25bfa1b3
...
@@ -809,7 +809,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
...
@@ -809,7 +809,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
public
boolean
processTaskData
(
ProtalDataRo
taskData
)
throws
Exception
{
public
boolean
processTaskData
(
ProtalDataRo
taskData
)
throws
Exception
{
taskData
.
setBatchNo
(
UUID
.
randomUUID
().
toString
());
taskData
.
setBatchNo
(
UUID
.
randomUUID
().
toString
());
Object
result
=
remoteRuleServer
.
fireRule
(
taskData
,
"风险管控/patrol"
);
Object
result
=
remoteRuleServer
.
fireRule
(
taskData
,
"风险管控/patrol"
);
return
true
;
return
true
;
}
}
...
@@ -855,8 +854,12 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
...
@@ -855,8 +854,12 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
fmeaIds
.
add
(
fmeaPointInputitem
.
getFmeaId
());
fmeaIds
.
add
(
fmeaPointInputitem
.
getFmeaId
());
}
}
});
});
fmeaPointInputitemMapper
.
updateStateByIds
(
1
,
failIds
);
if
(
failIds
.
size
()
>
0
)
{
fmeaPointInputitemMapper
.
updateStateByIds
(
0
,
successIds
);
fmeaPointInputitemMapper
.
updateStateByIds
(
1
,
failIds
);
}
if
(
successIds
.
size
()
>
0
)
{
fmeaPointInputitemMapper
.
updateStateByIds
(
0
,
successIds
);
}
RsDataQueue
rsDataQueue
=
RsDataQueue
.
getInstance
();
RsDataQueue
rsDataQueue
=
RsDataQueue
.
getInstance
();
fmeaIds
.
forEach
(
fmeaId
->
rsDataQueue
.
addAbnormalMessage
(
fmeaId
));
fmeaIds
.
forEach
(
fmeaId
->
rsDataQueue
.
addAbnormalMessage
(
fmeaId
));
}
}
...
@@ -1265,16 +1268,19 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
...
@@ -1265,16 +1268,19 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
ids
.
add
(
fmeaEquipmentPoint
.
getId
());
ids
.
add
(
fmeaEquipmentPoint
.
getId
());
fmeaIds
.
add
(
fmeaEquipmentPoint
.
getFmeaId
());
fmeaIds
.
add
(
fmeaEquipmentPoint
.
getFmeaId
());
});
});
Integer
state
=
null
;
if
(
param
.
getState
().
equals
(
"true"
))
{
if
(
param
.
getState
().
equals
(
"true"
))
{
fmeaEquipmentPointMapper
.
updateStateByIds
(
1
,
ids
);
state
=
1
;
RsDataQueue
rsDataQueue
=
RsDataQueue
.
getInstance
();
fmeaIds
.
forEach
(
fmeaId
->
rsDataQueue
.
addAbnormalMessage
(
fmeaId
));
}
else
if
(
param
.
getState
().
equals
(
"false"
))
{
}
else
if
(
param
.
getState
().
equals
(
"false"
))
{
fmeaEquipmentPointMapper
.
updateStateByIds
(
0
,
ids
);
state
=
0
;
}
if
(
state
!=
null
)
{
if
(
ids
.
size
()
>
0
)
{
fmeaEquipmentPointMapper
.
updateStateByIds
(
state
,
ids
);
}
RsDataQueue
rsDataQueue
=
RsDataQueue
.
getInstance
();
RsDataQueue
rsDataQueue
=
RsDataQueue
.
getInstance
();
fmeaIds
.
forEach
(
fmeaId
->
rsDataQueue
.
addAbnormalMessage
(
fmeaId
));
fmeaIds
.
forEach
(
fmeaId
->
rsDataQueue
.
addAbnormalMessage
(
fmeaId
));
}
}
}
}
@Async
@Async
...
...
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