From 7ba71a9635199ef5e90c7e5b902855dc4487d839 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 16 Feb 2023 09:33:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B0=8F=E5=8C=BA=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E6=8E=89=E4=BA=8C=E7=BB=B4=E7=A0=81=E9=82=A3=E4=B8=80?=
 =?UTF-8?q?=E5=9D=971623486671774978060?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HouseInformationController.java   |  1 +
 .../epmet/controller/NeighborHoodController.java |  6 ++++++
 .../com/epmet/service/NeighborHoodService.java   |  7 ++++++-
 .../service/impl/NeighborHoodServiceImpl.java    | 16 +++++++++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseInformationController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseInformationController.java
index 21cddd9951..0de2518bcd 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseInformationController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseInformationController.java
@@ -254,6 +254,7 @@ public class HouseInformationController {
 
     /**
     * @describe: 【双实录入】获取小区编码
+     * 生成小区编码
     * @author wangtong
     * @date 2022/6/29 9:59
     * @params [tokenDTO, gridId]
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java
index d318f9116b..9302784464 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java
@@ -77,6 +77,12 @@ public class NeighborHoodController {
 
     }
 
+    /**
+     * 房屋管理-新增小区
+     * @param tokenDTO
+     * @param formDTO
+     * @return
+     */
     @NoRepeatSubmit
     @PostMapping("neighborhoodadd")
     public Result neighborhoodadd(@LoginUser TokenDto tokenDTO, @RequestBody IcNeighborHoodAddFormDTO formDTO){
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java
index b091fc4e32..72524f19ff 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java
@@ -33,7 +33,12 @@ import javax.servlet.http.HttpServletResponse;
  * @since v1.0.0 2021-10-25
  */
 public interface NeighborHoodService{
-
+    /**
+     * 房屋管理-新增小区
+     *
+     * @param customerId
+     * @param formDTO
+     */
     void addNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO);
 
     PageData<IcNeighborHoodResultDTO> listNeighborhood(IcNeighborHoodListFormDTO formDTO);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
index a7d6cf0769..1571604c05 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.enums.CollectUrlEnum;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -82,7 +83,12 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
     @Autowired
     private CustomerAgencyDao customerAgencyDao;
 
-
+    /**
+     * 房屋管理-新增小区
+     *
+     * @param customerId
+     * @param formDTO
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO) {
@@ -140,6 +146,10 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
     * @return java.lang.String
     */
     private String createNeiQrcodeUrl(IcNeighborHoodEntity entity) throws Exception {
+        // 市北区-智慧社区:  1623486671774978060 23.2月为了方便社区的同事们演示系统，新建的一个客户id
+        if ("1623486671774978060".equals(entity.getCustomerId())) {
+            return StrConstant.EPMETY_STR;
+        }
         if (null == entity) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "小区不可为空", "小区不可为空");
         }
@@ -338,6 +348,10 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
 
     @Override
     public Result createBatchNeiQrUrl(String customerId) {
+        // 市北区-智慧社区:  1623486671774978060 23.2月为了方便社区的同事们演示系统，新建的一个客户id
+        if ("1623486671774978060".equals(customerId)) {
+            return new Result();
+        }
         //查询该客户下没有二维码的小区
         QueryWrapper<IcNeighborHoodEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(IcNeighborHoodEntity::getCustomerId,customerId)