Browse Source

【双实录入】统计相关接口生成

feature/teamB_zz_wgh
zhaoqifeng 3 years ago
parent
commit
ab07de4b80
  1. 24
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseInformationFormDTO.java
  2. 22
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingCountResultDTO.java
  3. 25
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingListResultDTO.java
  4. 23
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityCountResultDTO.java
  5. 25
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridCountListResultDTO.java
  6. 24
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStatisticsResultDTO.java
  7. 22
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HomeListResultDTO.java
  8. 24
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/NeighborHoodCountResultDTO.java
  9. 25
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/NeighborHoodListResultDTO.java
  10. 17
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/UnitCountResultDTO.java
  11. 22
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/UnitListResultDTO.java
  12. 158
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseInformationController.java
  13. 112
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseInformationService.java
  14. 157
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseInformationServiceImpl.java

24
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseInformationFormDTO.java

@ -0,0 +1,24 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import java.io.Serializable;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/6/28 15:06
*/
@Data
public class HouseInformationFormDTO extends PageFormDTO implements Serializable {
private static final long serialVersionUID = 2348447479132364176L;
private String staffId;
private String communityId;
private String gridId;
private String neighborHoodId;
private String buildingId;
private String unitId;
private String name;
private String sort;
}

22
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingCountResultDTO.java

@ -0,0 +1,22 @@
package com.epmet.dto.result;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/6/28 16:49
*/
@NoArgsConstructor
@Data
public class BuildingCountResultDTO {
private String buildingId;
private String buildingType;
private Integer unitCount;
private Integer houseCount;
private Integer personCount;
private Integer unitRealCount;
private Integer houseRealCount;
private Integer personRealCount;
}

25
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingListResultDTO.java

@ -0,0 +1,25 @@
package com.epmet.dto.result;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/6/28 16:45
*/
@NoArgsConstructor
@Data
public class BuildingListResultDTO implements Serializable {
private static final long serialVersionUID = -1423424057500044373L;
private String id;
private String name;
private Integer buildingCount;
private Integer houseCount;
private Integer personCount;
private Integer differBuildingCount;
private Integer differHouseCount;
private Integer differPersonCount;
}

23
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityCountResultDTO.java

@ -0,0 +1,23 @@
package com.epmet.dto.result;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/6/28 15:24
*/
@NoArgsConstructor
@Data
public class CommunityCountResultDTO implements Serializable {
private static final long serialVersionUID = -1677303397440121269L;
private Integer buildingCount;
private Integer houseCount;
private Integer personCount;
private Integer buildingRealCount;
private Integer houseRealCount;
private Integer personRealCount;
}

25
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridCountListResultDTO.java

@ -0,0 +1,25 @@
package com.epmet.dto.result;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/6/28 15:35
*/
@NoArgsConstructor
@Data
public class GridCountListResultDTO implements Serializable {
private static final long serialVersionUID = -7938740461257344347L;
private String id;
private String name;
private Integer buildingCount;
private Integer houseCount;
private Integer personCount;
private Integer differBuildingCount;
private Integer differHouseCount;
private Integer differPersonCount;
}

24
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridStatisticsResultDTO.java

@ -0,0 +1,24 @@
package com.epmet.dto.result;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/6/28 15:37
*/
@NoArgsConstructor
@Data
public class GridStatisticsResultDTO implements Serializable {
private static final long serialVersionUID = -2022337690871957027L;
private Integer buildingCount;
private Integer houseCount;
private Integer personCount;
private Integer buildingRealCount;
private Integer houseRealCount;
private Integer personRealCount;
}

22
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HomeListResultDTO.java

@ -0,0 +1,22 @@
package com.epmet.dto.result;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/6/28 17:00
*/
@NoArgsConstructor
@Data
public class HomeListResultDTO implements Serializable {
private static final long serialVersionUID = -1098032063828430218L;
private String id;
private String name;
private Double personCount;
private String houseType;
private String houseCode;
}

24
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/NeighborHoodCountResultDTO.java

