设备之系统——消息提醒 V3.4 BUG

枚举导致的空指针异常

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquipmentSendNotifyServiceImpl.java

@@ -537,7 +537,7 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
             StringBuilder taskfrequency = new StringBuilder();
             // 遍历润滑周期
             for (int i = 0; i < split.length; i++) {
-                taskfrequency.append(LubricationFrequencyEnum.massageOf(split[i]));
+                taskfrequency.append(split[i]!=null?LubricationFrequencyEnum.massageOf(split[i]):null);
                 if (i != split.length - 1) {
                     taskfrequency.append(',');
                 }
@@ -549,7 +549,7 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
                         EquLubricationTaskManagementTemplate lubricationTaskTemplate = new EquLubricationTaskManagementTemplate();
                         BeanUtils.copyProperties(lubricationTaskManagementDo, lubricationTaskTemplate);
                         BeanUtils.copyProperties(info, lubricationTaskTemplate);
-                        lubricationTaskTemplate.setPlant(PlantEnum.nameOf(plantEnum.getId()));
+                        lubricationTaskTemplate.setPlant(plantEnum.getName());
                         lubricationTaskTemplate.setIslubricationcompleted("y".equals(info.getIslubricationcompleted()) ? "是" : "否");
                         lubricationTaskTemplate.setFrequency(taskfrequency.toString());
                         return lubricationTaskTemplate;
@@ -641,7 +641,7 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
             BeanUtils.copyProperties(info, equMaintenanceTaskTemplate);
 
             equMaintenanceTaskTemplate.setPlant(plantEnum.getName());
-            equMaintenanceTaskTemplate.setMaintenancetype(MaintenanceTypeEnum.messageOf(info.getMaintenancetype()));
+            equMaintenanceTaskTemplate.setMaintenancetype(info.getMaintenancetype()!=null?MaintenanceTypeEnum.messageOf(info.getMaintenancetype()):null);
             equMaintenanceTaskTemplate.setTaskstate(TaskStatusEnum.massageOf(info.getTaskstate()));
 
             return equMaintenanceTaskTemplate;