添加婚姻统计接口

portal-server/src/main/java/com/zq/portal/controller/app/HyStatsController.java

 package com.zq.portal.controller.app;
 
 import com.zq.common.vo.ResultVo;
+import com.zq.portal.manager.CacheKeys;
+import com.zq.portal.manager.PortalCacheManager;
 import com.zq.portal.service.StatsService;
 import com.zq.portal.vo.StatsReqVo;
 import io.swagger.annotations.Api;
@@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class HyStatsController {
 
     public final StatsService statsService;
+    public final PortalCacheManager cacheManager;
 
     @ApiOperation("获取结婚离婚人数")
     @PostMapping(value = "/getTotalMarryDivorce")
@@ -28,6 +31,10 @@ public class HyStatsController {
     @ApiOperation("获取地区结婚离婚人数列表")
     @PostMapping(value = "/getAreaMarryDivorceList")
     public ResultVo getAreaMarryDivorceList(@RequestBody StatsReqVo vo) {
+        Object obj = cacheManager.getObj(CacheKeys.getAreaHyListKey(vo.getAreaCode()));
+        if (obj != null) {
+            return ResultVo.success(obj);
+        }
         return ResultVo.success(statsService.getAreaMarryDivorceList(vo));
     }
 

portal-server/src/main/java/com/zq/portal/manager/CacheKeys.java

@@ -8,5 +8,9 @@ public abstract class CacheKeys {
         return PREFIX + "map." + areaCode;
     }
 
+    public static String getAreaHyListKey(String areaCode) {
+        return PREFIX + "areaHyList." + areaCode;
+    }
+
 
 }

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

@@ -28,7 +28,7 @@ public class StatsService {
     private final HyStatsDao hyStatsDao;
     private final ShzzStatsDao shzzStatsDao;
     private final AreaDao areaDao;
-    private final PortalCacheManager portalCacheManager;
+    private final PortalCacheManager cacheManager;
 
     public Object getMapStatsData(StatsReqVo vo) {
         List<Map<String, Object>> returnData = new ArrayList<>();
@@ -55,7 +55,7 @@ public class StatsService {
         }
 
         if (returnData.size() > 0) {
-            portalCacheManager.setObj(CacheKeys.getMapDataKey(vo.getAreaCode()), returnData);
+            cacheManager.setObj(CacheKeys.getMapDataKey(vo.getAreaCode()), returnData);
         }
 
         return returnData;
@@ -94,13 +94,17 @@ public class StatsService {
         List<SystemArea> systemAreaList = areaDao.selectList(Wrappers.lambdaQuery(SystemArea.builder().parentId(area.getCode()).build()));
         for (SystemArea systemArea : systemAreaList) {
             Map<String, Object> areaData = new HashMap<>();
+            // 按结婚离婚分类统计
             List<StatsVo> totalMarryDivorce = hyStatsDao.getTotalMarryDivorce(StatsReqVo.builder().areaCode(systemArea.subAreaCode()).build());
-            areaData.put("data", totalMarryDivorce);
+            for (StatsVo statsVo : totalMarryDivorce) {
+                areaData.put(statsVo.getType(), statsVo.getNum());
+            }
             areaData.put("areaName", systemArea.getName());
             areaData.put("areaCode", systemArea.getCode());
             returnData.add(areaData);
         }
 
+        cacheManager.setObj(CacheKeys.getAreaHyListKey(vo.getAreaCode()), returnData);
         return returnData;
     }