@ -0,0 +1,24 @@
package com.epmet.dto.result;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/6/28 16:41
*/
@NoArgsConstructor
@Data
public class NeighborHoodCountResultDTO implements Serializable {
private static final long serialVersionUID = 4148009467129407023L;
private String neighborHoodId;
private Integer buildingCount;
private Integer houseCount;
private Integer personCount;
private Integer buildingRealCount;
private Integer houseRealCount;
private Integer personRealCount;
}

25
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/NeighborHoodListResultDTO.java

@ -0,0 +1,25 @@
package com.epmet.dto.result;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/6/28 16:21
*/
@NoArgsConstructor
@Data
public class NeighborHoodListResultDTO implements Serializable {
private static final long serialVersionUID = -5333918463141094854L;
private String id;
private String name;
private Integer buildingCount;
private Integer houseCount;
private Integer personCount;
private Integer differBuildingCount;
private Integer differHouseCount;
private Integer differPersonCount;
}

17
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/UnitCountResultDTO.java

@ -0,0 +1,17 @@
package com.epmet.dto.result;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/6/28 16:56
*/
@NoArgsConstructor
@Data
public class UnitCountResultDTO {
private String unitId;
private Integer houseCount;
private Integer personCount;
}

22
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/UnitListResultDTO.java

@ -0,0 +1,22 @@
package com.epmet.dto.result;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/6/28 16:53
*/
@NoArgsConstructor
@Data
public class UnitListResultDTO implements Serializable {
private static final long serialVersionUID = -8750897881106004416L;
private String id;
private String name;
private Double houseCount;
private Double personCount;
private Double differHouseCount;
}

158
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseInformationController.java

