数据大屏

performance-web/src/main/java/com/clx/performance/dao/LargeScreenAddressRouteDao.java

@@ -14,5 +14,5 @@ import java.util.List;
  */
 public interface LargeScreenAddressRouteDao extends BaseDao<LargeScreenAddressRouteMapper, LargeScreenAddressRoute, Integer> {
 
-    Optional<List<LargeScreenAddressRoute>> getEntityByReceiveAddressIdAndSendAddressId(Integer receiveAddressId, Integer sendAddressId);
+    List<LargeScreenAddressRoute> getEntityByReceiveAddressIdAndSendAddressId(Integer receiveAddressId, Integer sendAddressId);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/LargeScreenAddressRouteDaoImpl.java

@@ -19,10 +19,10 @@ import java.util.List;
 public class LargeScreenAddressRouteDaoImpl extends BaseDaoImpl<LargeScreenAddressRouteMapper, LargeScreenAddressRoute, Integer> implements LargeScreenAddressRouteDao {
 
     @Override
-    public Optional<List<LargeScreenAddressRoute>> getEntityByReceiveAddressIdAndSendAddressId(Integer receiveAddressId, Integer sendAddressId) {
-        return Optional.ofNullable(baseMapper.selectList(lQrWrapper().eq(LargeScreenAddressRoute::getReceiveSystemAddressId, receiveAddressId)
+    public List<LargeScreenAddressRoute> getEntityByReceiveAddressIdAndSendAddressId(Integer receiveAddressId, Integer sendAddressId) {
+        return baseMapper.selectList(lQrWrapper().eq(LargeScreenAddressRoute::getReceiveSystemAddressId, receiveAddressId)
                 .eq(LargeScreenAddressRoute::getSendSystemAddressId, sendAddressId)
-        ));
+        );
 
     }
 }

performance-web/src/main/java/com/clx/performance/listener/LargeScreenListener.java

 package com.clx.performance.listener;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.clx.order.feign.AddressFeign;
@@ -59,8 +60,8 @@ public class LargeScreenListener {
             String receiveName = orderVO.getReveiveAddressShorter();
             String sendName = orderVO.getSendAddressShorter();
 
-            Optional<List<LargeScreenAddressRoute>> optional = largeScreenAddressRouteDao.getEntityByReceiveAddressIdAndSendAddressId(receiveAddressId, sendAddressId);
-            if (optional.isPresent()) {
+            List<LargeScreenAddressRoute> list = largeScreenAddressRouteDao.getEntityByReceiveAddressIdAndSendAddressId(receiveAddressId, sendAddressId);
+            if (CollectionUtil.isNotEmpty(list)) {
                 log.info("当前地址已经记录receiveAddressId{}, sendAddressId{}", receiveAddressId, sendAddressId);
             } else {
                 ReceiveAndSendAddressVO feignAddressVO = Optional.of(addressFeign.getSendAndReceiveSystemAddress(sendAddressId, receiveAddressId)).filter(Result::succeed)