提上去

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

@@ -31,7 +31,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcBuildingUnitDao;
 import com.epmet.dto.BuildingTreeLevelDTO;
+import com.epmet.dto.IcBuildingDTO;
 import com.epmet.dto.form.*;
+import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO;
 import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.BuildingResultPagedDTO;
 import com.epmet.dto.result.IcBuildingListResultDTO;
@@ -283,5 +285,15 @@ public class BuildingController {
     }
 
 
-
+    /**
+     * 灵山大屏：查询楼栋坐标
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("building-distribution")
+    public Result<List<IcBuildingDTO>> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) {
+        return new Result<List<IcBuildingDTO>>().ok(buildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId()));
+    }
 }

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

@@ -48,10 +48,12 @@ import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcHouseDao;
+import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.*;
+import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO;
 import com.epmet.dto.result.*;
+import com.epmet.dto.result.lingshan.HouseDetailResultDTO;
 import com.epmet.entity.CustomerOrgParameterEntity;
-import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -100,9 +102,6 @@ public class HouseController implements ResultDataResolver {
     @Autowired
     private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
 
-    @Autowired
-    private  EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
-
     @Autowired
     private IcHouseDao icHouseDao;
     @Autowired
@@ -691,4 +690,24 @@ public class HouseController implements ResultDataResolver {
         return new Result<PageData<SubUserHouseListResultDTO>>().ok(r);
     }
 
+    /**
+     * 灵山大屏：查询房屋坐标点位
+     * 支持根据网格\小区\楼栋id查询
+     */
+    @PostMapping("house-distribution")
+    public Result<List<IcHouseDTO>> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) {
+        return new Result<List<IcHouseDTO>>().ok(houseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId()));
+    }
+
+    /**
+     * 灵山大屏：点击房屋，显示房屋详情
+     * @param houseId
+     * @return
+     */
+    @MaskResponse(fieldNames = {"showOwnerIdCard", "showOwnerPhone"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE})
+    @PostMapping("houseDetail/{houseId}")
+    public Result<HouseDetailResultDTO> queryHouseDetail(@PathVariable("houseId")String houseId){
+        return new Result<HouseDetailResultDTO>().ok(houseService.queryHouseDetail(houseId));
+    }
+
 }

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

@@ -1,19 +1,12 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.annotation.MaskResponse;
-import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.IcBuildingDTO;
-import com.epmet.dto.IcHouseDTO;
-import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO;
-import com.epmet.dto.result.lingshan.HouseDetailResultDTO;
 import com.epmet.service.IcBuildingService;
 import com.epmet.service.IcHouseService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
+import javax.annotation.Resource;
 
 /**
  * @Description 灵山大屏-查询gov-org库的接口， 可以放在这....
@@ -23,44 +16,15 @@ import java.util.List;
 @RestController
 @RequestMapping("houseScreen")
 public class LingShanScreenGovOrgController {
-    @Autowired
+    @Resource
     private IcHouseService icHouseService;
     @Autowired
     private IcBuildingService icBuildingService;
 
 
-    /**
-     * 灵山大屏：查询楼栋坐标
-     *
-     * @param tokenDto
-     * @param formDTO
-     * @return
-     */
-    @PostMapping("building-distribution")
-    public Result<List<IcBuildingDTO>> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) {
-        return new Result<List<IcBuildingDTO>>().ok(icBuildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId()));
-    }
 
 
-    /**
-     * 灵山大屏：查询房屋坐标点位
-     * 支持根据网格\小区\楼栋id查询
-     */
-    @PostMapping("house-distribution")
-    public Result<List<IcHouseDTO>> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) {
-        return new Result<List<IcHouseDTO>>().ok(icHouseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId()));
-    }
 
-    /**
-     * 灵山大屏：点击房屋，显示房屋详情
-     * @param houseId
-     * @return
-     */
-    @MaskResponse(fieldNames = {"showOwnerIdCard", "showOwnerPhone"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE})
-    @PostMapping("houseDetail/{houseId}")
-    public Result<HouseDetailResultDTO> queryHouseDetail(@PathVariable("houseId")String houseId){
-        return new Result<HouseDetailResultDTO>().ok(icHouseService.queryHouseDetail(houseId));
-    }
 
 
 

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

@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.BuildingTreeLevelDTO;
+import com.epmet.dto.IcBuildingDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.BuildingResultDTO;
 import com.epmet.dto.result.BuildingResultPagedDTO;
@@ -96,4 +97,13 @@ public interface BuildingService {
      */
     Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream, Result<ImportTaskCommonResultDTO> importTask) throws IOException;
 
+    /**
+     * 灵山大屏：查询楼栋坐标
+     *
+     * @param customerId
+     * @param gridId
+     * @param neighborHoodId
+     * @return
+     */
+    List<IcBuildingDTO> buildingDistribution(String customerId, String gridId, String neighborHoodId);
 }

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

@@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.dto.result.lingshan.HouseDetailResultDTO;
 import com.google.common.cache.Cache;
 
 import javax.servlet.http.HttpServletResponse;
