Skip to content

C
civil-bigdata
Commit 39621ff8 by 袁伟铭
Options

修改

parent 7acb81bd
Showing with 199 additions and 90 deletions
api-server/src/main/java/com/zq/api/config/ConfigCache.java
...@@ -31,7 +31,7 @@ public class ConfigCache { ...@@ -31,7 +31,7 @@ public class ConfigCache {
if (cache == null) { if (cache == null) {
cache = CacheManager.get(cacheName); cache = CacheManager.get(cacheName);
} }
log.info("####参数配置Cache初始化......"); log.debug("####参数配置Cache初始化......");
Map<String, SysConfig> cacheMap = new HashMap<>(); Map<String, SysConfig> cacheMap = new HashMap<>();
SysConfigDao configDao = SpringContextHolder.getBean(SysConfigDao.class); SysConfigDao configDao = SpringContextHolder.getBean(SysConfigDao.class);
List<SysConfig> sysConfigList = configDao.selectList(Wrappers.lambdaQuery(null)); List<SysConfig> sysConfigList = configDao.selectList(Wrappers.lambdaQuery(null));
......
api-server/src/main/java/com/zq/api/feign/PortalFeign.java
...@@ -11,6 +11,9 @@ import java.util.Map; ...@@ -11,6 +11,9 @@ import java.util.Map;
@RequestMapping("/portal/app") @RequestMapping("/portal/app")
public interface PortalFeign { public interface PortalFeign {
@GetMapping("/area/getChildAreaList")
ResultVo getChildAreaList(@RequestParam String areaCode);
@PostMapping("/stats/getMarriageStats") @PostMapping("/stats/getMarriageStats")
ResultVo getMarriageStats(@RequestBody Map<String, Object> paramsMap); ResultVo getMarriageStats(@RequestBody Map<String, Object> paramsMap);
...@@ -26,7 +29,18 @@ public interface PortalFeign { ...@@ -26,7 +29,18 @@ public interface PortalFeign {
@PostMapping("/stats/getYearDisabledIssueStats") @PostMapping("/stats/getYearDisabledIssueStats")
ResultVo getYearDisabledIssueStats(@RequestBody Map<String, Object> paramsMap); ResultVo getYearDisabledIssueStats(@RequestBody Map<String, Object> paramsMap);
@GetMapping("/area/getChildAreaList") @PostMapping("/stats/getAreaShjzStats")
ResultVo getChildAreaList(@RequestParam String areaCode); ResultVo getAreaShjzStats(@RequestBody Map<String, Object> paramsMap);
@PostMapping("/stats/getFivesYearShjzAchieveStats")
ResultVo getFivesYearShjzAchieveStats(@RequestBody Map<String, Object> paramsMap);
@PostMapping("/stats/getFivesYearShjzProvideStats")
ResultVo getFivesYearShjzProvideStats(@RequestBody Map<String, Object> paramsMap);
@PostMapping("/stats/getSoorganStats")
ResultVo getSoorganStats(@RequestBody Map<String, Object> paramsMap);
@PostMapping("/stats/getAreaUnderSoorganStatsList")
ResultVo getAreaUnderSoorganStatsList(@RequestBody Map<String, Object> paramsMap);
} }
api-server/src/main/java/com/zq/api/service/IApiLogic.java
...@@ -85,10 +85,50 @@ public interface IApiLogic extends IApiCommon { ...@@ -85,10 +85,50 @@ public interface IApiLogic extends IApiCommon {
ApiResp getYearDisabledIssueStats(ApiForm form); ApiResp getYearDisabledIssueStats(ApiForm form);
/** /**
* 获取区域社会救助统计列表
*
* @param form
* @return
*/
ApiResp getAreaShjzStats(ApiForm form);
/**
* 获取近五年城市农村低保发放人数统计
*
* @param form
* @return
*/
ApiResp getFivesYearShjzAchieveStats(ApiForm form);
/**
* 获取近五年城市农村低保发放金额统计
*
* @param form
* @return
*/
ApiResp getFivesYearShjzProvideStats(ApiForm form);
/**
* 获取子区域列表 * 获取子区域列表
* *
* @param form * @param form
* @return * @return
*/ */
ApiResp getChildAreaList(ApiForm form); ApiResp getChildAreaList(ApiForm form);
/**
* 获取社会机构统计
*
* @param form
* @return
*/
ApiResp getSoorganStats(ApiForm form);
/**
* 获取地区下面社会机构统计列表
*
* @param form
* @return
*/
ApiResp getAreaUnderSoorganStatsList(ApiForm form);
} }
api-server/src/main/java/com/zq/api/service/impl/ApiV100Logic.java
...@@ -38,6 +38,11 @@ public class ApiV100Logic extends BaseApiLogic implements IApiLogic { ...@@ -38,6 +38,11 @@ public class ApiV100Logic extends BaseApiLogic implements IApiLogic {
} }
@Override @Override
public ApiResp getChildAreaList(ApiForm form) {
return ApiUtils.toApiResp(form, portalFeign.getChildAreaList(form.get("areaCode")));
}
@Override
public ApiResp getMarriageStats(ApiForm form) { public ApiResp getMarriageStats(ApiForm form) {
return ApiUtils.toApiResp(form, portalFeign.getMarriageStats(form.getParamsMap())); return ApiUtils.toApiResp(form, portalFeign.getMarriageStats(form.getParamsMap()));
} }
...@@ -63,7 +68,27 @@ public class ApiV100Logic extends BaseApiLogic implements IApiLogic { ...@@ -63,7 +68,27 @@ public class ApiV100Logic extends BaseApiLogic implements IApiLogic {
} }
@Override @Override
public ApiResp getChildAreaList(ApiForm form) { public ApiResp getAreaShjzStats(ApiForm form) {
return ApiUtils.toApiResp(form, portalFeign.getChildAreaList(form.get("areaCode"))); return ApiUtils.toApiResp(form, portalFeign.getAreaShjzStats(form.getParamsMap()));
}
@Override
public ApiResp getFivesYearShjzAchieveStats(ApiForm form) {
return ApiUtils.toApiResp(form, portalFeign.getFivesYearShjzAchieveStats(form.getParamsMap()));
}
@Override
public ApiResp getFivesYearShjzProvideStats(ApiForm form) {
return ApiUtils.toApiResp(form, portalFeign.getFivesYearShjzProvideStats(form.getParamsMap()));
}
@Override
public ApiResp getSoorganStats(ApiForm form) {
return ApiUtils.toApiResp(form, portalFeign.getSoorganStats(form.getParamsMap()));
}
@Override
public ApiResp getAreaUnderSoorganStatsList(ApiForm form) {
return ApiUtils.toApiResp(form, portalFeign.getAreaUnderSoorganStatsList(form.getParamsMap()));
} }
} }
common-utils/src/main/java/com/zq/common/entity/VChildWelfareStats.java
...@@ -61,10 +61,16 @@ public class VChildWelfareStats { ...@@ -61,10 +61,16 @@ public class VChildWelfareStats {
private Integer childNum; private Integer childNum;
/** /**
* 孤儿数量
*/
@ApiModelProperty("孤儿数量")
private Integer orphanNum;
/**
* 事实无人领养 * 事实无人领养
*/ */
@ApiModelProperty("事实无人领养") @ApiModelProperty("事实无人领养数量")
private Integer factUnadopted; private Integer factUnadoptedNum;
/** /**
* 日期 * 日期
......
portal-server/src/main/java/com/zq/portal/controller/admin/CjStatsAdminController.java
...@@ -36,7 +36,6 @@ public class CjStatsAdminController { ...@@ -36,7 +36,6 @@ public class CjStatsAdminController {
@ApiOperation("获取区域残疾发放统计") @ApiOperation("获取区域残疾发放统计")
@PostMapping(value = "/getAreaDisabledIssueStats") @PostMapping(value = "/getAreaDisabledIssueStats")
public ResultVo getAreaDisabledIssueStats(@RequestBody StatsReqVo vo) { public ResultVo getAreaDisabledIssueStats(@RequestBody StatsReqVo vo) {
AssertUtils.notNull(vo.getYear(), "年份不能为空");
return ResultVo.success(cjStatsService.getCacheAreaDisabledIssueStats(vo)); return ResultVo.success(cjStatsService.getCacheAreaDisabledIssueStats(vo));
} }
......
portal-server/src/main/java/com/zq/portal/controller/admin/EtStatsAdminController.java
...@@ -22,7 +22,13 @@ public class EtStatsAdminController { ...@@ -22,7 +22,13 @@ public class EtStatsAdminController {
public final EtStatsService etStatsService; public final EtStatsService etStatsService;
@ApiOperation("儿童福利机构统计列表") @ApiOperation("统计该区域的机构和儿童数量")
@PostMapping(value = "/getAgencyChildStats")
public ResultVo<Object> getAgencyChildStats(@RequestBody StatsReqVo vo) {
return ResultVo.success(etStatsService.getCacheAgencyChildStats(vo));
}
@ApiOperation("统计该区域的机构和儿童数量统计列表")
@PostMapping(value = "/getAgencyChildStatsList") @PostMapping(value = "/getAgencyChildStatsList")
public ResultVo<List<VChildWelfareStats>> getAgencyChildStatsList(@RequestBody StatsReqVo vo) { public ResultVo<List<VChildWelfareStats>> getAgencyChildStatsList(@RequestBody StatsReqVo vo) {
return ResultVo.success(etStatsService.getCacheAgencyChildStatsList(vo)); return ResultVo.success(etStatsService.getCacheAgencyChildStatsList(vo));
...@@ -34,12 +40,6 @@ public class EtStatsAdminController { ...@@ -34,12 +40,6 @@ public class EtStatsAdminController {
return ResultVo.success(etStatsService.getCacheAgencyUnderChildStatsList(vo)); return ResultVo.success(etStatsService.getCacheAgencyUnderChildStatsList(vo));
} }
@ApiOperation("统计该区域的机构和儿童数量")
@PostMapping(value = "/getAgencyChildStats")
public ResultVo<Object> getAgencyChildStats(@RequestBody StatsReqVo vo) {
return ResultVo.success(etStatsService.getCacheAgencyChildStats(vo));
}
@ApiOperation("获取区域机构占比") @ApiOperation("获取区域机构占比")
@PostMapping(value = "/getAgencyPercentageStats") @PostMapping(value = "/getAgencyPercentageStats")
public ResultVo<Object> getAgencyPercentageStats(@RequestBody StatsReqVo vo) { public ResultVo<Object> getAgencyPercentageStats(@RequestBody StatsReqVo vo) {
......
portal-server/src/main/java/com/zq/portal/controller/app/CjStatsController.java
...@@ -36,7 +36,6 @@ public class CjStatsController { ...@@ -36,7 +36,6 @@ public class CjStatsController {
@ApiOperation("获取区域残疾发放统计") @ApiOperation("获取区域残疾发放统计")
@PostMapping(value = "/getAreaDisabledIssueStats") @PostMapping(value = "/getAreaDisabledIssueStats")
public ResultVo getAreaDisabledIssueStats(@RequestBody StatsReqVo vo) { public ResultVo getAreaDisabledIssueStats(@RequestBody StatsReqVo vo) {
AssertUtils.notNull(vo.getYear(), "年份不能为空");
return ResultVo.success(cjStatsService.getCacheAreaDisabledIssueStats(vo)); return ResultVo.success(cjStatsService.getCacheAreaDisabledIssueStats(vo));
} }
......
portal-server/src/main/java/com/zq/portal/controller/app/ShjzStatsController.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.ShjzStatsService; import com.zq.portal.service.ShjzStatsService;
import com.zq.portal.vo.StatsReqVo; import com.zq.portal.vo.StatsReqVo;
...@@ -46,6 +47,7 @@ public class ShjzStatsController { ...@@ -46,6 +47,7 @@ public class ShjzStatsController {
@ApiOperation("获取区域统计列表") @ApiOperation("获取区域统计列表")
@PostMapping(value = "/getAreaShjzStats") @PostMapping(value = "/getAreaShjzStats")
public ResultVo getAreaShjzStats(@RequestBody StatsReqVo vo) { public ResultVo getAreaShjzStats(@RequestBody StatsReqVo vo) {
AssertUtils.notNull(vo.getYear(), "年份不能为空");
return ResultVo.success(shjzStatsService.getAreaShjzStats(vo)); return ResultVo.success(shjzStatsService.getAreaShjzStats(vo));
} }
......
portal-server/src/main/java/com/zq/portal/dao/EtStatsDao.java
...@@ -37,11 +37,18 @@ public interface EtStatsDao { ...@@ -37,11 +37,18 @@ public interface EtStatsDao {
List<StatsVo> getAgencyUnderChildStats(StatsReqVo vo); List<StatsVo> getAgencyUnderChildStats(StatsReqVo vo);
/** /**
* 事实无人领养 * 事实无人领养统计
* *
* @param vo * @param vo
* @return * @return
*/ */
StatsVo getFactUnadoptedStats(StatsReqVo vo); StatsVo getFactUnadoptedStats(StatsReqVo vo);
/**
* 孤儿统计
*
* @param vo
* @return
*/
StatsVo getOrphanStats(StatsReqVo vo);
} }
portal-server/src/main/java/com/zq/portal/dao/VShjzAchieveDao.java
...@@ -3,7 +3,6 @@ package com.zq.portal.dao; ...@@ -3,7 +3,6 @@ package com.zq.portal.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zq.common.entity.VShjzAchieve; import com.zq.common.entity.VShjzAchieve;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
...@@ -18,28 +17,8 @@ import java.util.Map; ...@@ -18,28 +17,8 @@ import java.util.Map;
@Repository @Repository
public interface VShjzAchieveDao extends BaseMapper<VShjzAchieve> { public interface VShjzAchieveDao extends BaseMapper<VShjzAchieve> {
@Select(value = "SELECT\n" +
"\tiscity,\n" +
"\tSUM(s_2017) 's2017',\n" +
"\tSUM(s_2018) 's2018',\n" +
"\tSUM(s_2019) 's2019',\n" +
"\tSUM(s_2020) 's2020',\n" +
"\tSUM(s_2021) 's2021'\n" +
"FROM\n" +
"\t`v_shjz_achieve` \n" +
"\tWHERE DATE_FORMAT(create_time, '%Y-%m-%d') = #{date} \n" +
"GROUP BY\n" +
"\tiscity")
List<Map<String, Object>> getFivesYearStats(@Param("date") String date); List<Map<String, Object>> getFivesYearStats(@Param("date") String date);
@Select(value = "SELECT\n" +
"\tget_upunitname 'city',\n" +
"\ts_${year} 'achieveNum' \n" +
"FROM\n" +
"\t`v_shjz_achieve` \n" +
"WHERE\n" +
"\tDATE_FORMAT( create_time, '%Y-%m-%d' ) = '2021-06-26' \n" +
"\tAND iscity = '低保'")
List<Map<String, Object>> getStatsByYear(@Param("year") Integer year); List<Map<String, Object>> getStatsByYear(@Param("year") Integer year);
} }
portal-server/src/main/java/com/zq/portal/dao/VShjzProvideDao.java
...@@ -3,7 +3,6 @@ package com.zq.portal.dao; ...@@ -3,7 +3,6 @@ package com.zq.portal.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zq.common.entity.VShjzProvide; import com.zq.common.entity.VShjzProvide;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
...@@ -18,27 +17,7 @@ import java.util.Map; ...@@ -18,27 +17,7 @@ import java.util.Map;
@Repository @Repository
public interface VShjzProvideDao extends BaseMapper<VShjzProvide> { public interface VShjzProvideDao extends BaseMapper<VShjzProvide> {
@Select(value = "SELECT\n" +
"\tiscity,\n" +
"\tSUM(sum_year_2017) 's2017',\n" +
"\tSUM(sum_year_2018) 's2018',\n" +
"\tSUM(sum_year_2019) 's2019',\n" +
"\tSUM(sum_year_2020) 's2020',\n" +
"\tSUM(sum_year_2021) 's2021'\n" +
"FROM\n" +
"\t`v_shjz_provide` \n" +
"\tWHERE DATE_FORMAT(create_time, '%Y-%m-%d') = #{date} \n" +
"GROUP BY\n" +
"\tiscity")
List<Map<String, Object>> getFivesYearStats(@Param("date") String date); List<Map<String, Object>> getFivesYearStats(@Param("date") String date);
@Select(value = "SELECT\n" +
"\tget_upunitname 'city',\n" +
"\tsum_year_${year} 'provideNum' \n" +
"FROM\n" +
"\t`v_shjz_provide` \n" +
"WHERE\n" +
"\tDATE_FORMAT( create_time, '%Y-%m-%d' ) = '2021-06-26' \n" +
"\tAND iscity = '低保'")
List<Map<String, Object>> getStatsByYear(@Param("year") Integer year); List<Map<String, Object>> getStatsByYear(@Param("year") Integer year);
} }
portal-server/src/main/java/com/zq/portal/service/CjStatsService.java
...@@ -91,13 +91,11 @@ public class CjStatsService { ...@@ -91,13 +91,11 @@ public class CjStatsService {
List<String> severeNumList = new ArrayList<>(); List<String> severeNumList = new ArrayList<>();
List<String> severeAmountList = new ArrayList<>(); List<String> severeAmountList = new ArrayList<>();
vo.setDate(DateUtil.today());
vo.setSize(dateList.size()); vo.setSize(dateList.size());
vo.setType("1");// 1 重度残疾 vo.setType("1");// 1 重度残疾
getYearStatsData(vo, severeNumList, severeAmountList); getYearStatsData(vo, severeNumList, severeAmountList);
List<String> difficultNumList = new ArrayList<>(); List<String> difficultNumList = new ArrayList<>();
List<String> difficultAmountList = new ArrayList<>(); List<String> difficultAmountList = new ArrayList<>();
vo.setType("2");// 2 困难残疾 vo.setType("2");// 2 困难残疾
...@@ -180,7 +178,6 @@ public class CjStatsService { ...@@ -180,7 +178,6 @@ public class CjStatsService {
public Object getAreaDisabledIssueStats(StatsReqVo vo) { public Object getAreaDisabledIssueStats(StatsReqVo vo) {
SystemArea systemArea = areaDao.selectById(vo.getAreaCode()); SystemArea systemArea = areaDao.selectById(vo.getAreaCode());
vo.setSubAreaCode(systemArea.subAreaCode()); vo.setSubAreaCode(systemArea.subAreaCode());
vo.setDate(DateUtil.today());
List<String> areaList = new ArrayList<>(); List<String> areaList = new ArrayList<>();
List<String> severeIssueNumList = new ArrayList<>(); List<String> severeIssueNumList = new ArrayList<>();
......
portal-server/src/main/java/com/zq/portal/service/EtStatsService.java
...@@ -61,8 +61,10 @@ public class EtStatsService { ...@@ -61,8 +61,10 @@ public class EtStatsService {
build.setAgencyNum(orgStat.getNum()); build.setAgencyNum(orgStat.getNum());
StatsVo childStats = etStatsDao.getAreaChildStats(vo); StatsVo childStats = etStatsDao.getAreaChildStats(vo);
build.setChildNum(childStats.getNum()); build.setChildNum(childStats.getNum());
StatsVo Orphan = etStatsDao.getOrphanStats(vo);
build.setOrphanNum(Orphan.getNum());
StatsVo factUnadoptedStats = etStatsDao.getFactUnadoptedStats(vo); StatsVo factUnadoptedStats = etStatsDao.getFactUnadoptedStats(vo);
build.setFactUnadopted(factUnadoptedStats.getNum()); build.setFactUnadoptedNum(factUnadoptedStats.getNum());
redisUtils.setObj(PortalCacheKeys.getAgencyChildStatsKey(vo), build); redisUtils.setObj(PortalCacheKeys.getAgencyChildStatsKey(vo), build);
......
portal-server/src/main/java/com/zq/portal/service/ShjzStatsService.java
...@@ -297,20 +297,20 @@ public class ShjzStatsService { ...@@ -297,20 +297,20 @@ public class ShjzStatsService {
return returnData; return returnData;
} }
private BigDecimal getFivesYearTotalNum(BigDecimal toatlAmount, Map<String, Object> fivesYearStat) { private BigDecimal getFivesYearTotalNum(BigDecimal toatlNum, Map<String, Object> fivesYearStat) {
toatlAmount = toatlAmount.add(new BigDecimal(fivesYearStat.get("s2017").toString())); toatlNum = toatlNum.add(new BigDecimal(fivesYearStat.get("s2017").toString()));
toatlAmount = toatlAmount.add(new BigDecimal(fivesYearStat.get("s2018").toString())); toatlNum = toatlNum.add(new BigDecimal(fivesYearStat.get("s2018").toString()));
toatlAmount = toatlAmount.add(new BigDecimal(fivesYearStat.get("s2019").toString())); toatlNum = toatlNum.add(new BigDecimal(fivesYearStat.get("s2019").toString()));
toatlAmount = toatlAmount.add(new BigDecimal(fivesYearStat.get("s2020").toString())); toatlNum = toatlNum.add(new BigDecimal(fivesYearStat.get("s2020").toString()));
toatlAmount = toatlAmount.add(new BigDecimal(fivesYearStat.get("s2021").toString())); toatlNum = toatlNum.add(new BigDecimal(fivesYearStat.get("s2021").toString()));
return toatlAmount; return toatlNum;
} }
private BigDecimal getThreeYearTotalNum(BigDecimal toatlAmount, Map<String, Object> fivesYearStat) { private BigDecimal getThreeYearTotalNum(BigDecimal toatlNum, Map<String, Object> fivesYearStat) {
toatlAmount = toatlAmount.add(new BigDecimal(fivesYearStat.get("s2019").toString())); toatlNum = toatlNum.add(new BigDecimal(fivesYearStat.get("s2019").toString()));
toatlAmount = toatlAmount.add(new BigDecimal(fivesYearStat.get("s2020").toString())); toatlNum = toatlNum.add(new BigDecimal(fivesYearStat.get("s2020").toString()));
toatlAmount = toatlAmount.add(new BigDecimal(fivesYearStat.get("s2021").toString())); toatlNum = toatlNum.add(new BigDecimal(fivesYearStat.get("s2021").toString()));
return toatlAmount; return toatlNum;
} }
public Object getAreaShjzStats(StatsReqVo vo) { public Object getAreaShjzStats(StatsReqVo vo) {
......
portal-server/src/main/java/com/zq/portal/task/StatsTimingTask.java
...@@ -25,7 +25,7 @@ public class StatsTimingTask { ...@@ -25,7 +25,7 @@ public class StatsTimingTask {
private final AreaDao areaDao; private final AreaDao areaDao;
@Scheduled(cron = "0 0/10 * * * ?") @Scheduled(cron = "0 0/30 * * * ?")
public void cacheAreaData() { public void cacheAreaData() {
System.out.println("基本数统计 触发时间 ：" + new Date()); System.out.println("基本数统计 触发时间 ：" + new Date());
peopleService.getDBUserCount(); peopleService.getDBUserCount();
...@@ -34,7 +34,7 @@ public class StatsTimingTask { ...@@ -34,7 +34,7 @@ public class StatsTimingTask {
peopleService.getCJYLCount(); peopleService.getCJYLCount();
} }
@Scheduled(cron = "0 0/10 * * * ?") @Scheduled(cron = "0 0/30 * * * ?")
public void hyStats() { public void hyStats() {
System.out.println("婚姻-基本数统计 触发时间 ：" + new Date()); System.out.println("婚姻-基本数统计 触发时间 ：" + new Date());
...@@ -51,7 +51,7 @@ public class StatsTimingTask { ...@@ -51,7 +51,7 @@ public class StatsTimingTask {
} }
} }
@Scheduled(cron = "0 0/10 * * * ?") @Scheduled(cron = "0 0/30 * * * ?")
public void etStats() { public void etStats() {
System.out.println("儿童福利机构-基本数统计 触发时间 ：" + new Date()); System.out.println("儿童福利机构-基本数统计 触发时间 ：" + new Date());
...@@ -59,7 +59,7 @@ public class StatsTimingTask { ...@@ -59,7 +59,7 @@ public class StatsTimingTask {
etStatsService.getAgencyUnderChildStatsList(StatsReqVo.builder().areaCode("450000000000").build()); etStatsService.getAgencyUnderChildStatsList(StatsReqVo.builder().areaCode("450000000000").build());
} }
@Scheduled(cron = "0 0/10 * * * ?") @Scheduled(cron = "0 0/30 * * * ?")
public void shzzStats() { public void shzzStats() {
System.out.println("社会组织-基本数统计 触发时间 ：" + new Date()); System.out.println("社会组织-基本数统计 触发时间 ：" + new Date());
...@@ -68,7 +68,7 @@ public class StatsTimingTask { ...@@ -68,7 +68,7 @@ public class StatsTimingTask {
shzzStatsService.getSoorganPercentageStats(StatsReqVo.builder().areaCode("450000000000").build()); shzzStatsService.getSoorganPercentageStats(StatsReqVo.builder().areaCode("450000000000").build());
} }
@Scheduled(cron = "0 0/10 * * * ?") @Scheduled(cron = "0 0/30 * * * ?")
public void cjStats() { public void cjStats() {
System.out.println("残疾-基本数统计 触发时间 ：" + new Date()); System.out.println("残疾-基本数统计 触发时间 ：" + new Date());
......
portal-server/src/main/java/com/zq/portal/vo/StatsVo.java
...@@ -7,7 +7,7 @@ public class StatsVo { ...@@ -7,7 +7,7 @@ public class StatsVo {
private String year; private String year;
private Integer num; private Integer num = 0;
private String type; private String type;
......
portal-server/src/main/resources/mapper/CjStatsMapper.xml
...@@ -68,29 +68,23 @@ ...@@ -68,29 +68,23 @@
<select id="getAreaIssueStats" resultType="com.zq.portal.vo.StatsVo"> <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' SELECT UNIT_ID 'code',UNIT_NAME 'name', APPLY_TYPE_ID 'type', GRANT_YEAR 'year', COUNT_PEOPLE 'num', SUM_MONEY 'amount'
FROM `statics_grant` FROM `statics_grant`
WHERE 1=1 WHERE DATE_FORMAT(create_time, '%Y-%m-%d') = (SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM statics_grant ORDER BY create_time DESC LIMIT 1)
<if test="date != null and date != ''">
AND DATE_FORMAT(create_time, '%Y-%m-%d') = #{date}
</if>
<if test="year != null"> <if test="year != null">
AND GRANT_YEAR = #{year} AND GRANT_YEAR = #{year}
</if> </if>
<if test="type != null"> <if test="type != null">
AND APPLY_TYPE_ID = #{type} AND APPLY_TYPE_ID = #{type}
</if> </if>
ORDER BY UNIT_ID GROUP BY UNIT_ID
</select> </select>
<select id="getYearIssueStats" resultType="com.zq.portal.vo.StatsVo"> <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' SELECT APPLY_TYPE_ID 'type', GRANT_YEAR 'year', SUM( COUNT_PEOPLE ) 'num', SUM( SUM_MONEY ) 'amount'
FROM `statics_grant` FROM `statics_grant`
WHERE 1 = 1 WHERE DATE_FORMAT(create_time, '%Y-%m-%d') = (SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM statics_grant ORDER BY create_time DESC LIMIT 1)
<if test="subAreaCode != null and subAreaCode != ''"> <if test="subAreaCode != null and subAreaCode != ''">
AND UNIT_ID LIKE CONCAT( #{subAreaCode}, '%' ) AND UNIT_ID LIKE CONCAT( #{subAreaCode}, '%' )
</if> </if>
<if test="date != null and date != ''">
AND DATE_FORMAT(create_time, '%Y-%m-%d') = #{date}
</if>
<if test="type != null"> <if test="type != null">
AND APPLY_TYPE_ID = #{type} AND APPLY_TYPE_ID = #{type}
</if> </if>
......
portal-server/src/main/resources/mapper/EtStatsMapper.xml
...@@ -66,4 +66,19 @@ ...@@ -66,4 +66,19 @@
</if> </if>
</select> </select>
<select id="getOrphanStats" resultType="com.zq.portal.vo.StatsVo">
SELECT
COUNT(1) 'num'
FROM
jep03 j1
LEFT JOIN jep01 j2 ON j1.AJEP0100 = j2.AJEP0100
WHERE 1=1
<if test="subAreaCode !=null and subAreaCode != ''">
AND j2.AXAA0001 LIKE CONCAT(#{subAreaCode}, '%')
</if>
<if test="year != null">
AND DATE_FORMAT(j1.AJEP0120, "%Y") = #{year}
</if>
</select>
</mapper> </mapper>
portal-server/src/main/resources/mapper/ShjzAchieveStatsMapper.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.VShjzAchieveDao">
<select id="getFivesYearStats" resultType="java.util.Map">
SELECT iscity,
ROUND(SUM(s_2017) / 10000) 's2017', ROUND(SUM(s_2018) / 10000) 's2018', ROUND(SUM(s_2019) / 10000) 's2019', ROUND(SUM(s_2020) / 10000) 's2020', ROUND(SUM(s_2021) / 10000) 's2021'
FROM `v_shjz_achieve`
WHERE DATE_FORMAT(create_time, '%Y-%m-%d') =
(SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM v_shjz_achieve ORDER BY create_time DESC LIMIT 1)
GROUP BY
iscity
</select>
<select id="getStatsByYear" resultType="java.util.Map">
SELECT get_upunitname 'city', ROUND(s_${year} / 10000) 'achieveNum'
FROM `v_shjz_achieve`
WHERE DATE_FORMAT(create_time, '%Y-%m-%d') =
(SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM v_shjz_achieve ORDER BY create_time DESC
LIMIT 1)
AND iscity = '低保'
</select>
</mapper>
portal-server/src/main/resources/mapper/ShjzProvideStatsMapper.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.VShjzProvideDao">
<select id="getFivesYearStats" resultType="java.util.Map">
SELECT iscity,
ROUND(SUM(sum_year_2017)/10000) 's2017',
ROUND(SUM(sum_year_2018)/10000) 's2018',
ROUND(SUM(sum_year_2019)/10000) 's2019',
ROUND(SUM(sum_year_2020)/10000) 's2020',
ROUND(SUM(sum_year_2021)/10000) 's2021'
FROM `v_shjz_provide`
WHERE DATE_FORMAT(create_time, '%Y-%m-%d') =
(SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM v_shjz_achieve ORDER BY create_time DESC LIMIT 1)
GROUP BY
iscity
</select>
<select id="getStatsByYear" resultType="java.util.Map">
SELECT get_upunitname 'city', ROUND(sum_year_${year}/10000) 'provideNum'
FROM `v_shjz_provide`
WHERE DATE_FORMAT(create_time, '%Y-%m-%d') =
(SELECT DATE_FORMAT(create_time, '%Y-%m-%d') FROM v_shjz_achieve ORDER BY create_time DESC LIMIT 1)
AND iscity = '低保'
</select>
</mapper>
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