Browse Source

我的家庭相关接口

feature/user_house_import
wanggongfeng 3 years ago
parent
commit
0075e46aa8
  1. 158
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomPersonroomController.java
  2. 80
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java
  3. 49
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java
  4. 98
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/CustomPersonroomService.java
  5. 97
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/CustomPersonroomServiceImpl.java

158
epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomPersonroomController.java

@ -0,0 +1,158 @@
package com.elink.esua.epdc.controller;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO;
import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO;
import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO;
import com.elink.esua.epdc.service.CustomEnterpriseService;
import com.elink.esua.epdc.service.CustomPersonroomService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* 房屋
*
* @author work@yujt.net.cn
* @date 2022/6/9 11:27
*/
@RestController
@RequestMapping("custom/personroom")
public class ApiCustomPersonroomController {
@Autowired
private CustomPersonroomService customPersonroomService;
/**
* @return list
* @Description 获取小区下拉列表
* @Author wgf
* @Date 2022/6/9 11:27
**/
@GetMapping("getPlotOption")
public Result getPlotOption(EpidemicPlotCoordinateDTO formDto) {
// ValidatorUtils.validateEntity(formDto);
return customPersonroomService.getPlotOption(formDto);
}
/**
* @return list
* @Description 获取楼栋下拉列表
* @Author wgf
* @Date 2022/6/9 11:27
**/
@GetMapping("getBuildingOption")
public Result getBuildingOption(EpidemicPlotBuildingDTO formDto) {
// ValidatorUtils.validateEntity(formDto);
return customPersonroomService.getBuildingOption(formDto);
}
/**
* @return list
* @Description 获取单元下拉列表
* @Author wgf
* @Date 2022/6/9 11:27
**/
@GetMapping("getUnitOption")
public Result getUnitOption(EpidemicBuildingUnitDTO formDto) {
// ValidatorUtils.validateEntity(formDto);
return customPersonroomService.getUnitOption(formDto);
}
/**
* @return list
* @Description 获取房屋下拉列表
* @Author wgf
* @Date 2022/6/9 11:27
**/
@GetMapping("getHouseOption")
public Result getHouseOption(EpidemicBuildingUnitDTO formDto) {
// ValidatorUtils.validateEntity(formDto);
return customPersonroomService.getHouseOption(formDto);
}
/**
* ++++++++++++++++++++++++ 以下是人员信息相关接口 +++++++++++++++++++++++++++++
*/
/**
* 获取成员信息
*
* @param formDTO
* @return
* @Author wanggongfeng
*/
@GetMapping("getFamilyMember")
public Result getFamilyMember(GetMemberListFormDTO formDTO){
//效验数据
ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
return customPersonroomService.getFamilyMember(formDTO);
}
/**
* 新增成员信息
*
* @param formDTO
* @return
* @Author wanggongfeng
*/
@PostMapping("addFamilyMember")
public Result addFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO){
//效验数据
ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
return customPersonroomService.addFamilyMember(formDTO);
}
/**
* 修改成员信息
*
* @param formDTO
* @return
* @Author wanggongfeng
*/
@PostMapping("updateFamilyMember")
public Result updateFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO){
//效验数据
ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
return customPersonroomService.updateFamilyMember(formDTO);
}
/**
* 获取房屋信息
*
* @param formDTO
* @return
* @Author wanggongfeng
*/
@GetMapping("getHouseInfo")
public Result getHouseInfo(@RequestBody GetHouseInfoFormDTO formDTO){
//效验数据
ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
return customPersonroomService.getHouseInfo(formDTO);
}
}

80
epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java