@ -18,8 +18,8 @@
package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.result.HouseInfoResultDTO;
import com.epmet.dto.result.IcBulidingDetailDTO;
import com.epmet.dto.IcBuildingDTO;
import com.epmet.dto.IcBuildingUnitDTO;
import com.epmet.entity.IcNeighborHoodEntity;
import com.epmet.service.IcBuildingService;
import com.epmet.service.IcBuildingUnitService;
@ -50,6 +50,9 @@ public class HouseInformationController {
@Autowired
private IcBuildingUnitService icBuildingUnitService;
@Resource
private HouseInformationService houseInformationService;
/**
* @describe: 双实录入小区详情
* @author wangtong
@ -85,4 +88,155 @@ public class HouseInformationController {
public Result<HouseInfoResultDTO> getUnitDetail(@PathVariable("unitId") String unitId){
return icBuildingUnitService.getUnitDetail(unitId);
}
/**
* 双实录入社区录入数据统计
*
* @Param tokenDTO
* @Param formDTO
* @Return {@link Result<CommunityCountResultDTO>}
* @Author zhaoqifeng
* @Date 2022/6/28 15:32
*/
@PostMapping("getCommunityCount")
public Result<CommunityCountResultDTO> getCommunityCount(@LoginUser TokenDto tokenDTO, @RequestBody HouseInformationFormDTO formDTO) {
formDTO.setStaffId(tokenDTO.getUserId());
return new Result<CommunityCountResultDTO>().ok(houseInformationService.getCommunityCount(formDTO));
}
/**
* 双实录入社区-网格列表
*
* @Param tokenDTO
* @Param formDTO
* @Return {@link Result<PageData<GridCountListResultDTO>>}
* @Author zhaoqifeng
* @Date 2022/6/28 15:42
*/
@PostMapping("getGridList")
public Result<PageData<GridCountListResultDTO>> getGridList(@LoginUser TokenDto tokenDTO, @RequestBody HouseInformationFormDTO formDTO) {
formDTO.setStaffId(tokenDTO.getUserId());
return new Result<PageData<GridCountListResultDTO>>().ok(houseInformationService.getGridList(formDTO));
}
/**
* 双实录入网格录入数据统计
*
* @Param tokenDTO
* @Param formDTO
* @Return {@link Result<GridStatisticsResultDTO>}
* @Author zhaoqifeng
* @Date 2022/6/28 15:42
*/
@PostMapping("getGridCount")
public Result<GridStatisticsResultDTO> getGridCount(@LoginUser TokenDto tokenDTO, @RequestBody HouseInformationFormDTO formDTO) {
formDTO.setStaffId(tokenDTO.getUserId());
return new Result<GridStatisticsResultDTO>().ok(houseInformationService.getGridCount(formDTO));
}
/**
* 双实录入网格-小区列表
*
* @Param tokenDTO
* @Param formDTO
* @Return {@link Result<PageData<NeighborHoodListResultDTO>>}
* @Author zhaoqifeng
* @Date 2022/6/28 16:23
*/
@PostMapping("getNeighborHoodList")
public Result<PageData<NeighborHoodListResultDTO>> getNeighborHoodList(@LoginUser TokenDto tokenDTO, @RequestBody HouseInformationFormDTO formDTO) {
formDTO.setStaffId(tokenDTO.getUserId());
return new Result<PageData<NeighborHoodListResultDTO>>().ok(houseInformationService.getNeighborHoodList(formDTO));
}
/**
* 双实录入小区录入数据统计
*
* @Param tokenDTO
* @Param formDTO
* @Return {@link Result<NeighborHoodCountResultDTO>}
* @Author zhaoqifeng
* @Date 2022/6/28 16:44
*/
@PostMapping("getNeighborHoodCount")
public Result<NeighborHoodCountResultDTO> getNeighborHoodCount(@LoginUser TokenDto tokenDTO, @RequestBody HouseInformationFormDTO formDTO) {
formDTO.setStaffId(tokenDTO.getUserId());
return new Result<NeighborHoodCountResultDTO>().ok(houseInformationService.getNeighborHoodCount(formDTO));
}
/**
* 双实录入小区-楼栋列表
*
* @Param tokenDTO
* @Param formDTO
* @Return {@link Result<PageData<BuildingListResultDTO>>}
* @Author zhaoqifeng
* @Date 2022/6/28 16:47
*/
@PostMapping("getBuildingList")
public Result<PageData<BuildingListResultDTO>> getBuildingList(@LoginUser TokenDto tokenDTO, @RequestBody HouseInformationFormDTO formDTO) {
formDTO.setStaffId(tokenDTO.getUserId());
return new Result<PageData<BuildingListResultDTO>>().ok(houseInformationService.getBuildingList(formDTO));
}
/**
* 双实录入楼栋录入数据统计
*
* @Param tokenDTO
* @Param formDTO
* @Return {@link Result<BuildingCountResultDTO>}
* @Author zhaoqifeng
* @Date 2022/6/28 16:51
*/
@PostMapping("getBuildingCount")
public Result<BuildingCountResultDTO> getBuildingCount(@LoginUser TokenDto tokenDTO, @RequestBody HouseInformationFormDTO formDTO) {
formDTO.setStaffId(tokenDTO.getUserId());
return new Result<BuildingCountResultDTO>().ok(houseInformationService.getBuildingCount(formDTO));
}
/**
* 双实录入楼栋-单元列表
*
* @Param tokenDTO
* @Param formDTO
* @Return {@link Result<PageData<UnitListResultDTO>>}
* @Author zhaoqifeng
* @Date 2022/6/28 16:55
*/
@PostMapping("getUnitList")
public Result<PageData<UnitListResultDTO>> getUnitList(@LoginUser TokenDto tokenDTO, @RequestBody HouseInformationFormDTO formDTO) {
formDTO.setStaffId(tokenDTO.getUserId());
return new Result<PageData<UnitListResultDTO>>().ok(houseInformationService.getUnitList(formDTO));
}
/**
* 双实录入单元录入数据统计
*
* @Param tokenDTO
* @Param formDTO
* @Return {@link Result<UnitCountResultDTO>}
* @Author zhaoqifeng
* @Date 2022/6/28 16:57
*/
@PostMapping("getUnitCount")
public Result<UnitCountResultDTO> getUnitCount(@LoginUser TokenDto tokenDTO, @RequestBody HouseInformationFormDTO formDTO) {
formDTO.setStaffId(tokenDTO.getUserId());
return new Result<UnitCountResultDTO>().ok(houseInformationService.getUnitCount(formDTO));
}
/**
* 双实录入单元-房屋列表
*
* @Param tokenDTO
* @Param formDTO
* @Return {@link Result<PageData<HomeListResultDTO>>}
* @Author zhaoqifeng
* @Date 2022/6/28 17:02
*/
@PostMapping("getHouseList")
public Result<PageData<HomeListResultDTO>> getHouseList(@LoginUser TokenDto tokenDTO, @RequestBody HouseInformationFormDTO formDTO) {
formDTO.setStaffId(tokenDTO.getUserId());
return new Result<PageData<HomeListResultDTO>>().ok(houseInformationService.getHouseList(formDTO));
}
}

