添加点位类型和图片

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

@@ -14,13 +14,25 @@ import lombok.Getter;
 public enum RemoteOpcTypeEnum {
 
     /**
-     * 浮点数
+     * 普通点位
      */
-    SHORT(1),
+    PUTONG(1),
     /**
-     * 布尔值
+     * 开关点位0,1*
      */
-    BUER(2),;
+    KG(2),
+    /**
+     * 电机运行点位0,1
+     */
+    DJYX(3),
+    /**
+     * 电机就地信号0,1
+     */
+    DJJD(4),
+    /**
+     * 液位点位
+     */
+    YW(5);
     private Integer value;
 
 }

platform-opc/src/main/java/com/platform/opc/servie/OpcService.java

@@ -2,12 +2,9 @@ package com.platform.opc.servie;
 
 import com.alibaba.fastjson.JSON;
 import com.platform.common.constant.RedisKeyConstants;
-import com.platform.common.util.DateUtils;
 import com.platform.common.util.RedisUtils;
 import com.platform.common.util.StringUtils;
-import com.platform.dao.entity.remote.RemoteOpcLog;
 import com.platform.dao.influxdb.InfluxDBService;
-import com.platform.dao.mapper.remote.RemoteOpcLogMapper;
 import com.platform.dao.vo.query.remote.RemoteOpcVO;
 import com.platform.opc.util.OpcDAClient;
 import lombok.AllArgsConstructor;
@@ -16,15 +13,8 @@ import org.jinterop.dcom.common.JIException;
 import org.openscada.opc.lib.da.Group;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service("opcService")
 @AllArgsConstructor

platform-opc/src/main/java/com/platform/opc/servie/OpcTask.java

@@ -5,7 +5,6 @@ import com.platform.common.util.RedisUtils;
 import com.platform.common.util.StringUtils;
 import com.platform.dao.entity.remote.RemoteOpc;
 import com.platform.dao.enums.YesNoEnum;
-import com.platform.dao.mapper.remote.RemoteOpcLogMapper;
 import com.platform.dao.mapper.remote.RemoteOpcMapper;
 import com.platform.opc.util.OpcDAClient;
 import lombok.AllArgsConstructor;
@@ -20,8 +19,6 @@ import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
 import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.stream.Collectors;
 
 @Service("opcTask")

platform-rest/src/main/java/com/platform/rest/controller/influxdb/InfluxDBController.java

