设备接口的功能完善

zpl 4 years ago
parent 44798dd703
commit 92516d081c

@ -39,14 +39,14 @@ public class ResourceMQConsume {
String resultString = resourceMQProcess.resourceStatusProcess(text); String resultString = resourceMQProcess.resourceStatusProcess(text);
//返回设备处理结果 //返回设备处理结果
template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString); // template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString);
} }
@JmsListener(destination = "resource.alarm.process", containerFactory = "defaultFactory") @JmsListener(destination = "resource.alarm.process", containerFactory = "defaultFactory")
public void resourceAlarmProcess(String text, MessageHeaders headers) { public void resourceAlarmProcess(String text, MessageHeaders headers) {
logger.info("接收设备报警数据:" + text); logger.info("接收设备报警数据:" + text);
String resultString = resourceMQProcess.resourceFaultProcess(text); String resultString = resourceMQProcess.resourceFaultProcess(text);
template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString); // template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString);
} }
@JmsListener(destination = "resource.edc.process", containerFactory = "defaultFactory", concurrency = "5") @JmsListener(destination = "resource.edc.process", containerFactory = "defaultFactory", concurrency = "5")

@ -81,11 +81,11 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
throw BusinessException.build("设备编号错误!!!"); throw BusinessException.build("设备编号错误!!!");
} }
// 不良代码 // 不良代码
String ncCOdeNo = resourceRepairTask.getNcCodeNo(); /*String ncCOdeNo = resourceRepairTask.getNcCodeNo();
String ncCodeHandle = HandleEnum.NC_CODE.getHandle(site, ncCOdeNo); String ncCodeHandle = HandleEnum.NC_CODE.getHandle(site, ncCOdeNo);
if ( ncCodeService.getById(ncCodeHandle) == null ){ if ( ncCodeService.getById(ncCodeHandle) == null ){
throw BusinessException.build("不良代码错误!!!"); throw BusinessException.build("不良代码错误!!!");
} }*/
// 维修单号、维修HANDLE // 维修单号、维修HANDLE
List<String> nextNumber = nextNumberHelper.getNextNumber(site, Constants.RESOURCE_REPAIR_TASK, 1); List<String> nextNumber = nextNumberHelper.getNextNumber(site, Constants.RESOURCE_REPAIR_TASK, 1);
resourceRepairTask.setRepairNo(nextNumber.get(0)); resourceRepairTask.setRepairNo(nextNumber.get(0));

Loading…
Cancel
Save