web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/DeviceDetailsService.java

@@ -6,8 +6,6 @@ package com.gyee.runeconomy.service.monitor;/*
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
-import com.gyee.common.util.algorithm.MathUtils;
-import com.gyee.common.vo.monitor.AgcVo;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
 import com.gyee.runeconomy.model.vo.LineTreeVo;
@@ -17,7 +15,6 @@ import com.gyee.runeconomy.model.vo.WtStatusVo;
 import com.gyee.runeconomy.service.auto.IProEconTestingPointService;
 import com.gyee.runeconomy.util.StringUtils;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
-import com.gyee.runeconomy.util.realtimesource.StringUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -133,7 +130,7 @@ public class DeviceDetailsService {
         Map<String,List<ProEconTestingPoint>> resultMap = new HashMap<>();
         Map<String, ProBasicEquipment> wtmap = CacheContext.wtmap;
         QueryWrapper<ProEconTestingPoint> qw = new QueryWrapper<>();
-        qw.lambda().eq(ProEconTestingPoint::getModel,wtmap.get(wtid).getModelId()).eq(ProEconTestingPoint::getLogicalUnitId,part).eq(ProEconTestingPoint::getIsDisplay,1);
+        qw.lambda().eq(ProEconTestingPoint::getModel,wtmap.get(wtid).getModelId()).eq(ProEconTestingPoint::getLogicalUnitId,part);
         List<ProEconTestingPoint> list = proEconTestingPointService.list(qw);
         resultMap.put("AI",list.stream().filter(i->i.getUniformCode().startsWith("AI")).collect(Collectors.toList()));
         resultMap.put("DI",list.stream().filter(i->i.getUniformCode().startsWith("DI")).collect(Collectors.toList()));

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/util/realtimesource/EdosUtil.java

@@ -748,7 +748,7 @@ public class EdosUtil implements IEdosUtil {
         String pointIdString = StringUtil.join(pointids, ",");
         Optional<String> keys = Optional.ofNullable(pointIdString);
         String url = baseURL + "/latest?null=0";
-        if (pointIdString.startsWith("GF-")){
+        if (pointIdString.contains("GF-")){
             url = baseURL2 + "/latest?null=0";
         }
         try {
@@ -842,7 +842,7 @@ public class EdosUtil implements IEdosUtil {
         String pointIdString = StringUtil.join(pointids.toArray(), ",");
         Optional<String> keys = Optional.ofNullable(pointIdString);
         String url = baseURL + "/latest?null=0";
-        if (pointIdString.startsWith("GF-")){
+        if (pointIdString.contains("GF-")){
             url = baseURL2 + "/latest?null=0";
         }
         try {
@@ -947,7 +947,7 @@ public class EdosUtil implements IEdosUtil {
                 String pointIdString = StringUtil.join(pointids, ",");
                 Optional<String> keys = Optional.ofNullable(pointIdString);
                 String url = baseURL + "/latest?null=0";
-                if (pointIdString.startsWith("GF-")){
+                if (pointIdString.contains("GF-")){
                     url = baseURL2 + "/latest?null=0";
                 }
                 try {