Merge remote-tracking branch 'origin/dev0.2' into dev0.2

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

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName UserEnterGridFormDTO
+ * @Author wangc
+ * @date 2020.03.30 10:09
+ */
+@Data
+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

@@ -0,0 +1,33 @@
+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.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;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 用户引导Controller
+ * @ClassName UserGuideController
+ * @Author wangc
+ * @date 2020.03.30 09:34
+ */
+@RestController
+@RequestMapping("user")
+public class UserGuideController {
+
+
+    @PostMapping("entergrid")
+    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-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -2,11 +2,14 @@ package com.epmet.modules.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
+import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack;
 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;
 
 /**
  * @Description 居民端陌生人导览  调用epmet-user服务
@@ -15,13 +18,21 @@ import org.springframework.web.bind.annotation.PathVariable;
 @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
 public interface EpmetUserFeignClient {
 
-	/**
+    /**
-	 * @param userId
+     * @param userId
-	 * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO
+     * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO
-	 * @Author yinzuomei
+     * @Author yinzuomei
-	 * @Description 根据居民id查询最后一次访问的网格信息
+     * @Description 根据居民id查询最后一次访问的网格信息
-	 * @Date 2020/3/24 13:05
+     * @Date 2020/3/24 13:05
-	 **/
+     **/
-	@GetMapping(value = "epmetuser/gridlatest/getLatestGridInfoByUserId/{userId}")
+    @GetMapping(value = "epmetuser/gridlatest/getLatestGridInfoByUserId/{userId}")
-	Result<LatestGridInfoResultDTO> getLatestGridInfoByUserId(@PathVariable("userId") String userId);
+    Result<LatestGridInfoResultDTO> getLatestGridInfoByUserId(@PathVariable("userId") String userId);
+
+    /**
+     * @return com.epmet.dto.result.ResiRegisterResultDTO
+     * @Author sun
+     * @Description 居民端-居民注册页面初始化-居民注册访问记录表新增数据
+     **/
+    @PostMapping(value = "epmetuser/userresiregistervisit/init")
+    Result<ResiRegisterResultDTO> init(ResiRegisterFormDTO formDTO);
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -3,7 +3,9 @@ package com.epmet.modules.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
+import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -15,15 +17,26 @@ import org.springframework.stereotype.Component;
 @Component
 public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
 
-	/**
+    /**
-	 * @param userId
+     * @param userId
-	 * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO
+     * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO
-	 * @Author yinzuomei
+     * @Author yinzuomei
-	 * @Description 根据居民id查询最后一次访问的网格信息
+     * @Description 根据居民id查询最后一次访问的网格信息
-	 * @Date 2020/3/24 13:05
+     * @Date 2020/3/24 13:05
-	 **/
+     **/
-	@Override
+    @Override
-	public Result<LatestGridInfoResultDTO> getLatestGridInfoByUserId(String userId) {
+    public Result<LatestGridInfoResultDTO> getLatestGridInfoByUserId(String userId) {
-		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLatestGridInfoByUserId", userId);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLatestGridInfoByUserId", userId);
-	}
+    }
+
+    /**
+     * @return com.epmet.dto.result.ResiRegisterResultDTO
+     * @Author sun
+     * @Description 居民端-居民注册页面初始化-居民注册访问记录表新增数据
+     * @Date 2020/3/30
+     **/
+    @Override
+    public Result<ResiRegisterResultDTO> init(ResiRegisterFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "init", formDTO);
+    }
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java

