Skip to content

C
civil-bigdata
Commit f0540eb7 by 袁伟铭
Options

修改

parent bbcbb15a
Showing with 120 additions and 133 deletions
common-utils/src/main/java/com/zq/common/constant/DBName.java
......@@ -25,4 +25,7 @@ public class DBName {
// 养老
public final static String GXYL = "gxyl";
// 社会救助
public final static String GXSHJZ = "gxshjz";
}
common-utils/src/main/java/com/zq/common/entity/VShjzLowIncome.java deleted 100644 → 0
package com.zq.common.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 低保特困家庭信息（baf01）实体类
*
* @author makejava
* @since 2021-06-29 10:27:10
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@TableName(value = "baf01")
public class VShjzLowIncome {
/**
* ID
*/
@TableId
@ApiModelProperty("家庭信息表主键ID")
private String id;
/**
* Name
*/
@ApiModelProperty("申请人姓名")
private String name;
/**
* mainIdCard
*/
@ApiModelProperty("户主身份证")
private String mainIdCard;
/**
* phone
*/
@ApiModelProperty("联系电话")
private String phone;
/**
* address
*/
@ApiModelProperty("联系地址")
private String address;
/**
* unitCode
*/
@ApiModelProperty("所属社区行政区划代码")
private String unitCode;
/**
* reason
*/
@ApiModelProperty("主要致贫原因")
private String reason;
/**
* gross
*/
@ApiModelProperty("享受低保家庭人口总收入/月")
private String gross;
/**
* createTime
*/
@ApiModelProperty("更新时间")
private String createTime;
}
portal-server/src/main/java/com/zq/portal/controller/admin/ShjzStatsAdminController.java
......@@ -49,10 +49,10 @@ public class ShjzStatsAdminController {
return ResultVo.success(shjzStatsService.getAreaYearShjzAchieveStats(vo));
}
@ApiOperation("低保对象搜索")
@PostMapping(value = "/lowIncomeSearch")
public ResultVo lowIncomeSearch(@RequestBody StatsReqVo vo) {
return ResultVo.success(shjzStatsService.lowIncomeSearch(vo.getKeyword()));
@ApiOperation("社会救助搜索")
@PostMapping(value = "/societyHelpSearch")
public ResultVo societyHelpSearch(@RequestBody StatsReqVo vo) {
return ResultVo.success(shjzStatsService.societyHelpSearch(vo.getKeyword()));
}
}
portal-server/src/main/java/com/zq/portal/dao/VShjzLowIncomeDao.java → portal-server/src/main/java/com/zq/portal/dao/HelpStatsDao.java
package com.zq.portal.dao;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zq.common.constant.DBName;
import com.zq.common.entity.VShjzLowIncome;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
@DS(DBName.GXDB)
@DS(DBName.GXSHJZ)
@Repository
public interface VShjzLowIncomeDao extends BaseMapper<VShjzLowIncome> {
public interface HelpStatsDao {
/**
* 搜索
......
portal-server/src/main/java/com/zq/portal/manager/PortalCacheKeys.java
......@@ -78,7 +78,7 @@ public abstract class PortalCacheKeys {
// 获取区域养老院统计列表
public static String getAreaNursingStatsListKey(StatsReqVo vo) {
return PREFIX + "getAreaNursingStatsList." + vo.getAreaCode() + "." + vo.getYear();
return PREFIX + "getAreaNursingStatsList." + vo.getAreaCode() + "." + vo.getYear() + "." + vo.getType();
}
// 殡葬火化量统计列表
......
portal-server/src/main/java/com/zq/portal/service/BzStatsService.java
......@@ -63,7 +63,10 @@ public class BzStatsService {
List<StatsVo> sumStats = bzStatsDao.getAreaCremationStats(vo);
for (StatsVo statsVo : sumStats) {
build.setCremationSum(build.getCremationSum() + statsVo.getNum());
SystemArea area = areaDao.selectById(SystemArea.patchZero(statsVo.getCode()));
if (area != null && !systemArea.getCode().equals(area.getCode())) {
build.setCremationSum(build.getCremationSum() + statsVo.getNum());
}
}
StatsVo hastats = bzStatsDao.getCremationRateStats(vo);
build.setCremationRate(hastats.getNum());
......@@ -100,7 +103,7 @@ public class BzStatsService {
while (iterator.hasNext()) {
StatsVo statsVo = iterator.next();
SystemArea area = areaDao.selectById(SystemArea.patchZero(statsVo.getCode()));
if (!"0".equals(area.getParentId())) {
if (area != null && !"0".equals(area.getParentId()) && !systemArea.getCode().equals(area.getCode())) {
statsVo.setName(area.getName());
cityList.add(area.getName());
numList.add(NumberUtil.toStr(statsVo.getNum(), "0"));
......
portal-server/src/main/java/com/zq/portal/service/EtStatsService.java
......@@ -157,6 +157,7 @@ public class EtStatsService {
* @return
*/
public Object getAgencyPercentageStats(StatsReqVo vo) {
String cacheKey = PortalCacheKeys.getAgencyPercentageStatsKey(vo);
Map<String, Object> statsMap = getAgencyChildStatsList(vo);
List<VChildWelfareStats> areaStatsList = (List<VChildWelfareStats>) statsMap.get("areaStatsList");
......@@ -169,7 +170,7 @@ public class EtStatsService {
returnData.add(data);
}
redisUtils.setObj(PortalCacheKeys.getAgencyPercentageStatsKey(vo), returnData);
redisUtils.setObj(cacheKey, returnData);
return returnData;
}
......
portal-server/src/main/java/com/zq/portal/service/ShjzStatsService.java
......@@ -2,8 +2,8 @@ package com.zq.portal.service;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import com.zq.portal.dao.HelpStatsDao;
import com.zq.portal.dao.VShjzAchieveDao;
import com.zq.portal.dao.VShjzLowIncomeDao;
import com.zq.portal.dao.VShjzProvideDao;
import com.zq.portal.vo.StatsReqVo;
import com.zq.portal.vo.StatsVo;
......@@ -19,7 +19,8 @@ public class ShjzStatsService {
private final VShjzAchieveDao vShjzAchieveDao;
private final VShjzProvideDao vShjzProvideDao;
private final VShjzLowIncomeDao vShjzLowIncomeDao;
private final HelpStatsDao helpStatsDao;
/**
* 获取近5年发放金额折线
*
......@@ -362,12 +363,12 @@ public class ShjzStatsService {
}
/**
* 搜索
* 社会救助搜索
*
* @param keyword
* @return
*/
public Object lowIncomeSearch(String keyword) {
return vShjzLowIncomeDao.search(keyword);
public Object societyHelpSearch(String keyword) {
return helpStatsDao.search(keyword);
}
}
portal-server/src/main/java/com/zq/portal/service/YlStatsService.java
......@@ -37,6 +37,7 @@ public class YlStatsService {
/**
* 获取区域养老院统计列表
* type: 100-福利院 146-养老院 103-其他养老机构
*
* @param vo
* @return
......@@ -55,7 +56,7 @@ public class YlStatsService {
while (iterator.hasNext()) {
StatsVo statsVo = iterator.next();
SystemArea area = areaDao.selectById(SystemArea.patchZero(statsVo.getCode()));
if (!"0".equals(area.getParentId())) {
if (area != null && !"0".equals(area.getParentId()) && !systemArea.getCode().equals(area.getCode())) {
statsVo.setName(area.getName());
cityList.add(area.getName());
......
portal-server/src/main/java/com/zq/portal/task/StatsTimingTask.java
......@@ -23,8 +23,9 @@ public class StatsTimingTask {
private final ShzzStatsService shzzStatsService;
private final CjStatsService cjStatsService;
private final BzStatsService bzStatsService;
private final YlStatsService ylStatsService;
private final AreaDao areaDao;
private final String cron = "0 0 23 * * ?";
private final String cron = "0 0 0/2 * * ?";
@Scheduled(cron = cron)
......@@ -60,10 +61,12 @@ public class StatsTimingTask {
etStatsService.getAgencyChildStatsList(StatsReqVo.builder().areaCode("450000000000").build());
etStatsService.getAgencyUnderChildStatsList(StatsReqVo.builder().areaCode("450000000000").build());
etStatsService.getAgencyPercentageStats(StatsReqVo.builder().areaCode("450000000000").build());
for (SystemArea systemArea : systemAreaList) {
etStatsService.getAgencyChildStatsList(StatsReqVo.builder().areaCode(systemArea.getCode()).build());
etStatsService.getAgencyUnderChildStatsList(StatsReqVo.builder().areaCode(systemArea.getCode()).build());
etStatsService.getAgencyPercentageStats(StatsReqVo.builder().areaCode(systemArea.getCode()).build());
}
}
......@@ -98,11 +101,22 @@ public class StatsTimingTask {
System.out.println("殡葬-基本数统计 触发时间 ：" + new Date());
List<SystemArea> systemAreaList = areaDao.selectList(Wrappers.lambdaQuery(SystemArea.builder().parentId("450000000000").build()));
bzStatsService.getCremationRateStats(StatsReqVo.builder().areaCode("450000000000").build());
bzStatsService.getCremationStatsList(StatsReqVo.builder().areaCode("450000000000").build());
bzStatsService.getCremationRateStats(StatsReqVo.builder().areaCode("450000000000").build());
for (SystemArea systemArea : systemAreaList) {
bzStatsService.getCremationStatsList(StatsReqVo.builder().areaCode(systemArea.getCode()).build());
bzStatsService.getCremationRateStats(StatsReqVo.builder().areaCode(systemArea.getCode()).build());
bzStatsService.getCremationRateStats(StatsReqVo.builder().areaCode(systemArea.getCode()).build());
}
}
@Scheduled(cron = cron)
public void ylStats() {
System.out.println("养老-基本数统计 触发时间 ：" + new Date());
List<SystemArea> systemAreaList = areaDao.selectList(Wrappers.lambdaQuery(SystemArea.builder().parentId("450000000000").build()));
ylStatsService.getAreaNursingStatsList(StatsReqVo.builder().areaCode("450000000000").build());
for (SystemArea systemArea : systemAreaList) {
ylStatsService.getAreaNursingStatsList(StatsReqVo.builder().areaCode(systemArea.getCode()).build());
}
}
......
portal-server/src/main/resources/application.yml
......@@ -77,6 +77,12 @@ spring:
username: root
password: rooT123!321
driver-class-name: com.mysql.cj.jdbc.Driver
gxshjz:
type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://192.168.0.193:3306/gx-shjz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: rooT123!321
driver-class-name: com.mysql.cj.jdbc.Driver
druid:
# 初始连接数
initial-size: 10
......
portal-server/src/main/resources/mapper/BzStatsMapper.xml
......@@ -4,7 +4,7 @@
<select id="getAreaCremationStats" resultType="com.zq.portal.vo.StatsVo">
SELECT
LEFT(d.ups, 4) 'code',
LEFT(d.ups, #{size}) 'code',
COUNT( 1 ) 'num'
FROM
dic_city d
......
portal-server/src/main/resources/mapper/HelpStatsDao.xml 0 → 100644
<?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="com.zq.portal.dao.HelpStatsDao">
<!-- <select id="search" resultType="java.util.Map">-->
<!-- SELECT AXDF0002 'name', AXDF0004 'mainIdCard', AXDF0011 'phone',AXDF0008 'address', AXAA2701 'unitCode'-->
<!-- ,UPDATETIME 'createTime'-->
<!-- FROM-->
<!-- baf01-->
<!-- WHERE 1 = 1-->
<!-- <choose>-->
<!-- <when test="keyword != null and keyword != ''">-->
<!-- AND (AXDF0002 = #{keyword}-->
<!-- OR AXDF0004 = #{keyword})-->
<!-- </when>-->
<!-- <otherwise>-->
<!-- ORDER BY UPDATETIME DESC LIMIT 20-->
<!-- </otherwise>-->
<!-- </choose>-->
<!-- </select>-->
<select id="search" resultType="java.util.Map">
SELECT
address 'address',
NAME 'name',
id_card 'idCard',
help_type 'helpType',
help_amount 'helpAmount',
provide_state 'provideState',
start_provide_date 'startProvideDate',
end_provide_date 'endProvideDate'
FROM
`gw_temptable_20210630`
WHERE 1 = 1
<choose>
<when test="keyword != null and keyword != ''">
AND (NAME = #{keyword}
OR id_card = #{keyword})
</when>
<otherwise>
ORDER BY start_provide_date DESC LIMIT 20
</otherwise>
</choose>
</select>
</mapper>
portal-server/src/main/resources/mapper/ShjzLowIncomeMapper.xml deleted 100644 → 0
<?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="com.zq.portal.dao.VShjzLowIncomeDao">
<select id="search" resultType="java.util.Map">
SELECT AXDF0002 'name', AXDF0004 'mainIdCard', AXDF0011 'phone',AXDF0008 'address', AXAA2701 'unitCode'
,UPDATETIME 'createTime'
FROM
baf01
WHERE 1 = 1
<choose>
<when test="keyword != null and keyword != ''">
AND (AXDF0002 = #{keyword}
OR AXDF0004 = #{keyword})
</when>
<otherwise>
ORDER BY UPDATETIME DESC LIMIT 20
</otherwise>
</choose>
</select>
</mapper>
portal-server/src/main/resources/mapper/YlStatsMapper.xml
......@@ -2,22 +2,37 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zq.portal.dao.YlStatsDao">
<!-- <select id="getAreaNursingHomeStats" resultType="com.zq.portal.vo.StatsVo">-->
<!-- SELECT-->
<!-- LEFT(AHAE0033, #{size}) 'code',-->
<!-- COUNT( 1 ) 'num'-->
<!-- FROM `hdef1`-->
<!-- WHERE 1=1-->
<!-- <if test="subAreaCode != null and subAreaCode != ''">-->
<!-- AND AHAE0033 LIKE CONCAT(#{subAreaCode},'%')-->
<!-- </if>-->
<!-- <if test="year != null">-->
<!-- AND DATE_FORMAT(AXBE0015, "%Y") = #{year}-->
<!-- </if>-->
<!-- <if test="type != null">-->
<!-- AND AHAE0043 = #{type}-->
<!-- </if>-->
<!-- GROUP BY LEFT(AHAE0033, #{size})-->
<!-- </select>-->
<select id="getAreaNursingHomeStats" resultType="com.zq.portal.vo.StatsVo">
SELECT
LEFT(AHAE0033, #{size}) 'code',
LEFT(address_region_code, #{size}) 'code',
COUNT( 1 ) 'num'
FROM `hdef1`
WHERE 1=1
<if test="subAreaCode != null and subAreaCode != ''">
AND AHAE0033 LIKE CONCAT(#{subAreaCode},'%')
</if>
<if test="year != null">
AND DATE_FORMAT(AXBE0015, "%Y") = #{year}
</if>
FROM dp_org
WHERE address_region_code IS NOT NULL AND address_region_code != 1 AND address_region_code != 'null'
<if test="type != null">
AND AHAE0043 = #{type}
AND org_type_id = #{type}
</if>
GROUP BY LEFT(AHAE0033, #{size})
<if test="subAreaCode != null and subAreaCode != ''">
AND address_region_code LIKE CONCAT(#{subAreaCode},'%')
</if>
GROUP BY LEFT(address_region_code, #{size})
</select>
<!--获取区域进三年养老信息-->
......
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