Browse Source

双实信息录入-小区-楼栋-单元详情

master
Jackwang 3 years ago
parent
commit
103fa88d52
  1. 120
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBulidingDetailDTO.java
  2. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseInformationController.java
  3. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
  4. 11
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java
  5. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java
  6. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingUnitService.java
  7. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java
  8. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java
  9. 25
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
  10. 25
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml

120
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBulidingDetailDTO.java

@ -0,0 +1,120 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
@Data
public class IcBulidingDetailDTO implements Serializable {
private static final long serialVersionUID = 1L;
private String buildingId;
/**
* 组织id
*/
private String agencyId;
/**
* 网格id
*/
private String gridId;
/**
* 小区id
*/
private String neighborHoodId;
/**
* 楼栋名称
*/
private String buildingName;
/**
* 楼栋类型
*/
private String type;
/**
* 排序
*/
private BigDecimal sort;
/**
* 总单元数
*/
private Integer totalUnitNum;
/**
* 总楼层总数
*/
private Integer totalFloorNum;
/**
* 总户数
*/
private Integer totalHouseNum;
/**
* 坐标位置
*/
private String location;
/**
* 中心点位经度
*/
private String longitude;
/**
* 中心点位纬度
*/
private String latitude;
/**
* 楼长姓名
*/
private String buildingLeaderName;
/**
* 楼长电话
*/
private String buildingLeaderMobile;
/**
* 楼栋编码
*/
private String coding;
/**
* 实有人口数
*/
private Integer realPerson;
}

8
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.IcBuildingDTO;
import com.epmet.dto.IcBuildingUnitDTO;
import com.epmet.dto.result.HouseInfoResultDTO;
import com.epmet.dto.result.IcBulidingDetailDTO;
import com.epmet.entity.IcNeighborHoodEntity;
import com.epmet.service.IcBuildingService;
import com.epmet.service.IcBuildingUnitService;
@ -70,7 +70,7 @@ public class HouseInformationController {
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.IcBuildingDTO>
*/
@PostMapping("getBuildingDetail/{buildingId}")
public Result<IcBuildingDTO> getBuildingDetail(@PathVariable("buildingId") String buildingId){
public Result<IcBulidingDetailDTO> getBuildingDetail(@PathVariable("buildingId") String buildingId){
return icBuildingService.getBuildingDetail(buildingId);
}
@ -82,7 +82,7 @@ public class HouseInformationController {
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.IcBuildingUnitDTO>
*/
@PostMapping("getUnitDetail/{unitId}")
public Result<IcBuildingUnitDTO> getUnitDetail(@PathVariable("unitId") String unitId){
public Result<HouseInfoResultDTO> getUnitDetail(@PathVariable("unitId") String unitId){
return icBuildingUnitService.getUnitDetail(unitId);
}
}

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java

@ -196,4 +196,12 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
*/
Integer selectUnitCount(@Param("buildingId")String buildingId);
/**
* @describe: 获取楼栋详情
* @author wangtong
* @date 2022/6/28 16:16
* @params [buildingId]
* @return com.epmet.dto.result.IcBulidingDetailDTO
*/
IcBulidingDetailDTO getBuildingDetail(@Param("buildingId") String buildingId);
}

11
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingUnitDao.java

@ -18,6 +18,7 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.HouseInfoResultDTO;
import com.epmet.entity.IcBuildingUnitEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -50,4 +51,12 @@ public interface IcBuildingUnitDao extends BaseDao<IcBuildingUnitEntity> {
*/
void delUnit(@Param("ids")List<String> ids);
}
/**
* @describe: 获取单元详情
* @author wangtong
* @date 2022/6/28 17:03
* @params [unitId]
* @return com.epmet.dto.result.HouseInfoResultDTO
*/
HouseInfoResultDTO getUnitDetail(@Param("unitId") String unitId);
}

3
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java

@ -23,6 +23,7 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.IcBuildingDTO;
import com.epmet.dto.ImportGeneralDTO;
import com.epmet.dto.result.IcBulidingDetailDTO;
import com.epmet.entity.IcBuildingEntity;
import java.util.List;
@ -131,5 +132,5 @@ public interface IcBuildingService extends BaseService<IcBuildingEntity> {
* @params [buildingId]
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.IcBuildingDTO>
*/
Result<IcBuildingDTO> getBuildingDetail(String buildingId);
Result<IcBulidingDetailDTO> getBuildingDetail(String buildingId);
}

3
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingUnitService.java

@ -22,6 +22,7 @@ import com.epmet.commons.tools.dto.result.OptionResultDTO;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.IcBuildingUnitDTO;
import com.epmet.dto.result.HouseInfoResultDTO;
import com.epmet.entity.IcBuildingUnitEntity;
import java.util.List;
@ -121,5 +122,5 @@ public interface IcBuildingUnitService extends BaseService<IcBuildingUnitEntity>
* @params [unitId]
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.IcBuildingUnitDTO>
*/
Result<IcBuildingUnitDTO> getUnitDetail(String unitId);
Result<HouseInfoResultDTO> getUnitDetail(String unitId);
}

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java

