From 5cc4cceb7c835dbd6390c1019e963a15f08df52e Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 19 Aug 2022 15:36:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=BF=E5=AE=A2=E6=AC=A3?= =?UTF-8?q?=E5=96=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/VisitorInfoFormDTO.java | 14 +++++ .../IcResiCollectVisitorController.java | 60 ++++++++++++------- .../epmet/dao/IcResiCollectVisitorDao.java | 15 ++++- .../service/IcResiCollectVisitorService.java | 41 ++++++++----- .../impl/IcResiCollectVisitorServiceImpl.java | 12 +++- .../mapper/IcResiCollectVisitorDao.xml | 13 ++++ 6 files changed, 114 insertions(+), 41 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitorInfoFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitorInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitorInfoFormDTO.java new file mode 100644 index 0000000000..4c1467a774 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitorInfoFormDTO.java @@ -0,0 +1,14 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class VisitorInfoFormDTO implements Serializable { + + private String userId; + + private String customerId; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java index 60995a0211..05d5ba667b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java @@ -1,7 +1,6 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; -import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -17,7 +16,7 @@ import com.epmet.dto.SaveCollectVisitorFormDTO; import com.epmet.dto.form.CollectDetailFormDTO; import com.epmet.dto.form.CollectListFormDTO; import com.epmet.dto.form.VisitListFormDTO; -import com.epmet.dto.result.CollectListResultDTO; +import com.epmet.dto.form.VisitorInfoFormDTO; import com.epmet.excel.IcResiCollectVisitorExcel; import com.epmet.service.IcResiCollectVisitorService; import org.springframework.beans.factory.annotation.Autowired; @@ -42,7 +41,7 @@ public class IcResiCollectVisitorController { private IcResiCollectVisitorService icResiCollectVisitorService; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { // PageData page = icResiCollectVisitorService.page(params); PageData page = icResiCollectVisitorService.getPhrasePage(params); return new Result>().ok(page); @@ -52,6 +51,7 @@ public class IcResiCollectVisitorController { /** * Desc: 访客记录列表 + * * @param formDTO * @param tokenDto * @author wgf @@ -60,22 +60,22 @@ public class IcResiCollectVisitorController { @PostMapping("list") // @MaskResponse(fieldNames = { "memberIdNum", "memberMobile" }, // fieldsMaskType = { MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE }) - public Result> getVisitorList(@RequestBody VisitListFormDTO formDTO, @LoginUser TokenDto tokenDto){ - ValidatorUtils.validateEntity(formDTO,CollectListFormDTO.CollectListForm.class); + public Result> getVisitorList(@RequestBody VisitListFormDTO formDTO, @LoginUser TokenDto tokenDto) { + ValidatorUtils.validateEntity(formDTO, CollectListFormDTO.CollectListForm.class); formDTO.setUserId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icResiCollectVisitorService.getVisitorList(formDTO)); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { IcResiCollectVisitorDTO data = icResiCollectVisitorService.get(id); return new Result().ok(data); } @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcResiCollectVisitorDTO dto){ + public Result save(@RequestBody IcResiCollectVisitorDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); icResiCollectVisitorService.save(dto); @@ -84,7 +84,7 @@ public class IcResiCollectVisitorController { @NoRepeatSubmit @PostMapping("update") - public Result update(@RequestBody IcResiCollectVisitorDTO dto){ + public Result update(@RequestBody IcResiCollectVisitorDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icResiCollectVisitorService.update(dto); @@ -92,7 +92,7 @@ public class IcResiCollectVisitorController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); icResiCollectVisitorService.delete(ids); @@ -106,32 +106,46 @@ public class IcResiCollectVisitorController { } /** - * @describe: 保存访客信息 - * @author wangtong - * @date 2022/8/3 10:33 - * @params [dto] - * @return com.epmet.commons.tools.utils.Result - */ + * @return com.epmet.commons.tools.utils.Result + * @describe: 保存访客信息 + * @author wangtong + * @date 2022/8/3 10:33 + * @params [dto] + */ @NoRepeatSubmit @PostMapping("saveInfo") - public Result saveInfo(@RequestBody SaveCollectVisitorFormDTO dto){ + public Result saveInfo(@RequestBody SaveCollectVisitorFormDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto); return icResiCollectVisitorService.saveInfo(dto); } /** - * @describe: 访客信息详情 - * @author wangtong - * @date 2022/8/3 15:41 - * @params [dto] - * @return com.epmet.commons.tools.utils.Result - */ + * @return com.epmet.commons.tools.utils.Result + * @describe: 访客信息详情 + * @author wangtong + * @date 2022/8/3 15:41 + * @params [dto] + */ @PostMapping("getVisitorDetail") public Result getVisitorDetail(@RequestBody CollectDetailFormDTO dto) { ValidatorUtils.validateEntity(dto); return icResiCollectVisitorService.getVisitorDetail(dto); } + /** + * 登陆访客用户信息 + * + * @param tokenDto + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author zhy + * @date 2022/8/19 15:24 + */ + @PostMapping("visitorinfo") + public Result getVisitorInfo(@LoginUser TokenDto tokenDto, @RequestBody VisitorInfoFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return icResiCollectVisitorService.getVisitorInfo(tokenDto, dto); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java index acf3fe568c..dac7126438 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java @@ -2,9 +2,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcResiCollectVisitorDTO; -import com.epmet.dto.form.CollectListFormDTO; import com.epmet.dto.form.VisitListFormDTO; -import com.epmet.dto.result.CollectListResultDTO; +import com.epmet.dto.form.VisitorInfoFormDTO; import com.epmet.entity.IcResiCollectVisitorEntity; import org.apache.ibatis.annotations.Mapper; @@ -22,6 +21,7 @@ public interface IcResiCollectVisitorDao extends BaseDao getCollectList(VisitListFormDTO formDTO); + /** + * 最新一条访客信息 + * + * @param formDTO + * @return com.epmet.entity.IcResiCollectVisitorEntity + * @author zhy + * @date 2022/8/19 15:33 + */ + IcResiCollectVisitorEntity getLastInfo(VisitorInfoFormDTO formDTO); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java index 5f7f3e4d25..b8908d1db0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java @@ -2,13 +2,13 @@ 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.IcResiCollectVisitorDTO; import com.epmet.dto.SaveCollectVisitorFormDTO; import com.epmet.dto.form.CollectDetailFormDTO; -import com.epmet.dto.form.CollectListFormDTO; import com.epmet.dto.form.VisitListFormDTO; -import com.epmet.dto.result.CollectListResultDTO; +import com.epmet.dto.form.VisitorInfoFormDTO; import com.epmet.entity.IcResiCollectVisitorEntity; import java.util.List; @@ -34,6 +34,7 @@ public interface IcResiCollectVisitorService extends BaseService +