排序bug修改

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

@@ -155,6 +155,11 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD
         query.setOrderCols(orderCols);
         query.setSiteId(siteId);
         List<SstAppsDeskEntity> appsEntities = this.find(query);
+        Map<String,String> orderCols1 = new HashMap<>();
+        orderCols1.put("clickSum","DESC");
+        orderCols1.put("hotSort","DESC");
+        query.setOrderCols(orderCols1);
+        List<SstAppsDeskEntity> appsHots = this.find(query);
         Map<Long,Long> black = new HashMap<>();
         if(StringUtils.isNotEmpty(deviceCode)){
             DeviceBlackappPdu blackappPdu = new DeviceBlackappPdu();
@@ -162,7 +167,6 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD
             blackappPdu.setDeviceCode(deviceCode);
             Rest<RespData<List<DeviceBlackappPdu>>> rest = appFeign.blackappList(blackappPdu);
             if (rest.getCode().equals(YesNoEnum.YES.getValue())) {
-                List<AppsInfoEntity> appsInfoEntities = new ArrayList<>();
                 for(DeviceBlackappPdu pdu:rest.getData().getData()){
                     black.put(pdu.getAppId(),pdu.getAppId());
                 }
@@ -183,7 +187,6 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD
         siteApp.put("allApps", allApps);
         if(CollectionUtils.isNotEmpty(appsEntities)){
             List<AppsInfoEntity> showApps = new ArrayList<>();
-            List<AppsInfoEntity> hotApps = new ArrayList<>();
             for(SstAppsDeskEntity sstAppsDeskEntity:appsEntities){
                 if(black.containsKey(sstAppsDeskEntity.getAppId())){
                     continue;
@@ -196,14 +199,28 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD
                 if(sstAppsDeskEntity.getShowBasic()==1){
                     showApps.add(appInfoMap.get(sstAppsDeskEntity.getAppId()));
                 }
+            }
+            siteApp.put("showApps", showApps);
+        }else {
+            siteApp.put("showApps", Collections.emptyList());
+        }
+        if(CollectionUtils.isNotEmpty(appsHots)){
+            List<AppsInfoEntity> hotApps = new ArrayList<>();
+            for(SstAppsDeskEntity sstAppsDeskEntity:appsHots){
+                if(black.containsKey(sstAppsDeskEntity.getAppId())){
+                    continue;
+                }
+                if(!appInfoMap.containsKey(sstAppsDeskEntity.getAppId())){
+                    continue;
+                }
+                appInfoMap.get(sstAppsDeskEntity.getAppId()).setClickSum(sstAppsDeskEntity.getClickSum());
+                appInfoMap.get(sstAppsDeskEntity.getAppId()).setSort(sstAppsDeskEntity.getBasicSort());
                 if(sstAppsDeskEntity.getShowHot()==1){
                     hotApps.add(appInfoMap.get(sstAppsDeskEntity.getAppId()));
                 }
             }
-            siteApp.put("showApps", showApps);
             siteApp.put("hotApps", hotApps);
         }else {
-            siteApp.put("showApps", Collections.emptyList());
             siteApp.put("hotApps", Collections.emptyList());
         }
         return siteApp;

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

@@ -157,6 +157,11 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA
         query.setOrderCols(orderCols);
         query.setSiteId(siteId);
         List<SstAppsEntity> appsEntities = this.find(query);
+        Map<String,String> orderCols1 = new HashMap<>();
+        orderCols1.put("clickSum","DESC");
+        orderCols1.put("hotSort","DESC");
+        query.setOrderCols(orderCols1);
+        List<SstAppsEntity> appsHots = this.find(query);
         Map<Long,Long> black = new HashMap<>();
         if(StringUtils.isNotEmpty(deviceCode)){
             DeviceBlackappPdu blackappPdu = new DeviceBlackappPdu();
@@ -164,7 +169,6 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA
             blackappPdu.setDeviceCode(deviceCode);
             Rest<RespData<List<DeviceBlackappPdu>>> rest = appFeign.blackappList(blackappPdu);
             if (rest.getCode().equals(YesNoEnum.YES.getValue())) {
-                List<AppsInfoEntity> appsInfoEntities = new ArrayList<>();
                 for(DeviceBlackappPdu pdu:rest.getData().getData()){
                     black.put(pdu.getAppId(),pdu.getAppId());
                 }
@@ -186,7 +190,6 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA
         siteApp.put("allApps", allApps);
         if(CollectionUtils.isNotEmpty(appsEntities)){
             List<AppsInfoEntity> showApps = new ArrayList<>();
-            List<AppsInfoEntity> hotApps = new ArrayList<>();
             for(SstAppsEntity sstAppsEntity:appsEntities){
                 if(black.containsKey(sstAppsEntity.getAppId())){
                     continue;
@@ -199,14 +202,28 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA
                 if(sstAppsEntity.getShowBasic()==1){
                     showApps.add(appInfoMap.get(sstAppsEntity.getAppId()));
                 }
+            }
+            siteApp.put("showApps", showApps);
+        }else {
+            siteApp.put("showApps", Collections.emptyList());
+        }
+        if(CollectionUtils.isNotEmpty(appsHots)){
+            List<AppsInfoEntity> hotApps = new ArrayList<>();
+            for(SstAppsEntity sstAppsEntity:appsHots){
+                if(black.containsKey(sstAppsEntity.getAppId())){
+                    continue;
+                }
+                if(!appInfoMap.containsKey(sstAppsEntity.getAppId())){
+                    continue;
+                }
+                appInfoMap.get(sstAppsEntity.getAppId()).setClickSum(sstAppsEntity.getClickSum());
+                appInfoMap.get(sstAppsEntity.getAppId()).setSort(sstAppsEntity.getBasicSort());
                 if(sstAppsEntity.getShowHot()==1){
                     hotApps.add(appInfoMap.get(sstAppsEntity.getAppId()));
                 }
             }
-            siteApp.put("showApps", showApps);
             siteApp.put("hotApps", hotApps);
         }else {
-            siteApp.put("showApps", Collections.emptyList());
             siteApp.put("hotApps", Collections.emptyList());
         }
         return siteApp;