随手拍

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -1158,10 +1158,11 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         lantuRegisterResiFormDTO.setAvatarUrl(formDTO.getAvatarUrl());
 
         // 通过给的areaCode 去获取一下当前社区统建网格id
-        String gridId = govOrgOpenFeignClient.getGridIdByCommunityCode(formDTO.getAreaCode()).getData();
+        LanhuAgencyResultDTO lanhuAgencyResultDTO = govOrgOpenFeignClient.getGridIdByCommunityCode(formDTO.getAreaCode()).getData();
 
 
-        lantuRegisterResiFormDTO.setGridId(gridId);
+        lantuRegisterResiFormDTO.setGridId(lanhuAgencyResultDTO.getGridId());
+        lantuRegisterResiFormDTO.setStreetName(lanhuAgencyResultDTO.getStreetName());
 
 
         // 注册

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

@@ -0,0 +1,40 @@
+/**
+ * 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 com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 组织信息
+ *
+ * @author sun
+ */
+@Data
+public class LanhuAgencyResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String agencyName;
+
+    private String streetName;
+
+    private String gridId;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -793,5 +793,5 @@ public interface GovOrgOpenFeignClient {
      * @Date: 2024/4/11 13:57
      */
     @PostMapping("/gov/org/agency/getGridIdByCommunityCode/{areaCode}")
-    Result<String> getGridIdByCommunityCode(@PathVariable(value = "areaCode")String areaCode);
+    Result<LanhuAgencyResultDTO> getGridIdByCommunityCode(@PathVariable(value = "areaCode")String areaCode);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -495,7 +495,7 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     }
 
     @Override
-    public Result getGridIdByCommunityCode(String areaCode) {
+    public Result<LanhuAgencyResultDTO> getGridIdByCommunityCode(String areaCode) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridIdByCommunityCode", areaCode);
     }
 

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

@@ -647,11 +647,11 @@ public class AgencyController {
      * @Date: 2024/4/11 13:57
      */
     @PostMapping("getGridIdByCommunityCode/{areaCode}")
-    public Result<String> getGridIdByCommunityCode(@PathVariable(value = "areaCode") String areaCode) {
+    public Result<LanhuAgencyResultDTO> getGridIdByCommunityCode(@PathVariable(value = "areaCode") String areaCode) {
         if (StringUtils.isBlank(areaCode)) {
             return new Result<>();
         }
-        return new Result<String>().ok(agencyService.getGridIdByCommunityCode(areaCode));
+        return new Result<LanhuAgencyResultDTO>().ok(agencyService.getGridIdByCommunityCode(areaCode));
     }
 
 }

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

@@ -212,5 +212,5 @@ public interface AgencyService {
      */
     List<AgencyResultDTO> getAllCommunity(String customerId);
 
-    String getGridIdByCommunityCode(String areaCode);
+    LanhuAgencyResultDTO getGridIdByCommunityCode(String areaCode);
 }

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

@@ -1190,7 +1190,9 @@ public class AgencyServiceImpl implements AgencyService {
     }
 
     @Override
-    public String getGridIdByCommunityCode(String areaCode) {
+    public LanhuAgencyResultDTO getGridIdByCommunityCode(String areaCode) {
+
+        LanhuAgencyResultDTO lanhuAgencyResultDTO = new LanhuAgencyResultDTO();
 
         LambdaQueryWrapper<CustomerAgencyEntity> agencyqw = new LambdaQueryWrapper<>();
         agencyqw.eq(CustomerAgencyEntity::getAreaCode,areaCode).eq(CustomerAgencyEntity::getLevel,"community").orderByDesc(CustomerAgencyEntity::getCreatedTime).last("limit 1");
@@ -1199,6 +1201,9 @@ public class AgencyServiceImpl implements AgencyService {
             String errorMsg = "当前areaCode查询社区失败："+areaCode;
             throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), errorMsg, errorMsg);
         }
+        CustomerAgencyEntity street = customerAgencyDao.selectById(community.getPid());
+        lanhuAgencyResultDTO.setStreetName(street.getOrganizationName());
+
         LambdaQueryWrapper<CustomerGridEntity> gridqw = new LambdaQueryWrapper<>();
         gridqw.eq(CustomerGridEntity::getPid,community.getId()).eq(CustomerGridEntity::getGridName,"统建网格").orderByDesc(CustomerGridEntity::getCreatedTime).last("limit 1");
         CustomerGridEntity gridEntity = customerGridDao.selectOne(gridqw);
@@ -1206,7 +1211,8 @@ public class AgencyServiceImpl implements AgencyService {
             String errorMsg = "当前areaCode查询到的社区没有统建网格："+areaCode;
             throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), errorMsg, errorMsg);
         }
+        lanhuAgencyResultDTO.setGridId(gridEntity.getId());
 
