服务对象页面

xuefei

2020-12-12 160487aedf89e2aea61f043c7a5c3d211ed19798

服务对象页面

 api.md

@@ -12,8 +12,9 @@
[3.补贴](#3)  
     [ 3.1获取总统计数据](#3.1)  
     [ 3.2年度月度统计数据](#3.2)  
[4.服务对象](#4) 

[4.服务对象](#4)  
    [ 4.1获取统计数据](#4.1)  
    [ 4.2获取历史统计数据](#4.2)  
[5.服务机构](#5)  
    [ 5.1根据区域id获取区域下所有机构和人员数量以及订单总数](#5.1)  
    [ 5.2根据区域id获取区域下所有服务以及服务详情和订单人数](#5.2)  
@@ -413,6 +414,168 @@
}
``` 



<h3 id='4'>四、服务对象</h2>
<h4 id='4.1'>4.1获取统计数据</h4>
###### 接口功能
> 根据区域id和补贴类型获取总的统计数据

###### URL
> /api2/fwdx/getStaticsData

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

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

###### 请求参数
|参数|必选|类型|说明|
|:-----  |:-------|:-----|-----                               |
|  areaId  |  是  |String |     区域id                    |
|  type  |  否  |Integer |     补贴类型                    |

###### 返回字段
|返回字段|字段类型|说明                              |
|:-----   |:------|:-----------------------------   |
| subsidyType  |  int  |  补贴类型 |
| month  |  String  |  月份 |
| yearAdd  |  int  |  年新增 |
| yearOut  |  int  |  年退出 |
| yearSum  |  int  |  年合计 |
| monthAdd  |  int  |  月新增 |
| monthOut  |  int  |  月退出 |
| monthSum  |  int  |  月合计 |
| totalNum  |  int  |  申请总次数 |
| checkNum  |  int  |  复合总次数 |
| personNum  |  int  |  服务总人数 |
| subsidyTypeName  |  String  |  补贴名称 |
| child  |  List  |  子项目 |

###### 接口示例
``` java
{
    "success": true,
    "message": "success",
    "code": 200,
    "timestamp": 1607743828413,
    "result": {
        "id": 0,
        "subsidyType": 0,
        "areaId": null,
        "month": "2020-12",
        "yearAdd": 1345,
        "yearOut": 233,
        "yearSum": 12330,
        "monthAdd": 117,
        "monthOut": 53,
        "monthSum": 5500,
        "totalNum": 3054,
        "checkNum": 3400,
        "personNum": 13500,
        "subsidyTypeName": "困难残疾生活补贴",
        "child": [
            {
                "id": 1,
                "subsidyType": 0,
                "areaId": "1336922902628536320",
                "month": "2020-12",
                "yearAdd": 745,
                "yearOut": 124,
                "yearSum": 6790,
                "monthAdd": 50,
                "monthOut": 43,
                "monthSum": 3200,
                "totalNum": 1854,
                "checkNum": 2100,
                "personNum": 7800,
                "subsidyTypeName": "困难残疾生活补贴",
                "child": null
            },
            {
                "id": 2,
                "subsidyType": 1,
                "areaId": "1336922902628536320",
                "month": "2020-12",
                "yearAdd": 600,
                "yearOut": 109,
                "yearSum": 5540,
                "monthAdd": 67,
                "monthOut": 10,
                "monthSum": 2300,
                "totalNum": 1200,
                "checkNum": 1300,
                "personNum": 5700,
                "subsidyTypeName": "重度残疾人生活补贴",
                "child": null
            }
        ]
    }
``` 
<h4 id='4.2'>4.2获取历史统计数据</h4>
###### 接口功能
> 根据区域id和补贴类型获取获取历史统计数据

###### URL
> /api2/fwdx/getHistoryStaticsData

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

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

###### 请求参数
|参数|必选|类型|说明|
|:-----  |:-------|:-----|-----                               |
|  areaId  |  是  |String |     区域id                    |
|  type  |  否  |Integer |     补贴类型                    |

###### 返回字段
|返回字段|字段类型|说明                              |
|:-----   |:------|:-----------------------------   |
| month  |  String  |  月份 |
| mAdd  |  int  |  月新增 |
| mOut  |  int  |  月退出 |
| totalName  |  int  |  申请总次数 |
| checkNum  |  int  |  复核总次数 |

###### 接口示例
``` java
{
    "success": true,
    "message": "success",
    "code": 200,
    "timestamp": 1607744308886,
    "result": [
        {
            "mOut": 53,
            "month": "2020-12",
            "checkNum": 3400,
            "mAdd": 117,
            "totalName": 3054
        },
        {
            "mOut": 15,
            "month": "2020-11",
            "checkNum": 3400,
            "mAdd": 75,
            "totalName": 2454
        },
        {
            "mOut": 25,
            "month": "2020-10",
            "checkNum": 3400,
            "mAdd": 105,
            "totalName": 2284
        }
    ]
}
``` 



<h3 id='5'>五、服务机构</h2>
<h4 id='5.1'>5.1根据区域id获取区域下所有机构和人员数量以及订单总数</h4>
###### 接口功能

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

@@ -153,6 +153,7 @@
  # 无需登录认证的请求
  urls:
    - /api/**
    - /api2/**
    - /platform/file/**
    - /platform/oauth2/**
    - /platform/actuator/**

 platform-modules/platform-generator/src/main/java/cn/cetc54/platform/generator/PlatformMPGenerator.java

@@ -31,7 +31,7 @@
     * 实体类名
     * 建议仅需修改
     */
    private static final String className = "Test";
    private static final String className = "SubsidyPersonStatics";

    /**
     * 类说明描述
@@ -49,7 +49,7 @@
     * 数据库表名前缀
     * 下方请根据需要修改
     */
    private static final String tablePre = "t_";
    private static final String tablePre = "t_yl_";

    /**
     * 主键类型

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

@@ -10,10 +10,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;
@@ -25,7 +22,8 @@
@Slf4j
@RestController
@Api(description = "通用接口")
@RequestMapping("/api/common")
@RequestMapping("/api2/common")
@CrossOrigin("*")
public class CommonController {
    @Autowired
    private IAreaService iAreaService;

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

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

import cn.cetc54.platform.core.common.utils.ResultUtil;
import cn.cetc54.platform.core.common.vo.Result;
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.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
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.Date;
import java.util.List;

/**
 * @author xfei
 * @date 2020/12/12
 */
@Slf4j
@RestController
@Api(description = "服务对象")
@RequestMapping("/api2/fwdx")
@Transactional
@CrossOrigin("*")
public class FwdxController {
    @Autowired
    private ISubsidyPersonStaticsService iSubsidyPersonStaticsService;
    @GetMapping("getStaticsData")
    @ApiOperation(value = "获取统计数据")
    public Result getStaticsData(String areaId,Integer type){
        if (StrUtil.isEmpty(areaId)){
            return ResultUtil.error("缺少参数");
        }
        String month = DateUtil.format(new Date(),"yyyy-MM");
        QueryWrapper<SubsidyPersonStatics> query = new QueryWrapper<>();
        query.lambda().eq(SubsidyPersonStatics::getAreaId,areaId);
        query.lambda().eq(SubsidyPersonStatics::getMonth,month);
        if (type!=null){
            query.lambda().eq(SubsidyPersonStatics::getSubsidyType,type);
        }
        List<SubsidyPersonStatics> list = iSubsidyPersonStaticsService.list(query);
        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 getHistoryStaticsData(String areaId,Integer type){
        if (StrUtil.isEmpty(areaId)){
            return ResultUtil.error("缺少参数");
        }
        List result = iSubsidyPersonStaticsService.getMonthAddOut(areaId,type);
        return ResultUtil.data(result);

    }

}

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

@@ -16,19 +16,20 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import java.sql.Wrapper;
import java.util.*;
import java.util.stream.Collectors;

@Slf4j
@RestController
@Api(description = "服务机构页面接口")
@RequestMapping("/api/fwjg")
@RequestMapping("/api2/fwjg")
@Transactional
@CrossOrigin("*")
public class FwjgController {
    @Autowired
    private IAreaService iAreaService;
@@ -41,14 +42,6 @@
    @Autowired
    private IFuwuDetailsService iFuwuDetailsService;


    @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
    @ApiOperation(value = "分页获取所有")
    public Result<IPage<Area>> getByPage(PageVo page){

        IPage<Area> data = iAreaService.page(PageUtil.initMpPage(page));
        return new ResultUtil<IPage<Area>>().setData(data);
    }

    @RequestMapping(value = "/getCountByAreaId", method = RequestMethod.GET)
    @ApiOperation(value = "根据区域id获取区域下所有机构和人员数量以及订单总数")

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

@@ -15,6 +15,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
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;
@@ -30,7 +31,8 @@
@Slf4j
@RestController
@Api(description = "首页接口")
@RequestMapping("/api/index")
@RequestMapping("/api2/index")
@CrossOrigin("*")
public class IndexController {
    @Autowired
    private IOrgYanglaoService iOrgYanglaoService;

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

@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
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;
@@ -21,7 +22,8 @@
@Slf4j
@RestController
@Api(description = "补贴页面接口")
@RequestMapping("/api/subsidy")
@RequestMapping("/api2/subsidy")
@CrossOrigin("*")
public class SubsidyAPIController {
    @Autowired
    private ISubsidyLogService iSubsidyLogService;

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

New file
@@ -0,0 +1,47 @@
package cn.cetc54.platform.zhyl.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;

import javax.persistence.*;
import java.util.Date;

/**
 * @author xfei
 * @date 2020/12/11
 */
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "t_yl_subsidy_person")
@TableName("t_yl_subsidy_person")
@ApiModel(value = "补贴人员")
public class SubsidyPerson {
    @Id
    @GeneratedValue(strategy=GenerationType.IDENTITY)
    private int id;
    @ApiModelProperty("身份证号码")
    private String sfzhm;
    @ApiModelProperty("补贴种类")
    private int subsidyType;
    @ApiModelProperty("加入时间")
    private Date inTime;
    @ApiModelProperty("退出时间")
    private Date outTime;
    @ApiModelProperty("核对时间")
    private Date checkTime;
    @ApiModelProperty("状态 0/加入 1/退出")
    private int status;
    @ApiModelProperty("是否核对 0/未核对 1/已核对")
    private int isCheck;
    @Transient
    @TableField(exist=false)
    @ApiModelProperty(value = "补贴名称")
    private String subsidyTypeName;
}

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

New file
@@ -0,0 +1,66 @@
package cn.cetc54.platform.zhyl.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;

import javax.persistence.*;
import java.util.List;

/**
 * 补贴统计表
 * @author xfei
 * @date 2020/12/11
 */
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "t_yl_subsidy_person_statics")
@TableName("t_yl_subsidy_person_statics")
@ApiModel(value = "补贴人员")
public class SubsidyPersonStatics  {
    @Id
    @GeneratedValue(strategy= GenerationType.IDENTITY)
    private int id;
    @ApiModelProperty("补贴类型")
    private int subsidyType;
    @ApiModelProperty("补贴类型")
    private String areaId;
    @ApiModelProperty("月份")
    private String month;
    @ApiModelProperty("年新增")
    private int yearAdd;
    @ApiModelProperty("年退出")
    private int yearOut;
    @ApiModelProperty("年合计")
    private int yearSum;
    @ApiModelProperty("月新增")
    private int monthAdd;
    @ApiModelProperty("月退出")
    private int monthOut;
    @ApiModelProperty("月合计")
    private int monthSum;
    @ApiModelProperty("申请总次数")
    private int totalNum;
    @ApiModelProperty("复合总次数")
    private int checkNum;
    @ApiModelProperty("服务总人数")
    private int personNum;
    @Transient
    @TableField(exist=false)
    @ApiModelProperty(value = "补贴名称")
    private String subsidyTypeName;
    @Transient
    @TableField(exist=false)
    @ApiModelProperty(value = "子项")
    private List<SubsidyPersonStatics> child;

    public String getSubsidyTypeName() {
        return SubsidyEmum.values()[subsidyType].name();
    }
}

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

New file
@@ -0,0 +1,19 @@
package cn.cetc54.platform.zhyl.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.cetc54.platform.zhyl.entity.SubsidyPerson;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.Date;
import java.util.List;

/**
 * 测试数据处理层
 * @author 
 */
public interface SubsidyPersonMapper extends BaseMapper<SubsidyPerson> {
//    @Select()
//    int yearAddNum(@Param("year") Date year);

}

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

New file
@@ -0,0 +1,33 @@
package cn.cetc54.platform.zhyl.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.cetc54.platform.zhyl.entity.SubsidyPersonStatics;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;
import java.util.Map;

/**
 * 测试数据处理层
 * @author 
 */
public interface SubsidyPersonStaticsMapper extends BaseMapper<SubsidyPersonStatics> {
    /**
     * 获取每月新增和退出的历史数据
     * @param type
     * @return
     */
    @Select("<script>" +
            "select month,SUM(month_add) as mAdd,SUM(month_out) as mOut,SUM(check_num) as checkNum,SUM(total_num) as totalName " +
            "FROM t_yl_subsidy_person_statics " +
            " <where> " +
            "area_id = #{areaId} " +
            " <if test='type!= null'>" +
            " and subsidy_type = #{type}" +
            " </if>" +
            " </where>" +
            "GROUP BY month ORDER BY month DESC LIMIT 12" +
            " </script>")
    List<Map<String,Object>> getMonthAddOut(@Param("areaId") String areaId,@Param("type") Integer type);
}

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

New file
@@ -0,0 +1,14 @@
package cn.cetc54.platform.zhyl.service;

import com.baomidou.mybatisplus.extension.service.IService;
import cn.cetc54.platform.zhyl.entity.SubsidyPerson;

import java.util.List;

/**
 * 测试接口
 * @author 
 */
public interface ISubsidyPersonService extends IService<SubsidyPerson> {

}

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

New file
@@ -0,0 +1,22 @@
package cn.cetc54.platform.zhyl.service;

import com.baomidou.mybatisplus.extension.service.IService;
import cn.cetc54.platform.zhyl.entity.SubsidyPersonStatics;

import java.util.List;
import java.util.Map;

/**
 * 测试接口
 * @author 
 */
public interface ISubsidyPersonStaticsService extends IService<SubsidyPersonStatics> {
    /**
     * 获取月新增和退出的历史数据
     * @param areaId
     * @param type
     * @return
     */
    List<Map<String,Object>> getMonthAddOut(String areaId, Integer type);

}

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

New file
@@ -0,0 +1,26 @@
package cn.cetc54.platform.zhyl.serviceimpl;

import cn.cetc54.platform.zhyl.mapper.SubsidyPersonMapper;
import cn.cetc54.platform.zhyl.entity.SubsidyPerson;
import cn.cetc54.platform.zhyl.service.ISubsidyPersonService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;

/**
 * 测试接口实现
 * @author 
 */
@Slf4j
@Service
@Transactional
public class ISubsidyPersonServiceImpl extends ServiceImpl<SubsidyPersonMapper, SubsidyPerson> implements ISubsidyPersonService {

    @Autowired
    private SubsidyPersonMapper subsidyPersonMapper;
}

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

New file
@@ -0,0 +1,32 @@
package cn.cetc54.platform.zhyl.serviceimpl;

import cn.cetc54.platform.zhyl.mapper.SubsidyPersonStaticsMapper;
import cn.cetc54.platform.zhyl.entity.SubsidyPersonStatics;
import cn.cetc54.platform.zhyl.service.ISubsidyPersonStaticsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

/**
 * 测试接口实现
 * @author 
 */
@Slf4j
@Service
@Transactional
public class ISubsidyPersonStaticsServiceImpl extends ServiceImpl<SubsidyPersonStaticsMapper, SubsidyPersonStatics> implements ISubsidyPersonStaticsService {

    @Autowired
    private SubsidyPersonStaticsMapper subsidyPersonStaticsMapper;

    @Override
    public List<Map<String, Object>> getMonthAddOut(String areaId, Integer type) {
        return subsidyPersonStaticsMapper.getMonthAddOut(areaId,type);
    }
}

 platform-modules/platform-zhyl/src/main/resources/mapper/SubsidyPersonMapper.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.cetc54.platform.zhyl.mapper.SubsidyPersonMapper">

</mapper>

 platform-modules/platform-zhyl/src/main/resources/mapper/SubsidyPersonStaticsMapper.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.cetc54.platform.zhyl.mapper.SubsidyPersonStaticsMapper">

</mapper>