APP残疾页面数据更改

api-server/src/main/java/com/zq/api/feign/PortalFeign.java

@@ -69,8 +69,8 @@ public interface PortalFeign {
     ResultVo getAreaUnderNumStats(@RequestBody Map<String, Object> paramsMap);
 
     @PostMapping("/stats/getEnjoySubsidyStats")
-    ResultVo getEnjoySubsidyStats(Map<String, Object> paramsMap);
+    ResultVo getEnjoySubsidyStats(@RequestBody Map<String, Object> paramsMap);
 
     @PostMapping("/stats/getEnjoySumStatsData")
-    ResultVo getEnjoySumStatsData(Map<String, Object> paramsMap);
+    ResultVo getEnjoySumStatsData(@RequestBody Map<String, Object> paramsMap);
 }

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

@@ -44,13 +44,7 @@ public class CjStatsController {
     @ApiOperation("区域在享发放统计")
     @PostMapping(value = "/getEnjoySubsidyStats")
     public ResultVo getEnjoySubsidyStats(@RequestBody StatsReqVo vo) {
-        return ResultVo.success(cjStatsService.getCacheEnjoySubsidyStats(vo));
-    }
-
-    @ApiOperation("在享发放总数")
-    @PostMapping(value = "/getEnjoySumStatsData")
-    public ResultVo getEnjoySumStats(@RequestBody StatsReqVo vo) {
-        return ResultVo.success(cjStatsService.getCacheEnjoySumStatsData(vo));
+        return ResultVo.success(cjStatsService.getEnjoySubsidyStats(vo));
     }
 
 }

portal-server/src/main/java/com/zq/portal/dao/CjStatsDao.java

@@ -72,5 +72,5 @@ public interface CjStatsDao {
 
     List<StatsVo> getAreaSubsidyStats(StatsReqVo vo);
 
-    List<StatsVo> getEnjoySumStats(StatsReqVo vo);
+    StatsVo getEnjoySumStats(StatsReqVo vo);
 }

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

