From 930bebd386c97e130471a0b624fe4a6bcde0b215 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 16 Feb 2023 10:02:54 +0800
Subject: [PATCH] =?UTF-8?q?/gov/org/house/houseadd=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E6=8E=89=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=94=9F=E6=88=90=E8=BF=99?=
 =?UTF-8?q?=E4=B8=80=E5=9D=97=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/HouseController.java    |  8 ++++++++
 .../java/com/epmet/service/HouseService.java     |  7 ++++++-
 .../com/epmet/service/impl/HouseServiceImpl.java | 16 ++++++++++------
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
index f462449ec9..53738a3d4c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
@@ -169,6 +169,14 @@ public class HouseController implements ResultDataResolver {
         return new Result<PageData<IcHouseListResultDTO>>().ok(houseService.getHouseList(formDTO));
     }
 
+    /**
+     * 房屋管理-新增房屋
+     *
+     * @param tokenDTO
+     * @param formDTO
+     * @return
+     * @throws Exception
+     */
     @NoRepeatSubmit
     @PostMapping("houseadd")
     public Result houseAdd(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseAddFormDTO formDTO) throws Exception {
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
index d1d1b87503..1161a1ee9f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
@@ -38,7 +38,12 @@ import java.util.Set;
  */
 public interface HouseService {
 
-
+    /**
+     * 房屋管理-新增房屋
+     *
+     * @param customerId
+     * @param formDTO
+     */
     void addHouse(String customerId, IcHouseAddFormDTO formDTO);
 
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index 4cd8945a4a..d7e3b1f8b2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -8,7 +8,6 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.HouseQrcodeEnum;
@@ -35,17 +34,14 @@ import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.*;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
-import com.epmet.dto.form.stats.UserHouseStatsQueryFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.*;
 import com.epmet.enums.*;
 import com.epmet.feign.*;
 import com.epmet.model.HouseInfoModel;
 import com.epmet.model.ImportHouseInfoListener;
-import com.epmet.redis.CustomerAgencyRedis;
 import com.epmet.redis.IcHouseRedis;
 import com.epmet.service.*;
-import com.epmet.stats.UserHouseStatsResultDTO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.cache.Cache;
@@ -69,7 +65,6 @@ import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URLEncoder;
 import java.text.NumberFormat;
-import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -137,7 +132,12 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     @Autowired
     private DataReportOpenFeignClient dataReportOpenFeignClient;
 
-
+    /**
+     * 房屋管理-新增房屋
+     *
+     * @param customerId
+     * @param formDTO
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addHouse(String customerId, IcHouseAddFormDTO formDTO) {
@@ -1155,6 +1155,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         if (null == house) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到房屋信息", "未查到房屋信息");
         }
+        // 市北区-智慧社区:  1623486671774978060 23.2月为了方便社区的同事们演示系统，新建的一个客户id
+        if("1623486671774978060".equals(house.getCustomerId())){
+            return StrConstant.EPMETY_STR;
+        }
         //url组成:小程序地址?房屋编码
         CustomerOrgParameterEntity codePre = icHouseDao.selectByCustomerId(house.getCustomerId(), HouseQrcodeEnum.PREFIX_KEY.getCode());
         if(null == codePre){