112
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseInformationService.java

@ -0,0 +1,112 @@
package com.epmet.service;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.form.HouseInformationFormDTO;
import com.epmet.dto.result.*;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/6/28 15:14
*/
public interface HouseInformationService {
/**
* 双实录入社区录入数据统计
*
* @Param formDTO
* @Return {@link CommunityCountResultDTO}
* @Author zhaoqifeng
* @Date 2022/6/28 15:31
*/
CommunityCountResultDTO getCommunityCount(HouseInformationFormDTO formDTO);
/**
* 双实录入社区-网格列表
*
* @Param formDTO
* @Return {@link PageData<GridCountListResultDTO>}
* @Author zhaoqifeng
* @Date 2022/6/28 15:41
*/
PageData<GridCountListResultDTO> getGridList(HouseInformationFormDTO formDTO);
/**
* 双实录入网格录入数据统计
*
* @Param formDTO
* @Return {@link GridStatisticsResultDTO}
* @Author zhaoqifeng
* @Date 2022/6/28 15:41
*/
GridStatisticsResultDTO getGridCount(HouseInformationFormDTO formDTO);
/**
* 双实录入网格-小区列表
*
* @Param formDTO
* @Return {@link PageData<NeighborHoodListResultDTO>}
* @Author zhaoqifeng
* @Date 2022/6/28 16:24
*/
PageData<NeighborHoodListResultDTO> getNeighborHoodList(HouseInformationFormDTO formDTO);
/**
* 双实录入小区录入数据统计
*
* @Param formDTO
* @Return {@link NeighborHoodCountResultDTO}
* @Author zhaoqifeng
* @Date 2022/6/28 16:43
*/
NeighborHoodCountResultDTO getNeighborHoodCount(HouseInformationFormDTO formDTO);
/**
* 双实录入小区-楼栋列表
*
* @Param formDTO
* @Return {@link PageData<BuildingListResultDTO>}
* @Author zhaoqifeng
* @Date 2022/6/28 16:47
*/
PageData<BuildingListResultDTO> getBuildingList(HouseInformationFormDTO formDTO);
/**
* 双实录入楼栋录入数据统计
*
* @Param formDTO
* @Return {@link BuildingCountResultDTO}
* @Author zhaoqifeng
* @Date 2022/6/28 16:50
*/
BuildingCountResultDTO getBuildingCount(HouseInformationFormDTO formDTO);
/**
* 双实录入楼栋-单元列表
*
* @Param formDTO
* @Return {@link PageData<UnitListResultDTO>}
* @Author zhaoqifeng
* @Date 2022/6/28 16:54
*/
PageData<UnitListResultDTO> getUnitList(HouseInformationFormDTO formDTO);
/**
* 双实录入单元录入数据统计
*
* @Param formDTO
* @Return {@link UnitCountResultDTO}
* @Author zhaoqifeng
* @Date 2022/6/28 16:57
*/
UnitCountResultDTO getUnitCount(HouseInformationFormDTO formDTO);
/**
* 双实录入单元-房屋列表
*
* @Param formDTO
* @Return {@link PageData<HomeListResultDTO>}
* @Author zhaoqifeng
* @Date 2022/6/28 17:01
*/
PageData<HomeListResultDTO> getHouseList(HouseInformationFormDTO formDTO);
}