@ -29,6 +29,7 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.IcBuildingDao;
import com.epmet.dto.IcBuildingDTO;
import com.epmet.dto.ImportGeneralDTO;
import com.epmet.dto.result.IcBulidingDetailDTO;
import com.epmet.entity.IcBuildingEntity;
import com.epmet.service.IcBuildingService;
import lombok.extern.slf4j.Slf4j;
@ -168,8 +169,8 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
}
@Override
public Result<IcBuildingDTO> getBuildingDetail(String buildingId) {
return null;
public Result<IcBulidingDetailDTO> getBuildingDetail(String buildingId) {
return new Result<IcBulidingDetailDTO>().ok(baseDao.getBuildingDetail(buildingId));
}
}

6
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java

@ -28,6 +28,8 @@ import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.IcBuildingUnitDao;
import com.epmet.dto.IcBuildingUnitDTO;
import com.epmet.dto.result.HouseInfoResultDTO;
import com.epmet.dto.result.IcBulidingDetailDTO;
import com.epmet.entity.IcBuildingUnitEntity;
import com.epmet.service.IcBuildingUnitService;
import lombok.extern.slf4j.Slf4j;
@ -156,8 +158,8 @@ public class IcBuildingUnitServiceImpl extends BaseServiceImpl<IcBuildingUnitDao
}
@Override
public Result<IcBuildingUnitDTO> getUnitDetail(String unitId) {
return null;
public Result<HouseInfoResultDTO> getUnitDetail(String unitId) {
return new Result<HouseInfoResultDTO>().ok(baseDao.getUnitDetail(unitId));
}
}

25
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml

@ -403,5 +403,30 @@
<select id="selectUnitCount" resultType="java.lang.Integer">
SELECT COUNT(ID) FROM ic_building_unit WHERE BUILDING_ID = #{buildingId} AND DEL_FLAG = '0'
</select>
<select id="getBuildingDetail" resultType="com.epmet.dto.result.IcBulidingDetailDTO">
SELECT
b.ID AS buildingId,
b.BUILDING_NAME,
b.NEIGHBOR_HOOD_ID,
b.sort,
b.TOTAL_UNIT_NUM,
b.TOTAL_FLOOR_NUM,
b.TOTAL_HOUSE_NUM,
h.NEIGHBOR_HOOD_NAME,
b.LATITUDE,
b.LONGITUDE,
b.TYPE,
h.GRID_ID,
h.AGENCY_ID,
b.BUILDING_LEADER_NAME,
b.BUILDING_LEADER_MOBILE,
b.CODING,
b.SYS_CODING,
b.REAL_PERSON
FROM ic_building b
INNER JOIN ic_neighbor_hood h ON (h.id = b.NEIGHBOR_HOOD_ID AND h.DEL_FLAG = '0')
WHERE b.DEL_FLAG = '0'
AND b.ID = #{buildingId}
</select>
</mapper>

25
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingUnitDao.xml

@ -17,6 +17,29 @@
<select id="getUnitIdByBuildingId" resultType="java.lang.String">
SELECT ID FROM ic_building_unit WHERE DEL_FLAG = '0' AND BUILDING_ID = #{buildingId} ORDER BY UNIT_NUM+0 DESC LIMIT #{size}
</select>
<select id="getUnitDetail" resultType="com.epmet.dto.result.HouseInfoResultDTO">
SELECT bu.CUSTOMER_ID,
h.AGENCY_ID,
ca.ORGANIZATION_NAME as agencyName,
CONCAT(ca.ALL_PARENT_NAME,'-',ca.ORGANIZATION_NAME) as agencyPathName,
ca.AREA_CODE,
h.GRID_ID,
g.GRID_NAME,
h.id as neighborHoodId,
h.NEIGHBOR_HOOD_NAME,
b.id as buildingId,
b.BUILDING_NAME,
bu.id as buildingUnitId,
bu.UNIT_NAME
FROM ic_building_unit bu
INNER JOIN ic_building b ON (b.id = bu.BUILDING_ID AND b.DEL_FLAG = '0')
INNER JOIN ic_neighbor_hood h ON (h.id = b.NEIGHBOR_HOOD_ID AND h.DEL_FLAG = '0')
INNER JOIN customer_agency ca ON (h.AGENCY_ID = ca.id AND ca.DEL_FLAG = '0')
INNER JOIN customer_grid g ON (h.GRID_ID = g.id AND g.DEL_FLAG = '0')
WHERE bu.DEL_FLAG = '0'
AND bu.ID = #{unitId}
</select>
</mapper>
</mapper>

Loading…
Cancel
Save