Merge branches 'yantai_zhengwu_master', 'yantai_zhengwu_master' and 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master

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 {

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]

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){

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);
 
 

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);

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){

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)