@ -13,6 +13,12 @@ import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO; import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO; import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO;
import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO;
import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO;
import com.elink.esua.epdc.dto.suggestion.form.MySuggestionFormDTO; import com.elink.esua.epdc.dto.suggestion.form.MySuggestionFormDTO;
import com.elink.esua.epdc.dto.suggestion.form.SuggestionMakeFormDTO; import com.elink.esua.epdc.dto.suggestion.form.SuggestionMakeFormDTO;
import com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO; import com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO;
@ -30,6 +36,7 @@ import java.util.List;
*/ */
@FeignClient(name = ServiceConstant.EPDC_CUSTOM_SERVER, fallback = CustomFeignClientFallback.class) @FeignClient(name = ServiceConstant.EPDC_CUSTOM_SERVER, fallback = CustomFeignClientFallback.class)
public interface CustomFeignClient { public interface CustomFeignClient {
/** /**
* @param formDTO * @param formDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result * @return com.elink.esua.epdc.commons.tools.utils.Result
@ -228,4 +235,77 @@ public interface CustomFeignClient {
*/ */
@DeleteMapping(value = "custom/tripreport/deleteTripById", consumes = MediaType.APPLICATION_JSON_VALUE) @DeleteMapping(value = "custom/tripreport/deleteTripById", consumes = MediaType.APPLICATION_JSON_VALUE)
Result deleteTripById(GetTripInfoFormDTO formDto); Result deleteTripById(GetTripInfoFormDTO formDto);
/**
* @return list
* @Description 获取小区下拉列表
* @Author wgf
* @Date 2022/6/9 11:27
**/
@GetMapping(value = "custom/epidemicplotcoordinate/getPlotOption", consumes = MediaType.APPLICATION_JSON_VALUE)
Result getPlotOption(EpidemicPlotCoordinateDTO formDto);
/**
* @return list
* @Description 获取楼栋下拉列表
* @Author wgf
* @Date 2022/6/9 11:27
**/
@GetMapping(value = "custom/epidemicplotcoordinate/getBuildingOption", consumes = MediaType.APPLICATION_JSON_VALUE)
Result getBuildingOption(EpidemicPlotBuildingDTO formDto);
/**
* @return list
* @Description 获取单元下拉列表
* @Author wgf
* @Date 2022/6/9 11:27
**/
@GetMapping(value = "custom/epidemicplotcoordinate/getUnitOption", consumes = MediaType.APPLICATION_JSON_VALUE)
Result getUnitOption(EpidemicBuildingUnitDTO formDto);
/**
* @return list
* @Description 获取房屋下拉列表
* @Author wgf
* @Date 2022/6/9 11:27
**/
@GetMapping(value = "custom/epidemicplotcoordinate/getHouseOption", consumes = MediaType.APPLICATION_JSON_VALUE)
Result getHouseOption(EpidemicBuildingUnitDTO formDto);
/**
* 获取成员信息
* @param formDto
* @return
*/
@GetMapping(value = "custom/family/getFamilyMember", consumes = MediaType.APPLICATION_JSON_VALUE)
Result getFamilyMember(GetMemberListFormDTO formDto);
/**
* 新增成员信息
* @param formDto
* @return
*/
@PostMapping(value = "custom/family/addFamilyMember", consumes = MediaType.APPLICATION_JSON_VALUE)
Result addFamilyMember(FamilyMemberInfoFormDTO formDto);
/**
* 更新成员信息
* @param formDto
* @return
*/
@PostMapping(value = "custom/family/updateFamilyMember", consumes = MediaType.APPLICATION_JSON_VALUE)
Result updateFamilyMember(FamilyMemberInfoFormDTO formDto);
/**
* 获取房屋信息
* @param formDto
* @return
*/
@GetMapping(value = "custom/family/getHouseInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
Result getHouseInfo(GetHouseInfoFormDTO formDto);
} }

49
epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java

@ -14,6 +14,12 @@ import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO; import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO; import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO;
import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO;
import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO;
import com.elink.esua.epdc.dto.suggestion.form.MySuggestionFormDTO; import com.elink.esua.epdc.dto.suggestion.form.MySuggestionFormDTO;
import com.elink.esua.epdc.dto.suggestion.form.SuggestionMakeFormDTO; import com.elink.esua.epdc.dto.suggestion.form.SuggestionMakeFormDTO;
import com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO; import com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO;
@ -124,4 +130,47 @@ public class CustomFeignClientFallback implements CustomFeignClient {
public Result deleteTripById(GetTripInfoFormDTO formDto) { public Result deleteTripById(GetTripInfoFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "deleteTripById", formDto); return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "deleteTripById", formDto);
} }
@Override
public Result getPlotOption(EpidemicPlotCoordinateDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getPlotOption", formDto);
}
@Override
public Result getBuildingOption(EpidemicPlotBuildingDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getBuildingOption", formDto);
}
@Override
public Result getUnitOption(EpidemicBuildingUnitDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getUnitOption", formDto);
}
@Override
public Result getHouseOption(EpidemicBuildingUnitDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getHouseOption", formDto);
}
@Override
public Result getFamilyMember(GetMemberListFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getFamilyMember", formDto);
}
@Override
public Result addFamilyMember(FamilyMemberInfoFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "addFamilyMember", formDto);
}
@Override
public Result updateFamilyMember(FamilyMemberInfoFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "updateFamilyMember", formDto);
}
@Override
public Result getHouseInfo(GetHouseInfoFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getHouseInfo", formDto);
}
} }

