优化

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

@@ -25,6 +25,7 @@ import org.springframework.util.CollectionUtils;
 import java.math.BigDecimal;
 import java.net.UnknownHostException;
 import java.time.Instant;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
@@ -337,6 +338,8 @@ public class OpcDAClient {
             log.info("获取分组的数据数量：" + items.length);
             Map<Item, ItemState> resultMap = group.read(true, items);
             //log.info("数据获取完成。数量：", resultMap.size() + ", 组序号：" + i);
+            LocalDateTime time = LocalDateTime.now();
+            String timeStr = DateUtils.dateToString(time);
             Instant now = Instant.now();
             for (Item item : resultMap.keySet()) {
                 RemoteOpcVO result = new RemoteOpcVO();
@@ -345,7 +348,8 @@ public class OpcDAClient {
                 result.setPositionNum(item.getId());
                 result.setResult(new BigDecimal(value));
                 result.setTestInstant(now);
-                // log.info("id: " + item.getId() + ", value: " + value + ", timestamp: " + itemMap.getTimestamp());
+                result.setTime(timeStr);
+                log.info("id: " + item.getId() + ", value: " + value + ", timestamp: " + itemMap.getTimestamp());
                 resultList.add(result);
             }
         } catch (Exception e) {

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

@@ -29,6 +29,7 @@ import tk.mybatis.mapper.weekend.WeekendCriteria;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -218,6 +219,8 @@ public class RemoteOpcController {
             remoteMeasureDTO.setCreatedFlag(YesNoEnum.YES.getValue());
             remoteMeasureDTO.setPositionFlag(YesNoEnum.YES.getValue());
             resultList = remoteOpcService.selectList(remoteMeasureDTO);
+            LocalDateTime time = LocalDateTime.now();
+            String timeStr = DateUtils.dateToString(time);
             for (RemoteOpcVO vo : resultList) {
                 if (vo.getType().equals(RemoteOpcTypeEnum.PUTONG.getValue())) {
                     float value = RandomUtils.nextFloat();
@@ -229,6 +232,7 @@ public class RemoteOpcController {
                     boolean value = RandomUtils.nextBoolean();
                     vo.setResult(new BigDecimal(value ? 1 : 0));
                 }
+                vo.setTime(timeStr);
             }
             if (BeanUtils.isDev()) {
                 remoteOpcService.sendWarn(resultList);