电桩监控查询优化

service/src/main/java/com/kym/service/admin/impl/ConnectorInfoServiceImpl.java

@@ -53,13 +53,14 @@ public class ConnectorInfoServiceImpl extends MyBaseServiceImpl<ConnectorInfoMap
         }
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
         var connectorInfos = lambdaQuery()
-                .likeLeft(isNotNull(params.getEquipmentId()), ConnectorInfo::getEquipmentId, params.getEquipmentId())
-                .eq(isNotNull(params.getStationId()), ConnectorInfo::getStationId, params.getStationId())
-                .eq(isNotNull(params.getStatus()), ConnectorInfo::getStatus, params.getStatus())
+                .eq(CommUtil.isNotEmptyAndNull(params.getEquipmentId()), ConnectorInfo::getConnectorId,
+                        CommUtil.isNotEmptyAndNull(params.getEquipmentId()) ? KymCache.INSTANCE.getConnectorId(params.getEquipmentId()) : null)
+                .eq(CommUtil.isNotEmptyAndNull(params.getStationId()), ConnectorInfo::getStationId, params.getStationId())
+                .eq(CommUtil.isNotEmptyAndNull(params.getStatus()), ConnectorInfo::getStatus, params.getStatus())
                 .list();
         var pageBean = new PageBean<>(connectorInfos);
         // 转换成vo
-        var connectorInfoVos = new ArrayList<ConnectorInfoVo>(connectorInfos.parallelStream()
+        var connectorInfoVos = new ArrayList<>(connectorInfos.parallelStream()
                 .map(item -> {
                             var vo = new ConnectorInfoVo();
                             BeanUtils.copyProperties(item, vo);