fix：“修复机器排行统计出错问题“

src/main/java/com/szwl/service/es/EsTEquipmentService.java

@@ -12,7 +12,6 @@ import com.szwl.model.bean.ChartColumn;
 import com.szwl.model.bean.SellChartBean;
 import com.szwl.model.bean.SellChartColumn;
 import com.szwl.model.bo.R;
-import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.TEquipment;
 import com.szwl.model.query.StatisticsParam;
 import com.szwl.model.query.TCoinOrderParam;
@@ -22,10 +21,10 @@ import com.szwl.model.utils.DateUtils;
 import com.szwl.service.TEquipmentService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.elasticsearch.client.indices.GetIndexRequest;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.indices.GetIndexRequest;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
@@ -44,7 +43,6 @@ import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Optional;
 
 @Slf4j
 @Service
@@ -247,16 +245,14 @@ public class EsTEquipmentService extends EsBaseService<TEquipment, TEquipmentPar
             return getEquipmentStatistics(boolQueryBuilder, esTOrderService.getTableName(), "productName.keyword");
         } else {
             log.info("1");
-            ChartColumn chartColumn = getEquipmentStatistics(boolQueryBuilder, esTOrderService.getTableName(), "equipmentId");
+            ChartColumn chartColumn = getEquipmentStatistics(boolQueryBuilder, esTOrderService.getTableName(), "clientId.keyword");
 
             // 设置categories
             ArrayList<String> equipmentIdList = chartColumn.getCategories();
             ArrayList<String> list = new ArrayList<>();
-//            for(String e:equipmentIdList){
-//                list.add(Long.valueOf(e));
-//            }
+
             for (String e : equipmentIdList) {
-                TEquipment equipment = R.getDataIfSuccess(szwlFeign.findById(e));
+                TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(e));
                 if (equipment != null && equipment.getId() != null) {
                     if (StringUtils.isNotEmpty(equipment.getName())) {
                         list.add(equipment.getName());
@@ -269,37 +265,6 @@ public class EsTEquipmentService extends EsBaseService<TEquipment, TEquipmentPar
 
             }
             chartColumn.setCategories(list);
-//        TEquipmentParam tEquipmentParam = new TEquipmentParam();
-//        tEquipmentParam.setId_inList(equipmentIdList);
-//        List<TEquipment> equipmentList = this.selectEntityByEqualToOption(tEquipmentParam);
-//            TEquipmentExample exampe = new TEquipmentExample();
-//            TEquipmentExample.Criteria criteria = exampe.createCriteria();
-//            criteria.andIdIn(list);
-//            List<TEquipment> tEquipments = tEquipmentService.selectByOption(exampe);
-//            LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
-//            query.in(TEquipment::getId,list);
-//            List<TEquipment> tEquipments = tEquipmentService.list(query);
-//            ArrayList<String> categories_final = new ArrayList<>();
-//            for (String equipmentId : equipmentIdList) {
-//                String finalCategories =  equipmentId;
-////            Optional<TEquipment> op = equipmentList.stream().filter(
-//                Optional<TEquipment> op = tEquipments.stream().filter(
-//                        e ->{
-//                            return StringUtils.equals(String.valueOf(e.getId()),equipmentId);
-//                        }
-//                ).findFirst();
-//                if(op.isPresent()){
-//                    TEquipment equipment = op.get();
-//                    if(StringUtils.isNotEmpty(equipment.getName())){
-//                        finalCategories = equipment.getName();
-//                    }else{
-//                        finalCategories = equipment.getClientId().substring(equipment.getClientId().length()-6,equipment.getClientId().length());
-//                    }
-//                }
-//                categories_final.add(finalCategories);
-//            }
-//            chartColumn.setCategories(categories_final);
-
             return chartColumn;
         }
     }