springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/PopulationStatisticsVO.java
New file @@ -0,0 +1,26 @@ package com.panzhihua.common.model.vos.grid.admin; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * * @author lyq * @version 1.0 * @since 1.0 * @date 2021-05-26 * */ @Data @ApiModel("居民统计返回参数") public class PopulationStatisticsVO { @ApiModelProperty(value = "本地人口") private Integer localNum = 0; @ApiModelProperty(value = "流动人口") private Integer flowNum = 0; @ApiModelProperty(value = "特殊人口") private Integer specialNum = 0; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3397,4 +3397,11 @@ */ @PostMapping("/village/grid/building/house/del/population") R delBuildingHousePopulation(@RequestBody DelComMngHousePopulationDTO housePopulationDTO); /** * 综治后台-居民标签栏统计 * @return 居民统计 */ @GetMapping("/population/grid/statistics") R getGridPopulationStatistics(@RequestParam("communityId") Long communityId); } springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/PopulationApi.java
@@ -6,6 +6,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.PopulationDetailVO; import com.panzhihua.common.model.vos.grid.admin.ComMngPopulationListVO; import com.panzhihua.common.model.vos.grid.admin.PopulationStatisticsVO; import com.panzhihua.common.model.vos.screen.ComActPopulationScreenVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.grid.GridService; @@ -45,4 +46,10 @@ public R get(@RequestParam("populationId")Long populationId){ return communityService.getGridPopulationDetail(populationId); } @ApiOperation(value = "居民标签栏统计@lyq",response = PopulationStatisticsVO.class) @GetMapping("/statistics") public R statistics(){ return communityService.getGridPopulationStatistics(0L); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/PopulationApi.java
@@ -44,11 +44,21 @@ return comMngPopulationService.getGridPopulationAdminList(populationListDTO); } /** * 综治后台-删除居民 * @param ids 居民id集合 * @return 删除结果 */ @PostMapping("/grid/del") public R delGridPopulationAdmin(@RequestBody List<Long> ids) { return comMngPopulationService.delGridPopulationAdmin(ids); } /** * 综治后台-居民详情 * @param populationId 居民id * @return 居民详情 */ @GetMapping("/grid/get") public R getGridPopulationAdminDetail(@RequestParam("populationId")Long populationId) { return comMngPopulationService.getPopulationDetailApp(populationId); @@ -58,4 +68,11 @@ public R binding() { return comMngPopulationService.binding(); } @GetMapping("/grid/statistics") public R getGridPopulationStatistics(@RequestParam("communityId") Long communityId) { return comMngPopulationService.getGridPopulationStatistics(communityId); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -21,6 +21,7 @@ import com.panzhihua.common.model.vos.grid.PopulationDetailVO; import com.panzhihua.common.model.vos.grid.PopulationListVO; import com.panzhihua.common.model.vos.grid.admin.ComMngPopulationListVO; import com.panzhihua.common.model.vos.grid.admin.PopulationStatisticsVO; import com.panzhihua.common.model.vos.user.*; import com.panzhihua.common.model.vos.community.PageComActMessageVO; import com.panzhihua.common.model.vos.user.ComHouseMemberVo; @@ -993,4 +994,27 @@ " </script>") IPage<EventSpecialPopulationVO> getBuildingHousePopulationList(Page page,@Param("populationDTO") PageComMngPopulationDTO populationDTO); @Select("<script> " + "SELECT " + " count( id ) AS localNum, " + " ( SELECT count( id ) FROM com_mng_population WHERE out_or_local = 2 " + "<if test='communityId != null and communityId != 0'>" + " AND act_id = #{communityId} " + " </if> " + " ) AS flowNum, " + " ( SELECT count( id ) FROM com_mng_population WHERE label IS NOT NULL " + "<if test='communityId != null and communityId != 0'>" + " AND act_id = #{communityId} " + " </if> " + " ) AS specialNum " + "FROM " + " com_mng_population " + "WHERE " + " out_or_local = 1 " + "<if test='communityId != null and communityId != 0'>" + " AND act_id = #{communityId} " + " </if> " + " </script>") PopulationStatisticsVO getGridPopulationStatistics(@Param("communityId") Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -224,7 +224,7 @@ R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO); R binding(); R getGridPopulationStatistics(Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -1592,4 +1592,9 @@ return R.ok(populationVOIPage); } @Override public R getGridPopulationStatistics(Long communityId){ return R.ok(this.baseMapper.getGridPopulationStatistics(communityId)); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventVisitingTasksMapper.java
@@ -103,4 +103,6 @@ Map<String, Object> findUserById(Long userId); String getPopulationLabel(@Param("populationId") Long populationId); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -1738,6 +1738,7 @@ // if(!latLng.matches("^[\\-\\+]?(0(\\.\\d{1,10})?|([1-9](\\d)?)(\\.\\d{1,10})?|1[0-7]\\d{1}(\\.\\d{1,10})?|180\\.0{1,10}),[\\-\\+]?((0|([1-8]\\d?))(\\.\\d{1,10})?|90(\\.0{1,10})?)$")){ // return R.fail("经纬度参数错误"); // } //经纬度匹配规则：（短（纬度）在前长（经度）在后，不要擅自修改此规则，否则出现问题后果自负） if(!latLng.matches("[1-9][0-9](\\.[0-9]{1,6})?,[1-9][0-9]{2}(\\.[0-9]{1,6})?")){ return R.fail("经纬度参数错误"); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -412,17 +412,32 @@ if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){ return R.fail("当前状态不可完成走访"); } //查询当前人员是否是(精神障碍,吸毒,刑满释放,社区矫正),如果是这四种状态，option参数为必填参数 String label = this.baseMapper.getPopulationLabel(eventVisitingTasksDO.getVisiterId()); if(StringUtils.isNotEmpty(label)){ if(label.contains("精神障碍") || label.contains("吸毒") || label.contains("刑满释放") || label.contains("社区矫正")){ if(StringUtils.isNotEmpty(taskCompleteDTO.getOption())){ return R.fail("请选择异常状态"); } } } EventVisitingTasksDO complete = new EventVisitingTasksDO(); BeanUtils.copyProperties(taskCompleteDTO,complete); if(taskCompleteDTO.getException().intValue() == 0){ if(taskCompleteDTO.getException() == 0){ complete.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode()); }else{ complete.setEventStatus(EventTasksStatusEnum.YC.getCode()); } complete.setSubmitDate(DateUtil.parse(taskCompleteDTO.getSubmitDate(), DatePattern.NORM_DATETIME_FORMAT)); if(StringUtils.isNotEmpty(eventVisitingTasksDO.getTableContentJson())){ JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()); if(StringUtils.isNotEmpty(taskCompleteDTO.getOption())){ json.put("check",taskCompleteDTO.getOption()); } complete.setTableContentJson(json.toJSONString()); } if(!StringUtils.isEmpty(taskCompleteDTO.getImgList())){ taskCompleteDTO.getImgList().forEach(e->{ @@ -527,6 +542,5 @@ } return false; } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml
@@ -194,5 +194,9 @@ where id = #{id} </update> <select id="getPopulationLabel" resultType="String"> select label from com_mng_population where id = #{populationId} </select> </mapper>