@@ -0,0 +1,38 @@
+package com.epmet.modules.resiregister.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.form.ResiRegisterFormDTO;
+import com.epmet.dto.result.ResiRegisterResultDTO;
+import com.epmet.modules.resiregister.service.ResiRegisterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 居民端居民注册相关接口入口
+ * @Author sun
+ * @Date 2020/3/30
+ * @since v1.0.0
+ */
+@RestController
+@RequestMapping("resiregister")
+public class ResiRegisterController {
+    @Autowired
+    private ResiRegisterService resiMineGridService;
+
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-居民注册页面初始化-居民注册访问记录表新增数据
+     * @Date 2020/3/30
+     **/
+    @PostMapping("init")
+    public Result<ResiRegisterResultDTO> init(@LoginUser TokenDto tokenDTO, @RequestBody ResiRegisterFormDTO resiRegisterFormDTO) {
+        return resiMineGridService.init(tokenDTO, resiRegisterFormDTO);
+    }
+
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java

@@ -0,0 +1,25 @@
+package com.epmet.modules.resiregister.service;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ResiRegisterFormDTO;
+import com.epmet.dto.result.ResiRegisterResultDTO;
+
+/**
+ * @Description 居民端居民注册信息service
+ * @Author sun
+ * @Date 2020/3/30
+ */
+public interface ResiRegisterService {
+
+
+    /**
+     * 居民端-居民注册页面初始化-居民注册访问记录表新增数据
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    Result<ResiRegisterResultDTO> init(TokenDto tokenDTO, ResiRegisterFormDTO formDTO);
+
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java

@@ -0,0 +1,33 @@
+package com.epmet.modules.resiregister.service.impl;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ResiRegisterFormDTO;
+import com.epmet.dto.result.ResiRegisterResultDTO;
+import com.epmet.modules.feign.EpmetUserFeignClient;
+import com.epmet.modules.resiregister.service.ResiRegisterService;
+import com.epmet.modules.utils.ModuleConstant;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description 居民端居民注册信息service
+ * @Author sun
+ * @Date 2020/3/30
+ */
+@Service
+public class ResiRegisterServiceImpl implements ResiRegisterService {
+
+    @Autowired
+    private EpmetUserFeignClient epmetUserFeignClient;
+
+    @Override
+    public Result<ResiRegisterResultDTO> init(TokenDto tokenDTO, ResiRegisterFormDTO formDTO) {
+        if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
+            return new Result<ResiRegisterResultDTO>().error(ModuleConstant.USER_NOT_NULL);
+        }
+        formDTO.setUserId(tokenDTO.getUserId());
+        return epmetUserFeignClient.init(formDTO);
+    }
+}

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-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiRegisterFormDTO.java

@@ -0,0 +1,59 @@
+/**
+ * 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.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 居民端-居民注册页面初始化-居民访问记录表新增数据-配置入参
+ * @author sun
+ */
+@Data
+public class ResiRegisterFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id CUSTOMER.id
+     */
+    @NotBlank(message = "客户ID不能为空")
+    private String customerId;
+
+    /**
+     * 网格Id
+     */
+    @NotBlank(message = "网格ID不能为空")
+    private String gridId;
+
+    /**
+     * 访问来源 指的是用户点的那个功能进入到的注册页面，就是一个功能模块的Id（value:feature+action）
+     */
+    @NotBlank(message = "访问来源不能为空")
+    private String visitFrom;
+
+    /**
+     * 用户Id
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+
+}

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

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

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.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 lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 居民端-居民注册页面初始化-居民访问记录表新增数据-配置入参
+ * @author sun
+ */
+@Data
+public class ResiRegisterResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户居民端注册访问记录表(user_resi_register_visit)Id
+     */
+    private String userResiRegisterVisitId;
+
+
+}

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

@@ -0,0 +1,30 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @ClassName UserInfoOnEnterGridResultDTO
+ * @Author wangc
+ * @date 2020.03.30 14:40
+ */
+@Data
+public class UserInfoOnEnterGridResultDTO implements Serializable{
+    private static final long serialVersionUID = 1L;
+
+    private String currentCustomerId;
+
+    private String currentGridId;
+
+    private String currentGridName;
+
+    private String nickname;
+
+    private String userHeadPhoto;
+
+    private List<String> userRoleList;
+
+}

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

@@ -0,0 +1,28 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName UserRoleResultDTO
+ * @Author wangc
+ * @date 2020.03.30 15:29
+ */
+@Data
+public class UserRoleResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 角色名称
+     * */
+    private String roleName;
+
+    /**
+     * 角色key值:normal_resi 、normal_resi 、 normal_resi
+     * */
+    private String roleKey;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.constant;
+
+/**
+ * 常量
+ * @author sun
+ * @since 1.0.0
+ */
+public interface UserResiRegisterConstant {
+
+    /**
+     * 最后一次操作行为-初始化
+     */
+    String INITIALIZE = "initialize";
+
+    /**
+     * 最后一次操作行为-获取手机验证码
+     */
+    String SMS_CODE = "sms_code";
+
+    /**
+     * 最后一次操作行为-提交成功
+     */
+    String SUCCESS = "success";
+
+    /**
+     * 最后一次操作行为-提交失败
+     */
+    String FAILD="faild";
+}

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/controller/UserResiRegisterVisitController.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.UserResiRegisterVisitDTO;
+import com.epmet.dto.form.ResiRegisterFormDTO;
+import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.excel.UserResiRegisterVisitExcel;
 import com.epmet.service.UserResiRegisterVisitService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +93,8 @@ public class UserResiRegisterVisitController {
         ExcelUtils.exportExcelToTarget(response, null, list, UserResiRegisterVisitExcel.class);
     }
 
