信息采集审核

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

@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+/**
+ * @Author wgf
+ * @DateTime 2022/8/5 8:00
+ * @DESC
+ */
+@Data
+public class VisitListFormDTO extends PageFormDTO {
+
+    private static final long serialVersionUID = 2106773724057183577L;
+
+    private String startTime;
+
+    private String endTime;
+
+    private String userId;
+
+    private String customerId;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java

@@ -1,7 +1,10 @@
 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;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -12,6 +15,9 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 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.excel.IcResiCollectVisitorExcel;
 import com.epmet.service.IcResiCollectVisitorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +50,23 @@ public class IcResiCollectVisitorController {
 
     }
 
+    /**
+     * Desc: 访客记录列表
+     * @param formDTO
+     * @param tokenDto
+     * @author wgf
+     * @date 2022/8/5 8:23
+     */
+    @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){
+        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})
     public Result<IcResiCollectVisitorDTO> get(@PathVariable("id") String id){
         IcResiCollectVisitorDTO data = icResiCollectVisitorService.get(id);

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

@@ -2,6 +2,9 @@ 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.entity.IcResiCollectVisitorEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -24,4 +27,12 @@ public interface IcResiCollectVisitorDao extends BaseDao<IcResiCollectVisitorEnt
      */
     List<IcResiCollectVisitorDTO> getPhrasePage(Map<String, Object> params);
 
+    /**
+     * Desc: 查询访客信息
+     * @param formDTO
+     * @author wgf
+     * @date 2022/8/5 8:41
+     */
+    List<IcResiCollectVisitorDTO> getCollectList(VisitListFormDTO formDTO);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java

@@ -6,6 +6,9 @@ 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.entity.IcResiCollectVisitorEntity;
 
 import java.util.List;
@@ -36,6 +39,8 @@ public interface IcResiCollectVisitorService extends BaseService<IcResiCollectVi
      */
     PageData<IcResiCollectVisitorDTO> getPhrasePage(Map<String, Object> params);
 
+    PageData<IcResiCollectVisitorDTO> getVisitorList(VisitListFormDTO formDTO);
+
     /**
      * 默认查询
      *

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

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+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.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcResiCollectVisitorDao;
@@ -12,14 +15,20 @@ 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.result.CollectListResultDTO;
 import com.epmet.entity.IcResiCollectVisitorEntity;
 import com.epmet.redis.IcResiCollectVisitorRedis;
 import com.epmet.service.IcResiCollectVisitorService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -60,6 +69,21 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
         return new PageData<>(list, page.getTotal());
     }
 
+    /**
+     * Desc: 查询访客信息
+     * @param formDTO
+     * @author wgf
+     * @date 2022/8/5 8:23
+     */
+    @Override
+    public PageData<IcResiCollectVisitorDTO> getVisitorList(VisitListFormDTO formDTO) {
+        PageData<IcResiCollectVisitorDTO> result = new PageData<>(new ArrayList<>(), 0);
+        PageInfo<IcResiCollectVisitorDTO> pageList = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getCollectList(formDTO));
+        result.setList(pageList.getList());
+        result.setTotal(Integer.parseInt(String.valueOf(pageList.getTotal())));
+        return result;
+    }
+
     @Override
     public List<IcResiCollectVisitorDTO> list(Map<String, Object> params) {
         List<IcResiCollectVisitorEntity> entityList = baseDao.selectList(getWrapper(params));

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

@@ -66,5 +66,41 @@
         order by CREATED_TIME desc
     </select>
 
+    <select id="getCollectList" resultType="com.epmet.dto.IcResiCollectVisitorDTO">
+        select
+        ID,
+        concat(VILLAGE_NAME,BUILD_NAME,UNIT_NAME,HOME_NAME) as address,
+        CUSTOMER_ID,
+        GRID_ID,
+        AGENCY_ID,
+        PIDS,
+        VILLAGE_ID,
+        VILLAGE_NAME,
+        BUILD_ID,
+        BUILD_NAME,
+        UNIT_ID,
+        UNIT_NAME,
+        HOME_ID,
+        HOME_NAME,
+        ADDRESS,
+        NAME,
+        MOBILE,
+        ID_CARD,
+        COME_REASON,
+        FACE_IMG,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        from ic_resi_collect_visitor
+        where DEL_FLAG = '0'
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        order by CREATED_TIME desc
+    </select>
+
 
 </mapper>