转换

zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java

@@ -503,8 +503,8 @@ public class DcWarningServiceImpl implements IDcWarningService
         if (warningType!=null) {
             dcEvent.setEventType((long) ValueConverter.convertValueHost(dcWarning.getWarningType()));//事件主类
         }
-        if (dcWarning.getWarningSubclass()!=null&&warningType!=UniversalEnum.SEVEN.getNumber()&& warningType!=UniversalEnum.TEN.getNumber()) {
-            dcEvent.setEventSubclass(ValueConverter.convertValueSon(dcWarning.getWarningSubclass()));//事件子类(7与10不转)
+        if (dcWarning.getWarningSubclass()!=null&&warningType!=UniversalEnum.SEVEN.getNumber()) {
+            dcEvent.setEventSubclass(ValueConverter.convertValueSon(dcWarning.getWarningSubclass()));//事件子类(7不转)
         }
         if (dcWarning.getWarningSubclass()!=null&&(warningType==UniversalEnum.SEVEN.getNumber())){
             dcEvent.setEventSubclass(dcWarning.getWarningSubclass());//事件子类(7主类对应的子类直接set)