all

huanghongfa

2021-02-20 50c0239af826da55e07f2d4c7508c1ae5e3b6031

all

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,54 +23,16 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityUserInfoVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/FileUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/IdCard.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/excel/CustomSheetWriteHandler.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserInputDO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/SysUserInputService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportUserDTO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/logback-spring.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/logback-spring.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/logback-spring.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/SFTPUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/SFTPUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/exceptions/GlobalExceptionCapture.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/exceptions/GlobalExceptionCapture.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/user/EexcelUserDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/user/EexcelUserDTO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/LoginUserInfoVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/LoginUserInfoVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/user/UserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/user/UserService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/SFTPUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/SFTPUtil.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/easyexcel/UploadEexcelUserDTOListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/easyexcel/UploadEexcelUserDTOListener.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/logback-spring.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructAreaDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructAreaDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructHouseUserDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngStructHouseUserDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructAreaService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructAreaService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/logback-spring.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/logback-spring.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/logback-spring.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/zuul/src/main/java/com/panzhihua/zuul/filters/SercuritFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/java/com/panzhihua/zuul/filters/SercuritFilter.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/logback-spring.xml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -478,7 +440,7 @@
      <workItem from="1613609849178" duration="13230000" />
      <workItem from="1613633203630" duration="14394000" />
      <workItem from="1613714097966" duration="14584000" />
      <workItem from="1613782093187" duration="3257000" />
      <workItem from="1613782093187" duration="9984000" />
    </task>
    <servers />
  </component>
@@ -506,10 +468,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="464" y="213" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1536.824@0.0.1536.824" timestamp="1612177264050" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1613725347160">
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1613788451041">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1613725347160" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1613788451041" />
    <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -538,54 +500,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1612426172959" />
    <state width="1031" height="320" key="GridCell.Tab.0.bottom" timestamp="1613785266855">
    <state width="1031" height="196" key="GridCell.Tab.0.bottom" timestamp="1613798144902">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="320" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613785266855" />
    <state width="1031" height="320" key="GridCell.Tab.0.center" timestamp="1613785266855">
    <state width="1031" height="196" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.0.center" timestamp="1613798144902">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="320" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1613785266855" />
    <state width="1031" height="320" key="GridCell.Tab.0.left" timestamp="1613785266854">
    <state width="1031" height="196" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.0.left" timestamp="1613798144902">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="320" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1613785266854" />
    <state width="1031" height="320" key="GridCell.Tab.0.right" timestamp="1613785266855">
    <state width="1031" height="196" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.0.right" timestamp="1613798144902">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="320" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1613785266855" />
    <state width="1031" height="320" key="GridCell.Tab.1.bottom" timestamp="1613785266855">
    <state width="1031" height="196" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.1.bottom" timestamp="1613798144903">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="320" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613785266855" />
    <state width="1031" height="320" key="GridCell.Tab.1.center" timestamp="1613785266855">
    <state width="1031" height="196" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613798144903" />
    <state width="1031" height="196" key="GridCell.Tab.1.center" timestamp="1613798144902">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="320" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1613785266855" />
    <state width="1031" height="320" key="GridCell.Tab.1.left" timestamp="1613785266855">
    <state width="1031" height="196" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.1.left" timestamp="1613798144902">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="320" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1613785266855" />
    <state width="1031" height="320" key="GridCell.Tab.1.right" timestamp="1613785266855">
    <state width="1031" height="196" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.1.right" timestamp="1613798144902">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="320" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1613785266855" />
    <state width="1031" height="320" key="GridCell.Tab.2.bottom" timestamp="1613785266855">
    <state width="1031" height="196" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1613798144902" />
    <state width="1031" height="196" key="GridCell.Tab.2.bottom" timestamp="1613798144903">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="320" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613785266855" />
    <state width="1031" height="320" key="GridCell.Tab.2.center" timestamp="1613785266855">
    <state width="1031" height="196" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613798144903" />
    <state width="1031" height="196" key="GridCell.Tab.2.center" timestamp="1613798144903">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="320" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1613785266855" />
    <state width="1031" height="320" key="GridCell.Tab.2.left" timestamp="1613785266855">
    <state width="1031" height="196" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1613798144903" />
    <state width="1031" height="196" key="GridCell.Tab.2.left" timestamp="1613798144903">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="320" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1613785266855" />
    <state width="1031" height="320" key="GridCell.Tab.2.right" timestamp="1613785266855">
    <state width="1031" height="196" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1613798144903" />
    <state width="1031" height="196" key="GridCell.Tab.2.right" timestamp="1613798144903">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="320" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1613785266855" />
    <state width="1031" height="196" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1613798144903" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1612603382513">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -626,29 +588,20 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="131" y="82" key="new project wizard/0.0.1536.824@0.0.1536.824" timestamp="1610606891357" />
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog" timestamp="1612596211909">
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog" timestamp="1613788208222">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog/0.0.1536.824@0.0.1536.824" timestamp="1612596211909" />
    <state x="545" y="169" key="refactoring.ChangeSignatureDialog/0.0.1536.824@0.0.1536.824" timestamp="1613788208222" />
    <state x="425" y="187" key="run.anything.popup" timestamp="1611565231827">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1611565231827" />
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1613705386044">
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1613787820637">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1613705386044" />
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1613787820637" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java</url>
          <line>79</line>
          <option name="timeStamp" value="11" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
    <pin-to-top-manager>
      <pinned-members>
        <PinnedItemInfo parentTag="com.panzhihua.common.model.vos.R" memberName="data" />

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ExportUserDTO.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 居民excel导出查询参数
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-02-20 10:27
 **/