+    @PostMapping("init")
+    public Result<ResiRegisterResultDTO> init(@RequestBody ResiRegisterFormDTO resiRegisterFormDTO){
+        return userResiRegisterVisitService.saveUserResiRegisterVisit(resiRegisterFormDTO);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.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.UserRoleDTO;
+import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.excel.UserRoleExcel;
 import com.epmet.service.UserRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +93,19 @@ public class UserRoleController {
         ExcelUtils.exportExcelToTarget(response, null, list, UserRoleExcel.class);
     }
 
+    /**
+     * @Description 根据用户Id、来源app、客户Id查询用户角色
+     * @Param userRoleFormDTO
+     * @return UserRoleResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:35
+     **/
+    @PostMapping("getuserroleinfo")
+    public Result<List<UserRoleResultDTO>> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO){
+
+        ValidatorUtils.validateEntity(userRoleFormDTO);
+
+        return userRoleService.getUserRoleInfo(userRoleFormDTO);
+    }
+
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.UserResiRegisterVisitDTO;
 import com.epmet.entity.UserResiRegisterVisitEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -29,5 +30,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface UserResiRegisterVisitDao extends BaseDao<UserResiRegisterVisitEntity> {
-	
+
+    void saveUserResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
 }

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

@@ -18,9 +18,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.entity.UserRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 用户角色关系表 
  *
@@ -29,5 +33,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface UserRoleDao extends BaseDao<UserRoleEntity> {
-	
+    /**
+     * @Description 根据用户Id、来源app、客户Id查询用户角色
+     * @Param userRoleFormDTO
+     * @return UserRoleResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:35
+     **/
+    List<UserRoleResultDTO> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+
 }

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/UserResiRegisterVisitService.java

@@ -19,7 +19,11 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiRegisterVisitDTO;
+import com.epmet.dto.form.ResiRegisterFormDTO;
+import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.entity.UserResiRegisterVisitEntity;
 
 import java.util.List;
@@ -92,4 +96,13 @@ public interface UserResiRegisterVisitService extends BaseService<UserResiRegist
      * @date 2020-03-30
      */
     void delete(String[] ids);
+
+    /**
+     * 居民端-居民注册页面初始化-居民注册访问记录表新增数据
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    Result<ResiRegisterResultDTO> saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.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.UserRoleDTO;
+import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.entity.UserRoleEntity;
 
 import java.util.List;
@@ -92,4 +95,14 @@ public interface UserRoleService extends BaseService<UserRoleEntity> {
      * @date 2020-03-30
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 根据用户Id、来源app、客户Id查询用户角色
+     * @Param userRoleFormDTO
+     * @return UserRoleResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:35
+     **/
+    Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+
 }

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;
+    }
+
 }

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

@@ -19,12 +19,17 @@ 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.FieldConstant;
 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.constant.UserResiRegisterConstant;
 import com.epmet.dao.UserResiRegisterVisitDao;
 import com.epmet.dto.UserResiRegisterVisitDTO;
+import com.epmet.dto.form.ResiRegisterFormDTO;
+import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.entity.UserResiRegisterVisitEntity;
 import com.epmet.redis.UserResiRegisterVisitRedis;
 import com.epmet.service.UserResiRegisterVisitService;
@@ -34,6 +39,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -48,6 +54,8 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
 
     @Autowired
     private UserResiRegisterVisitRedis userResiRegisterVisitRedis;
+    @Autowired
+    private UserResiRegisterVisitDao userResiRegisterVisitDao;
 
     @Override
     public PageData<UserResiRegisterVisitDTO> page(Map<String, Object> params) {
@@ -65,8 +73,8 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
         return ConvertUtils.sourceToTarget(entityList, UserResiRegisterVisitDTO.class);
     }
 
