fix：修改bug

DESKTOP-71BH0QO\L、ming

2021-04-02 8555f974846ca5b4f4734f52b51e39cd4502df44

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -1,12 +1,10 @@
package com.panzhihua.service_user.api;

import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
@@ -150,6 +148,15 @@
    @PostMapping("listtag")
    public R listTag(){
        return userService.listTag();
    }

    /**
     * 查询当前社区所有标签以及预设标签
     * @return 标签集合
     */
    @PostMapping("listtag/getTag")
    public R listTags(@RequestParam("communityId") Long communityId){
        return userService.listTags(communityId);
    }

    /**
@@ -602,4 +609,129 @@
    public R getSysUserVOByPhone(@RequestParam(value = "phone") String phone){
        return userService.getSysUserVOByPhone(phone);
    }

    /**
     *分页查询人口管理
     * @param pageInputUserDTO 查询参数
     * @return 分页数据
     */
    @PostMapping("common/data/user/page")
    public R pageInputUser(@RequestBody PageInputUserDTO pageInputUserDTO){
        return sysUserInputService.pageInputUser(pageInputUserDTO);
    }

    /**
     * 设置用户标签
     * @param inputUserTagsDTO 标签信息
     * @return 设置结果
     */
    @PostMapping("common/data/user/tags")
    public R setInputUserTag(@RequestBody InputUserTagsDTO inputUserTagsDTO){
        return sysUserInputService.putUserTag(inputUserTagsDTO);
    }

    /**
     * 批量导入居民用户
     * @param list 居民用户集合
     * @param areaName 小区名字
     * @return 导入结果
     */
    @PostMapping("common/data/user/import")
    public R batchSaveInputUser(@RequestBody List<EexcelUserDTO> list,@RequestParam("areaName")StringBuffer areaName){
        R r = null;
        try {
            r = sysUserInputService.batchSaveUser(list, areaName);
        } catch (Exception e) {
            String message = e.getMessage();
            log.error(message);
            if (message.contains("unique_id_card")) {
                int i = message.indexOf("'");
                String idcard = message.substring(i + 1, message.indexOf("'", i + 1));
//                System.out.println(idcard);
                return R.fail("身份证存在重复"+idcard);
            }else {
                return R.fail(e.getMessage());
            }
        }
        return r;
    }

    /**
     *  居民管理》居民详情
     * @param id 人员id
     * @return CommunityUserInfoVO
     */
    @PostMapping("common/data/user/detail")
    public R inputUserDetail(@RequestParam("id")Long id){
        return sysUserInputService.inputUserDetail(id);
    }

    /**
     *  用户搜索了就下载搜索的用户否则下载所有用户
     * @param exportUserDTO 用户搜索内容
     * @return List<EexcelUserDTO> excel内容
     */
    @PostMapping("common/data/user/export")
    public R inputUserExport(@RequestBody ExportUserDTO exportUserDTO){
        return sysUserInputService.exportInputUser(exportUserDTO);
    }

    /**
     * 特殊群体
     * @param pageInputUserDTO
     * @return
     */
    @PostMapping("common/data/special/page")
    R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO) {
        return sysUserInputService.specialInputUser(pageInputUserDTO);
    }

    /**
     * 特殊群体
     * @param id
     * @return
     */
    @DeleteMapping("common/data/special/delete")
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id) {
        return sysUserInputService.deleteSpecialInputUser(id);
    }
    /**
     * 特殊群体标签列表
     * @param comMngUserTagDTO
     * @return
     */
    @PostMapping("common/data/special/tags/page")
    R specialInputUserTags(@RequestBody ComMngUserTagDTO comMngUserTagDTO) {
        return sysUserInputService.specialInputUserTags(comMngUserTagDTO);
    }

    /**
     * 新增或修改特殊群体标签
     * @param comMngTagVO
     * @return
     */
    @PostMapping("common/data/special/tags/save")
    R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO) {
        return sysUserInputService.saveSpecialInputUserTags(comMngTagVO);
    }

    /**
     * 删除特殊群体标签
     * @param id
     * @return
     */
    @DeleteMapping("common/data/special/tags/delete")
    R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id) {
        return sysUserInputService.deleteSpecialInputUserTags(id);
    }

    /**
     * 特殊群体导出
     * @param exportSpecialUserDTO
     * @return
     */
    @PostMapping("common/data/special/export")
    R specialUserExport(@RequestBody ExportSpecialUserDTO exportSpecialUserDTO) {
        return sysUserInputService.specialUserExport(exportSpecialUserDTO);
    }
}