Commit 25bfa1b3 authored by xukaiqiang's avatar xukaiqiang

bug

parent de7570c0
...@@ -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));
} }
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment