Browse Source

【BUG】修复智能查询,历史故障,对锚在支柱没查到时直接返回空

fenghao 4 years ago
parent
commit
2e1f9eba05

+ 9 - 2
railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusFjxgmdServiceImpl.java

@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 /**
@@ -104,11 +105,17 @@ public class BusFjxgmdServiceImpl implements IBusFjxgmdService{
             vo.setLineId(busFjxgmdQueryVo.getLineId());
             vo.setXingbie(busFjxgmdQueryVo.getXingbie());
             List<BusZzdzxx> zzList = busZzdzxxMapper.smartQuery(vo);
-            if (zzList != null && zzList.size() > 0) {
+            if (zzList != null && zzList.size() == 1) {
                 BusZzdzxx zz = zzList.get(0);
                 busFjxgmdQueryVo.setMarker(zz.getMarker());
+                return busFjxgmdMapper.getListByZz(busFjxgmdQueryVo);
             }
+            else {
+                return new ArrayList<BusFjxgmd>();
+            }
+        }
+        else {
+            return new ArrayList<BusFjxgmd>();
         }
-        return busFjxgmdMapper.getListByZz(busFjxgmdQueryVo);
     }
 }

+ 9 - 2
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJlgzServiceImpl.java

@@ -20,6 +20,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 /**
@@ -165,12 +166,18 @@ public class BusJlgzServiceImpl implements IBusJlgzService {
 			vo.setLineId(busJlgzQueryVo.getLineId());
 			vo.setXingbie(busJlgzQueryVo.getXingbie());
 			List<BusZzdzxx> zzList = busZzdzxxMapper.smartQuery(vo);
-			if (zzList != null && zzList.size() > 0) {
+			if(zzList != null && zzList.size() == 1){
 				BusZzdzxx zz = zzList.get(0);
 				busJlgzQueryVo.setMarker(zz.getMarker());
+				return busJlgzMapper.getListByZz(busJlgzQueryVo);
+			}
+			else {
+				return new ArrayList<BusJlgzListByZzVo>();
 			}
 		}
-		return busJlgzMapper.getListByZz(busJlgzQueryVo);
+		else {
+			return new ArrayList<BusJlgzListByZzVo>();
+		}
 	}
 
 	@Override