专题分析列表排序

common/src/main/java/com/gyee/common/vo/specific/SpecificTarget.java

@@ -12,4 +12,5 @@ public class SpecificTarget {
     private String wpname;
 //    private Integer year;
     List<SpecificTargetVo> targetList;
+    private Integer orderNum;
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.DoubleUtils;
+import com.gyee.common.util.SortUtils;
 import com.gyee.common.vo.specific.SpecificCenterVo;
 import com.gyee.common.vo.specific.SpecificTarget;
 import com.gyee.common.vo.specific.SpecificTargetVo;
@@ -712,13 +713,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
                     vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -746,7 +750,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -856,13 +860,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
                     vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -890,7 +897,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -999,13 +1006,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
                     vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1033,7 +1043,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
 
@@ -1143,13 +1153,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
                     vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1177,7 +1190,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -1286,13 +1299,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
                     vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1320,7 +1336,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -1429,13 +1445,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
                     vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1463,7 +1482,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -1572,13 +1591,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
                     vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1607,7 +1629,7 @@ public class SpecificService {
             });
         }
 
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
         return resultendList;
     }
 
@@ -1715,13 +1737,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
                     vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1749,7 +1774,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -1858,13 +1883,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
                     vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -1892,7 +1920,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -2001,13 +2029,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
                     vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -2035,7 +2066,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -2144,13 +2175,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
                     vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -2178,7 +2212,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -2288,13 +2322,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
                     vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -2322,7 +2359,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }
@@ -2431,13 +2468,16 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
+                int orderNum = 0;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
                     vo.setWpname(CacheContext.rgmap.get(companys).getAname());
                 }else{
                     vo.setWpname(CacheContext.wpmap.get(wpid).getAname());
+                    orderNum = CacheContext.wpmap.get(wpid).getOrderNum();
                 }
+                vo.setOrderNum(orderNum);
                 List<SpecificTargetVo> tempList = new ArrayList<>();
 
                 Map<Integer, SpecificTargetVo> listMap = map.get(wpid);
@@ -2465,7 +2505,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-
+        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
 
         return resultendList;
     }