|
@@ -140,7 +140,7 @@ public class OpcDAClient {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
public static List<RemoteOpc> addGroupAndItems(List<RemoteOpc> remoteOpcList) {
|
|
public static List<RemoteOpc> addGroupAndItems(List<RemoteOpc> remoteOpcList) {
|
|
- log.info("remoteOpcList: " + remoteOpcList.size());
|
|
|
|
|
|
+ // log.info("remoteOpcList: " + remoteOpcList.size());
|
|
Map<String, List<RemoteOpc>> listMap = remoteOpcList.stream().collect(Collectors.groupingBy(RemoteOpc::getLine));
|
|
Map<String, List<RemoteOpc>> listMap = remoteOpcList.stream().collect(Collectors.groupingBy(RemoteOpc::getLine));
|
|
OpcDAClient.connect();
|
|
OpcDAClient.connect();
|
|
List<RemoteOpc> list = new ArrayList<>();
|
|
List<RemoteOpc> list = new ArrayList<>();
|
|
@@ -161,9 +161,9 @@ public class OpcDAClient {
|
|
Group group = null;
|
|
Group group = null;
|
|
try {
|
|
try {
|
|
if (!CollectionUtils.isEmpty(groupList)) {
|
|
if (!CollectionUtils.isEmpty(groupList)) {
|
|
- log.info("groupList: " + groupList.size());
|
|
|
|
|
|
+ // log.info("groupList: " + groupList.size());
|
|
for (Group checkGroup : groupList) {
|
|
for (Group checkGroup : groupList) {
|
|
- log.info("checkGroup: " + checkGroup.getName());
|
|
|
|
|
|
+ // log.info("checkGroup: " + checkGroup.getName());
|
|
if (checkGroup.getName().equals(entry.getKey())) {
|
|
if (checkGroup.getName().equals(entry.getKey())) {
|
|
log.info("已存在分组line id: " + entry.getKey());
|
|
log.info("已存在分组line id: " + entry.getKey());
|
|
group = checkGroup;
|
|
group = checkGroup;
|
|
@@ -351,7 +351,7 @@ public class OpcDAClient {
|
|
result.setResult(new BigDecimal(value));
|
|
result.setResult(new BigDecimal(value));
|
|
result.setTestInstant(now);
|
|
result.setTestInstant(now);
|
|
result.setTime(timeStr);
|
|
result.setTime(timeStr);
|
|
- log.info("id: " + item.getId() + ", value: " + value + ", timestamp: " + itemMap.getTimestamp());
|
|
|
|
|
|
+ // log.info("id: " + item.getId() + ", value: " + value + ", timestamp: " + itemMap.getTimestamp());
|
|
resultList.add(result);
|
|
resultList.add(result);
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|