社会救助接口修改

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

@@ -5,6 +5,7 @@ import com.zq.common.vo.ResultVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import javax.management.relation.RelationSupport;
 import java.util.Map;
 
 @FeignClient(name = "PORTAL-SERVER", configuration = FeignConfig.class)  //指定调用哪个微服务
@@ -61,4 +62,7 @@ public interface PortalFeign {
 
     @PostMapping("/stats/getCremationStatsList")
     ResultVo getCremationStatsList(@RequestBody Map<String, Object> paramsMap);
+
+    @PostMapping("/stats/getAreaUnderNumStats")
+    ResultVo getAreaUnderNumStats(@RequestBody Map<String, Object> paramsMap);
 }

api-server/src/main/java/com/zq/api/service/IApiLogic.java

@@ -100,6 +100,14 @@ public interface IApiLogic extends IApiCommon {
     ApiResp getAreaShjzStats(ApiForm form);
 
     /**
+     * 获取区域社会救助统计列表
+     *
+     * @param form
+     * @return
+     */
+    ApiResp getAreaUnderNumStats(ApiForm form);
+
+    /**
      * 获取近五年城市农村低保发放人数统计
      *
      * @param form

api-server/src/main/java/com/zq/api/service/impl/ApiV100Logic.java

@@ -96,6 +96,11 @@ public class ApiV100Logic extends BaseApiLogic implements IApiLogic {
     }
 
     @Override
+    public ApiResp getAreaUnderNumStats(ApiForm form) {
+        return ApiUtils.toApiResp(form,portalFeign.getAreaUnderNumStats(form.getParamsMap()));
+    }
+
+    @Override
     public ApiResp getFivesYearShjzAchieveStats(ApiForm form) {
         return ApiUtils.toApiResp(form, portalFeign.getFivesYearShjzAchieveStats(form.getParamsMap()));
     }

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

@@ -229,6 +229,7 @@ public class CjStatsService {
             vo.setSubAreaCode(severeAreaIssueStat.getCode());
             Map<String, Object> data = new HashMap<>();
             data.put("areaName", severeAreaIssueStat.getName());
+            data.put("areaCode",severeAreaIssueStat.getCode());
             data.put("severePeopleNum", cjStatsDao.getSeverePeopleNumStats(vo).getNum());
             data.put("issueNum", severeAreaIssueStat.getNum());
             data.put("issueAmount", severeAreaIssueStat.getAmount());

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

@@ -591,6 +591,20 @@ public class ShjzStatsService {
         returnData.put("villageNumList", villageNumList);
         returnData.put("villageNumRateList", villageNumRateList);
 
+
+        List<Map<String, Object>> data = new ArrayList<>();
+        for (Map<String, Object> map : data) {
+            Map<String, Object> numMap = new HashMap<>();
+//            numMap.put("areaCode","");
+            numMap.put("city", "");
+            numMap.put("provideNum", "");
+            numMap.put("achieveNum", "");
+            data.add(numMap);
+        }
+
+        returnData.put("data", data);
+
+
         redisUtils.setObj(PortalCacheKeys.getAreaUnderEnbuzNumStatsKey(vo), returnData);
         return returnData;
     }