Skip to content

C
civil-bigdata
Commit 7acb81bd by 袁伟铭
Options

修改

parent cfb1416f
Showing with 238 additions and 19 deletions
api-server/src/main/java/com/zq/api/feign/PortalFeign.java
...@@ -20,6 +20,12 @@ public interface PortalFeign { ...@@ -20,6 +20,12 @@ public interface PortalFeign {
@PostMapping("/stats/getFivesYearMarriageLine") @PostMapping("/stats/getFivesYearMarriageLine")
ResultVo getFivesYearMarriageLine(@RequestBody Map<String, Object> paramsMap); ResultVo getFivesYearMarriageLine(@RequestBody Map<String, Object> paramsMap);
@PostMapping("/stats/getAreaDisabledIssueStats")
ResultVo getAreaDisabledIssueStats(@RequestBody Map<String, Object> paramsMap);
@PostMapping("/stats/getYearDisabledIssueStats")
ResultVo getYearDisabledIssueStats(@RequestBody Map<String, Object> paramsMap);
@GetMapping("/area/getChildAreaList") @GetMapping("/area/getChildAreaList")
ResultVo getChildAreaList(@RequestParam String areaCode); ResultVo getChildAreaList(@RequestParam String areaCode);
......
api-server/src/main/java/com/zq/api/interceptor/ApiInterceptor.java
...@@ -70,12 +70,10 @@ public class ApiInterceptor extends HandlerInterceptorAdapter { ...@@ -70,12 +70,10 @@ public class ApiInterceptor extends HandlerInterceptorAdapter {
// 调试日志 // 调试日志
if (ApiUtils.DEBUG) { if (ApiUtils.DEBUG) {
log.info("API DEBUG INTERCEPTOR \n[path=" + uri + "/" + queryString + "]" // log.info("API DEBUG INTERCEPTOR \n[path=" + uri + "/" + queryString + "]" //
+ "[from:" + form.toString() + "]" // + "[from:" + form + "]" //
+ "\n[time=" + (System.currentTimeMillis() - start) + "ms]"); + "\n[time=" + (System.currentTimeMillis() - start) + "ms]");
} }
return true; return true;
} }
......
api-server/src/main/java/com/zq/api/service/IApiLogic.java
...@@ -69,6 +69,22 @@ public interface IApiLogic extends IApiCommon { ...@@ -69,6 +69,22 @@ public interface IApiLogic extends IApiCommon {
ApiResp getFivesYearMarriageLine(ApiForm form); ApiResp getFivesYearMarriageLine(ApiForm form);
/** /**
* 获取区域残疾发放统计
*
* @param form
* @return
*/
ApiResp getAreaDisabledIssueStats(ApiForm form);
/**
* 近五年发放人数和金额统计
*
* @param form
* @return
*/
ApiResp getYearDisabledIssueStats(ApiForm form);
/**
* 获取子区域列表 * 获取子区域列表
* *
* @param form * @param form
......
api-server/src/main/java/com/zq/api/service/impl/ApiV100Logic.java
...@@ -53,6 +53,16 @@ public class ApiV100Logic extends BaseApiLogic implements IApiLogic { ...@@ -53,6 +53,16 @@ public class ApiV100Logic extends BaseApiLogic implements IApiLogic {
} }
@Override @Override
public ApiResp getAreaDisabledIssueStats(ApiForm form) {
return ApiUtils.toApiResp(form, portalFeign.getAreaDisabledIssueStats(form.getParamsMap()));
}
@Override
public ApiResp getYearDisabledIssueStats(ApiForm form) {
return ApiUtils.toApiResp(form, portalFeign.getYearDisabledIssueStats(form.getParamsMap()));
}
@Override
public ApiResp getChildAreaList(ApiForm form) { public ApiResp getChildAreaList(ApiForm form) {
return ApiUtils.toApiResp(form, portalFeign.getChildAreaList(form.get("areaCode"))); return ApiUtils.toApiResp(form, portalFeign.getChildAreaList(form.get("areaCode")));
} }
......
portal-server/src/main/java/com/zq/portal/controller/admin/CjStatsAdminController.java 0 → 100644
package com.zq.portal.controller.admin;
import com.zq.common.utils.AssertUtils;
import com.zq.common.vo.ResultVo;
import com.zq.portal.service.CjStatsService;
import com.zq.portal.vo.StatsReqVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(tags = "残疾统计相关接口")
@RequiredArgsConstructor
@RestController
@RequestMapping(value = "/portal/admin/stats")
public class CjStatsAdminController {
public final CjStatsService cjStatsService;
@ApiOperation("近五年发放人数和金额统计")
@PostMapping(value = "/getYearDisabledIssueStats")
public ResultVo getYearDisabledIssueStats(@RequestBody StatsReqVo vo) {
return ResultVo.success(cjStatsService.getCacheYearDisabledIssueStats(vo));
}
@ApiOperation("获取残疾等级统计")
@PostMapping(value = "/getDisabledLevelStats")
public ResultVo getDisabledLevelStats(@RequestBody StatsReqVo vo) {
AssertUtils.notNull(vo.getYear(), "年份不能为空");
return ResultVo.success(cjStatsService.getCacheDisabledLevelStats(vo));
}
@ApiOperation("获取区域残疾发放统计")
@PostMapping(value = "/getAreaDisabledIssueStats")
public ResultVo getAreaDisabledIssueStats(@RequestBody StatsReqVo vo) {
AssertUtils.notNull(vo.getYear(), "年份不能为空");
return ResultVo.success(cjStatsService.getCacheAreaDisabledIssueStats(vo));
}
}
portal-server/src/main/java/com/zq/portal/controller/app/CjStatsController.java
package com.zq.portal.controller.app; package com.zq.portal.controller.app;
import com.zq.common.utils.AssertUtils;
import com.zq.common.vo.ResultVo; import com.zq.common.vo.ResultVo;
import com.zq.portal.service.CjStatsService; import com.zq.portal.service.CjStatsService;
import com.zq.portal.vo.StatsReqVo; import com.zq.portal.vo.StatsReqVo;
...@@ -20,15 +21,23 @@ public class CjStatsController { ...@@ -20,15 +21,23 @@ public class CjStatsController {
public final CjStatsService cjStatsService; public final CjStatsService cjStatsService;
@ApiOperation("近五年发放人数和金额统计") @ApiOperation("近五年发放人数和金额统计")
@PostMapping(value = "/getPeopleAmountStats") @PostMapping(value = "/getYearDisabledIssueStats")
public ResultVo getPeopleAmountStats(@RequestBody StatsReqVo vo) { public ResultVo getYearDisabledIssueStats(@RequestBody StatsReqVo vo) {
return ResultVo.success(cjStatsService.getCachePeopleAmountStats()); return ResultVo.success(cjStatsService.getCacheYearDisabledIssueStats(vo));
} }
@ApiOperation("获取残疾等级统计") @ApiOperation("获取残疾等级统计")
@PostMapping(value = "/getDisabledLevelStats") @PostMapping(value = "/getDisabledLevelStats")
public ResultVo getDisabledLevelStats(@RequestBody StatsReqVo vo) { public ResultVo getDisabledLevelStats(@RequestBody StatsReqVo vo) {
AssertUtils.notNull(vo.getYear(), "年份不能为空");
return ResultVo.success(cjStatsService.getCacheDisabledLevelStats(vo)); return ResultVo.success(cjStatsService.getCacheDisabledLevelStats(vo));
} }
@ApiOperation("获取区域残疾发放统计")
@PostMapping(value = "/getAreaDisabledIssueStats")
public ResultVo getAreaDisabledIssueStats(@RequestBody StatsReqVo vo) {
AssertUtils.notNull(vo.getYear(), "年份不能为空");
return ResultVo.success(cjStatsService.getCacheAreaDisabledIssueStats(vo));
}
} }
portal-server/src/main/java/com/zq/portal/dao/CjStatsDao.java
...@@ -13,6 +13,13 @@ import java.util.List; ...@@ -13,6 +13,13 @@ import java.util.List;
public interface CjStatsDao { public interface CjStatsDao {
/** /**
* 获取近五年年份
*
* @return
*/
List<String> getYearList();
/**
* 统计进5年发放人数和金额 * 统计进5年发放人数和金额
* *
* @return * @return
...@@ -24,4 +31,30 @@ public interface CjStatsDao { ...@@ -24,4 +31,30 @@ public interface CjStatsDao {
*/ */
List<StatsVo> getDisabledLevelStats(StatsReqVo vo); List<StatsVo> getDisabledLevelStats(StatsReqVo vo);
/**
* 获取近五年重度残疾人数
*/
List<StatsVo> getYearSevereDisabledStats(StatsReqVo vo);
/**
* 获取区域下的残疾人统计
*
* @param vo
* @return
*/
StatsVo getSeverePeopleNumStats(StatsReqVo vo);
/**
* 获取区域发放统计
*
* @return
*/
List<StatsVo> getAreaIssueStats(StatsReqVo vo);
/**
* 获取年份发放统计
*
* @return
*/
List<StatsVo> getYearIssueStats(StatsReqVo vo);
} }
portal-server/src/main/java/com/zq/portal/manager/PortalCacheKeys.java
...@@ -61,13 +61,18 @@ public abstract class PortalCacheKeys { ...@@ -61,13 +61,18 @@ public abstract class PortalCacheKeys {
return PREFIX + "getAgencyUnderChildStatsList." + vo.getAreaCode() + "." + vo.getYear(); return PREFIX + "getAgencyUnderChildStatsList." + vo.getAreaCode() + "." + vo.getYear();
} }
// 统计进5年发放人数和金额
public static String getPeopleAmountStatsKey() {
return PREFIX + "getPeopleAmountStats.";
}
// 残疾等级统计 // 残疾等级统计
public static String getDisabledLevelStatsKey(StatsReqVo vo) { public static String getDisabledLevelStatsKey(StatsReqVo vo) {
return PREFIX + "getCacheDisabledLevelStats." + vo.getAreaCode() + "." + vo.getYear(); return PREFIX + "getDisabledLevelStats." + vo.getAreaCode() + "." + vo.getYear();
}
// 统计年发放人数和金额
public static String getYearDisabledIssueStatsKey(StatsReqVo vo) {
return PREFIX + "getYearDisabledIssueStats." + vo.getAreaCode();
}
// 获取区域残疾统计
public static String getAreaDisabledIssueStatsKey(StatsReqVo vo) {
return PREFIX + "getAreaDisabledIssueStats." + vo.getAreaCode() + "." + vo.getYear();
} }
} }
portal-server/src/main/java/com/zq/portal/service/EtStatsService.java
...@@ -70,6 +70,9 @@ public class EtStatsService { ...@@ -70,6 +70,9 @@ public class EtStatsService {
VChildWelfareStats childWelfareStats = vChildWelfareStatsDao.selectOne(Wrappers.lambdaQuery(VChildWelfareStats.builder().year(vo.getYear() == null ? 0 : vo.getYear()).areaCode(systemArea.getCode()).createTime(DateUtil.parseDate(DateUtil.today())).build())); VChildWelfareStats childWelfareStats = vChildWelfareStatsDao.selectOne(Wrappers.lambdaQuery(VChildWelfareStats.builder().year(vo.getYear() == null ? 0 : vo.getYear()).areaCode(systemArea.getCode()).createTime(DateUtil.parseDate(DateUtil.today())).build()));
if (childWelfareStats == null) { if (childWelfareStats == null) {
vChildWelfareStatsDao.insert(build); vChildWelfareStatsDao.insert(build);
} else {
build.setId(childWelfareStats.getId());
vChildWelfareStatsDao.updateById(build);
} }
return build; return build;
......
portal-server/src/main/java/com/zq/portal/service/HyStatsService.java
...@@ -103,6 +103,9 @@ public class HyStatsService { ...@@ -103,6 +103,9 @@ public class HyStatsService {
VMarriageStats marriageStats = vMarriageStatsDao.selectOne(Wrappers.lambdaQuery(VMarriageStats.builder().year(vo.getYear() == null ? 0 : vo.getYear()).areaCode(area.getCode()).createTime(DateUtil.parseDate(DateUtil.today())).build())); VMarriageStats marriageStats = vMarriageStatsDao.selectOne(Wrappers.lambdaQuery(VMarriageStats.builder().year(vo.getYear() == null ? 0 : vo.getYear()).areaCode(area.getCode()).createTime(DateUtil.parseDate(DateUtil.today())).build()));
if (marriageStats == null) { if (marriageStats == null) {
vMarriageStatsDao.insert(build); vMarriageStatsDao.insert(build);
} else {
build.setId(marriageStats.getId());
vMarriageStatsDao.updateById(build);
} }
return build; return build;
......
portal-server/src/main/java/com/zq/portal/service/ShzzStatsService.java
...@@ -83,6 +83,9 @@ public class ShzzStatsService { ...@@ -83,6 +83,9 @@ public class ShzzStatsService {
VSoorganStats soorganStats = vSoorganStatsDao.selectOne(Wrappers.lambdaQuery(VSoorganStats.builder().year(vo.getYear() == null ? 0 : vo.getYear()).areaCode(systemArea.getCode()).createTime(DateUtil.parseDate(DateUtil.today())).build())); VSoorganStats soorganStats = vSoorganStatsDao.selectOne(Wrappers.lambdaQuery(VSoorganStats.builder().year(vo.getYear() == null ? 0 : vo.getYear()).areaCode(systemArea.getCode()).createTime(DateUtil.parseDate(DateUtil.today())).build()));
if (soorganStats == null) { if (soorganStats == null) {
vSoorganStatsDao.insert(build); vSoorganStatsDao.insert(build);
} else {
build.setId(soorganStats.getId());
vSoorganStatsDao.updateById(build);
} }
return build; return build;
......
portal-server/src/main/java/com/zq/portal/task/StatsTimingTask.java
...@@ -3,10 +3,7 @@ package com.zq.portal.task; ...@@ -3,10 +3,7 @@ package com.zq.portal.task;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.zq.common.entity.SystemArea; import com.zq.common.entity.SystemArea;
import com.zq.portal.dao.AreaDao; import com.zq.portal.dao.AreaDao;
import com.zq.portal.service.EtStatsService; import com.zq.portal.service.*;
import com.zq.portal.service.HyStatsService;
import com.zq.portal.service.PeopleService;
import com.zq.portal.service.ShzzStatsService;
import com.zq.portal.vo.StatsReqVo; import com.zq.portal.vo.StatsReqVo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
...@@ -24,6 +21,7 @@ public class StatsTimingTask { ...@@ -24,6 +21,7 @@ public class StatsTimingTask {
private final HyStatsService hyStatsService; private final HyStatsService hyStatsService;
private final EtStatsService etStatsService; private final EtStatsService etStatsService;
private final ShzzStatsService shzzStatsService; private final ShzzStatsService shzzStatsService;
private final CjStatsService cjStatsService;
private final AreaDao areaDao; private final AreaDao areaDao;
...@@ -70,5 +68,12 @@ public class StatsTimingTask { ...@@ -70,5 +68,12 @@ public class StatsTimingTask {
shzzStatsService.getSoorganPercentageStats(StatsReqVo.builder().areaCode("450000000000").build()); shzzStatsService.getSoorganPercentageStats(StatsReqVo.builder().areaCode("450000000000").build());
} }
@Scheduled(cron = "0 0/10 * * * ?")
public void cjStats() {
System.out.println("残疾-基本数统计 触发时间 ：" + new Date());
cjStatsService.getDisabledLevelStats(StatsReqVo.builder().areaCode("450000000000").year(2021).build());
}
} }
portal-server/src/main/java/com/zq/portal/vo/StatsReqVo.java
...@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; ...@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
public class StatsReqVo { public class StatsReqVo {
private String areaCode; private String areaCode = "450000000000";
private String subAreaCode; private String subAreaCode;
...@@ -19,10 +19,14 @@ public class StatsReqVo { ...@@ -19,10 +19,14 @@ public class StatsReqVo {
private Integer month; private Integer month;
private String date;
private String startTime; private String startTime;
private String endTime; private String endTime;
private String type; private String type;
private Integer size;
} }
portal-server/src/main/java/com/zq/portal/vo/StatsVo.java
...@@ -17,4 +17,6 @@ public class StatsVo { ...@@ -17,4 +17,6 @@ public class StatsVo {
private String amount; private String amount;
private String code;
} }
portal-server/src/main/resources/mapper/CjStatsMapper.xml
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
SELECT ENSURE_LEVEL_ID 'type', COUNT( 1 ) 'num' SELECT ENSURE_LEVEL_ID 'type', COUNT( 1 ) 'num'
FROM `cjrjz_proposer` FROM `cjrjz_proposer`
WHERE ENSURE_LEVEL_ID IS NOT NULL WHERE ENSURE_LEVEL_ID IS NOT NULL
<if test="type != null">
AND ENSURE_LEVEL_ID = #{type}
</if>
<if test="subAreaCode != null and subAreaCode != ''"> <if test="subAreaCode != null and subAreaCode != ''">
AND CARD_CODE LIKE CONCAT(#{subAreaCode}, '%') AND CARD_CODE LIKE CONCAT(#{subAreaCode}, '%')
</if> </if>
...@@ -25,4 +28,81 @@ ...@@ -25,4 +28,81 @@
GROUP BY ENSURE_LEVEL_ID GROUP BY ENSURE_LEVEL_ID
</select> </select>
<!--获取近年重度残疾人数-->
<select id="getYearSevereDisabledStats" resultType="com.zq.portal.vo.StatsVo">
SELECT
LEFT ( CREATE_DATE, 4 ) 'year',
COUNT( 1 ) 'num'
FROM
`cjrjz_proposer`
WHERE
ENSURE_LEVEL_ID IS NOT NULL
AND ENSURE_LEVEL_ID IN (1,2)
<if test="subAreaCode != null and subAreaCode != ''">
AND CARD_CODE LIKE CONCAT(#{subAreaCode}, '%')
</if>
<if test="year != null">
AND LEFT(CREATE_DATE, 4) = #{year}
</if>
GROUP BY LEFT ( CREATE_DATE, 4 )
ORDER BY LEFT ( CREATE_DATE, 4 ) DESC
LIMIT #{size}
</select>
<select id="getSeverePeopleNumStats" resultType="com.zq.portal.vo.StatsVo">
SELECT
COUNT( 1 ) 'num'
FROM
`cjrjz_proposer`
WHERE
ENSURE_LEVEL_ID IS NOT NULL
AND ENSURE_LEVEL_ID IN (1,2)
<if test="subAreaCode != null and subAreaCode != ''">
AND CARD_CODE LIKE CONCAT(#{subAreaCode}, '%')
</if>
<if test="year != null">
AND LEFT(CREATE_DATE, 4) = #{year}
</if>
</select>
<select id="getAreaIssueStats" resultType="com.zq.portal.vo.StatsVo">
SELECT UNIT_ID 'code',UNIT_NAME 'name', APPLY_TYPE_ID 'type', GRANT_YEAR 'year', COUNT_PEOPLE 'num', SUM_MONEY 'amount'
FROM `statics_grant`
WHERE 1=1
<if test="date != null and date != ''">
AND DATE_FORMAT(create_time, '%Y-%m-%d') = #{date}
</if>
<if test="year != null">
AND GRANT_YEAR = #{year}
</if>
<if test="type != null">
AND APPLY_TYPE_ID = #{type}
</if>
ORDER BY UNIT_ID
</select>
<select id="getYearIssueStats" resultType="com.zq.portal.vo.StatsVo">
SELECT APPLY_TYPE_ID 'type', GRANT_YEAR 'year', SUM( COUNT_PEOPLE ) 'num', SUM( SUM_MONEY ) 'amount'
FROM `statics_grant`
WHERE 1 = 1
<if test="subAreaCode != null and subAreaCode != ''">
AND UNIT_ID LIKE CONCAT( #{subAreaCode}, '%' )
</if>
<if test="date != null and date != ''">
AND DATE_FORMAT(create_time, '%Y-%m-%d') = #{date}
</if>
<if test="type != null">
AND APPLY_TYPE_ID = #{type}
</if>
GROUP BY GRANT_YEAR
ORDER BY GRANT_YEAR DESC LIMIT #{size}
</select>
<select id="getYearList" resultType="java.lang.String">
SELECT GRANT_YEAR 'year'
FROM `statics_grant`
GROUP BY GRANT_YEAR
ORDER BY GRANT_YEAR DESC LIMIT 5
</select>
</mapper> </mapper>
portal-server/src/main/resources/mapper/EtStatsMapper.xml
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
AND o.AXAA0001 LIKE CONCAT(#{subAreaCode}, '%') AND o.AXAA0001 LIKE CONCAT(#{subAreaCode}, '%')
</if> </if>
<if test="year != null"> <if test="year != null">
AND DATE_FORMAT(c.AJAX0107, "%Y") = #{year} AND DATE_FORMAT(o.AJEE0109, "%Y") = #{year}
</if> </if>
</select> </select>
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
jep08 j1 jep08 j1
LEFT JOIN jep01 j2 ON j1.AJEP0100 = j2.AJEP0100 LEFT JOIN jep01 j2 ON j1.AJEP0100 = j2.AJEP0100
WHERE 1=1 WHERE 1=1
j2.AXAA0001 LIKE CONCAT(#{subAreaCode},'%')
<if test="subAreaCode !=null and subAreaCode != ''"> <if test="subAreaCode !=null and subAreaCode != ''">
AND j2.AXAA0001 LIKE CONCAT(#{subAreaCode}, '%') AND j2.AXAA0001 LIKE CONCAT(#{subAreaCode}, '%')
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment