Merge branch 'demo_' of http://124.71.196.186:8888/hfxc226/hitch-manage into demo_

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-opc/src/main/java/com/platform/opc/servie/OpcTask.java

@@ -36,7 +36,7 @@ public class OpcTask {
     /**
      * 新增点位：在新增点位后，点击立即生效按钮,这个时间不能再执行上面的addItems()方法
      * 删除点位：在点位，点击取消采集按钮
-     * 每10秒*
+     * 每60秒*
      */
     @Scheduled(fixedDelay = 60000)
     public void addAndDelItems() {

platform-opc/src/main/java/com/platform/opc/util/OpcDAClient.java

@@ -363,6 +363,7 @@ public class OpcDAClient {
     private static String getVal(JIVariant var) throws JIException {
         String value;
         int type = var.getType();
+        log.info("type" + type);
         switch (type) {
             case JIVariant.VT_I2:
                 value = var.getObjectAsShort() + "";
@@ -383,7 +384,13 @@ public class OpcDAClient {
                 value = var.getObjectAsString2() + "";
                 break;
             case JIVariant.VT_BOOL:
-                value = var.getObjectAsBoolean() + "";
+                boolean result = var.getObjectAsBoolean();
+                log.info("result：" + result);
+                if(result){
+                    value = "1";
+                }else{
+                    value = "0";
+                }
                 break;
             case JIVariant.VT_UI2:
             case JIVariant.VT_UI4:

platform-rest/src/main/java/com/platform/rest/controller/websocket/WebSocketController.java

@@ -1,7 +1,7 @@
 package com.platform.rest.controller.websocket;
 
 import com.platform.common.util.R;
-import com.platform.dao.config.websocket.WebSocketServer;
+import com.platform.service.config.websocket.WebSocketServer;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;

platform-dao/src/main/java/com/platform/dao/config/websocket/WebSocketConfig.java → platform-service/src/main/java/com/platform/service/config/websocket/WebSocketConfig.java

@@ -1,4 +1,4 @@
-package com.platform.dao.config.websocket;
+package com.platform.service.config.websocket;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

platform-dao/src/main/java/com/platform/dao/config/websocket/WebSocketServer.java → platform-service/src/main/java/com/platform/service/config/websocket/WebSocketServer.java

@@ -1,4 +1,4 @@
-package com.platform.dao.config.websocket;
+package com.platform.service.config.websocket;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

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

@@ -1,6 +1,5 @@
 package com.platform.service.remote.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.constant.RedisKeyConstants;
@@ -8,20 +7,18 @@ import com.platform.common.enums.DictTypeEnum;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.util.JsonUtils;
 import com.platform.common.util.RedisUtils;
-import com.platform.common.util.StringUtils;
 import com.platform.dao.bean.MyPage;
-import com.platform.dao.config.websocket.WebSocketServer;
 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;
 import com.platform.dao.mapper.upms.SysDictMapper;
 import com.platform.dao.util.CustomExcelImportUtil;
 import com.platform.dao.vo.query.remote.RemoteOpcVO;
 import com.platform.service.base.impl.BaseServiceImpl;
+import com.platform.service.config.websocket.WebSocketServer;
 import com.platform.service.remote.RemoteOpcService;
 import lombok.AllArgsConstructor;
 import org.springframework.scheduling.annotation.Async;
@@ -74,10 +71,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 +116,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 +287,7 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
         } else {
             remoteOpc.setCreatedFlag(value);
         }
+        remoteOpc.setRemark("");
         mapper.updateByExampleSelective(remoteOpc, weekend);
     }