进入网格修改

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@@ -31,6 +31,7 @@ import com.epmet.constant.UserWorkType;
 import com.epmet.dao.CustomerDao;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerDTO;
+import com.epmet.dto.CustomerHomeDTO;
 import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java

@@ -1,12 +1,11 @@
 package com.epmet.service.impl;
 
-import com.epmet.commons.tools.constant.NumConstant;
+
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.StrangerResiGuideConstant;
 import com.epmet.dto.form.EnterGridFormDTO;
 import com.epmet.dto.form.UserEnterGridFormDTO;
-import com.epmet.dto.form.VisitedFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.service.UserAccessService;
@@ -41,7 +40,7 @@ public class UserAccessServiceImpl implements UserAccessService {
                 epmetUserFeignClient.getUserInfoAndRoles(userInfoParams);
         if(userInfoResult.success()){
             //2:调用epmet-user服务查询数据 新建网格记录数据
-            VisitedFormDTO visitedFormDTO = new VisitedFormDTO();
+            /*VisitedFormDTO visitedFormDTO = new VisitedFormDTO();
             visitedFormDTO.setGridId(userInfoParams.getGridId());
             visitedFormDTO.setCustomerId(userInfoParams.getCustomerId());
             visitedFormDTO.setUserId(userInfoParams.getUserId());
@@ -53,10 +52,10 @@ public class UserAccessServiceImpl implements UserAccessService {
             Result re = epmetUserFeignClient.saveVisitedRecord(visitedFormDTO);
             if (!re.success()) {
                 log.warn(StrangerResiGuideConstant.EPMET_USER_EXCEPTION);
-            }
+            }*/
         }else{
             //getUserInfoAndRoles调用失败
-
+            log.warn(StrangerResiGuideConstant.EPMET_USER_EXCEPTION);
         }
 
         return userInfoResult;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java

@@ -20,6 +20,11 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
      * */
     private String currentCustomerId;
 
+    /**
+     * 当前客户名称
+     * */
+    //private String currentCustomerName;
+
     /**
      * 当前网格Id
      * */

epmet-user/epmet-user-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java

@@ -5,6 +5,8 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerDTO;
 import com.epmet.feign.fallback.OperCrmFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -22,4 +24,7 @@ public interface OperCrmFeignClient {
 	 */
 	@PostMapping("/oper/crm/customer/getcostomerInfo")
 	Result<CustomerDTO> getCustomerInfo(@RequestBody CustomerDTO dto);
+
+	@GetMapping("/oper/crm/customer/{id}")
+	Result<CustomerDTO> get(@PathVariable("id") String id);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java

@@ -18,4 +18,9 @@ public class OperCrmFeignClientFallBack implements OperCrmFeignClient {
 	public Result<CustomerDTO> getCustomerInfo(CustomerDTO dto) {
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getCustomerInfo", dto);
 	}
+
+	@Override
+	public Result<CustomerDTO> get(String id) {
+		return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "get", id);
+	}
 }

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

@@ -19,7 +19,6 @@ package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
@@ -28,24 +27,20 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserCustomerConstant;
 import com.epmet.dao.*;
-import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.*;
-import com.epmet.dto.RegisterRelationDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.UserResiInfoDTO;
-import com.epmet.dto.UserResiRegisterVisitDTO;
-import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.EnterGridFormDTO;
-import com.epmet.dto.form.UserResiInfoFormDTO;
-import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.entity.RegisterRelationEntity;
 import com.epmet.entity.UserCustomerEntity;
-import com.epmet.entity.UserResiInfoEntity;
 import com.epmet.entity.UserWechatEntity;
 import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.RegisterRelationRedis;
+import com.epmet.service.GridVisitedService;
 import com.epmet.service.RegisterRelationService;
+import com.epmet.util.ModuleConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -90,6 +85,12 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
     @Autowired
     private RegisterRelationDao registerRelationDao;
 
+    @Autowired
+    private GridVisitedService gridVisitedService;
+
+    @Autowired
+    private OperCrmFeignClient operCrmFeignClient;
+
 
     @Override
     public PageData<RegisterRelationDTO> page(Map<String, Object> params) {
@@ -276,7 +277,33 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
             log.warn(String.format("查找网格信息失败，网格Id:【%s】",gridId));
         }
 
+        /*Result<CustomerDTO> customerResult =
+        operCrmFeignClient.get(enterGridFormDTO.getCustomerId());
+        if(customerResult.success() && null != customerResult.getData() && StringUtils.isNotBlank(customerResult.getData().getCustomerName())){
+            resultObj.setCurrentCustomerName(customerResult.getData().getCustomerName());
+        }else{
+            log.warn(ModuleConstant.CUSTOMER_INFO_NOT_FOUND);
+        }*/
+
         result.setData(resultObj);
+
+        VisitedFormDTO visitedFormDTO = new VisitedFormDTO();
+        visitedFormDTO.setGridId(enterGridFormDTO.getGridId());
+        visitedFormDTO.setCustomerId(enterGridFormDTO.getCustomerId());
+        visitedFormDTO.setUserId(enterGridFormDTO.getUserId());
+        UserResiInfoFormDTO userResiParam = new UserResiInfoFormDTO();
+        userResiParam.setUserId(enterGridFormDTO.getUserId());
+        UserResiInfoResultDTO resiResult =
+        userResiInfoDao.selectUserResiInfoDTO(userResiParam);
+        if(null == resiResult){
+            visitedFormDTO.setIsReg(NumConstant.ZERO_STR);
+        }else{
+            visitedFormDTO.setIsReg(NumConstant.ONE_STR);
+        }
+        if(!gridVisitedService.saveVisitedRecord(visitedFormDTO).success()){
+            log.warn(ModuleConstant.SAVE_VISITED_RECORD_FAILURE);
+        }
+
         return result;
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/util/ModuleConstant.java

@@ -10,4 +10,13 @@ public interface ModuleConstant {
      * */
      String EMPTY_STR = "";
 
+     /**
+      * 保存用户访问记录失败
+      * */
+     String SAVE_VISITED_RECORD_FAILURE = "保存用户访问记录失败";
+
+     /**
+      * 未检索到客户信息
+      * */
+     String CUSTOMER_INFO_NOT_FOUND = "未检索到客户信息";
 }