Browse Source

居民注册页面初始化注册访问记录表新增数据接口

dev_shibei_match
sunyuchao 6 years ago
parent
commit
5e1f5d4062
  1. 29
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
  2. 35
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java
  3. 38
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java
  4. 25
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java
  5. 33
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java
  6. 59
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiRegisterFormDTO.java
  7. 40
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java
  8. 37
      epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java
  9. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java
  10. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java
  11. 13
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java
  12. 40
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java
  13. 32
      epmet-user/epmet-user-server/src/main/resources/mapper/UserResiRegisterVisitDao.xml

29
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<LatestGridInfoResultDTO> 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<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);
}

35
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<LatestGridInfoResultDTO> 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<LatestGridInfoResultDTO> 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<ResiRegisterResultDTO> init(ResiRegisterFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "init", formDTO);
}
}

38
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);
}
}

25
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);
}

33
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);
}
}

59
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;
/**
* 访问来源 指的是用户点的那个功能进入到的注册页面就是一个功能模块的Idvalue:feature+action
*/
@NotBlank(message = "访问来源不能为空")
private String visitFrom;
/**
* 用户Id
*/
@NotBlank(message = "用户ID不能为空")
private String userId;
}

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

37
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";
}

6
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);
}
}

4
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);
}

13
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);
}

40
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){
String id = (String)params.get(FieldConstant.ID_HUMP);
private QueryWrapper<UserResiRegisterVisitEntity> getWrapper(Map<String, Object> params) {
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);
}
}

32
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>
Loading…
Cancel
Save