-    private QueryWrapper<UserResiRegisterVisitEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<UserResiRegisterVisitEntity> getWrapper(Map<String, Object> params) {
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<UserResiRegisterVisitEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -101,4 +109,30 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result<ResiRegisterResultDTO> saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO) {
+        Date date = new Date();
+        UserResiRegisterVisitDTO userResiRegisterVisitDTO = new UserResiRegisterVisitDTO();
+        userResiRegisterVisitDTO.setCustomerId(formDTO.getCustomerId());
+        userResiRegisterVisitDTO.setGridId(formDTO.getGridId());
+        userResiRegisterVisitDTO.setUserId(formDTO.getUserId());
+        userResiRegisterVisitDTO.setVisitFrom(formDTO.getVisitFrom());
+        //最后一次操作行为（initialize:初始化 sms_code:获取验证码 success:提交成功  faild:提交失败）
+        userResiRegisterVisitDTO.setLastOperateVisit(UserResiRegisterConstant.INITIALIZE);
+        userResiRegisterVisitDTO.setVisitTime(date);
+        //UUID
+        userResiRegisterVisitDTO.setId(IdWorker.get32UUID());
+        userResiRegisterVisitDTO.setDelFlag(0);
+        userResiRegisterVisitDTO.setRevision(0);
+        userResiRegisterVisitDTO.setCreatedBy(formDTO.getUserId());
+        userResiRegisterVisitDTO.setCreatedTime(date);
+        userResiRegisterVisitDTO.setUpdatedBy(formDTO.getUserId());
+        userResiRegisterVisitDTO.setUpdatedTime(date);
+        userResiRegisterVisitDao.saveUserResiRegisterVisit(userResiRegisterVisitDTO);
+        ResiRegisterResultDTO resiRegisterResultDTO = new ResiRegisterResultDTO();
+        resiRegisterResultDTO.setUserResiRegisterVisitId(userResiRegisterVisitDTO.getId());
+        return new Result<ResiRegisterResultDTO>().ok(resiRegisterResultDTO);
+    }
+
 }

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

@@ -23,8 +23,11 @@ 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.UserRoleDao;
 import com.epmet.dto.UserRoleDTO;
+import com.epmet.dto.form.UserRoleFormDTO;
+import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.entity.UserRoleEntity;
 import com.epmet.redis.UserRoleRedis;
 import com.epmet.service.UserRoleService;
@@ -101,4 +104,16 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description 根据用户Id、来源app、客户Id查询用户角色
+     * @Param userRoleFormDTO
+     * @return UserRoleResultDTO
+     * @Author wangc
+     * @Date 2020.03.30 15:35
+     **/
+    @Override
+    public Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) {
+        return new Result<List<UserRoleResultDTO>>().ok(baseDao.getUserRoleInfo(userRoleFormDTO));
+    }
+
 }

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

@@ -19,5 +19,37 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <insert id="saveUserResiRegisterVisit" parameterType="com.epmet.dto.UserResiRegisterVisitDTO">
+        INSERT INTO user_resi_register_visit (
+            id,
+            customer_id,
+            grid_id,
+            user_id,
+            visit_from,
+            last_operate_visit,
+            visit_time,
+            del_flag,
+            revision,
+            created_by,
+            created_time,
+            updated_by,
+            updated_time
+        )VALUES(
+            #{id},
+            #{customerId},
+            #{gridId},
+            #{userId},
+            #{visitFrom},
+            #{lastOperateVisit},
+            #{visitTime},
+            #{delFlag},
+            #{revision},
+            #{createdBy},
+            #{createdTime},
+            #{updatedBy},
+            #{updatedTime}
+        )
+    </insert>
+
 
 </mapper>

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

@@ -17,4 +17,27 @@
     </resultMap>
 
 
+
+    <select id="getUserRoleInfo" parameterType="com.epmet.dto.form.UserRoleFormDTO" resultType="com.epmet.dto.result.UserRoleResultDTO" >
+
+    SELECT
+        er.ROLE_NAME,
+        er.ROLE_KEY
+    FROM
+        USER_ROLE ur
+        JOIN EPMET_ROLE er ON ur.ROLE_ID = er.ID
+
+    WHERE
+        er.APP = #{app}
+    AND
+        ur.CUSTOMER_ID = #{customerId}
+    AND
+        ur.USER_ID = #{userId}
+    AND
+        er.DEL_FLAG = 0
+    AND
+        ur.DEL_FLAG = 0
+
+    </select>
+
 </mapper>