Browse Source

烟台需求:居民原始数据导出

master
lichao 2 years ago
parent
commit
79079e184b
  1. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
  2. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
  3. BIN
      epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_export_for_langchao.xlsx
  4. 24
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiListLangchaoFormDTO.java
  5. 115
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiLangchaoListResultDTO.java
  6. 30
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
  7. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
  8. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
  9. 61
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
  10. BIN
      epmet-user/epmet-user-server/src/main/resources/excel/resi_export_for_langchao.xlsx
  11. 10
      epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@ -725,7 +725,7 @@ public class HouseController implements ResultDataResolver {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
msg.setOperateTime(new Date()); msg.setOperateTime(new Date());
msg.setContent("导出langchao房屋数据"); msg.setContent("导出langchao房屋数据");
msg.setType("exportHouse"); msg.setType("exportHouseForLangchao");
msg.setTypeDisplay("导出langchao房屋数据"); msg.setTypeDisplay("导出langchao房屋数据");
msg.setUserId(tokenDto.getUserId()); msg.setUserId(tokenDto.getUserId());
msg.setFromApp(tokenDto.getApp()); msg.setFromApp(tokenDto.getApp());

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@ -580,9 +580,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
PageHelper.startPage(pageNo, pageSize); PageHelper.startPage(pageNo, pageSize);
icHouseExcels = icHouseDao.searchHouseForLangchao(formDTO); icHouseExcels = icHouseDao.searchHouseForLangchao(formDTO);
if (CollectionUtils.isEmpty(icHouseExcels)) { /* if (CollectionUtils.isEmpty(icHouseExcels)) {
break; break;
} }*/
excelWriter.fill(icHouseExcels, writeSheet); excelWriter.fill(icHouseExcels, writeSheet);
pageNo++; pageNo++;
} while (icHouseExcels.size() == pageSize); } while (icHouseExcels.size() == pageSize);

BIN
epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_export_for_langchao.xlsx

Binary file not shown.

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

@ -0,0 +1,24 @@
package com.epmet.dto.form;/**
* Created by 11 on 2020/3/19.
*/
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
/**
* @Description 烟台需求langchao数据导出
* @ClassName HouseListLangchaoFormDTO
* @Author lc
* @date 2023.03.19 15:00
*/
@Data
public class ResiListLangchaoFormDTO extends PageFormDTO {
private static final long serialVersionUID = -1L;
// 社区名称
private String communityName;
// 街道名称
private String streetName;
}

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

@ -0,0 +1,115 @@
package com.epmet.dto.result;
import lombok.Data;
import org.aspectj.weaver.ast.Not;
import java.io.Serializable;
import java.util.Date;
import java.util.Set;
/**
* desc 烟台需求提供langchao数据
*
* @author liujianjun
*/
@Data
public class ResiLangchaoListResultDTO implements Serializable {
private static final long serialVersionUID = 4963952996288796744L;
private Integer seqNo;
private String areaName;
private String streetName;
private String communityName;
private String name;
private String idType;
private String idCard;
private String phone;
private String tenement;
private String tag;
private String livingProvince;
private String livingCity;
private String livingArea;
private String livingStreet;
private String livingCommunity;
private String livingViliageName;
private String livingBuildingNo;
private String livingUnitNo;
private String livingHouseNo;
private String livingAddress;
private String isNowLive;
private String role;
private String registerProvince;
private String registerCity;
private String registerArea;
private String registerStreet;
private String registerCommunity;
private String registerViliageName;
private String registerBuildingNo;
private String registerUnitNo;
private String registerHouseNo;
private String registerAddress;
private String householdCategory;
private String householdId;
private String character;
private String politicsStatus;
private String nation;
private String marriage;
private String focusGroups;
private String nationality;
private String remark;
private Date createTime;
private Date updateTime;
private Date pushTime;
private String operateType;
private String orgKey;
private String custKey;
}

30
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@ -1618,4 +1618,34 @@ public class IcResiUserController implements ResultDataResolver {
} }
} }
/**
* @Description: 烟台需求langchao未导入数据提供导入
* @param response:
* @param tokenDto:
* @Return void
* @Author: lichao
* @Date: 2023/6/28 13:57
*/
@GetMapping("exportResiForLangchao")
public void exportResiForLangchao(HttpServletResponse response,@LoginUser TokenDto tokenDto) throws Exception {
icResiUserService.exportResiForLangchao(response);
// 新增操作日志
CheckMQMsg msg = new CheckMQMsg();
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
msg.setOperateTime(new Date());
msg.setContent("导出langchao居民数据");
msg.setType("exportResiForLangchao");
msg.setTypeDisplay("导出langchao居民数据");
msg.setUserId(tokenDto.getUserId());
msg.setFromApp(tokenDto.getApp());
msg.setIp(IpUtils.getIpAddr(request));
msg.setFromClient(tokenDto.getClient());
SystemMsgFormDTO form = new SystemMsgFormDTO();
form.setMessageType(TopicConstants.CHECK_OR_EXPORT);
form.setContent(msg);
epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
}
} }