@@ -224,7 +224,7 @@ public class CjStatsService {
         List<StatsVo> severeAreaIssueStats = cjStatsDao.getAreaIssueStats(vo);
         for (StatsVo severeAreaIssueStat : severeAreaIssueStats) {
             SystemArea area = areaDao.selectById(SystemArea.patchZero(severeAreaIssueStat.getCode()));
-            if(area==null){
+            if (area == null) {
                 continue;
             }
             areaList.add(area.getName());
@@ -234,9 +234,9 @@ public class CjStatsService {
             vo.setSubAreaCode(severeAreaIssueStat.getCode());
             Map<String, Object> data = new HashMap<>();
             data.put("areaName", area.getName());
-            data.put("areaCode",severeAreaIssueStat.getCode());
+            data.put("areaCode", severeAreaIssueStat.getCode());
             data.put("severePeopleNum", cjStatsDao.getSeverePeopleNumStats(vo).getNum());
-            data.put("difficultPeopleNum",cjStatsDao.getDifficultPeopleNumStats(vo).getNum());
+            data.put("difficultPeopleNum", cjStatsDao.getDifficultPeopleNumStats(vo).getNum());
             data.put("issueNum", severeAreaIssueStat.getNum());
             data.put("issueAmount", severeAreaIssueStat.getAmount());
             areaPeopleNumList.add(data);
@@ -279,15 +279,15 @@ public class CjStatsService {
         return PagingUtils.paging(vo, cjStatsDao::search);
     }
 
-    public Object getCacheEnjoySubsidyStats(StatsReqVo vo) {
-        Object obj = redisUtils.getObj(PortalCacheKeys.getEnjoySubsidyStatsKey(vo));
-        if (obj != null) {
-            return obj;
-        }
-        return getEnjoySubsidyStats(vo);
-    }
+//    public Object getCacheEnjoySubsidyStats(StatsReqVo vo) {
+//        Object obj = redisUtils.getObj(PortalCacheKeys.getEnjoySubsidyStatsKey(vo));
+//        if (obj != null) {
+//            return obj;
+//        }
+//        return getEnjoySubsidyStats(vo);
+//    }
 
-    //区域补贴在享人数
+    //区域补贴在享人和钱数
     public Object getEnjoySubsidyStats(StatsReqVo vo) {
         if (StringUtils.isBlank(vo.getAreaCode())) {
             vo.setAreaCode("450000000000");
@@ -296,59 +296,36 @@ public class CjStatsService {
         vo.setSubAreaCode(systemArea.subAreaCode());
         vo.setSize(SystemArea.getNextLevelLength(systemArea.getType()));
 
-        List<String> areaList = new ArrayList<>();
-        List<String> nursingSubsidyNumList = new ArrayList<>();//护理补贴
-        List<String> nursingSubsidyAmountList = new ArrayList<>();
-        List<String> livingAllowanceNumList = new ArrayList<>();//生活补贴
-        List<String> livingAllowanceAmountList = new ArrayList<>();
+        StatsVo stats = cjStatsDao.getEnjoySumStats(vo);
+        Map<String, Object> totalData = new HashMap<>();
+        totalData.put("totalNum", stats.getNum());
+        totalData.put("totalAmount", stats.getAmount());
 
+        List<Map<String, Object>> areaPeopleNumList = new ArrayList<>();
         List<StatsVo> subsidyStats = cjStatsDao.getAreaSubsidyStats(vo);
         for (StatsVo subsidyStat : subsidyStats) {
             SystemArea area = areaDao.selectById(SystemArea.patchZero(subsidyStat.getCode()));
             if (area == null) {
                 continue;
             }
-            areaList.add(area.getName());
-            nursingSubsidyNumList.add(subsidyStat.getHlnum());
-            nursingSubsidyAmountList.add(subsidyStat.getHlamount());
-            livingAllowanceNumList.add(subsidyStat.getShnum());
-            livingAllowanceAmountList.add(subsidyStat.getShamount());
-
-            vo.setSubAreaCode(subsidyStat.getCode());
-        }
             Map<String, Object> data = new HashMap<>();
-            data.put("areaList", areaList);
-            data.put("nursingSubsidyNum", nursingSubsidyNumList);
-            data.put("nursingSubsidyAmount", nursingSubsidyAmountList);
-            data.put("livingAllowanceNum", livingAllowanceNumList);
-            data.put("livingAllowanceAmount", livingAllowanceAmountList);
-            redisUtils.setObj(PortalCacheKeys.getEnjoySubsidyStatsKey(vo), data);
-
-        return data;
-    }
-
+            data.put("areaCode", subsidyStat.getCode());
+            data.put("areaName", area.getName());
+            data.put("nursingSubsidyNum", subsidyStat.getHlnum());
+            data.put("nursingSubsidyAmount", subsidyStat.getHlamount());
+            data.put("livingAllowanceNum", subsidyStat.getShnum());
+            data.put("livingAllowanceAmount", subsidyStat.getShamount());
 
-    public Object getCacheEnjoySumStatsData(StatsReqVo vo) {
-        Object obj = redisUtils.getObj(PortalCacheKeys.getEnjoySumStatsKey(vo));
-        if (obj != null) {
-            return obj;
+            areaPeopleNumList.add(data);
         }
-        return getEnjoySumStatsData(vo);
-    }
 
-    public Object getEnjoySumStatsData(StatsReqVo vo) {
-        List<Map<String, Object>> returnData = new ArrayList<>();
-        List<StatsVo> enjoySumStats = cjStatsDao.getEnjoySumStats(vo);
-        for (StatsVo statsVo : enjoySumStats) {
-            Map<String, Object> data = new HashMap<>();
-            data.put("num", statsVo.getNum());
-            data.put("amout", statsVo.getAmount());
-            returnData.add(data);
-        }
+        Map<String, Object> returnData = new HashMap<>();
+        returnData.put("total",totalData);
+        returnData.put("stats",areaPeopleNumList);
+
+//        redisUtils.setObj(PortalCacheKeys.getEnjoySubsidyStatsKey(vo), returnData);
 
-        redisUtils.setObj(PortalCacheKeys.getYearDisabledIssueStatsKey(vo), returnData);
         return returnData;
     }
 
-
 }

portal-server/src/main/resources/mapper/CjStatsMapper.xml

@@ -100,7 +100,7 @@
     </select>
 
     <select id="getAreaSubsidyStats" resultType="com.zq.portal.vo.StatsVo">
-        SELECT LEFT(AREACODE, 6) 'code', FF_DATE 'month',FF_ZD_PC 'hlnum', FF_ZD_MC 'hlamount',FF_KUN_PC 'shnum', FF_KUN_MC 'shamount'
+        SELECT LEFT(AREACODE, #{size}) 'code', FF_DATE 'month',FF_ZD_PC 'hlnum', FF_ZD_MC 'hlamount',FF_KUN_PC 'shnum', FF_KUN_MC 'shamount'
         FROM `ff_data_jm`
         WHERE
         CHAR_LENGTH (LEFT ( AREACODE, #{size} )) = #{size}