157
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseInformationServiceImpl.java

@ -0,0 +1,157 @@
package com.epmet.service.impl;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.form.HouseInformationFormDTO;
import com.epmet.dto.result.*;
import com.epmet.service.HouseInformationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/6/28 15:14
*/
@Slf4j
@Service
public class HouseInformationServiceImpl implements HouseInformationService {
/**
* 双实录入社区录入数据统计
*
* @param formDTO
* @Param formDTO
* @Return {@link CommunityCountResultDTO}
* @Author zhaoqifeng
* @Date 2022/6/28 15:31
*/
@Override
public CommunityCountResultDTO getCommunityCount(HouseInformationFormDTO formDTO) {
return null;
}
/**
* 双实录入社区-网格列表
*
* @param formDTO
* @Param formDTO
* @Return {@link PageData < GridCountListResultDTO >}
* @Author zhaoqifeng
* @Date 2022/6/28 15:41
*/
@Override
public PageData<GridCountListResultDTO> getGridList(HouseInformationFormDTO formDTO) {
return null;
}
/**
* 双实录入网格录入数据统计
*
* @param formDTO
* @Param formDTO
* @Return {@link GridStatisticsResultDTO}
* @Author zhaoqifeng
* @Date 2022/6/28 15:41
*/
@Override
public GridStatisticsResultDTO getGridCount(HouseInformationFormDTO formDTO) {
return null;
}
/**
* 双实录入网格-小区列表
*
* @param formDTO
* @Param formDTO
* @Return {@link PageData< NeighborHoodListResultDTO >}
* @Author zhaoqifeng
* @Date 2022/6/28 16:24
*/
@Override
public PageData<NeighborHoodListResultDTO> getNeighborHoodList(HouseInformationFormDTO formDTO) {
return null;
}
/**
* 双实录入小区录入数据统计
*
* @param formDTO
* @Param formDTO
* @Return {@link NeighborHoodCountResultDTO}
* @Author zhaoqifeng
* @Date 2022/6/28 16:43
*/
@Override
public NeighborHoodCountResultDTO getNeighborHoodCount(HouseInformationFormDTO formDTO) {
return null;
}
/**
* 双实录入小区-楼栋列表
*
* @param formDTO
* @Param formDTO
* @Return {@link PageData<BuildingListResultDTO>}
* @Author zhaoqifeng
* @Date 2022/6/28 16:47
*/
@Override
public PageData<BuildingListResultDTO> getBuildingList(HouseInformationFormDTO formDTO) {
return null;
}
/**
* 双实录入楼栋录入数据统计
*
* @param formDTO
* @Param formDTO
* @Return {@link BuildingCountResultDTO}
* @Author zhaoqifeng
* @Date 2022/6/28 16:50
*/
@Override
public BuildingCountResultDTO getBuildingCount(HouseInformationFormDTO formDTO) {
return null;
}
/**
* 双实录入楼栋-单元列表
*
* @param formDTO
* @Param formDTO
* @Return {@link PageData<UnitListResultDTO>}
* @Author zhaoqifeng
* @Date 2022/6/28 16:54
*/
@Override
public PageData<UnitListResultDTO> getUnitList(HouseInformationFormDTO formDTO) {
return null;
}
/**
* 双实录入单元录入数据统计
*
* @param formDTO
* @Param formDTO
* @Return {@link UnitCountResultDTO}
* @Author zhaoqifeng
* @Date 2022/6/28 16:57
*/
@Override
public UnitCountResultDTO getUnitCount(HouseInformationFormDTO formDTO) {
return null;
}
/**
* 双实录入单元-房屋列表
*
* @param formDTO
* @Param formDTO
* @Return {@link PageData<HomeListResultDTO>}
* @Author zhaoqifeng
* @Date 2022/6/28 17:01
*/
@Override
public PageData<HomeListResultDTO> getHouseList(HouseInformationFormDTO formDTO) {
return null;
}
}
Loading…
Cancel
Save