新接口修改

xuefei

2020-12-22 4745238280ae22f373802470844c66cbcdbf4458

新接口修改

 .gitignore

@@ -4,3 +4,4 @@
**/target/
/.iml/
/**/*.iml
/platform-admin/src/main/resources/static/

 api.md

@@ -21,6 +21,18 @@
    [ 5.3根据区域id和订单量查询服务机构排名情况](#5.3)  
    [ 5.4根据区域id和订单量查询服务机构排名情况](#5.4)  
    [ 5.5执行中订单](#5.4)  
[5.养老机构](#6)  
    [ 6.1 获取统计数据](#6.1)  
    [ 6.2 床位个数排名](#6.2)  
    [ 6.3 床位使用率排名](#6.3)  
    [ 5.4 历史数据](#6.4)   
[7.新首页](#7)  
    [ 7.1 社会救助](#7.1)  
    [ 7.2 社会事务](#7.2)  
    [ 7.3 养老服务](#7.3)  
    [ 7.4 儿童福利](#7.4)  
    [ 7.5 综合分析](#7.5)  
    [ 7.6 区域地名](#7.6)  


<h3 id='1'>一、通用</h2>
@@ -1221,7 +1233,7 @@


<h3 id='6'>六、养老机构</h2>
<h4 id='6.1'>6.1获取统计数据</h4>
<h4 id='6.1'>6.1 获取统计数据</h4>
###### 接口功能
> 获取统计数据

@@ -1267,7 +1279,7 @@
        "type2Num": 0
    }
``` 
<h4 id='6.2'>6.2床位个数排名</h4>
<h4 id='6.2'>6.2 床位个数排名</h4>
###### 接口功能
> 床位个数排名

@@ -1346,7 +1358,7 @@
        }
    ]
``` 
<h4 id='6.3'>6.3床位使用率排名</h4>
<h4 id='6.3'>6.3 床位使用率排名</h4>
###### 接口功能
> 床位使用率排名

@@ -1393,7 +1405,7 @@
    ]
}
``` 
<h4 id='6.4'>6.4历史数据</h4>
<h4 id='6.4'>6.4 历史数据</h4>
###### 接口功能
> 历史数据

@@ -1461,4 +1473,508 @@
        "num3": -6
    }
}
``` 


<h3 id='7'>七、新首页</h2>
<h4 id='7.1'>7.1 社会救助</h4>
###### 接口功能
> 社会救助

###### URL
> /api2/indexnew/getSocialAssistance

###### 支持格式
> JSON

###### HTTP请求方式
> GET

###### 请求参数
|参数|必选|类型|说明|
|:-----  |:-------|:-----|-----                               |

###### 返回字段
|返回字段|字段类型|说明                              |
|:-----   |:------|:-----------------------------   |
| values  |  list  |  0/月份 1/社会低保 2/城市特困 3/农村低保 4/农村特困 |
| totalNum  |  int  |  累计救助人数 |
| bedNumber  |  int  |  累计救助金额 |
###### 接口示例
``` java
{
    "success": true,
    "message": "success",
    "code": 200,
    "timestamp": 1608193290531,
    "result": {
        "totalNum": 8412,
        "values": [
            [
                1,
                2,
                3,
                4,
                5,
                6,
                7,
                8,
                9,
                10,
                11,
                12
            ],
            [
                11907653,
                10597717,
                9296957,
                6597877,
                4763372,
                10710327,
                9553979,
                4834701,
                10880464,
                9810688,
                5738737,
                10748867
            ],
            [
                11010462,
                7804402,
                9392711,
                11341311,
                8226456,
                7441524,
                4568079,
                11054400,
                4058794,
                5997314,
                9592501,
                11165410
            ],
            [
                7735633,
                7007250,
                6633273,
                7130232,
                7686402,
                8403656,
                7056768,
                7306279,
                9173077,
                8598968,
                10173203,
                8361172
            ],
            [
                6009653,
                4813926,
                5912294,
                7372661,
                11468996,
                11789401,
                10779945,
                6445069,
                10400497,
                8283154,
                11153893,
                8146418
            ]
        ],
        "totalMoney": 404936523
    }
}
``` 
<h4 id='7.2'>7.2 社会事务</h4>
###### 接口功能
> 社会事务

###### URL
> /api2/indexnew/getSocialAffair

###### 支持格式
> JSON

###### HTTP请求方式
> GET

###### 请求参数
|参数|必选|类型|说明|
|:-----  |:-------|:-----|-----                               |

###### 返回字段
|返回字段|字段类型|说明                              |
|:-----   |:------|:-----------------------------   |
| values  |  list  |  0/月份 1/结婚 2/离婚 |
| num1  |  int  |  残疾补助人数 |
| num2  |  int  |  残疾补助金额 |
| num3  |  int  |  累计离世人员 |
| num4  |  int  |  累计结婚登记 |
| num5  |  int  |  重度残疾人员 |
| num6  |  int  |  困难残疾人员 |
###### 接口示例
``` java
{
    "success": true,
    "message": "success",
    "code": 200,
    "timestamp": 1608193383484,
    "result": {
        "num6": 13425,
        "values": [
            [
                1,
                2,
                3,
                4,
                5,
                6,
                7,
                8,
                9,
                10,
                11,
                12
            ],
            [
                2124,
                2143,
                2462,
                2373,
                2278,
                2425,
                2467,
                2471,
                2425,
                2282,
                2341,
                2153
            ],
            [
                1689,
                1412,
                1607,
                1188,
                1844,
                1871,
                1940,
                1781,
                1498,
                1550,
                1274,
                1080
            ]
        ],
        "num1": 1768,
        "num5": 25956,
        "num4": 6543,
        "num3": 4568,
        "num2": 2562
    }
}
``` 
<h4 id='7.3'>7.3 养老服务</h4>
###### 接口功能
> 养老服务

###### URL
> /api2/indexnew/getPensionService

###### 支持格式
> JSON

###### HTTP请求方式
> GET

###### 请求参数
|参数|必选|类型|说明|
|:-----  |:-------|:-----|-----                               |

###### 返回字段
|返回字段|字段类型|说明                              |
|:-----   |:------|:-----------------------------   |
| list  |  list  | 0/高龄补贴 1/高龄津贴 2/寿星补贴  |
| n1  |  int  |  养老机构数 |
| n2  |  int  |  床位数 |
| n3  |  int  |  服务机构数 |
| n4  |  int  |  机构人员数 |
###### 接口示例
``` java
{
    "success": true,
    "message": "success",
    "code": 200,
    "timestamp": 1608193630945,
    "result": {
        "n1": 63,
        "n2": 8769,
        "n3": 458,
        "n4": 13876,
        "list": [
            {
                "num": 1697,
                "money": 687
            },
            {
                "num": 1227,
                "money": 857
            },
            {
                "num": 1333,
                "money": 498
            }
        ]
    }
}
``` 

<h4 id='7.4'>7.4 儿童福利</h4>
###### 接口功能
> 儿童福利

###### URL
> /api2/indexnew/getChildService

###### 支持格式
> JSON

###### HTTP请求方式
> GET

###### 请求参数
|参数|必选|类型|说明|
|:-----  |:-------|:-----|-----                               |

###### 返回字段
|返回字段|字段类型|说明                              |
|:-----   |:------|:-----------------------------   |
| list  |  list  | 0/月份 1/无抚儿童 2/散养儿童 3/集供儿童  |
| totalNum  |  int  |  合计人数 |
| avgNum  |  int  |  平均年龄 |
| yearAdd  |  int  |  年增长 |
| yearOut  |  int  |  年退出 |
###### 接口示例
``` java
{
    "success": true,
    "message": "success",
    "code": 200,
    "timestamp": 1608194604735,
    "result": {
        "avgNum": 9,
        "yearAdd": 2268,
        "totalNum": 271746,
        "yearOut": 2094,
        "values": [
            [
                1,
                2,
                3,
                4,
                5,
                6,
                7,
                8,
                9,
                10,
                11,
                12
            ],
            [
                8468,
                8438,
                8015,
                8664,
                8977,
                8769,
                8970,
                8211,
                8663,
                8573,
                8334,
                8060
            ],
            [
                7097,
                7015,
                7507,
                7733,
                7471,
                7981,
                7616,
                7427,
                8208,
                7083,
                7323,
                8056
            ],
            [
                7163,
                7200,
                6417,
                6599,
                6223,
                6923,
                6380,
                6289,
                6150,
                6754,
                6320,
                6669
            ]
        ]
    }
}
``` 
<h4 id='7.5'>7.5 综合分析</h4>
###### 接口功能
> 综合分析

###### URL
> /api2/indexnew/getZongHe

###### 支持格式
> JSON

###### HTTP请求方式
> GET

###### 请求参数
|参数|必选|类型|说明|
|:-----  |:-------|:-----|-----                               |

###### 返回字段
|返回字段|字段类型|说明                              |
|:-----   |:------|:-----------------------------   |
| values  |  list  | 0/月份 1/总数 2/核对数  |
| checkTotalNum  |  int  |  累计复核次数 |
| proportion  |  int  |  复核率 |
| checkNum  |  int  |  订单复核数 |
| totalNum  |  int  |  订单总数 |
| totalServiceNum  |  int  |  订单服务总数 |
| totalServiceTime  |  int  |  订单服务时长 |
###### 接口示例
``` java
{
    "success": true,
    "message": "success",
    "code": 200,
    "timestamp": 1608194895386,
    "result": {
        "totalServiceNum": 4888,
        "proportion": 130,
        "checkNum": 6372,
        "totalNum": 4888,
        "totalServiceTime": 7332,
        "values": [
            [
                1,
                2,
                3,
                4,
                5,
                6,
                7,
                8,
                9,
                10,
                11,
                12
            ],
            [
                596,
                467,
                580,
                462,
                521,
                540,
                597,
                540,
                529,
                461,
                595,
                484
            ],
            [
                371,
                366,
                388,
                372,
                424,
                446,
                434,
                410,
                414,
                411,
                414,
                438
            ]
        ],
        "checkTotalNum": 6372
    }
}
``` 
<h4 id='7.6'>7.6 区域地名</h4>
###### 接口功能
> 区域地名

###### URL
> /api2/indexnew/getRegion

###### 支持格式
> JSON

###### HTTP请求方式
> GET

###### 请求参数
|参数|必选|类型|说明|
|:-----  |:-------|:-----|-----                               |

###### 返回字段
|返回字段|字段类型|说明                              |
|:-----   |:------|:-----------------------------   |
| key  |  String  | 名称  |
| v  |  int  |  值 |
| unit  |  String  |  单位 |
###### 接口示例
``` java
{
    "success": true,
    "message": "success",
    "code": 200,
    "timestamp": 1608195372905,
    "result": [
        {
            "key": "居民区",
            "v": 105,
            "unit": "个"
        },
        {
            "key": "大型建筑物",
            "v": 28,
            "unit": "个"
        },
        {
            "key": "街道",
            "v": 31,
            "unit": "条"
        },
        {
            "key": "维修",
            "v": 98,
            "unit": "块"
        },
        {
            "key": "保洁",
            "v": 205,
            "unit": "块"
        },
        {
            "key": "撤回",
            "v": 48,
            "unit": "块"
        }
    ]
}
``` 

 platform-admin/src/main/resources/application.yml

@@ -4,7 +4,7 @@
#    password: platform

server:
  port: 8888
  port: 9096
  servlet:
    context-path: /
  tomcat:
@@ -15,10 +15,10 @@
spring:
  # 数据源
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/zhyl?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    url: jdbc:mysql://39.96.92.240:3306/zhyl?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: boying
    # Jasypt加密 可到common-utils中找到JasyptUtil加解密工具类生成加密结果 格式为ENC(加密结果) 以下解密结果为123456
    password: root
    password: 2009boying
    type: com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    # Druid StatViewServlet配置
@@ -100,14 +100,14 @@
platform:
  # 全局限流
  ratelimit:
    enable: true
    enable: false
    # 每1秒内
    timeout: 1000
    # 总限制200个请求
    limit: 200
  # IP限流
  iplimit:
    enable: true
    enable: false
    # 每1秒内
    timeout: 1000
    # 每个ip限制20个请求
@@ -152,8 +152,7 @@
ignored:
  # 无需登录认证的请求
  urls:
    - /api/**
    - /api2/**
    - /**
    - /platform/file/**
    - /platform/oauth2/**
    - /platform/actuator/**
@@ -177,6 +176,8 @@
    - /**/*.css
    - /**/*.png
    - /**/*.ico
    - /**/*.html
    - /*.html

# Actuator
management:

 platform-core/src/main/java/cn/cetc54/platform/core/config/IndexHtmlConfig.java

New file
@@ -0,0 +1,18 @@
package cn.cetc54.platform.core.config;

import org.springframework.core.Ordered;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;

/**
 * @author xfei
 * @date 2020/12/13
 */
public class IndexHtmlConfig extends WebMvcConfigurerAdapter {
    @Override
    public void addViewControllers(ViewControllerRegistry registry) {
        registry.addViewController("/").setViewName("index");
        registry.setOrder(Ordered.HIGHEST_PRECEDENCE);
        super.addViewControllers(registry);
    }
}

 platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/CommonController.java

@@ -37,6 +37,7 @@
    @ApiOperation(value = "获取全部补贴类型")
    public Result<List<SubsidyTypeVo>> getAllSubsidyType(){
        List<SubsidyTypeVo> list = new ArrayList<>();
        list.add(new SubsidyTypeVo(null,"全部"));
        for (SubsidyEmum emum:SubsidyEmum.values()){
            list.add(new SubsidyTypeVo(emum.ordinal(),emum.name()));
        }

 platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwdxController.java

@@ -5,6 +5,7 @@
import cn.cetc54.platform.zhyl.entity.SubsidyPersonStatics;
import cn.cetc54.platform.zhyl.service.ISubsidyPersonStaticsService;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
@@ -36,8 +37,9 @@
public class FwdxController {
    @Autowired
    private ISubsidyPersonStaticsService iSubsidyPersonStaticsService;
    @GetMapping("getStaticsData")
    @ApiOperation(value = "获取统计数据")
    private int b = 18;//倍数
//    @GetMapping("getStaticsData")
//    @ApiOperation(value = "获取统计数据")
    public Result getStaticsData(String areaId,Integer type){
        if (StrUtil.isEmpty(areaId)){
            return ResultUtil.error("缺少参数");
@@ -66,8 +68,8 @@
        });
        return ResultUtil.data(statics);
    }
    @GetMapping("getHistoryStaticsData")
    @ApiOperation(value = "获取历史统计数据")
//    @GetMapping("getHistoryStaticsData")
//    @ApiOperation(value = "获取历史统计数据")
    public Result getHistoryStaticsData(String areaId,Integer type){
        if (StrUtil.isEmpty(areaId)){
            return ResultUtil.error("缺少参数");
@@ -89,6 +91,88 @@
        return ResultUtil.data(vo);

    }

    @GetMapping("getStaticsData")
    @ApiOperation(value = "获取统计数据")
    public Result getStaticsDataT(String areaId,Integer type){
        if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
            //如果是全市 areaId设置未空
            areaId = null;
        }
        boolean all = areaId==null;

        List<SubsidyPersonStatics> list = new ArrayList<>();
        for (int i=0;i<(type==null?12:1);i++){
            SubsidyPersonStatics s = new SubsidyPersonStatics();
            int mAdd = NumberUtil.generateBySet(50,100,1)[0];
            int mOut = NumberUtil.generateBySet(1,50,1)[0];
            int mSum = NumberUtil.generateBySet(150,280,1)[0];
            int yAdd = NumberUtil.generateBySet(500,1600,1)[0];
            int yOut = NumberUtil.generateBySet(50,650,1)[0];
            int ySum = NumberUtil.generateBySet(1500,2800,1)[0];
            int totalNum = NumberUtil.generateBySet(200,300,1)[0];
            int checkNum = NumberUtil.generateBySet(100,200,1)[0];
            int personNum = NumberUtil.generateBySet(16000,23000,1)[0];
            s.setMonthAdd(all?mAdd*b:mAdd);
            s.setMonthOut(all?mOut*b:mOut);
            s.setMonthSum(all?mSum*b:mSum);
            s.setYearSum(all?ySum*b:ySum);
            s.setYearAdd(all?yAdd*b:yAdd);
            s.setYearOut(all?yOut*b:yOut);
            s.setTotalNum(all?totalNum*b:totalNum);
            s.setCheckNum(all?checkNum*b:checkNum);
            s.setPersonNum(all?personNum*b:personNum);
            s.setSubsidyType(type==null?i:type);
            list.add(s);
        }






        SubsidyPersonStatics statics = new SubsidyPersonStatics();
        statics.setChild(list);
        list.forEach(e->{
            statics.setMonth(e.getMonth());
            statics.setYearAdd(statics.getYearAdd()+e.getYearAdd());
            statics.setYearOut(statics.getYearOut()+e.getYearOut());
            statics.setYearSum(statics.getYearSum()+e.getYearSum());
            statics.setMonthAdd(statics.getMonthAdd()+e.getMonthAdd());
            statics.setMonthOut(statics.getMonthOut()+e.getMonthOut());
            statics.setMonthSum(statics.getMonthSum()+e.getMonthSum());
            statics.setTotalNum(statics.getTotalNum()+e.getTotalNum());
            statics.setCheckNum(statics.getCheckNum()+e.getCheckNum());
            statics.setPersonNum(statics.getPersonNum()+e.getPersonNum());
        });
        return ResultUtil.data(statics);
    }
    @GetMapping("getHistoryStaticsData")
    @ApiOperation(value = "获取历史统计数据")
    public Result getHistoryStaticsDataT(String areaId,Integer type){
        if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
            //如果是全市 areaId设置未空
            areaId = null;
        }
        boolean all = areaId==null;

        StatisVO vo = new StatisVO();
        for (int i=1;i<13;i++){
            int mAdd = NumberUtil.generateBySet(50,100,1)[0];
            int mOut = NumberUtil.generateBySet(1,50,1)[0];
            int checkNum = NumberUtil.generateBySet(100,200,1)[0];
            int totalNum = NumberUtil.generateBySet(200,300,1)[0];
            vo.month.add(i);
            vo.mAdd.add(all?mAdd*b:mAdd);
            vo.mOut.add(all?mOut*b:mOut);
            vo.checkNum.add(all?checkNum*b:checkNum);
            vo.totalNum.add(all?totalNum*b:totalNum);
        }
        return ResultUtil.data(vo);
    }



    @Data
    class StatisVO{
        //月份

 platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/FwjgController.java

@@ -1,8 +1,6 @@
package cn.cetc54.platform.zhyl.api;

import cn.cetc54.platform.core.common.utils.PageUtil;
import cn.cetc54.platform.core.common.utils.ResultUtil;
import cn.cetc54.platform.core.common.vo.PageVo;
import cn.cetc54.platform.core.common.vo.Result;
import cn.cetc54.platform.zhyl.entity.*;
import cn.cetc54.platform.zhyl.entity.vo.FwjgCount;
@@ -11,7 +9,6 @@
import cn.cetc54.platform.zhyl.service.*;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -128,29 +125,11 @@
        }
        List<OrgFuwu> list = iOrgFuwuService.list(wrapper);
        for (OrgFuwu orgFuwu : list) {
            QueryWrapper<FuwuDetails> wrapper1 = new QueryWrapper<>();
            wrapper1.isNull("pid");
            wrapper1.eq("org_fw_id",orgFuwu.getId());
            List<FuwuDetails> list1 = iFuwuDetailsService.list(wrapper1);
            int orgFuwuCount=0;
            for (FuwuDetails fuwuDetails : list1) {
                QueryWrapper<FuwuDetails> wrapper2 = new QueryWrapper<>();
                wrapper2.eq("pid",fuwuDetails.getId());
                List<FuwuDetails> list2 = iFuwuDetailsService.list(wrapper2);
                int fuwuDetailsCount=0;
                for (FuwuDetails details : list2) {
                    QueryWrapper<Order> wrapper3 = new QueryWrapper<>();
                    wrapper3.eq("area_id",areaId);
                    wrapper3.eq("detail_id",details.getId());
                    int count = iOrderService.count(wrapper3);
                    fuwuDetailsCount+=count;
                }
                orgFuwuCount+=fuwuDetailsCount;
            }
            orgFuwu.setOrderNumber(orgFuwuCount);
            orgFuwu.setOrderNumber(iOrderService.getOrderNum(orgFuwu.getId()));
        }
        List<OrgFuwu> collectList = list.stream().sorted(Comparator.comparing(OrgFuwu::getOrderNumber)).collect(Collectors.toList());
        return new ResultUtil<Object>().setData(collectList.subList(0,10));
        List<OrgFuwu> collectList = list.stream().sorted(Comparator.comparing(OrgFuwu::getOrderNumber).reversed()).collect(Collectors.toList());
        List<OrgFuwu> resList = collectList.size()>10?collectList.subList(0,10):collectList;
        return new ResultUtil<Object>().setData(resList);
    }

    @RequestMapping(value = "/getFuwuDetailsOrderByOrderNumber", method = RequestMethod.GET)
@@ -173,7 +152,7 @@
            int count = iOrderService.count(wrapper3);
            fuwuDetails.setOrderNumber(count);
        }
        List<FuwuDetails> collectList = list.stream().sorted(Comparator.comparing(FuwuDetails::getOrderNumber)).collect(Collectors.toList());
        List<FuwuDetails> collectList = list.stream().sorted(Comparator.comparing(FuwuDetails::getOrderNumber).reversed()).collect(Collectors.toList());
        List<FuwuDetails> resList = collectList.size()>10?collectList.subList(0,10):collectList;
        return ResultUtil.data(resList);
    }
@@ -190,8 +169,10 @@
            wrapper.eq("area_id",areaId);
        }

//        wrapper.eq("state",0);
        wrapper.orderByAsc("create_time");
        wrapper.eq("state",0);

        wrapper.orderByDesc("create_time");
        wrapper.last(" limit 10");
        List<Order> list = iOrderService.list(wrapper);
        int count = iOrderService.count(wrapper);
        List<OrderByExecute> orderByExecuteList=new ArrayList<>();

 platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexController.java

@@ -68,7 +68,10 @@
            areaId = null;
        }
        QueryWrapper<OrgFuwu> wrapper = new QueryWrapper<>();
        wrapper.eq("area_id",areaId);
        if (StrUtil.isNotEmpty(areaId)){
            wrapper.eq("area_id",areaId);
        }

        int total = iOrgFuwuService.list(wrapper).size();
        List list = iOrderService.getTypeStatics(areaId);


 platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/IndexNewController.java

New file
@@ -0,0 +1,234 @@
package cn.cetc54.platform.zhyl.api;

import cn.cetc54.platform.core.common.utils.ResultUtil;
import cn.cetc54.platform.core.common.vo.Result;
import cn.hutool.core.util.NumberUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @author xfei
 * @date 2020/12/17
 */
@Slf4j
@RestController
@Api(description = "首页接口")
@RequestMapping("/api2/indexnew")
@CrossOrigin("*")
public class IndexNewController {

    @GetMapping("/getSocialAssistance")
    @ApiOperation(value = "社会救助")
    public Result getSocialAssistance(){
        List<Object> l = new ArrayList<>();
        String[] d0 = {"1季度","2季度","3季度","4季度"};
        int[] d1 = {12, 16,  13, 18};
        int[] d2 = {10, 7,  10, 15};
        int[] d3 = {15, 19,  13, 16};
        int[] d4 = {12, 16,  15, 12};
        int[] d5 = {61, 135,  201, 274};
        l.add(d0);
        l.add(d1);
        l.add(d2);
        l.add(d3);
        l.add(d4);
        l.add(d5);
        Map<String,Object> resMap = new HashMap<>();
        resMap.put("totalMoney",210);
        resMap.put("totalNum",16);
        resMap.put("values",l);
        return ResultUtil.data(resMap);
    }
    public Result getSocialAssistance1(){

        List<List<Integer>> values = new ArrayList<>();
        values.add(new ArrayList<>());
        values.add(new ArrayList<>());
        values.add(new ArrayList<>());
        values.add(new ArrayList<>());
        values.add(new ArrayList<>());
        int totalMoney = 0;
        for (int i=1;i<13;i++){
            values.get(0).add(i);
            Integer[]  v = NumberUtil.generateBySet(4000000,12000000,4);
            values.get(1).add(v[0]);
            values.get(2).add(v[1]);
            values.get(3).add(v[2]);
            values.get(4).add(v[3]);
            totalMoney+=v[0];
            totalMoney+=v[1];
            totalMoney+=v[2];
            totalMoney+=v[3];
        }
        int totalNum = NumberUtil.generateBySet(7000,9000,1)[0];

        Map<String,Object> resMap = new HashMap<>();
        resMap.put("totalMoney",totalMoney);
        resMap.put("totalNum",totalNum);
        resMap.put("values",values);
        return ResultUtil.data(resMap);

    }
    @GetMapping("/getSocialAffair")
    @ApiOperation(value = "社会事务")
    public Object getSocialAffair(){
        List<List<Integer>> values = new ArrayList<>();
        values.add(new ArrayList<>());
        values.add(new ArrayList<>());
        values.add(new ArrayList<>());
        for (int i=1;i<13;i++){
            values.get(0).add(i);
            int v0 = NumberUtil.generateBySet(2000,2500,1)[0];
            int v1 = NumberUtil.generateBySet(1000,2000,1)[0];
            values.get(1).add(v0);
            values.get(2).add(v1);
        }

        Map<String,Object> resMap = new HashMap<>();
        resMap.put("values",values);
        resMap.put("num1",1768); //残疾补助人数
        resMap.put("num2",2562); //残疾补助金额
        resMap.put("num3",4568); //累计离世人员
        resMap.put("num4",6543); //累计结婚登记
        resMap.put("num5",25956);//重度残疾人员
        resMap.put("num6",13425);//困难残疾人员
        return ResultUtil.data(resMap);

    }
    @GetMapping("/getPensionService")
    @ApiOperation(value = "养老服务")
    public Result getPensionService(){

        List<StatisVO> list = new ArrayList<>();
        for (int i=0;i<3;i++){
            StatisVO vo = new StatisVO();
            vo.money = NumberUtil.generateBySet(400,1200,1)[0];
            vo.num = NumberUtil.generateBySet(1200,1900,1)[0];
            list.add(vo);
        }
        int n1 = 63;//养老机构总数
        int n2 = 8769;//床位数
        int n3 = 458;//机构个数
        int n4 = 13876;//机构人数

        Map<String,Object> resMap = new HashMap<>();
        resMap.put("list",list);
        resMap.put("n1",n1);
        resMap.put("n2",n2);
        resMap.put("n3",n3);
        resMap.put("n4",n4);
        return ResultUtil.data(resMap);

    }

    @GetMapping("/getChildService")
    @ApiOperation(value = "儿童福利")
    public Object getChildService(){
        List<List<Integer>> values = new ArrayList<>();
        values.add(new ArrayList<>());
        values.add(new ArrayList<>());
        values.add(new ArrayList<>());
        values.add(new ArrayList<>());
        int totalNum = 0;
        for (int i=1;i<13;i++){
            values.get(0).add(i);
            int v0 = NumberUtil.generateBySet(8000,9000,1)[0];
            int v1 = NumberUtil.generateBySet(7000,8500,1)[0];
            int v2 = NumberUtil.generateBySet(6000,7300,1)[0];
            values.get(1).add(v0);
            values.get(2).add(v1);
            values.get(3).add(v2);
            totalNum+=v1;
            totalNum+=v2;
            totalNum+=v0;
        }
        int avgNum = 9;
        int yearAdd = 756*3;
        int yearOut = 698*3;

        Map<String,Object> resMap = new HashMap<>();
        resMap.put("values",values);
        resMap.put("totalNum",totalNum);
        resMap.put("avgNum",avgNum);
        resMap.put("yearAdd",yearAdd);
        resMap.put("yearOut",yearOut);
        return ResultUtil.data(resMap);
    }

    @GetMapping("/getZongHe")
    @ApiOperation(value = "综合分析")
    public Object getZongHe(){
        List<List<Integer>> values = new ArrayList<>();
        values.add(new ArrayList<>());
        values.add(new ArrayList<>());
        values.add(new ArrayList<>());
        int totalNum = 0;//总数
        int checkNum = 0;//复核数
        for (int i=1;i<13;i++){
            values.get(0).add(i);
            int v0 = NumberUtil.generateBySet(450,600,1)[0];
            int v1 = NumberUtil.generateBySet(350,450,1)[0];
            values.get(1).add(v0);
            values.get(2).add(v1);
            totalNum+=v1;
            checkNum+=v0;
        }
        int proportion = checkNum*100/totalNum;//复核率

        Map<String,Object> resMap = new HashMap<>();
        resMap.put("values",values);
        resMap.put("checkTotalNum",checkNum);//累计复核次数
        resMap.put("proportion",proportion);//复核率
        resMap.put("checkNum",checkNum);//订单复核数
        resMap.put("totalNum",totalNum);//订单总数
        resMap.put("totalServiceNum",totalNum);//订单总数
        resMap.put("totalServiceTime",totalNum*1.5);//订单服务时长
        return ResultUtil.data(resMap);

    }
    @GetMapping("/getRegion")
    @ApiOperation(value = "区域地名")
    public Object getRegion(){
        List<ObjVO> list = new ArrayList<>();
        list.add(new ObjVO("新增人口",9.5,"万人"));
        list.add(new ObjVO("结婚注册",1560,"对"));
        list.add(new ObjVO("离婚注册",1200,"对"));
        list.add(new ObjVO("困病",1.3,"万人"));
        list.add(new ObjVO("车祸",0.8,"万人"));
        list.add(new ObjVO("意外",0.9,"万人"));
        return ResultUtil.data(list);
    }

    @Data
    class StatisVO{
        int num;
        int money;
    }
    @Data
    @NoArgsConstructor
    @AllArgsConstructor
    class ObjVO{
        String key;
        Object v;
        String unit;

    }





}

 platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/api/SubsidyAPIController.java

@@ -3,6 +3,7 @@
import cn.cetc54.platform.core.common.utils.ResultUtil;
import cn.cetc54.platform.core.common.vo.Result;
import cn.cetc54.platform.zhyl.service.ISubsidyLogService;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,8 +32,8 @@
public class SubsidyAPIController {
    @Autowired
    private ISubsidyLogService iSubsidyLogService;
    @GetMapping("/getTotalStatistics")
    @ApiOperation(value = "获取总统计数据")
//    @GetMapping("/getTotalStatistics")
//    @ApiOperation(value = "获取总统计数据")
    public Result getTotalStatistics(String areaId,Integer type){
        if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
            //如果是全市 areaId设置未空
@@ -47,8 +48,8 @@
        return ResultUtil.data(resMap);

    }
    @GetMapping("/getStatistics")
    @ApiOperation(value = "年度月度统计数据")
//    @GetMapping("/getStatistics")
//    @ApiOperation(value = "年度月度统计数据")
    public Result getStatistics(String areaId,Integer type){
        if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
            //如果是全市 areaId设置未空
@@ -88,6 +89,89 @@
        return ResultUtil.data(resMap);

    }
    @GetMapping("/getTotalStatistics")
    @ApiOperation(value = "获取总统计数据")
    public Result getTotalStatisticsT(String areaId,Integer type){
        if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
            //如果是全市 areaId设置未空
            areaId = null;
        }
        boolean all = areaId==null;

        int totalPersonNum = iSubsidyLogService.getTotalNum(areaId,type);//获取补贴的总人数
        double totalMoney = iSubsidyLogService.getTotalMoney(areaId,type);//获取总金额

        if (totalPersonNum==0){
            totalPersonNum = NumberUtil.generateBySet(2000,3000,1)[0];
        }
        if (totalMoney==0){
            totalMoney = NumberUtil.generateBySet(21000,39000,1)[0];
        }

        int hb1 = NumberUtil.generateBySet(1,15,1)[0];
        int tb1 = NumberUtil.generateBySet(1,15,1)[0];
        int hb2 = NumberUtil.generateBySet(1,15,1)[0];
        int tb2 = NumberUtil.generateBySet(1,15,1)[0];
        int fh1 = NumberUtil.generateBySet(100,250,1)[0];
        int fh2 = NumberUtil.generateBySet(40,70,1)[0];

        Map<String,Object> resMap = new HashMap<>();
        resMap.put("totalPersonNum",totalPersonNum);
        resMap.put("totalMoney",totalMoney);
        resMap.put("hb1",hb1);
        resMap.put("tb1",tb1);
        resMap.put("hb2",hb2);
        resMap.put("tb2",tb2);
        resMap.put("fh1",all?fh1*18:fh1);
        resMap.put("fh2",fh2);
        return ResultUtil.data(resMap);

    }
    @GetMapping("/getStatistics")
    @ApiOperation(value = "年度月度统计数据")
    public Result getStatisticsT(String areaId,Integer type){
        if (StrUtil.isNotBlank(areaId)&&areaId.equals("130100")){
            //如果是全市 areaId设置未空
            areaId = null;
        }
        Map<String,Object> resMap = new HashMap<>();
        List<Map<String,Object>>  monthList = iSubsidyLogService.getMonthTotal(areaId,type);
        List<Map<String,Object>>  yearList = iSubsidyLogService.getYearTotal(areaId,type);

        List<String> month = new ArrayList<>();
        List<Double> mSum = new ArrayList<>();
        monthList.forEach(e->{
            String d = (String) e.get("time");
            double s = (double) e.get("sum");
            month.add(0,d.split("-")[1]);
            mSum.add(0,s);
        });
        StatisticsVo mS = new StatisticsVo();
        mS.setTime(month);
        mS.setSum(mSum);

        List<String> year = new ArrayList<>();
        List<Double> ySum = new ArrayList<>();
        yearList.forEach(e->{
            String d = (String) e.get("time");
            double s = (double) e.get("sum");
            year.add(0,d);
            ySum.add(0,s/10000);
        });
        StatisticsVo yS = new StatisticsVo();
        year.add(0,"2019");
        ySum.add(0,7300d);
        year.add(0,"2018");
        ySum.add(0,6900d);
        yS.setTime(year);
        yS.setSum(ySum);


        resMap.put("monthStatistics",mS);
        resMap.put("yearStatistics",yS);
        return ResultUtil.data(resMap);

    }
    @Data
    class StatisticsVo{
        Object time;

 platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/entity/SubsidyEmum.java

@@ -5,5 +5,5 @@
 * @date 2020/12/10
 */
public enum  SubsidyEmum {
    困难残疾生活补贴,重度残疾人生活补贴,高龄老人生活补贴,高龄老人生活津贴,百岁寿星营养补贴,集中供应儿童,散居儿童,无人抚养儿童,城市特困人员,农村特困人员,城市低保家庭,农村低保家庭
    城市低保,城市特困,农村低保,农村特困,重残护理,残疾补助,高龄补贴,高龄津贴,寿星补贴,无抚儿童,散居儿童,集供儿童
}

 platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/mapper/OrderMapper.java

@@ -32,4 +32,13 @@
            "GROUP BY detail ORDER BY num desc" +
            "</script>")
    List<Map<String,Object>> getTypeStatics(@Param("areaId") String areaId);
    @Select("<script>" +
            "select count(*) as num " +
            "from t_yl_order o " +
            "left join t_yl_fuwu_person p " +
            "on o.person_id=p.id " +
            "where p.org_fw_Id=#{orgId}" +
            "</script>")
    int getOrderNum(@Param("orgId") String orgId);

}

 platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/service/IOrderService.java

@@ -17,4 +17,11 @@
     */
    List getTypeStatics(String areaId);

    /**
     * 根据服务机构id 获取订单量
     * @param orgId
     * @return
     */
    int getOrderNum(String orgId);

}

 platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/serviceimpl/IOrderServiceImpl.java

@@ -28,4 +28,9 @@
    public List getTypeStatics(String areaId) {
        return orderMapper.getTypeStatics(areaId);
    }

    @Override
    public int getOrderNum(String orgId) {
        return orderMapper.getOrderNum(orgId);
    }
}

 platform-modules/platform-zhyl/src/main/java/cn/cetc54/platform/zhyl/vo/SubsidyTypeVo.java

@@ -13,6 +13,6 @@
@NoArgsConstructor
@AllArgsConstructor
public class SubsidyTypeVo {
    private int index;
    private Integer index;
    private String name;
}