@Data
@ApiModel("居民excel导出查询参数")
public class ExportUserDTO {
    @ApiModelProperty(value = "姓名")
    private String name;
    @ApiModelProperty(value = "手机号")
    private String phone;
    @ApiModelProperty(value = "小区名字")
    private String areaName;
    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -865,4 +865,6 @@
     */
    @PostMapping("checkAreaHouse")
    R checkAreaHouse(@RequestParam("id")Long id);


}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -1,6 +1,7 @@
package com.panzhihua.common.service.user;

import com.panzhihua.common.model.dtos.PageDTO;
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;
@@ -10,6 +11,7 @@
import com.panzhihua.common.model.vos.MenuVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.user.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -526,4 +528,12 @@
     */
    @PostMapping("detailusercomunity")
    R detailUserComunity(@RequestParam("userId")Long userId);

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

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/ExportUserDTO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/user/UserService.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java

@@ -9,6 +9,7 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.FtpConstants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
@@ -586,17 +587,57 @@

    @ApiOperation(value = "导出" )
    @PostMapping("export")
    public R export(@RequestBody ComMngStructAreaVO comMngStructAreaVO){
    public R export(@RequestBody ExportUserDTO exportUserDTO){
        Long communityId = this.getCommunityId();
        comMngStructAreaVO.setCommunityId(communityId);
        exportUserDTO.setCommunityId(communityId);
        String url=excelUrl;
        String uuid= UUID.randomUUID().toString().replace("-","");
        String fileName=url+uuid+".xlsx";
//        R r=communityService.export(comMngStructAreaVO);
//        if (R.isOk(r)) {
//            List<EexcelUserDTO>eexcelUserDTOS=JSONArray.parseArray(JSONArray.toJSONString(r.getData()),EexcelUserDTO.class);
//
//        }
        return R.ok(fileName);
        String name=uuid+".xlsx";
        String ftpUrl="/mnt/data/web/excel/";
//        用户搜索了就下载搜索的用户否则下载所有用户
        R r=userService.export(exportUserDTO);
        if (R.isOk(r)) {
            List<EexcelUserDTO>eexcelUserDTOS=JSONArray.parseArray(JSONArray.toJSONString(r.getData()),EexcelUserDTO.class);
            try {
                SFTPUtil sftp = new SFTPUtil(userName,password,host,port);
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl+name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator+name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream=null;
                    try {
                        excelWriter = EasyExcel.write(fileName, EexcelUserDTO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("模板").build();
                        excelWriter.write(eexcelUserDTOS, writeSheet);
                        excelWriter.finish();
                        File file=new File(fileName);
                        inputStream=new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】",absolutePath,delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                        if (excelWriter != null) {
                            excelWriter.finish();
                        }
                    }
                }
                return R.ok(url+name);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return R.fail("未查询到用户");
    }
}

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

@@ -1,6 +1,7 @@
package com.panzhihua.service_user.api;

import com.panzhihua.common.model.dtos.PageDTO;
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;
@@ -584,4 +585,14 @@
        }
        return R.ok(communityUserInfoVO);
    }

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

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.vos.IndexDataKanbanVO;
import com.panzhihua.common.model.vos.IndexDataVO;
@@ -297,4 +299,98 @@
            "WHERE\n" +
            "\ta.area_name = #{areaName}")
    Integer selectCountHouse(String areaName);

    @Select("<script> " +
            "SELECT\n" +
            "u.user_id 'order',\n" +
            "h.house_name doorNumber,\n" +
            "if(h.state=2,'租住','自主')isRent,\n" +
            "u.`name`,\n" +
            "'汉' nation,\n" +
            "if(u.is_partymember=1,'党员','群众')politicalOutlook,\n" +
            "'未知' maritalStatus,\n" +
            "u.phone,\n" +
            "'未知' education,\n" +
            "u.id_card,\n" +
            "'未知' company,\n" +
            "'未知' residence,\n" +
            "'未知' isPanZhiHua,\n" +
            "'未知' situation,\n" +
            "'未知' isContact,\n" +
            "'未知' major,\n" +
            "'未知' soldier,\n" +
            "'未知' disability,\n" +
            "'未知' lowIncomeHouseholds,\n" +
            "'未知' lowIncomePeople,\n" +
            "'未知' oldPeople,\n" +
            "'未知' specialServiceFamily,\n" +
            "'未知' keyPersonnel\n" +
            "FROM\n" +
            "sys_user u\n" +
            "left join com_mng_struct_house_user hu on hu.user_id=u.user_id\n"+
            "left join com_mng_struct_house h on hu.house_code=h.house_code\n"+
            "<if test='exportUserDTO.areaName != null and exportUserDTO.areaName.trim() != &quot;&quot;'>" +
            " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
            " </if> " +
            "<if test='exportUserDTO.areaName == null or exportUserDTO.areaName.trim() == &quot;&quot;'>" +
            "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
            " </if> " +
            "<if test='exportUserDTO.areaName != null and exportUserDTO.areaName.trim() != &quot;&quot;'>" +
            "AND c.`area_name` like concat(#{exportUserDTO.areaName},'%')  \n" +
            " </if> " +
            " where u.community_id=#{exportUserDTO.communityId} and u.type=1 " +
            "<if test='exportUserDTO.name != null and exportUserDTO.name.trim() != &quot;&quot;'>" +
            " and u.`name` like concat(#{exportUserDTO.name},'%')  \n" +
            " </if> " +
            "<if test='exportUserDTO.phone != null and exportUserDTO.phone.trim() != &quot;&quot;'>" +
            "AND u.phone like concat(#{exportUserDTO.phone},'%') " +
            " </if> " +
            " group by u.user_id  "+

            "union all "+
            "SELECT \n" +
            "u.id+100000000 'order',\n" +
            "u.door_number doorNumber,\n" +
            "u.is_rent isRent,\n" +
            "u.name,\n" +
            "u.nation,\n" +
            "case u.political_outlook when 1 then '党员'  when 2 then '团员' else '群众' end politicalOutlook,\n" +
            "if(u.marital_status=1,'已婚','未婚')maritalStatus,\n" +
            "u.phone,\n" +
            "u.education,\n" +
            "u.id_card,\n" +
            "u.company,\n" +
            "u.residence,\n" +
            "if(u.is_panzhiHua=1,'是','否') isPanZhiHua,\n" +
            "u.situation,\n" +
            "if(is_contact=1,'是','否') isContact,\n" +
            "if(u.major=1,'是','否') major,\n" +
            "if(u.soldier=1,'是','否') soldier,\n" +
            "if(u.disability=1,'是','否') disability,\n" +
            "if(u.lowIncome_households=1,'是','否') lowIncomeHouseholds,\n" +
            "if(u.lowIncome_people=1,'是','否') lowIncomePeople,\n" +
            "if(u.old_people=1,'是','否') oldPeople,\n" +
            "if(u.special_service_family=1,'是','否') specialServiceFamily,\n" +
            "if(u.key_personnel=1,'是','否') keyPersonnel\n" +
            "FROM\n" +
            "\tsys_user_input u\n" +
            "\tLEFT JOIN sys_user su on su.id_card=u.id_card"+
            "<if test='exportUserDTO.areaName != null and exportUserDTO.areaName.trim() != &quot;&quot;'>" +
            " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
            " </if> " +
            "<if test='exportUserDTO.areaName == null or exportUserDTO.areaName.trim() == &quot;&quot;'>" +
            "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
            " </if> " +
            "<if test='exportUserDTO.areaName != null and exportUserDTO.areaName.trim() != &quot;&quot;'>" +
            "AND c.`area_name` like concat(#{exportUserDTO.areaName},'%')  \n" +
            " </if> " +
            " where u.community_id=#{exportUserDTO.communityId} " +
            "<if test='exportUserDTO.phone != null and exportUserDTO.phone.trim() != &quot;&quot;'>" +
            "AND u.phone like concat(#{exportUserDTO.phone},'%') " +
            " </if> " +
            "<if test='exportUserDTO.name != null and exportUserDTO.name.trim() != &quot;&quot;'>" +
            " and u.`name` like concat(#{exportUserDTO.name},'%')  \n" +
            " </if> " +
            "</script>")
    List<EexcelUserDTO> selectExport(@Param("exportUserDTO") ExportUserDTO exportUserDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_user.service;

import com.panzhihua.common.model.dtos.PageDTO;
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;
@@ -337,4 +338,10 @@
     * @return CommunityUserInfoVO
     */
    CommunityUserInfoVO detailUserComunity(Long userId);
    /**
     *  用户搜索了就下载搜索的用户否则下载所有用户
     * @param exportUserDTO 用户搜索内容
     * @return List<EexcelUserDTO> excel内容
     */
    R export(ExportUserDTO exportUserDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -8,7 +8,9 @@
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.PageDTO;
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;
@@ -1471,6 +1473,18 @@
        return communityUserInfoVO;
    }

    /**
     * 用户搜索了就下载搜索的用户否则下载所有用户
     *
     * @param exportUserDTO 用户搜索内容
     * @return List<EexcelUserDTO> excel内容
     */
    @Override
    public R export(ExportUserDTO exportUserDTO) {
        List<EexcelUserDTO> eexcelUserDTOS=userDao.selectExport(exportUserDTO);
        return R.ok(eexcelUserDTOS);
    }


    public static void main(String[] args) {
//        String encode = new BCryptPasswordEncoder().encode("lbsq123456");