2
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@ -503,4 +503,6 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
* @return * @return
*/ */
IcResiUserEntity getById(String icResiUserId); IcResiUserEntity getById(String icResiUserId);
List<ResiLangchaoListResultDTO> searchResiForLangchao(ResiListLangchaoFormDTO formDTO);
} }

2
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@ -602,4 +602,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
Integer pageNo, Integer pageSize, Integer pageNo, Integer pageSize,
String orgId, String orgType, String orgId, String orgType,
String codeType,String code); String codeType,String code);
void exportResiForLangchao(HttpServletResponse response) throws Exception;
} }

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

@ -74,6 +74,7 @@ import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO;
import com.epmet.opendata.dto.form.SaveCaResidentUserFormDTO; import com.epmet.opendata.dto.form.SaveCaResidentUserFormDTO;
import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO; import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO;
import com.epmet.opendata.feign.GuardarDatosFeignClient; import com.epmet.opendata.feign.GuardarDatosFeignClient;
import com.epmet.remote.EpmetUserRemoteService;
import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
import com.epmet.service.*; import com.epmet.service.*;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
@ -96,6 +97,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
@ -184,6 +186,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
@Autowired @Autowired
private IcVaccineRelationDao icVaccineRelationDao; private IcVaccineRelationDao icVaccineRelationDao;
@Autowired
private EpmetUserRemoteService epmetUserRemoteService;
/** /**
* 组织字段目前用于居民信息动态查询接口将此条件从conditions中移除单独生成固定的sql片段 * 组织字段目前用于居民信息动态查询接口将此条件从conditions中移除单独生成固定的sql片段
@ -4187,4 +4191,61 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
PageInfo<ResiPortrayalDetailDTO> pageInfo = new PageInfo<>(list); PageInfo<ResiPortrayalDetailDTO> pageInfo = new PageInfo<>(list);
return new PageData<>(list, pageInfo.getTotal(), pageSize); return new PageData<>(list, pageInfo.getTotal(), pageSize);
} }
@Override
public void exportResiForLangchao(HttpServletResponse response) throws Exception{
//导出居民
ResiListLangchaoFormDTO formDTO = new ResiListLangchaoFormDTO();
// 获取agency 查看是否
Result<CustomerAgencyDTO> agency = govOrgOpenFeignClient.getAgencyById(epmetUserRemoteService.getLoginUserDetails().getAgencyId());
if (!agency.getData().getLevel().equals("community")){
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "只有社区才可以导出", "只有社区才可以导出");
}
Result<CustomerAgencyDTO> agencyPid = govOrgOpenFeignClient.getAgencyById(agency.getData().getPid());
formDTO.setStreetName(agencyPid.getData().getOrganizationName());
formDTO.setCommunityName(agency.getData().getOrganizationName());
// formDTO.setStreetName("白石街道");
// formDTO.setCommunityName("丽都社区");
List<ResiLangchaoListResultDTO> resiList = null;
Integer pageNo = NumConstant.ONE;
Integer pageSize = NumConstant.TWO_THOUSAND;
// formDTO.setPageSize(NumConstant.TEN_THOUSAND);
ExcelWriter excelWriter = null;
long start = System.currentTimeMillis();
try {
String templatePath = "excel/resi_export_for_langchao.xlsx";
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(templatePath);
excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("居民原始数据.xlsx", response))
.withTemplate(inputStream).build();
WriteSheet writeSheet = EasyExcel.writerSheet().build();
do {
PageHelper.startPage(pageNo, pageSize);
resiList = icResiUserDao.searchResiForLangchao(formDTO);
/* if (org.springframework.util.CollectionUtils.isEmpty(resiList)) {
break;
}*/
excelWriter.fill(resiList, writeSheet);
pageNo++;
} while (resiList.size() == pageSize);
} catch (EpmetException e) {
response.reset();
response.setCharacterEncoding("UTF-8");
response.setHeader("content-type", "application/json; charset=UTF-8");
PrintWriter printWriter = response.getWriter();
Result<Object> result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg());
printWriter.write(JSON.toJSONString(result));
printWriter.close();
} finally {
if (excelWriter != null) {
excelWriter.finish();
}
log.info("exportBuildinginfo cost:{}ms",System.currentTimeMillis()-start);
}
}
} }

BIN
epmet-user/epmet-user-server/src/main/resources/excel/resi_export_for_langchao.xlsx

Binary file not shown.

10
epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@ -1741,4 +1741,14 @@
<select id="getById" parameterType="java.lang.String" resultType="com.epmet.entity.IcResiUserEntity"> <select id="getById" parameterType="java.lang.String" resultType="com.epmet.entity.IcResiUserEntity">
select r.* from ic_resi_user r where r.id = #{icResiUserId} select r.* from ic_resi_user r where r.id = #{icResiUserId}
</select> </select>
<select id="searchResiForLangchao" resultType="com.epmet.dto.result.ResiLangchaoListResultDTO">
select *
from init_ods_community_people_result
where
streetName = #{streetName}
and
communityName = #{communityName}
</select>
</mapper> </mapper>

Loading…
Cancel
Save