完善opc展示页面

platform-common/src/main/java/com/platform/common/constant/RedisKeyConstants.java

@@ -73,4 +73,16 @@ public class RedisKeyConstants {
      */
     public static final String EXPIRE_BUSINESS_KEY_REPAIR_OVERTIME_STEP_THIRD = EXPIRE_BUSINESS_KEY_REPAIR_OVERTIME_PREFIX + "_third";
 
+
+    /**
+     * DCS数据存储前缀
+     */
+    public static final String DCS_PREFIX = "redis_opc_";
+
+    public static String redis_opc_update_flag = "redis_opc_update_flag";
+    // 待采集点位列表
+    public static String redis_opc_wait_add_list = "redis_opc_wait_add_list";
+    // 待撤销点位列表
+    public static String redis_opc_wait_remove_list = "redis_opc_wait_remove_list";
+
 }

platform-dao/src/main/java/com/platform/dao/vo/query/remote/RemoteOpcVO.java

@@ -163,6 +163,10 @@ public class RemoteOpcVO extends BaseVO implements Serializable {
      * 更新人
      */
     private String updateUserId;
+    /**
+     * 更新人
+     */
+    private String time;
     /**
      * 创建日期
      */

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

@@ -1,5 +1,6 @@
 package com.platform.opc.servie;
 
+import com.platform.common.constant.RedisKeyConstants;
 import com.platform.common.util.RedisUtils;
 import com.platform.dao.entity.remote.RemoteOpc;
 import com.platform.dao.enums.YesNoEnum;
@@ -56,8 +57,8 @@ public class OpcInit {
      */
     @Scheduled(fixedDelay = 10000)
     public void addAndDelItems() {
-        RedisUtils.setString(OpcDAClient.redis_opc_update_flag, "1");
-        List<String> list = RedisUtils.getList(OpcDAClient.redis_opc_wait_add_list, 0, -1);
+        RedisUtils.setString(RedisKeyConstants.redis_opc_update_flag, "1");
+        List<String> list = RedisUtils.getList(RedisKeyConstants.redis_opc_wait_add_list, 0, -1);
         if (!CollectionUtils.isEmpty(list)) {
             List<String> uniqueStr = list.stream().distinct().collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(uniqueStr)) {
@@ -65,9 +66,9 @@ public class OpcInit {
                 log.info("开始添加新点位：");
             }
         }
-        RedisUtils.del(OpcDAClient.redis_opc_wait_add_list);
+        RedisUtils.del(RedisKeyConstants.redis_opc_wait_add_list);
 
-        List<String> removeList = RedisUtils.getList(OpcDAClient.redis_opc_wait_remove_list, 0, -1);
+        List<String> removeList = RedisUtils.getList(RedisKeyConstants.redis_opc_wait_remove_list, 0, -1);
         if (!CollectionUtils.isEmpty(removeList)) {
             List<RemoteOpc> remoteOpcList = findAllItems(false, removeList);
             if (!CollectionUtils.isEmpty(remoteOpcList)) {
@@ -78,8 +79,8 @@ public class OpcInit {
                 }
             }
         }
-        RedisUtils.del(OpcDAClient.redis_opc_wait_remove_list);
-        RedisUtils.del(OpcDAClient.redis_opc_update_flag);
+        RedisUtils.del(RedisKeyConstants.redis_opc_wait_remove_list);
+        RedisUtils.del(RedisKeyConstants.redis_opc_update_flag);
     }
 
     /**

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

@@ -1,12 +1,14 @@
 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.mapper.remote.RemoteOpcLogMapper;
 import com.platform.dao.mapper.remote.RemoteOpcMapper;
+import com.platform.dao.vo.query.remote.RemoteOpcVO;
 import com.platform.opc.entity.OpcResult;
 import com.platform.opc.util.OpcDAClient;
 import lombok.AllArgsConstructor;
@@ -45,8 +47,8 @@ public class OpcService {
     public void getValue(Group group) throws JIException {
         log.info("拉取-" + group.getName());
         log.info(Thread.currentThread().getName() + "-线程-" + group.getName() + new Date());
-        List<OpcResult> resultList = OpcDAClient.getItemValuesList(group);
-        RedisUtils.setString("opc-id-" + group.getName(), JSON.toJSONString(resultList));
+        List<RemoteOpcVO> resultList = OpcDAClient.getItemValuesList(group);
+        RedisUtils.setString(RedisKeyConstants.DCS_PREFIX + group.getName(), JSON.toJSONString(resultList));
         log.info("结束拉取" + group.getName());
     }
 
@@ -55,25 +57,25 @@ public class OpcService {
      */
     @Async
     public void saveValue(String id) {
-        log.info("保存-" + id);
-        String jsonStr = RedisUtils.getString(id);
+        String jsonStr = RedisUtils.getString(RedisKeyConstants.DCS_PREFIX + id);
         if (StringUtils.isNotBlank(jsonStr)) {
-            List<OpcResult> resultList = JSON.parseArray(jsonStr, OpcResult.class);
+            log.info("保存-" + id);
+            List<RemoteOpcVO> resultList = JSON.parseArray(jsonStr, RemoteOpcVO.class);
             List<RemoteOpcLog> addOpcLogList = new ArrayList<>();
             List<RemoteOpcLog> updateRemoteOpcLogList = new ArrayList<>();
             Weekend<RemoteOpcLog> weekend = new Weekend<>(RemoteOpcLog.class);
             WeekendCriteria<RemoteOpcLog, Object> weekendCriteria = weekend.weekendCriteria();
             // 查询当天是否已经存在了，存在则追加，否则更新
             LocalDateTime time = LocalDateTime.now();
-            weekendCriteria.andIn(RemoteOpcLog::getPositionNum, resultList.stream().map(OpcResult::getId).collect(Collectors.toList()));
+            weekendCriteria.andIn(RemoteOpcLog::getPositionNum, resultList.stream().map(RemoteOpcVO::getPositionNum).collect(Collectors.toList()));
             weekendCriteria.andEqualTo(RemoteOpcLog::getYear, time.getYear());
             weekendCriteria.andEqualTo(RemoteOpcLog::getMonth, time.getMonthValue());
             weekendCriteria.andEqualTo(RemoteOpcLog::getDay, time.getDayOfMonth());
             List<RemoteOpcLog> checkList = remoteOpcLogMapper.selectByExample(weekend);
-            for (OpcResult result : resultList) {
+            for (RemoteOpcVO result : resultList) {
                 RemoteOpcLog remoteOpcLog = new RemoteOpcLog();
                 remoteOpcLog.setPositionNum(result.getId());
-                remoteOpcLog.setResult(new BigDecimal(result.getValue()));
+                remoteOpcLog.setResult(result.getResult());
                 LocalDateTime localDateTime = DateUtils.strToLocalDateTime(result.getTime(), DateUtils.PATTERN_YMD_HMS);
                 remoteOpcLog.setCreatedTime(localDateTime);
                 remoteOpcLog.setYear(localDateTime.getYear());
@@ -81,7 +83,7 @@ public class OpcService {
                 remoteOpcLog.setDay(localDateTime.getDayOfMonth());
                 // remoteOpcLog.setHour(localDateTime.getHour());
                 // remoteOpcLog.setMinute(localDateTime.getMinute());
-                remoteOpcLog.setRemark(result.getTime().split(" ")[1] + "," + result.getValue() + ";");
+                remoteOpcLog.setRemark(result.getTime().split(" ")[1] + "," + result.getResult() + ";");
                 List<RemoteOpcLog> findItemList = checkList.stream().filter(remoteOpcLog1 -> remoteOpcLog1.getPositionNum().equals(result.getId())).collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(findItemList) && findItemList.size() > 0) {
                     updateRemoteOpcLogList.add(remoteOpcLog);

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

@@ -1,5 +1,6 @@
 package com.platform.opc.servie;
 
+import com.platform.common.constant.RedisKeyConstants;
 import com.platform.common.util.RedisUtils;
 import com.platform.common.util.StringUtils;
 import com.platform.dao.mapper.remote.RemoteOpcLogMapper;
@@ -29,7 +30,7 @@ public class OpcTask {
      */
     @Scheduled(fixedDelay = 2000)  //间隔2秒
     public void getValue() throws JIException {
-        String key = RedisUtils.getString(OpcDAClient.redis_opc_update_flag);
+        String key = RedisUtils.getString(RedisKeyConstants.redis_opc_update_flag);
         if(StringUtils.isBlank(key)){
             for (int i = 0; i < OpcDAClient.groupList.size(); i++) {
                 Group group = OpcDAClient.groupList.get(i);
@@ -47,7 +48,7 @@ public class OpcTask {
      */
     @Scheduled(fixedDelay = 300000)  //间隔300秒，5分钟保存一次数据到数据库，确保每天不超过700万数据
     public void saveValue() throws JIException {
-        String key = RedisUtils.getString(OpcDAClient.redis_opc_update_flag);
+        String key = RedisUtils.getString(RedisKeyConstants.redis_opc_update_flag);
         if(StringUtils.isBlank(key)){
             for (int i = 0; i < OpcDAClient.groupList.size(); i++) {
                 Group group = OpcDAClient.groupList.get(i);

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

@@ -3,6 +3,7 @@ package com.platform.opc.util;
 import com.platform.common.util.BigDecimalUtil;
 import com.platform.common.util.DateUtils;
 import com.platform.dao.entity.remote.RemoteOpc;
+import com.platform.dao.vo.query.remote.RemoteOpcVO;
 import com.platform.opc.entity.OpcResult;
 import lombok.extern.slf4j.Slf4j;
 import org.jinterop.dcom.common.JIErrorCodes;
@@ -16,6 +17,7 @@ import org.openscada.opc.lib.da.*;
 import org.openscada.opc.lib.da.browser.FlatBrowser;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.net.UnknownHostException;
 import java.util.*;
 import java.util.concurrent.Executors;
@@ -30,12 +32,6 @@ import java.util.stream.Collectors;
 public class OpcDAClient {
 
     public static String redis_ok = "redis_ok";
-    public static String redis_opc_item_values = "redis_opc_item_values";
-    public static String redis_opc_update_flag = "redis_opc_update_flag";
-    // 待采集点位列表
-    public static String redis_opc_wait_add_list = "redis_opc_wait_add_list";
-    // 待撤销点位列表
-    public static String redis_opc_wait_remove_list = "redis_opc_wait_remove_list";
     public static String host = "192.168.108.108";
     public static String user = "Administrator";
     public static String password = "Hollysys";
@@ -297,8 +293,8 @@ public class OpcDAClient {
      * @param group:
      * @return
      */
-    public static List<OpcResult> getItemValuesList(Group group) {
-        List<OpcResult> resultList = new ArrayList<>();
+    public static List<RemoteOpcVO> getItemValuesList(Group group) {
+        List<RemoteOpcVO> resultList = new ArrayList<>();
         try {
             log.info("获取分组的数据： 组名：" + group.getName());
             Item[] items = itemArrList.get(group.getName()).toArray(new Item[0]);
@@ -306,11 +302,11 @@ public class OpcDAClient {
             Map<Item, ItemState> resultMap = group.read(true, items);
             //log.info("数据获取完成。数量：", resultMap.size() + ", 组序号：" + i);
             for (Item item : resultMap.keySet()) {
-                OpcResult result = new OpcResult();
+                RemoteOpcVO result = new RemoteOpcVO();
                 ItemState itemMap = resultMap.get(item);
                 String value = getVal(itemMap.getValue());
-                result.setId(item.getId());
-                result.setValue(value);
+                result.setPositionNum(item.getId());
+                result.setResult(new BigDecimal(value));
                 result.setTime(DateUtils.dateToString(itemMap.getTimestamp().getTime()));
                 // log.info("id: " + item.getId() + ", value: " + value + ", timestamp: " + itemMap.getTimestamp());
                 resultList.add(result);

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

@@ -1,9 +1,12 @@
 package com.platform.rest.controller.remote;
 
+import com.alibaba.fastjson.JSON;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.constant.RedisKeyConstants;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.R;
 import com.platform.common.util.RedisUtils;
+import com.platform.common.util.StringUtils;
 import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.remote.RemoteOpcDTO;
@@ -182,6 +185,23 @@ public class RemoteOpcController {
         return new R<>(remoteMeasureService.selectList(remoteMeasureDTO));
     }
 
+
+    /**
+     * 获取实时数据列表，从redis里面获取
+     *
+     * @param remoteMeasureDTO opc点位对应表DTO
+     * @return R
+     */
+    @GetMapping("/redis")
+    public R queryFromRedis(RemoteOpcDTO remoteMeasureDTO) {
+        String jsonStr = RedisUtils.getString(RedisKeyConstants.DCS_PREFIX + remoteMeasureDTO.getLine());
+        if (StringUtils.isNotBlank(jsonStr)) {
+            List<RemoteOpcVO> resultList = JSON.parseArray(jsonStr, RemoteOpcVO.class);
+            return new R<>(resultList);
+        }
+        return new R<>(remoteMeasureService.selectList(remoteMeasureDTO));
+    }
+
     /**
      * opc点位对应表导出
      *