获取访客欣喜

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

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<PageData<IcResiCollectVisitorDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<IcResiCollectVisitorDTO>> page(@RequestParam Map<String, Object> params) {
 //        PageData<IcResiCollectVisitorDTO> page = icResiCollectVisitorService.page(params);
         PageData<IcResiCollectVisitorDTO> page = icResiCollectVisitorService.getPhrasePage(params);
         return new Result<PageData<IcResiCollectVisitorDTO>>().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<PageData<IcResiCollectVisitorDTO>> getVisitorList(@RequestBody VisitListFormDTO formDTO, @LoginUser TokenDto tokenDto){
+    public Result<PageData<IcResiCollectVisitorDTO>> getVisitorList(@RequestBody VisitListFormDTO formDTO, @LoginUser TokenDto tokenDto) {
-        ValidatorUtils.validateEntity(formDTO,CollectListFormDTO.CollectListForm.class);
+        ValidatorUtils.validateEntity(formDTO, CollectListFormDTO.CollectListForm.class);
         formDTO.setUserId(tokenDto.getUserId());
         formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<PageData<IcResiCollectVisitorDTO>>().ok(icResiCollectVisitorService.getVisitorList(formDTO));
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
-    public Result<IcResiCollectVisitorDTO> get(@PathVariable("id") String id){
+    public Result<IcResiCollectVisitorDTO> get(@PathVariable("id") String id) {
         IcResiCollectVisitorDTO data = icResiCollectVisitorService.get(id);
         return new Result<IcResiCollectVisitorDTO>().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,26 +106,26 @@ public class IcResiCollectVisitorController {
     }
 
     /**
+     * @return com.epmet.commons.tools.utils.Result
      * @describe: 保存访客信息
      * @author wangtong
      * @date 2022/8/3 10:33
      * @params [dto]
-    * @return com.epmet.commons.tools.utils.Result
      */
     @NoRepeatSubmit
     @PostMapping("saveInfo")
-    public Result saveInfo(@RequestBody SaveCollectVisitorFormDTO dto){
+    public Result saveInfo(@RequestBody SaveCollectVisitorFormDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto);
         return icResiCollectVisitorService.saveInfo(dto);
     }
 
     /**
+     * @return com.epmet.commons.tools.utils.Result
      * @describe: 访客信息详情
      * @author wangtong
      * @date 2022/8/3 15:41
      * @params [dto]
-    * @return com.epmet.commons.tools.utils.Result
      */
     @PostMapping("getVisitorDetail")
     public Result getVisitorDetail(@RequestBody CollectDetailFormDTO dto) {
@@ -133,5 +133,19 @@ public class IcResiCollectVisitorController {
         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);
+    }
 
 }

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<IcResiCollectVisitorEnt
 
     /**
      * 条件查询
+     *
      * @param params
      * @return
      */
@@ -29,10 +29,21 @@ public interface IcResiCollectVisitorDao extends BaseDao<IcResiCollectVisitorEnt
 
     /**
      * Desc: 查询访客信息
+     *
      * @param formDTO
      * @author wgf
      * @date 2022/8/5 8:41
      */
     List<IcResiCollectVisitorDTO> getCollectList(VisitListFormDTO formDTO);
 
+    /**
+     * 最新一条访客信息
+     *
+     * @param formDTO
+     * @return com.epmet.entity.IcResiCollectVisitorEntity
+     * @author zhy
+     * @date 2022/8/19 15:33
+     */
+    IcResiCollectVisitorEntity getLastInfo(VisitorInfoFormDTO formDTO);
+
 }

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<IcResiCollectVi
 
     /**
      * 分页条件查询
+     *
      * @param params
      * @return
      */
@@ -92,20 +93,32 @@ public interface IcResiCollectVisitorService extends BaseService<IcResiCollectVi
     void delete(String[] ids);
 
     /**
+     * @return com.epmet.commons.tools.utils.Result
      * @describe: 保存访客信息
      * @author wangtong
      * @date 2022/8/3 10:44
      * @params [dto]
-    * @return com.epmet.commons.tools.utils.Result
      */
     Result saveInfo(SaveCollectVisitorFormDTO dto);
 
     /**
+     * @return com.epmet.commons.tools.utils.Result
      * @describe: 访客信息详情
      * @author wangtong
      * @date 2022/8/3 15:43
      * @params [dto]
-    * @return com.epmet.commons.tools.utils.Result
      */
     Result getVisitorDetail(CollectDetailFormDTO dto);
+
+    /**
+     * 登陆访客用户信息
+     *
+     * @param tokenDto
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/8/19 15:24
+     */
+    Result getVisitorInfo(TokenDto tokenDto, VisitorInfoFormDTO dto);
+
 }

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

@@ -8,6 +8,7 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcResiCollectVisitorDao;
@@ -15,10 +16,9 @@ import com.epmet.dto.IcNeighborHoodDTO;
 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.form.VisitVisitorFormDTO;
-import com.epmet.dto.result.CollectListResultDTO;
+import com.epmet.dto.form.VisitorInfoFormDTO;
 import com.epmet.entity.IcResiCollectVisitorEntity;
 import com.epmet.redis.IcResiCollectVisitorRedis;
 import com.epmet.service.IcResiCollectVisitorService;
@@ -171,4 +171,12 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
         return new Result().ok(entity);
     }
 
+    @Override
+    public Result getVisitorInfo(TokenDto tokenDto, VisitorInfoFormDTO dto) {
+        dto.setUserId(tokenDto.getUserId());
+        dto.setCustomerId(tokenDto.getCustomerId());
+        IcResiCollectVisitorEntity entity = baseDao.getLastInfo(dto);
+        return new Result().ok(entity);
+    }
+
 }

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

@@ -104,5 +104,18 @@
         order by CREATED_TIME desc
     </select>
 
+    <select id="getLastInfo" resultType="com.epmet.entity.IcResiCollectVisitorEntity">
+        SELECT
+            *
+        FROM
+            ic_resi_collect_visitor
+        WHERE
+            DEL_FLAG = '0'
+          AND CREATED_BY = #{userId}
+          AND CUSTOMER_ID = #{customerId}
+        ORDER BY
+            CREATED_TIME DESC
+        LIMIT 1
+    </select>
 
 </mapper>