-        return gridEntity.getId();
+        return lanhuAgencyResultDTO;
     }
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LantuRegisterResiFormDTO.java

@@ -41,6 +41,7 @@ public class LantuRegisterResiFormDTO {
 
     private String sex;
 
+    private String streetName;
 
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.IssueInitiatorFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
@@ -90,6 +91,15 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 **/
 	UserResiInfoDTO selectByUserId(String userId);
 
+	/**
+	 * @Description: 根据要用户id, 查询用户注册的信息  从resiinfo变成baseinfo
+	 * @param userId:
+	 * @Return com.epmet.dto.UserBaseInfoDTO
+	 * @Author: lichao
+	 * @Date: 2024/4/12 14:44
+	 */
+	UserBaseInfoDTO selectByUserBaseInfoId(@Param("userId") String userId);
+
 	/**
 	 * 根据用户ID更新
 	 * @author zhaoqifeng

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -772,6 +772,30 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                 userResiRegisterVisitDao.updateById(visit);
             }
 
+            UserResiInfoEntity userResiInfoEntity = new UserResiInfoEntity();
+            //居民注册信息
+            UserResiInfoDTO userResiInfoDTO=userResiInfoDao.selectByUserId(baseInfo.getUserId());
+            if(null == userResiInfoDTO){
+                userResiInfoEntity.setCustomerId(formDTO.getCustomerId());
+                userResiInfoEntity.setUserId(baseInfo.getUserId());
+                userResiInfoEntity.setSurname(NameUtils.getSurNameComplex(formDTO.getRealName()));
+                userResiInfoEntity.setName(NameUtils.getNameComplex(formDTO.getRealName()));
+                userResiInfoEntity.setRegMobile(formDTO.getMobile());
+                userResiInfoEntity.setStreet(formDTO.getStreetName());
+                userResiInfoEntity.setResiVisitId(visit.getId());
+                userResiInfoDao.insert(userResiInfoEntity);
+            }else{
+                if (StringUtils.isNotBlank(formDTO.getRealName()) && StringUtils.isBlank(baseInfo.getSurname())) {
+                    userResiInfoEntity.setSurname(NameUtils.getSurNameComplex(formDTO.getRealName()));
+                }
+                if (StringUtils.isNotBlank(formDTO.getRealName()) && StringUtils.isBlank(baseInfo.getName())) {
+                    userResiInfoEntity.setName(NameUtils.getNameComplex(formDTO.getRealName()));
+                }
+                userResiInfoEntity.setStreet(formDTO.getStreetName());
+                userResiInfoEntity.setResiVisitId(visit.getId());
+                userResiInfoDao.updateById(userResiInfoEntity);
+            }
+
             //新增该用户在该客户下的注册状态
             LambdaQueryWrapper<UserCustomerEntity> userCustomerEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
             userCustomerEntityLambdaQueryWrapper.eq(UserCustomerEntity::getCustomerId,baseInfo.getCustomerId());
@@ -803,6 +827,8 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                 userRoleDTO.setGridId(UserRoleConstant.DEFAULT_GRID_ID);
                 userRoleService.saveUserRole(userRoleDTO);
             }
+
+
         } finally {
             distributedLock.unLock(lock);
         }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -43,6 +43,7 @@ import com.epmet.constant.UserConstant;
 import com.epmet.constant.UserResiRegisterConstant;
 import com.epmet.constant.UserRoleConstant;
 import com.epmet.dao.*;
+import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserResiRegisterVisitDTO;
 import com.epmet.dto.UserRoleDTO;
@@ -536,9 +537,14 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	 */
     @Override
     public Boolean getIsResiFlag(String userId) {
-		UserResiInfoDTO userResiInfoDTO = baseDao.selectByUserId(userId);
+/*		UserResiInfoDTO userResiInfoDTO = baseDao.selectByUserId(userId);
 		if (null != userResiInfoDTO){
 			return true;
+		}*/
+		// 从resiInfo中查询修改 变成  从baseInfo
+		UserBaseInfoDTO userBaseInfoDTO = baseDao.selectByUserBaseInfoId(userId);
+		if (null != userBaseInfoDTO){
+			return true;
 		}
 		return false;
     }

epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

@@ -193,6 +193,16 @@
             AND uri.USER_ID = #{userId}
     </select>
 
+    <select id="selectByUserBaseInfoId" resultType="com.epmet.dto.UserBaseInfoDTO">
+        SELECT
+            *
+        FROM
+            user_base_info uri
+        WHERE
+            uri.DEL_FLAG = '0'
+          AND uri.USER_ID = #{userId}
+    </select>
+
     <select id="selectCountByIdNum" parameterType="map" resultType="java.lang.Integer">
         SELECT
             count(uri.id)
@@ -251,4 +261,5 @@
                 </foreach>
             )
     </select>
+
 </mapper>