opc采集类型

platform-dao/src/main/java/com/platform/dao/enums/RemoteOpcTypeEnum.java

@@ -0,0 +1,26 @@
+package com.platform.dao.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Description opc点位类型
+ * @Author chenyuehu
+ * @Date 2020/2/17
+ * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Getter
+@AllArgsConstructor
+public enum RemoteOpcTypeEnum {
+
+    /**
+     * 浮点数
+     */
+    SHORT(1),
+    /**
+     * 布尔值
+     */
+    BUER(2),;
+    private Integer value;
+
+}

platform-service/src/main/java/com/platform/service/remote/impl/RemoteOpcServiceImpl.java

@@ -15,6 +15,7 @@ import com.platform.dao.dto.remote.RemoteOpcDTO;
 import com.platform.dao.entity.remote.RemoteOpc;
 import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.upms.SysDict;
+import com.platform.dao.enums.RemoteOpcTypeEnum;
 import com.platform.dao.enums.YesNoEnum;
 import com.platform.dao.mapper.remote.RemoteOpcMapper;
 import com.platform.dao.mapper.sb.SbInfoMapper;
@@ -74,10 +75,15 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
         if (count > 0) {
             throw new BusinessException("该点位已经存在，无法新增，请点击查询进行修改，数量：" + count);
         }
-        if (model.getAvFlag() == YesNoEnum.YES.getValue()) {
+        if (model.getType() == RemoteOpcTypeEnum.SHORT.getValue()) {
             model.setPositionNum(model.getDescription() + "_AV");
-        } else {
+            model.setAvFlag(YesNoEnum.YES.getValue());
+        } else if (model.getType() == RemoteOpcTypeEnum.BUER.getValue())  {
             model.setPositionNum(model.getDescription() + "_DV");
+            model.setAvFlag(YesNoEnum.NO.getValue());
+        } else{
+            model.setPositionNum(model.getDescription() + "_AV");
+            model.setAvFlag(YesNoEnum.YES.getValue());
         }
         if (model.getXPosition() == null) {
             model.setXPosition(new BigDecimal(50));
@@ -114,10 +120,15 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
                 }
             }
         }
-        if (model.getAvFlag() == YesNoEnum.YES.getValue()) {
+        if (model.getType() == RemoteOpcTypeEnum.SHORT.getValue()) {
             model.setPositionNum(model.getDescription() + "_AV");
-        } else {
+            model.setAvFlag(YesNoEnum.YES.getValue());
+        } else if (model.getType() == RemoteOpcTypeEnum.BUER.getValue())  {
             model.setPositionNum(model.getDescription() + "_DV");
+            model.setAvFlag(YesNoEnum.NO.getValue());
+        } else{
+            model.setPositionNum(model.getDescription() + "_AV");
+            model.setAvFlag(YesNoEnum.YES.getValue());
         }
         super.modModelByDTO(model);
     }
@@ -280,6 +291,7 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
         } else {
             remoteOpc.setCreatedFlag(value);
         }
+        remoteOpc.setRemark("");
         mapper.updateByExampleSelective(remoteOpc, weekend);
     }