enterGrid相关

epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/UserEnterGridFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -15,8 +16,10 @@ public class UserEnterGridFormDTO implements Serializable{
 
     private static final long serialVersionUID = 1L;
 
+    @NotBlank(message = "客户Id不能为空")
     private String customerId;
 
+    @NotBlank(message = "网格Id不能为空")
     private String gridId;
 
 

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java

@@ -6,8 +6,6 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.StrangerAccessRecordDTO;
-import com.epmet.dto.form.CustomerGridListFormDTO;
-import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java

@@ -3,7 +3,9 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserEnterGridResultDTO;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.UserEnterGridFormDTO;
+import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,9 +22,10 @@ import org.springframework.web.bind.annotation.RestController;
 public class UserGuideController {
 
 
-
     @PostMapping("entergrid")
-    Result<UserEnterGridResultDTO> enterGrid(@LoginUser TokenDto token, @RequestBody UserEnterGridResultDTO userEnterGridResultDTO){
+    Result<UserInfoOnEnterGridResultDTO> enterGrid(@LoginUser TokenDto token, @RequestBody UserEnterGridFormDTO userEnterGridFormDTO){
+
+        ValidatorUtils.validateEntity(userEnterGridFormDTO);
 
         return null;
     }

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

@@ -110,4 +110,6 @@ public interface StrangerAccessRecordService extends BaseService<StrangerAccessR
      * @author sun
      */
     Result<HomeDesignByCustomerResultDTO> getGridHome(TokenDto tokenDTO, StrangerFormDTO formDTO);
+
+
 }

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

@@ -0,0 +1,24 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.UserEnterGridFormDTO;
+import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
+import com.epmet.service.UserAccessService;
+
+/**
+ * @Description
+ * @ClassName UserAccessServiceImpl
+ * @Author wangc
+ * @date 2020.03.30 14:05
+ */
+public class UserAccessServiceImpl implements UserAccessService {
+    @Override
+    public Result<UserInfoOnEnterGridResultDTO> enterGrid(TokenDto tokenDto, UserEnterGridFormDTO formDTO) {
+
+        //TODO  加入不放行白名单
+
+
+        return null;
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName EnterGridFormDTO
+ * @Author wangc
+ * @date 2020.03.30 14:38
+ */
+
+@Data
+public class EnterGridFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @NotBlank(message = "用户Id不能为空")
+    private String userId;
+
+    @NotBlank(message = "客户Id不能为空")
+    private String customerId;
+
+    @NotBlank(message = "网格Id不能为空")
+    private String gridId;
+
+}

epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/UserEnterGridResultDTO.java → epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java

@@ -1,4 +1,4 @@
-package com.epmet.dto;
+package com.epmet.dto.result;
 
 import lombok.Data;
 
@@ -7,13 +7,12 @@ import java.util.List;
 
 /**
  * @Description
- * @ClassName UserEnterGridResultDTO
+ * @ClassName UserInfoOnEnterGridResultDTO
  * @Author wangc
- * @date 2020.03.30 10:37
+ * @date 2020.03.30 14:40
  */
 @Data
-public class UserEnterGridResultDTO implements Serializable{
-
+public class UserInfoOnEnterGridResultDTO implements Serializable{
     private static final long serialVersionUID = 1L;
 
     private String currentCustomerId;

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

@@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.RegisterRelationDTO;
+import com.epmet.dto.form.EnterGridFormDTO;
+import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.excel.RegisterRelationExcel;
 import com.epmet.service.RegisterRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +93,18 @@ public class RegisterRelationController {
         ExcelUtils.exportExcelToTarget(response, null, list, RegisterRelationExcel.class);
     }
 
+    /**
+     * @Description 在用户进入网格时查询用户的注册信息（且统计）以及角色列表
+     * @Param enterGridFormDTO
+     * @return UserInfoOnEnterGridResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:06
+     **/
+    @PostMapping("getuserinfoandroles")
+    public Result<UserInfoOnEnterGridResultDTO> getUserInfoAndRoles(@RequestBody EnterGridFormDTO enterGridFormDTO){
+
+        ValidatorUtils.validateEntity(enterGridFormDTO);
+
+        return registerRelationService.getUserInfoAndRoles(enterGridFormDTO);
+    }
 }

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

@@ -19,7 +19,10 @@ 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.form.EnterGridFormDTO;
+import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.entity.RegisterRelationEntity;
 
 import java.util.List;
@@ -92,4 +95,13 @@ public interface RegisterRelationService extends BaseService<RegisterRelationEnt
      * @date 2020-03-30
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 在用户进入网格时查询用户的注册信息（且统计）以及角色列表
+     * @Param enterGridFormDTO
+     * @return UserInfoOnEnterGridResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:06
+     **/
+    Result<UserInfoOnEnterGridResultDTO> getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO);
 }

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

@@ -23,8 +23,14 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.RegisterRelationDao;
+import com.epmet.dao.UserResiInfoDao;
+import com.epmet.dao.UserRoleDao;
+import com.epmet.dao.UserWechatDao;
 import com.epmet.dto.RegisterRelationDTO;
+import com.epmet.dto.form.EnterGridFormDTO;
+import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.entity.RegisterRelationEntity;
 import com.epmet.redis.RegisterRelationRedis;
 import com.epmet.service.RegisterRelationService;
@@ -49,6 +55,15 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
     @Autowired
     private RegisterRelationRedis registerRelationRedis;
 
+    @Autowired
+    private UserWechatDao userWechatDao;
+
+    @Autowired
+    private UserResiInfoDao userResiInfoDao;
+
+    @Autowired
+    private UserRoleDao userRoleDao;
+
     @Override
     public PageData<RegisterRelationDTO> page(Map<String, Object> params) {
         IPage<RegisterRelationEntity> page = baseDao.selectPage(
@@ -101,4 +116,26 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description 在用户进入网格时查询用户的注册信息（且统计）以及角色列表
+     * @Param enterGridFormDTO
+     * @return UserInfoOnEnterGridResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:06
+     **/
+    @Override
+    public Result<UserInfoOnEnterGridResultDTO> getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO) {
+
+        //1.查找用户注册关系表，如果没有表示当前用户为陌生人(拉取用户微信表信息)，如果有表示当前用户已经进行居民认证
+
+        //2.根据居民认证的网格、客户进行统计
+
+        //3.去网格表中查询网格对应的名称
+
+
+
+
+        return null;
+    }
+
 }