居民预约

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/PartyServiceCenterConstant.java

@@ -8,6 +8,7 @@ package com.epmet.constant;
 public interface PartyServiceCenterConstant {
 
     String ORG_TYPE_AGENCY = "agency";
+    String ORG_TYPE_GRID = "grid";
 
     String APPOINTMENT_STATUS_APPOINTING = "appointing";
     String APPOINTMENT_STATUS_CANCEL = "cancel";

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

@@ -40,6 +40,7 @@ import com.epmet.constant.PartyServiceCenterConstant;
 import com.epmet.dao.IcMatterAppointmentRecordDao;
 import com.epmet.dao.IcPartyServiceCenterDao;
 import com.epmet.dto.IcPartyServiceCenterDTO;
+import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.dto.TimeDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -347,13 +348,9 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
                 throw new RenException(EpmetErrorCode.APPOINTMENT_TIME_ERROR.getCode());
             }
         }
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, tokenDto.getUserId());
+        Result<RegisterRelationDTO> registerRelation = userOpenFeignClient.resiRelationInfo(tokenDto.getUserId());
-        if (null == staffInfo){
+        if (!registerRelation.success()){
-            throw new RenException(String.format("查询人员{%s}信息失败",tokenDto.getUserId()));
+            throw new EpmetException(String.format("查询居民{%s}信息失败",tokenDto.getUserId()));
-        }
-        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
-        if (null == agencyInfo){
-            throw new RenException(String.format("查询组织信息失败%s",staffInfo.getAgencyId()));
         }
         IcMatterAppointmentRecordEntity e = ConvertUtils.sourceToTarget(formDTO, IcMatterAppointmentRecordEntity.class);
         e.setCustomerId(customerId);
@@ -361,11 +358,24 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
             e.setOrgId(formDTO.getOrgId());
             e.setOrgType(formDTO.getOrgType());
         }else {
-            e.setOrgId(staffInfo.getAgencyId());
+            e.setOrgId(registerRelation.getData().getGridId());
-            e.setOrgType(PartyServiceCenterConstant.ORG_TYPE_AGENCY);
+            e.setOrgType(PartyServiceCenterConstant.ORG_TYPE_GRID);
+        }
+        if (e.getOrgType().equals(PartyServiceCenterConstant.ORG_TYPE_GRID)){
+            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(e.getOrgId());
+            if (null == gridInfo){
+                throw new EpmetException(String.format("查询组织信息失败%s",e.getOrgId()));
+            }
+            e.setPid(gridInfo.getPid());
+            e.setPids(gridInfo.getPids());
+        }else {
+            AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(e.getOrgId());
+            if (null == agencyInfo){
+                throw new EpmetException(String.format("查询组织信息失败%s",e.getOrgId()));
+            }
+            e.setPid(agencyInfo.getPid());
+            e.setPids(agencyInfo.getPids());
         }
-        e.setPid(agencyInfo.getPid());
-        e.setPids(agencyInfo.getPids());
         e.setStatus(PartyServiceCenterConstant.APPOINTMENT_STATUS_APPOINTING);
         matterAppointmentRecordDao.insert(e);
     }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -698,4 +698,14 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping(value = "/epmetuser/icresiuser/geticresiuser/{icResiUserId}")
     Result<IcResiUserDTO> getIcResiUserDTO(@PathVariable("icResiUserId") String icResiUserId);
+
+    /**
+     * @Description  查询居民注册关系
+     * @param userId
+     * @author zxc
+     * @date 2021/12/30 3:12 下午
+     */
+    @PostMapping("/epmetuser/userbaseinfo/resirelationinfo")
+    Result<RegisterRelationDTO> resiRelationInfo(@RequestParam("userId")String userId);
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -517,4 +517,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<IcResiUserDTO> getIcResiUserDTO(String icResiUserId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIcResiUserDTO", icResiUserId);
     }
+
+    @Override
+    public Result<RegisterRelationDTO> resiRelationInfo(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "resiRelationInfo", userId);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.form.CommonUserIdFormDTO;
 import com.epmet.dto.form.IssueInitiatorFormDTO;
@@ -203,5 +204,16 @@ public class UserBaseInfoController {
         ValidatorUtils.validateEntity(param, CommonUserIdFormDTO.CommonUserIdGroup.class);
         return new Result<ExtUserInfoResultDTO>().ok(userBaseInfoService.extUserInfo(param));
     }
+
+    /**
+     * @Description  查询居民注册关系
+     * @param userId
+     * @author zxc
+     * @date 2021/12/30 3:12 下午
+     */
+    @PostMapping("resirelationinfo")
+    public Result<RegisterRelationDTO> resiRelationInfo(@RequestParam("userId")String userId){
+        return new Result<RegisterRelationDTO>().ok(userBaseInfoService.resiRelationInfo(userId));
+    }
 }
 

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

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.entity.RegisterRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -55,4 +56,12 @@ public interface RegisterRelationDao extends BaseDao<RegisterRelationEntity> {
      * @date 2021/3/16 下午3:05
      */
     String selectRegisterGridIdByUserId(@Param("userId")String userId);
+
+    /**
+     * @Description  居民注册关系
+     * @param userId
+     * @author zxc
+     * @date 2021/12/30 3:14 下午
+     */
+    RegisterRelationDTO resiRelationInfo(@Param("userId")String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java

@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.form.CommonUserIdFormDTO;
 import com.epmet.dto.form.VolunteerRegResiFormDTO;
@@ -194,4 +195,12 @@ public interface UserBaseInfoService extends BaseService<UserBaseInfoEntity> {
 
     @Deprecated
     Integer checkIdNum(String idNum, String customerId, String excludeUserId);
+
+    /**
+     * @Description  查询居民注册关系
+     * @param userId
+     * @author zxc
+     * @date 2021/12/30 3:12 下午
+     */
+    RegisterRelationDTO resiRelationInfo(String userId);
 }

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

@@ -30,6 +30,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.*;
+import com.epmet.dto.RegisterRelationDTO;
 import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserWechatDTO;
@@ -86,6 +87,8 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
     private RegisterRelationService registerRelationService;
     @Autowired
     private UserResiInfoService userResiInfoService;
+    @Autowired
+    private RegisterRelationDao registerRelationDao;
 
     @Override
     public PageData<UserBaseInfoDTO> page(Map<String, Object> params) {
@@ -490,4 +493,15 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
     public Integer checkIdNum(String idNum, String customerId, String excludeUserId) {
         return baseDao.selectCountIdNum(idNum,customerId,excludeUserId);
     }
+
+    /**
+     * @Description  查询居民注册关系
+     * @param userId
+     * @author zxc
+     * @date 2021/12/30 3:12 下午
+     */
+    @Override
+    public RegisterRelationDTO resiRelationInfo(String userId) {
+        return registerRelationDao.resiRelationInfo(userId);
+    }
 }

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

@@ -82,5 +82,10 @@
         SELECT GRID_ID FROM register_relation WHERE DEL_FLAG = 0 and USER_ID = #{userId}
     </select>
 
+    <!-- 居民注册关系 -->
+    <select id="resiRelationInfo" resultType="com.epmet.dto.RegisterRelationDTO">
+        SELECT * FROM register_relation WHERE DEL_FLAG = 0 AND USER_ID = #{userId}
+    </select>
+
 
 </mapper>