应用集市列表增加应用code

sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeSiteServiceImpl.java

@@ -25,10 +25,7 @@ import com.mortals.xhx.module.converge.dao.ConvergeSiteDao;
 import com.mortals.xhx.module.converge.service.ConvergeSiteService;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -65,21 +62,29 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
                     for (ConvergeDeviceEntity deviceEntity:deviceEntityList){
                         EquipmentVO equipmentVO = new EquipmentVO();
                         BeanUtils.copyProperties(deviceEntity,equipmentVO,BeanUtil.getNullPropertyNames(deviceEntity));
-                        List<ConvergeAppsEntity> apps = convergeAppsService.find(new ConvergeAppsQuery().siteId(deviceEntity.getSiteId()).equipmentId(deviceEntity.getId()));
+                        ConvergeAppsQuery appsQuery = new ConvergeAppsQuery();
+                        appsQuery.setSiteId(deviceEntity.getSiteId());
+                        appsQuery.setEquipmentId(deviceEntity.getId());
+                        Map<String,String> orderCols = new HashMap<>();
+                        orderCols.put("statYearMonth","desc");
+                        appsQuery.setOrderCols(orderCols);
+                        List<ConvergeAppsEntity> apps = convergeAppsService.find(appsQuery);
                         if(CollectionUtils.isEmpty(apps)){
                             continue;
                         }
-                        for(ConvergeAppsEntity item:apps){
+                        List<ConvergeAppsEntity> appsNew = new ArrayList<>();
+                        appsNew.add(apps.get(0));
+                        for(ConvergeAppsEntity item:appsNew){
                             ConvergeAppsInterfaceEntity query = new ConvergeAppsInterfaceEntity();
                             query.setEcode(deviceEntity.getLogo());
                             query.setApplicationId(item.getAppEname());
                             List<InterfaceStatsVO> interfaceEntityList = convergeAppsInterfaceService.getTotalInvokeSum(query);
                             if(CollectionUtils.isEmpty(interfaceEntityList) || interfaceEntityList.get(0) == null){
-                                interfaceEntityList=null;
+                                continue;
                             }
                             item.setInterfaceEntityList(interfaceEntityList);
                         }
-                        equipmentVO.setAppStats(convertAppVO(apps));
+                        equipmentVO.setAppStats(convertAppVO(appsNew));
                         equipments.add(equipmentVO);
                     }
                     branchVO.setEquipments(equipments);
@@ -164,7 +169,7 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
             List<AppVO> voList = new ArrayList<>();
             for (ConvergeAppsEntity item:apps){
                 if(CollectionUtils.isEmpty(item.getInterfaceEntityList()) || item.getInterfaceEntityList().get(0) == null){
-                    item.setInterfaceEntityList(Collections.emptyList());
+                    continue;
                 }
                 AppVO vo = new AppVO();
                 BeanUtils.copyProperties(item,vo,BeanUtil.getNullPropertyNames(item));