修改

portal-server/src/main/java/com/zq/portal/service/StatsService.java

@@ -53,31 +53,30 @@ public class StatsService {
         // 婚姻
         // 婚姻
         vo.setType("IA");
         vo.setType("IA");
         List<StatsVo> fivesYearMarriageLine = hyStatsDao.getFivesYearMarriageLine(vo);
         List<StatsVo> fivesYearMarriageLine = hyStatsDao.getFivesYearMarriageLine(vo);
-        Collections.reverse(fivesYearMarriageLine);
-        Map<String, Object> hy = new HashMap<>();
-        hy.put("type", "婚姻");
         vo.setType(null);// 用完设置为null不影响后台的统计
         vo.setType(null);// 用完设置为null不影响后台的统计
-        addStatsObjData(returnData, fivesYearMarriageLine, hy);
+        Collections.reverse(fivesYearMarriageLine);
+        Map<String, Object> hy = getMapStatsObj(fivesYearMarriageLine, "婚姻");
+        returnData.add(hy);
 
 
         // 社会组织
         // 社会组织
         List<StatsVo> soorganThreeYearStats = shzzStatsDao.getSoorganThreeYearStats(vo);
         List<StatsVo> soorganThreeYearStats = shzzStatsDao.getSoorganThreeYearStats(vo);
         Collections.reverse(soorganThreeYearStats);
         Collections.reverse(soorganThreeYearStats);
-        Map<String, Object> shzz = new HashMap<>();
-        shzz.put("type", "社会组织");
-        addStatsObjData(returnData, soorganThreeYearStats, shzz);
+        Map<String, Object> shzz = getMapStatsObj(soorganThreeYearStats, "社会组织");
+        returnData.add(shzz);
 
 
         redisUtils.setObj(PortalCacheKeys.getAppMapStatsKey(vo), returnData);
         redisUtils.setObj(PortalCacheKeys.getAppMapStatsKey(vo), returnData);
         return returnData;
         return returnData;
     }
     }
 
 
     /**
     /**
-     * 给map对象添加近三年的数据
+     * 构造一个近三年数据的map对象
      *
      *
-     * @param returnData
      * @param statsList
      * @param statsList
-     * @param mapObj
+     * @param type
      */
      */
-    private void addStatsObjData(List<Map<String, Object>> returnData, List<StatsVo> statsList, Map<String, Object> mapObj) {
+    private Map<String, Object> getMapStatsObj(List<StatsVo> statsList, String type) {
+        Map<String, Object> mapObj = new HashMap<>();
+        mapObj.put("type", type);
         for (int i = 0; i < statsList.size(); i++) {
         for (int i = 0; i < statsList.size(); i++) {
             StatsVo statsVo = statsList.get(i);
             StatsVo statsVo = statsList.get(i);
             if (i == 0) {
             if (i == 0) {
@@ -88,6 +87,6 @@ public class StatsService {
                 mapObj.put("three", statsVo.getNum());
                 mapObj.put("three", statsVo.getNum());
             }
             }
         }
         }
-        returnData.add(mapObj);
+        return mapObj;
     }
     }
 }
 }