@@ -57,12 +57,15 @@ public class InfluxDBController {
     @PutMapping("/{id}")
     public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody RemoteOpcDTO remoteMeasureDTO) {
         RemoteOpcVO vo = BeanConverterUtil.copyObjectProperties(remoteOpcService.getModelById(id), RemoteOpcVO.class);
-        if(vo.getType().equals(RemoteOpcTypeEnum.SHORT.getValue())){
+        if (vo.getType().equals(RemoteOpcTypeEnum.PUTONG.getValue())) {
             float value = RandomUtils.nextFloat();
             vo.setResult(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
-        }else{
+        } else if (vo.getType().equals(RemoteOpcTypeEnum.YW.getValue())) {
+            int value = (int) (Math.random() * 100 + 1);
+            vo.setResult(new BigDecimal(value));
+        } else {
             boolean value = RandomUtils.nextBoolean();
-            vo.setResult(new BigDecimal(value?1:0));
+            vo.setResult(new BigDecimal(value ? 1 : 0));
         }
 
         influxDBService.writeOne(vo);
@@ -71,7 +74,7 @@ public class InfluxDBController {
 
     public static void main(String[] args) {
         boolean value = RandomUtils.nextBoolean();
-        System.out.println(new BigDecimal(value?1:0));
+        System.out.println(new BigDecimal(value ? 1 : 0));
     }
 
     /**
@@ -86,12 +89,15 @@ public class InfluxDBController {
     public R updateBatch(@RequestBody RemoteOpcDTO remoteOpcDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
         List<RemoteOpcVO> voList = remoteOpcService.selectPageList(null, pageNum, pageSize).getRows();
         for (RemoteOpcVO vo : voList) {
-            if(vo.getType().equals(RemoteOpcTypeEnum.SHORT.getValue())){
+            if (vo.getType().equals(RemoteOpcTypeEnum.PUTONG.getValue())) {
                 float value = RandomUtils.nextFloat();
                 vo.setResult(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
-            }else{
+            } else if (vo.getType().equals(RemoteOpcTypeEnum.YW.getValue())) {
+                int value = (int) (Math.random() * 100 + 1);
+                vo.setResult(new BigDecimal(value));
+            } else {
                 boolean value = RandomUtils.nextBoolean();
-                vo.setResult(new BigDecimal(value?1:0));
+                vo.setResult(new BigDecimal(value ? 1 : 0));
             }
         }
         influxDBService.writeBatch(voList);
@@ -111,6 +117,7 @@ public class InfluxDBController {
 
     /**
      * opc记录表导出-导出某个点位的某个时间段数据
+     *
      * @return R
      */
     @GetMapping("/export")

platform-rest/src/main/java/com/platform/rest/controller/remote/RemoteOpcController.java

@@ -9,6 +9,7 @@ import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.remote.RemoteOpcDTO;
 import com.platform.dao.entity.remote.RemoteOpc;
+import com.platform.dao.enums.RemoteOpcTypeEnum;
 import com.platform.dao.enums.YesNoEnum;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.remote.ExportRemoteOpcVO;
@@ -17,12 +18,17 @@ import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.remote.RemoteOpcService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.math.RandomUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import tk.mybatis.mapper.weekend.Weekend;
+import tk.mybatis.mapper.weekend.WeekendCriteria;
 
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -207,16 +213,35 @@ public class RemoteOpcController {
      */
     @GetMapping("/redis")
     public R queryFromRedis(RemoteOpcDTO remoteMeasureDTO) {
-        String jsonStr = RedisUtils.getString(RedisKeyConstants.DCS_PREFIX + remoteMeasureDTO.getLine());
-        // log.info("jsonStr: " + jsonStr);
-        List<RemoteOpcVO> resultList = new ArrayList<>();
-        if (StringUtils.isNotBlank(jsonStr)) {
-            resultList = JSON.parseArray(jsonStr, RemoteOpcVO.class);
-        } else {
+        List<RemoteOpcVO> resultList;
+        if (BeanUtils.isDev()) {// 测试数据
+            remoteMeasureDTO.setCreatedFlag(YesNoEnum.YES.getValue());
+            remoteMeasureDTO.setPositionFlag(YesNoEnum.YES.getValue());
             resultList = remoteOpcService.selectList(remoteMeasureDTO);
-        }
-        if (BeanUtils.isDev() ) {
-            remoteOpcService.sendWarn(resultList);
+            for (RemoteOpcVO vo : resultList) {
+                if (vo.getType().equals(RemoteOpcTypeEnum.PUTONG.getValue())) {
+                    float value = RandomUtils.nextFloat();
+                    vo.setResult(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
+                } else if (vo.getType().equals(RemoteOpcTypeEnum.YW.getValue())) {
+                    int value = (int) (Math.random() * 100 + 1);
+                    vo.setResult(new BigDecimal(value));
+                } else {
+                    boolean value = RandomUtils.nextBoolean();
+                    vo.setResult(new BigDecimal(value ? 1 : 0));
+                }
+            }
+            if (BeanUtils.isDev()) {
+                remoteOpcService.sendWarn(resultList);
+            }
+        } else {
+            String jsonStr = RedisUtils.getString(RedisKeyConstants.DCS_PREFIX + remoteMeasureDTO.getLine());
+            // log.info("jsonStr: " + jsonStr);
+            if (StringUtils.isNotBlank(jsonStr)) {
+                resultList = JSON.parseArray(jsonStr, RemoteOpcVO.class);
+            } else {
+                resultList = remoteOpcService.selectList(remoteMeasureDTO);
+            }
+
         }
         return new R<>(resultList);
     }

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

@@ -71,14 +71,14 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
         if (count > 0) {
             throw new BusinessException("该点位已经存在，无法新增，请点击查询进行修改，数量：" + count);
         }
-        if (model.getType() == RemoteOpcTypeEnum.SHORT.getValue()) {
+        if (model.getType() == RemoteOpcTypeEnum.PUTONG.getValue()) {
             model.setPositionNum(model.getDescription() + "_AV");
             model.setAvFlag(YesNoEnum.YES.getValue());
-        } else if (model.getType() == RemoteOpcTypeEnum.BUER.getValue())  {
-            model.setPositionNum(model.getDescription() + "_DV");
+        } else if (model.getType() == RemoteOpcTypeEnum.YW.getValue())  {
+            model.setPositionNum(model.getDescription() + "_AV");
             model.setAvFlag(YesNoEnum.NO.getValue());
         } else{
-            model.setPositionNum(model.getDescription() + "_AV");
+            model.setPositionNum(model.getDescription() + "_DV");
             model.setAvFlag(YesNoEnum.YES.getValue());
         }
         if (model.getXPosition() == null) {
@@ -116,14 +116,14 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
                 }
             }
         }
-        if (model.getType() == RemoteOpcTypeEnum.SHORT.getValue()) {
+        if (model.getType() == RemoteOpcTypeEnum.PUTONG.getValue()) {
             model.setPositionNum(model.getDescription() + "_AV");
             model.setAvFlag(YesNoEnum.YES.getValue());
-        } else if (model.getType() == RemoteOpcTypeEnum.BUER.getValue())  {
-            model.setPositionNum(model.getDescription() + "_DV");
+        } else if (model.getType() == RemoteOpcTypeEnum.YW.getValue())  {
+            model.setPositionNum(model.getDescription() + "_AV");
             model.setAvFlag(YesNoEnum.NO.getValue());
         } else{
-            model.setPositionNum(model.getDescription() + "_AV");
+            model.setPositionNum(model.getDescription() + "_DV");
             model.setAvFlag(YesNoEnum.YES.getValue());
         }
         super.modModelByDTO(model);