98
epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/CustomPersonroomService.java

@ -0,0 +1,98 @@
package com.elink.esua.epdc.service;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.epidemic.DictOptionDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO;
import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO;
import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO;
import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO;
import java.util.List;
/**
* 房屋
*
* @author work@yujt.net.cn
* @date 2020/2/28 11:28
*/
public interface CustomPersonroomService {
/**
* @return list
* @Description 获取小区下拉列表
* @Author wgf
* @Date 2022/6/9 11:27
**/
Result<List<DictOptionDTO>> getPlotOption(EpidemicPlotCoordinateDTO formDto);
/**
* @return list
* @Description 获取楼栋下拉列表
* @Author wgf
* @Date 2022/6/9 11:27
**/
Result<List<DictOptionDTO>> getBuildingOption(EpidemicPlotBuildingDTO formDto);
/**
* @return list
* @Description 获取单元下拉列表
* @Author wgf
* @Date 2022/6/9 11:27
**/
Result<List<DictOptionDTO>> getUnitOption(EpidemicBuildingUnitDTO formDto);
/**
* @return list
* @Description 获取房屋下拉列表
* @Author wgf
* @Date 2022/6/9 11:27
**/
Result<List<DictOptionDTO>> getHouseOption(EpidemicBuildingUnitDTO formDto);
/**
* 获取成员信息
* @param formDTO
* @return
*/
Result<FamilyMemberInfoResultDTO> getFamilyMember(GetMemberListFormDTO formDTO);
/**
* 添加成员
* @param formDTO
* @return
*/
Result addFamilyMember(FamilyMemberInfoFormDTO formDTO);
/**
* 修改成员
* @param formDTO
* @return
*/
Result updateFamilyMember(FamilyMemberInfoFormDTO formDTO);
/**
* 获取房屋信息
* @param formDTO
* @return
*/
Result getHouseInfo(GetHouseInfoFormDTO formDTO);
}

97
epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/CustomPersonroomServiceImpl.java

@ -0,0 +1,97 @@
package com.elink.esua.epdc.service.impl;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
import com.alibaba.fastjson.JSONObject;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
import com.elink.esua.epdc.dto.epidemic.DictOptionDTO;
import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO;
import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO;
import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO;
import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO;
import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO;
import com.elink.esua.epdc.dto.personroom.result.HouseInfoResultDTO;
import com.elink.esua.epdc.feign.AdminFeignClient;
import com.elink.esua.epdc.feign.CustomFeignClient;
import com.elink.esua.epdc.redis.AppUserRedis;
import com.elink.esua.epdc.service.CustomEnterpriseService;
import com.elink.esua.epdc.service.CustomPersonroomService;
import com.elink.esua.epdc.utils.WxMaServiceUtils;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 房屋
*
* @author work@yujt.net.cn
* @date 2020/2/28 11:28
*/
@Slf4j
@Service
public class CustomPersonroomServiceImpl implements CustomPersonroomService {
@Autowired
private CustomFeignClient customFeignClient;
@Override
public Result<List<DictOptionDTO>> getPlotOption(EpidemicPlotCoordinateDTO formDto) {
return customFeignClient.getPlotOption(formDto);
}
@Override
public Result<List<DictOptionDTO>> getBuildingOption(EpidemicPlotBuildingDTO formDto) {
return customFeignClient.getBuildingOption(formDto);
}
@Override
public Result<List<DictOptionDTO>> getUnitOption(EpidemicBuildingUnitDTO formDto) {
return customFeignClient.getUnitOption(formDto);
}
@Override
public Result<List<DictOptionDTO>> getHouseOption(EpidemicBuildingUnitDTO formDto) {
return customFeignClient.getHouseOption(formDto);
}
@Override
public Result<FamilyMemberInfoResultDTO> getFamilyMember(GetMemberListFormDTO formDTO) {
return customFeignClient.getFamilyMember(formDTO);
}
@Override
public Result addFamilyMember(FamilyMemberInfoFormDTO formDTO) {
return customFeignClient.addFamilyMember(formDTO);
}
@Override
public Result updateFamilyMember(FamilyMemberInfoFormDTO formDTO) {
return customFeignClient.updateFamilyMember(formDTO);
}
@Override
public Result<HouseInfoResultDTO> getHouseInfo(GetHouseInfoFormDTO formDTO) {
return customFeignClient.getHouseInfo(formDTO);
}
}
Loading…
Cancel
Save