@@ -204,4 +205,22 @@ public interface HouseService {
     PageData<IcHouseListResultDTO> houseStatisListDetail(HouseChartFormDTO formDTO);
 
     PageData<SubUserHouseListResultDTO> usingCommunityUserHouseStats(String orgId, String orgType, Integer pageNo, Integer pageSize);
+
+    /**
+     * 灵山大屏：查询房屋坐标点位
+     *
+     * @param gridId
+     * @param neighborHoodId
+     * @param buildingId
+     * @return
+     */
+    List<IcHouseDTO> houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId);
+
+
+    /**
+     * 灵山大屏：点击房屋，显示房屋详情
+     * @param houseId
+     * @return
+     */
+    HouseDetailResultDTO queryHouseDetail(String houseId);
 }

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

@@ -134,13 +134,5 @@ public interface IcBuildingService extends BaseService<IcBuildingEntity> {
      */
     Result<IcBulidingDetailDTO> getBuildingDetail(String buildingId);
 
-    /**
+
-     * 灵山大屏：查询楼栋坐标
-     *
-     * @param customerId
-     * @param gridId
-     * @param neighborHoodId
-     * @return
-     */
-    List<IcBuildingDTO> buildingDistribution(String customerId, String gridId, String neighborHoodId);
 }

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

@@ -181,21 +181,5 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      */
     void updatePartyCenterHouse(String houseId, String partyCenterHouseFlag);
 
-    /**
-     * 灵山大屏：查询房屋坐标点位
-     *
-     * @param gridId
-     * @param neighborHoodId
-     * @param buildingId
-     * @return
-     */
-    List<IcHouseDTO> houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId);
 
-
-    /**
-     * 灵山大屏：点击房屋，显示房屋详情
-     * @param houseId
-     * @return
-     */
-    HouseDetailResultDTO queryHouseDetail(String houseId);
 }

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

@@ -763,4 +763,20 @@ public class BuildingServiceImpl implements BuildingService {
 
     }
 
+
+    /**
+     * 灵山大屏：查询楼栋坐标
+     *
+     * @param customerId
+     * @param gridId
+     * @param neighborHoodId
+     * @return
+     */
+    @Override
+    public List<IcBuildingDTO> buildingDistribution(String customerId, String gridId, String neighborHoodId) {
+        List<IcBuildingEntity> list=icBuildingDao.selectListByMap(customerId,gridId,neighborHoodId);
+        return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class);
+    }
+
+
 }

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

@@ -36,6 +36,7 @@ import com.epmet.dao.*;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.dto.result.lingshan.HouseDetailResultDTO;
 import com.epmet.entity.*;
 import com.epmet.enums.*;
 import com.epmet.feign.*;
@@ -132,7 +133,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
 
     @Autowired
     private DataReportOpenFeignClient dataReportOpenFeignClient;
-
+    @Autowired
+    private LingshanPartyCenterHouseLianhuDao partyCenterHouseLianhuDao;
     /**
      * 房屋管理-新增房屋
      *
@@ -1525,4 +1527,36 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         agencyNamePathList.add(agencyInfo.getOrganizationName());
         return String.join("-", agencyNamePathList);
     }
+
+
+    /**
+     * 灵山大屏：查询房屋坐标点位
+     *
+     * @param gridId
+     * @param neighborHoodId
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public List<IcHouseDTO> houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) {
+        List<IcHouseEntity> list=icHouseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId);
+        return ConvertUtils.sourceToTarget(list,IcHouseDTO.class);
+    }
+
+    /**
+     * 灵山大屏：点击房屋，显示房屋详情
+     * @param houseId
+     * @return
+     */
+    @Override
+    public HouseDetailResultDTO queryHouseDetail(String houseId) {
+        IcHouseDTO data = icHouseService.get(houseId);
+        HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class);
+        if (null != resultDTO) {
+            LambdaQueryWrapper<LingshanPartyCenterHouseLianhuEntity> countQuery = new LambdaQueryWrapper<>();
+            countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId);
+            resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery));
+        }
+        return resultDTO;
+    }
 }

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

@@ -173,17 +173,5 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
         return new Result<IcBulidingDetailDTO>().ok(baseDao.getBuildingDetail(buildingId));
     }
 
-    /**
+
-     * 灵山大屏：查询楼栋坐标
-     *
-     * @param customerId
-     * @param gridId
-     * @param neighborHoodId
-     * @return
-     */
-    @Override
-    public List<IcBuildingDTO> buildingDistribution(String customerId, String gridId, String neighborHoodId) {
-        List<IcBuildingEntity> list=baseDao.selectListByMap(customerId,gridId,neighborHoodId);
-        return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class);
-    }
 }

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

@@ -560,36 +560,6 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         baseDao.update(null, update);
     }
 
-    /**
-     * 灵山大屏：查询房屋坐标点位
-     *
-     * @param gridId
-     * @param neighborHoodId
-     * @param buildingId
-     * @return
-     */
-    @Override
-    public List<IcHouseDTO> houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) {
-        List<IcHouseEntity> list=baseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId);
-        return ConvertUtils.sourceToTarget(list,IcHouseDTO.class);
-    }
-
-    /**
-     * 灵山大屏：点击房屋，显示房屋详情
-     * @param houseId
-     * @return
-     */
-    @Override
-    public HouseDetailResultDTO queryHouseDetail(String houseId) {
-        IcHouseDTO data = get(houseId);
-        HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class);
-        if (null != resultDTO) {
-            LambdaQueryWrapper<LingshanPartyCenterHouseLianhuEntity> countQuery = new LambdaQueryWrapper<>();
-            countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId);
-            resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery));
-        }
-        return resultDTO;
-    }
 
 
 }