diff --git a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/UserEnterGridFormDTO.java b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/UserEnterGridFormDTO.java new file mode 100644 index 0000000000..21864bec1d --- /dev/null +++ b/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; + + +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java index e2a164c48f..e3e998fd78 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerAccessRecordController.java +++ b/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; diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java new file mode 100644 index 0000000000..bf19d03521 --- /dev/null +++ b/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 enterGrid(@LoginUser TokenDto token, @RequestBody UserEnterGridFormDTO userEnterGridFormDTO){ + + ValidatorUtils.validateEntity(userEnterGridFormDTO); + + return null; + } + +} diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java index b2d42505b3..6e0479fa9f 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/StrangerAccessRecordService.java @@ -110,4 +110,6 @@ public interface StrangerAccessRecordService extends BaseService getGridHome(TokenDto tokenDTO, StrangerFormDTO formDTO); + + } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java new file mode 100644 index 0000000000..d008450ade --- /dev/null +++ b/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 enterGrid(TokenDto tokenDto, UserEnterGridFormDTO formDTO) { + + //TODO 加入不放行白名单 + + + return null; + } +} diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index 15966f5f15..d034f07265 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/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 - * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO - * @Author yinzuomei - * @Description 根据居民id查询最后一次访问的网格信息 - * @Date 2020/3/24 13:05 - **/ - @GetMapping(value = "epmetuser/gridlatest/getLatestGridInfoByUserId/{userId}") - Result getLatestGridInfoByUserId(@PathVariable("userId") String userId); + /** + * @param userId + * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO + * @Author yinzuomei + * @Description 根据居民id查询最后一次访问的网格信息 + * @Date 2020/3/24 13:05 + **/ + @GetMapping(value = "epmetuser/gridlatest/getLatestGridInfoByUserId/{userId}") + Result getLatestGridInfoByUserId(@PathVariable("userId") String userId); + + /** + * @return com.epmet.dto.result.ResiRegisterResultDTO + * @Author sun + * @Description 居民端-居民注册页面初始化-居民注册访问记录表新增数据 + **/ + @PostMapping(value = "epmetuser/userresiregistervisit/init") + Result init(ResiRegisterFormDTO formDTO); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java index b45339f8ba..190298d177 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/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 - * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO - * @Author yinzuomei - * @Description 根据居民id查询最后一次访问的网格信息 - * @Date 2020/3/24 13:05 - **/ - @Override - public Result getLatestGridInfoByUserId(String userId) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getLatestGridInfoByUserId", userId); - } + /** + * @param userId + * @return com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO + * @Author yinzuomei + * @Description 根据居民id查询最后一次访问的网格信息 + * @Date 2020/3/24 13:05 + **/ + @Override + public Result getLatestGridInfoByUserId(String 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 init(ResiRegisterFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "init", formDTO); + } } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java new file mode 100644 index 0000000000..58128b7e19 --- /dev/null +++ b/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 init(@LoginUser TokenDto tokenDTO, @RequestBody ResiRegisterFormDTO resiRegisterFormDTO) { + return resiMineGridService.init(tokenDTO, resiRegisterFormDTO); + } + +} diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java new file mode 100644 index 0000000000..1b439f38db --- /dev/null +++ b/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 init(TokenDto tokenDTO, ResiRegisterFormDTO formDTO); + +} diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java new file mode 100644 index 0000000000..7b7f1fd0d0 --- /dev/null +++ b/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 init(TokenDto tokenDTO, ResiRegisterFormDTO formDTO) { + if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { + return new Result().error(ModuleConstant.USER_NOT_NULL); + } + formDTO.setUserId(tokenDTO.getUserId()); + return epmetUserFeignClient.init(formDTO); + } +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EnterGridFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EnterGridFormDTO.java new file mode 100644 index 0000000000..254a19c0e8 --- /dev/null +++ b/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; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiRegisterFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiRegisterFormDTO.java new file mode 100644 index 0000000000..15faa061e4 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiRegisterFormDTO.java @@ -0,0 +1,59 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserRoleFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserRoleFormDTO.java new file mode 100644 index 0000000000..75340b75c5 --- /dev/null +++ b/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; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java new file mode 100644 index 0000000000..81496ffcfc --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java @@ -0,0 +1,40 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java new file mode 100644 index 0000000000..5bcfd548cc --- /dev/null +++ b/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 userRoleList; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java new file mode 100644 index 0000000000..11de4ed8c2 --- /dev/null +++ b/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; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java new file mode 100644 index 0000000000..bb00c84ef9 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +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"; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java index eed8b4b3a7..65e8b455fa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java +++ b/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 getUserInfoAndRoles(@RequestBody EnterGridFormDTO enterGridFormDTO){ + + ValidatorUtils.validateEntity(enterGridFormDTO); + + return registerRelationService.getUserInfoAndRoles(enterGridFormDTO); + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java index 076495660e..8b9971f8bd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java +++ b/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 init(@RequestBody ResiRegisterFormDTO resiRegisterFormDTO){ + return userResiRegisterVisitService.saveUserResiRegisterVisit(resiRegisterFormDTO); + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java index 8abd9cb961..9ad160716a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java +++ b/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> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO){ + + ValidatorUtils.validateEntity(userRoleFormDTO); + + return userRoleService.getUserRoleInfo(userRoleFormDTO); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java index 19e5e45a3a..d5e564f559 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java +++ b/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 { - + + void saveUserResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java index ca82e9ae48..0fac9314a9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java +++ b/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 { - + /** + * @Description 根据用户Id、来源app、客户Id查询用户角色 + * @Param userRoleFormDTO + * @return UserRoleResultDTO + * @Author wangc + * @Date 2020.03.30 15:35 + **/ + List getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java index 7eb2f2d376..2ba4b0b66d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java +++ b/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 getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java index a8a9a8530b..1a9c0e2b6b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java +++ b/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 saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java index 877c2d0f52..525eda15a3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java +++ b/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 { * @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> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index f2fdb3d3eb..5c5358527c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/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 page(Map params) { IPage page = baseDao.selectPage( @@ -101,4 +116,26 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO) { + + //1.查找用户注册关系表，如果没有表示当前用户为陌生人(拉取用户微信表信息)，如果有表示当前用户已经进行居民认证 + + //2.根据居民认证的网格、客户进行统计 + + //3.去网格表中查询网格对应的名称 + + + + + return null; + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java index 083355ae87..976a4d1358 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java +++ b/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 page(Map params) { @@ -65,8 +73,8 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -101,4 +109,30 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl 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().ok(resiRegisterResultDTO); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java index 28508b6652..c3926f71d0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java +++ b/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> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) { + return new Result>().ok(baseDao.getUserRoleInfo(userRoleFormDTO)); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiRegisterVisitDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiRegisterVisitDao.xml index 4651dec2a4..1a1af30845 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiRegisterVisitDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiRegisterVisitDao.xml @@ -19,5 +19,37 @@ + + 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} + ) + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml index 7ea5756844..5e8221dd5d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml @@ -17,4 +17,27 @@ + + + \ No newline at end of file