【网格党建平面图】饼图

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerPolyPieFormDTO.java

@@ -0,0 +1,15 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class VolunteerPolyPieFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 6284245738483042805L;
+
+    private String agencyId;
+
+    private String customerId;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyListResultDTO.java

@@ -28,4 +28,8 @@ public class VolunteerPolyListResultDTO  implements Serializable {
      * 手机号
      */
     private String mobile;
+
+    private String userId;
+
+    private String icResiUser;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyPieResultDTO.java

@@ -0,0 +1,15 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class VolunteerPolyPieResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 777585539653982139L;
+
+    private String label;
+    private String value;
+    private String code;
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVolunteerPolyController.java

@@ -14,7 +14,9 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcVolunteerPolyDTO;
 import com.epmet.dto.form.VolunteerPolyListFormDTO;
 import com.epmet.dto.form.VolunteerPolyMapDataFormDTO;
+import com.epmet.dto.form.VolunteerPolyPieFormDTO;
 import com.epmet.dto.result.VolunteerPolyMapDataResultDTO;
+import com.epmet.dto.result.VolunteerPolyPieResultDTO;
 import com.epmet.service.IcVolunteerPolyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -37,20 +39,20 @@ public class IcVolunteerPolyController {
     private IcVolunteerPolyService icVolunteerPolyService;
 
     @RequestMapping("page")
-    public Result<PageData<IcVolunteerPolyDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<IcVolunteerPolyDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<IcVolunteerPolyDTO> page = icVolunteerPolyService.page(params);
         return new Result<PageData<IcVolunteerPolyDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
-    public Result<IcVolunteerPolyDTO> get(@PathVariable("id") String id){
+    public Result<IcVolunteerPolyDTO> get(@PathVariable("id") String id) {
         IcVolunteerPolyDTO data = icVolunteerPolyService.get(id);
         return new Result<IcVolunteerPolyDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody IcVolunteerPolyDTO dto){
+    public Result save(@RequestBody IcVolunteerPolyDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         icVolunteerPolyService.save(dto);
@@ -59,7 +61,7 @@ public class IcVolunteerPolyController {
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody IcVolunteerPolyDTO dto){
+    public Result update(@RequestBody IcVolunteerPolyDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         icVolunteerPolyService.update(dto);
@@ -67,7 +69,7 @@ public class IcVolunteerPolyController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         icVolunteerPolyService.delete(ids);
@@ -78,12 +80,12 @@ public class IcVolunteerPolyController {
      * 【网格党建平面图】地图
      *
      * @param form
-     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.VolunteerPolyMapDataResultDTO>>
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.VolunteerPolyMapDataResultDTO>>
      * @author LZN
      * @date 2022/5/19 13:54
      */
     @PostMapping("/mapData")
-    public Result<List<VolunteerPolyMapDataResultDTO>> getMapData(@RequestBody VolunteerPolyMapDataFormDTO form, @LoginUser TokenDto tokenDto){
+    public Result<List<VolunteerPolyMapDataResultDTO>> getMapData(@RequestBody VolunteerPolyMapDataFormDTO form, @LoginUser TokenDto tokenDto) {
         form.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(form);
         List<VolunteerPolyMapDataResultDTO> dto = icVolunteerPolyService.getMapData(form);
@@ -99,7 +101,7 @@ public class IcVolunteerPolyController {
      * @date 2022/5/19 14:49
      */
     @PostMapping("list")
-    public Result<PageData> getList(@RequestBody VolunteerPolyListFormDTO form,@LoginUser TokenDto tokenDto){
+    public Result<PageData> getList(@RequestBody VolunteerPolyListFormDTO form, @LoginUser TokenDto tokenDto) {
         form.setCustomerId(tokenDto.getCustomerId());
         PageData data = icVolunteerPolyService.getList(form);
         return new Result<PageData>().ok(data);
@@ -107,27 +109,44 @@ public class IcVolunteerPolyController {
 
     /**
      * 抽取志愿者数据
+     *
      * @Param customerId
      * @Return {@link Result}
      * @Author zhaoqifeng
      * @Date 2022/5/19 15:41
      */
     @PostMapping("volunteerDataExtraction/{customerId}")
-    public Result volunteerDataExtraction(@PathVariable("customerId") String customerId){
+    public Result volunteerDataExtraction(@PathVariable("customerId") String customerId) {
         icVolunteerPolyService.volunteerDataExtraction(customerId);
         return new Result();
     }
 
     /**
      * 志愿者变动
+     *
      * @Param form
      * @Return {@link Result}
      * @Author zhaoqifeng
      * @Date 2022/5/19 18:05
      */
     @PostMapping("volunteerChanged")
-    public Result volunteerChanged(@RequestBody MqBaseFormDTO form){
+    public Result volunteerChanged(@RequestBody MqBaseFormDTO form) {
         icVolunteerPolyService.volunteerChanged(form);
         return new Result();
     }
+
+    /**
+     * 【网格党建平面图】饼图
+     *
+     * @param form
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.VolunteerPolyPieResultDTO>
+     * @author LZN
+     * @date 2022/5/19 17:21
+     */
+    @PostMapping("statistics")
+    public Result<List<VolunteerPolyPieResultDTO>> getStatistics(@RequestBody VolunteerPolyPieFormDTO form) {
+        List<VolunteerPolyPieResultDTO> dto = icVolunteerPolyService.getStatistics(form);
+        return new Result<List<VolunteerPolyPieResultDTO>>().ok(dto);
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVolunteerPolyDao.java

@@ -1,8 +1,10 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.VolunteerPolyPieFormDTO;
 import com.epmet.dto.result.VolunteerPolyListResultDTO;
 import com.epmet.dto.result.VolunteerPolyMapDataResultDTO;
+import com.epmet.dto.result.VolunteerPolyPieResultDTO;
 import com.epmet.entity.IcVolunteerPolyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -34,4 +36,6 @@ public interface IcVolunteerPolyDao extends BaseDao<IcVolunteerPolyEntity> {
 
     void deleteDataByCustomerId(@Param("customerId") String customerId);
     void deleteCategoryByCustomerId(@Param("customerId") String customerId);
+
+    List<VolunteerPolyPieResultDTO> getStatistics(VolunteerPolyPieFormDTO form);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVolunteerPolyService.java

@@ -6,7 +6,9 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcVolunteerPolyDTO;
 import com.epmet.dto.form.VolunteerPolyListFormDTO;
 import com.epmet.dto.form.VolunteerPolyMapDataFormDTO;
+import com.epmet.dto.form.VolunteerPolyPieFormDTO;
 import com.epmet.dto.result.VolunteerPolyMapDataResultDTO;
+import com.epmet.dto.result.VolunteerPolyPieResultDTO;
 import com.epmet.entity.IcVolunteerPolyEntity;
 
 import java.util.List;
@@ -102,6 +104,7 @@ public interface IcVolunteerPolyService extends BaseService<IcVolunteerPolyEntit
 
     /**
      * 志愿者数据抽取
+     *
      * @Param customerId
      * @Return void
      * @Author zhaoqifeng
@@ -118,4 +121,14 @@ public interface IcVolunteerPolyService extends BaseService<IcVolunteerPolyEntit
      * @Date 2022/5/19 16:02
      */
     void volunteerChanged(MqBaseFormDTO dto);
+
+    /**
+     * 【网格党建平面图】饼图
+     *
+     * @param form
+     * @return com.epmet.dto.result.VolunteerPolyPieResultDTO
+     * @author LZN
+     * @date 2022/5/19 17:21
+     */
+    List<VolunteerPolyPieResultDTO> getStatistics(VolunteerPolyPieFormDTO form);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java

@@ -10,12 +10,15 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcVolunteerPolyCategoryDao;
@@ -23,17 +26,21 @@ import com.epmet.dao.IcVolunteerPolyDao;
 import com.epmet.dao.UserBaseInfoDao;
 import com.epmet.dto.IcVolunteerPolyDTO;
 import com.epmet.dto.VolunteerInfoDTO;
+import com.epmet.dto.form.IcFormOptionsQueryFormDTO;
 import com.epmet.dto.form.VolunteerPolyListFormDTO;
 import com.epmet.dto.form.VolunteerPolyMapDataFormDTO;
 import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
 import com.epmet.dto.result.VolunteerPolyListResultDTO;
 import com.epmet.dto.result.VolunteerPolyMapDataResultDTO;
 import com.epmet.entity.IcResiUserEntity;
+import com.epmet.dto.form.VolunteerPolyPieFormDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.IcVolunteerPolyCategoryEntity;
 import com.epmet.entity.IcVolunteerPolyEntity;
 import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.feign.EpmetHeartOpenFeignClient;
 import com.epmet.service.IcVolunteerPolyCategoryService;
+import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.IcVolunteerPolyService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -45,10 +52,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import javax.annotation.Resource;
-import java.util.Arrays;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -61,6 +66,8 @@ import java.util.stream.Collectors;
 @Slf4j
 public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyDao, IcVolunteerPolyEntity> implements IcVolunteerPolyService {
 
+    @Resource
+    private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
     @Resource
     private IcResiUserDao icResiUserDao;
     @Resource
@@ -88,8 +95,8 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
         return ConvertUtils.sourceToTarget(entityList, IcVolunteerPolyDTO.class);
     }
 
-    private QueryWrapper<IcVolunteerPolyEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<IcVolunteerPolyEntity> getWrapper(Map<String, Object> params) {
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<IcVolunteerPolyEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -134,7 +141,7 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
      */
     @Override
     public List<VolunteerPolyMapDataResultDTO> getMapData(VolunteerPolyMapDataFormDTO form) {
-        List<VolunteerPolyMapDataResultDTO> dto = baseDao.getMapData(form.getCode(),form.getCustomerId());
+        List<VolunteerPolyMapDataResultDTO> dto = baseDao.getMapData(form.getCode(), form.getCustomerId());
         // 获取gridName
         for (VolunteerPolyMapDataResultDTO item : dto) {
             if (StringUtils.isNotEmpty(item.getGridId())) {
@@ -144,9 +151,9 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
                 }
             }
             // 获取houseName
-            if(StringUtils.isNotEmpty(item.getHomeId())) {
+            if (StringUtils.isNotEmpty(item.getHomeId())) {
                 HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(form.getCustomerId(), item.getHomeId());
-                if(null != houseInfo) {
+                if (null != houseInfo) {
                     item.setHouseName(houseInfo.getHouseName());
                 }
             }
@@ -164,8 +171,8 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
      */
     @Override
     public PageData getList(VolunteerPolyListFormDTO form) {
-        PageHelper.startPage(form.getPageNo(),form.getPageSize());
+        PageHelper.startPage(form.getPageNo(), form.getPageSize());
-        List<VolunteerPolyListResultDTO> result = baseDao.getList(form.getCode(),form.getCustomerId());
+        List<VolunteerPolyListResultDTO> result = baseDao.getList(form.getCode(), form.getCustomerId());
         PageInfo<VolunteerPolyListResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }
@@ -206,7 +213,7 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
             partition.forEach(part -> userList.addAll(getUserInfoList(part)));
             Map<String, UserBaseInfoEntity> userMap = userList.stream().collect(Collectors.toMap(UserBaseInfoEntity::getUserId, a -> a, (o, n) -> o));
             //将居民志愿者转成map
-            Map<String, IcVolunteerPolyDTO> volunteerMap = volunteerList.stream().collect(Collectors.toMap(IcVolunteerPolyDTO::getIdCard,a -> a, (o, n) -> o));
+            Map<String, IcVolunteerPolyDTO> volunteerMap = volunteerList.stream().collect(Collectors.toMap(IcVolunteerPolyDTO::getIdCard, a -> a, (o, n) -> o));
             //小程序与居民信息匹配不上的志愿者
             List<IcVolunteerPolyDTO> notInList = new ArrayList<>();
             appVolunteerList.forEach(item -> {
@@ -224,7 +231,7 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
                 }
             });
             //将小程序的志愿者列表转成map
-            Map<String, IcVolunteerPolyDTO> appVolunteerMap = appVolunteerList.stream().collect(Collectors.toMap(IcVolunteerPolyDTO::getIdCard,a -> a, (o, n) -> o));
+            Map<String, IcVolunteerPolyDTO> appVolunteerMap = appVolunteerList.stream().collect(Collectors.toMap(IcVolunteerPolyDTO::getIdCard, a -> a, (o, n) -> o));
             ////小程序与居民信息匹配上的志愿者userId更新到居民志愿者列表
             volunteerList.forEach(item -> {
                 if (appVolunteerMap.containsKey(item.getIdCard())) {
@@ -354,7 +361,7 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
         ResiUserBaseInfoResultDTO user = userBaseInfoDao.selecUserBaseInfoByUserId(userId);
         if (null != user) {
             //获取志愿者信息
-            Result<VolunteerInfoDTO> volunteerResult =  epmetHeartOpenFeignClient.queryUserVolunteerInfo(userId);
+            Result<VolunteerInfoDTO> volunteerResult = epmetHeartOpenFeignClient.queryUserVolunteerInfo(userId);
             if (!volunteerResult.success()) {
                 log.error("志愿者变更-获取小程序志愿者失败");
             }
@@ -431,4 +438,36 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
         return userBaseInfoDao.selectList(userInfoWrapper);
     }
 
+    /**
+     * 【网格党建平面图】饼图
+     *
+     * @param form
+     * @return com.epmet.dto.result.VolunteerPolyPieResultDTO
+     * @author LZN
+     * @date 2022/5/19 17:21
+     */
+    @Override
+    public List<VolunteerPolyPieResultDTO> getStatistics(VolunteerPolyPieFormDTO form) {
+
+        List<VolunteerPolyPieResultDTO> list = baseDao.getStatistics(form);
+        Map<String, String> map = list.stream().collect(Collectors.toMap(VolunteerPolyPieResultDTO::getCode, VolunteerPolyPieResultDTO::getValue));
+
+        //获取志愿者类别
+        IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO();
+        optionsForm.setCustomerId(form.getCustomerId());
+        optionsForm.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
+        optionsForm.setColumnName("VOLUNTEER_CATEGORY");
+        Result<Map<String, String>> volunteerMap = operCustomizeOpenFeignClient.getOptionsMap(optionsForm);
+
+        Map<String, String> data = volunteerMap.getData();
+
+        return list.stream().map(item -> {
+            VolunteerPolyPieResultDTO dto = new VolunteerPolyPieResultDTO();
+            dto.setCode(item.getCode());
+            dto.setValue(item.getValue());
+            dto.setLabel(data.get(item.getValue()));
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml

@@ -46,7 +46,9 @@
         SELECT
             p.id,
             p.NAME,
-            p.mobile
+            p.mobile,
+            p.user_id,
+            p.IC_RESI_USER
         FROM
             ic_volunteer_poly p
             LEFT JOIN ic_volunteer_poly_category c ON p.ID_CARD = c.ID_CARD AND c.del_flag = '0'
@@ -54,6 +56,16 @@
             c.VOLUNTEER_CATEGORY = #{code}
             AND c.CUSTOMER_ID = #{customerId}
     </select>
+    <select id="getStatistics" resultType="com.epmet.dto.result.VolunteerPolyPieResultDTO">
+        SELECT
+            c.VOLUNTEER_CATEGORY AS CODE,
+            count( p.id ) AS value
+        FROM
+            ic_volunteer_poly p
+            LEFT JOIN ic_volunteer_poly_category c ON p.ID_CARD = c.ID_CARD
+        GROUP BY
+            c.VOLUNTEER_CATEGORY
+    </select>
     <delete id="deleteDataByCustomerId">
         delete from ic_volunteer_poly where CUSTOMER_ID = #{customerId}
     </delete>