Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectService.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
#	epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/SaveCollectVisitorFormDTO.java

@@ -0,0 +1,122 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 居民信息采集-访客
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-02
+ */
+@Data
+public class SaveCollectVisitorFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * 组织的pids
+     */
+	private String pids;
+
+    /**
+     * 所属小区ID；
+     */
+    @NotBlank(message = "小区ID不能为空")
+	private String villageId;
+
+    /**
+     * 所属小区名称
+     */
+    @NotBlank(message = "小区名称不能为空")
+	private String villageName;
+
+    /**
+     * 所属楼宇Id
+     */
+    @NotBlank(message = "楼宇Id不能为空")
+	private String buildId;
+
+    /**
+     * 所属楼宇名称
+     */
+    @NotBlank(message = "楼宇名称不能为空")
+	private String buildName;
+
+    /**
+     * 单元id
+     */
+    @NotBlank(message = "单元id不能为空")
+	private String unitId;
+
+    /**
+     * 单元名
+     */
+    @NotBlank(message = "单元名不能为空")
+	private String unitName;
+
+    /**
+     * 所属家庭Id
+     */
+    @NotBlank(message = "家庭Id不能为空")
+	private String homeId;
+
+    /**
+     * 房间名
+     */
+    @NotBlank(message = "房间名不能为空")
+	private String homeName;
+
+    /**
+     * 详细地址
+     */
+    @NotBlank(message = "家庭地址不能为空")
+    private String address;
+
+    /**
+     * 姓名
+     */
+    @NotBlank(message = "姓名不能为空")
+	private String name;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空")
+	private String mobile;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 来访事由
+     */
+	private String comeReason;
+
+    /**
+     * 人脸照片
+     */
+	private String faceImg;
+
+
+}

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

@@ -0,0 +1,18 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: epmet-cloud
+ * @description:
+ * @author: wangtong
+ * @create: 2022-08-03 14:15
+ **/
+@Data
+public class CollectPageFormDTO extends PageFormDTO implements Serializable {
+
+    private String customerId;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectPageListDTO.java

@@ -0,0 +1,51 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/18 19:00
+ * @DESC
+ */
+@Data
+public class CollectPageListDTO implements Serializable {
+
+    private static final long serialVersionUID = -6692672375850864451L;
+
+
+    private String id;
+
+    /**
+     * 居住地址
+     */
+    private String address;
+
+    /**
+     * 居民：resi  访客：visitor
+     */
+    private String type;
+
+    /**
+     * 居民登记/访客登记
+     */
+    private String title;
+
+    /**
+     * 审核状态：0待审核 1审核不通过 2审核通过
+     */
+    private String checkState;
+
+    /**
+     * 审核状态名称
+     */
+    private String checkStateName;
+
+    /**
+     * 提交时间
+     */
+    private String createTime;
+
+
+}

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

@@ -166,6 +166,37 @@ public class IcResiCollectController {
         return new Result();
     }
 
+
+    /**
+     * @describe: 扫描社区/小区二维码进行居民信息登记
+     * @author wangtong
+     * @date 2022/8/2 16:01
+     * @params [formDTO]
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @NoRepeatSubmit
+    @PostMapping("saveCollectInfo")
+    public Result saveCollectInfo(@RequestBody SaveCollectFormDTO formDTO) {
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, IcResiCollectFormDTO.class);
+        formDTO.setOrigin("internal");//固定为内部
+        return icResiCollectService.saveCollectInfo(formDTO);
+    }
+
+    /**
+    * @describe: 我的登记列表
+    * @author wangtong
+    * @date 2022/8/3 13:59
+    * @params [dto]
+    * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData<com.epmet.dto.result.CollectPageListDTO>>
+    */
+    @PostMapping("getCollectPage")
+    public Result<PageData<CollectPageListDTO>> getCollectPage(@LoginUser TokenDto tokenDto,@RequestBody CollectPageFormDTO dto) {
+        dto.setCustomerId(tokenDto.getCustomerId());
+        PageData<CollectPageListDTO> page = icResiCollectService.getCollectPage(dto);
+        return new Result<PageData<CollectPageListDTO>>().ok(page);
+    }
+
     /**
      * 信息采集-审核通过-新增房屋-复显房屋信息
      * @param formDTO

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

@@ -7,9 +7,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 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.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcResiCollectVisitorDTO;
+import com.epmet.dto.SaveCollectVisitorFormDTO;
 import com.epmet.excel.IcResiCollectVisitorExcel;
 import com.epmet.service.IcResiCollectVisitorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,6 +78,20 @@ public class IcResiCollectVisitorController {
         ExcelUtils.exportExcelToTarget(response, null, list, IcResiCollectVisitorExcel.class);
     }
 
+    /**
+    * @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){
+        //效验数据
+        ValidatorUtils.validateEntity(dto);
+        return icResiCollectVisitorService.saveInfo(dto);
+    }
 
 
 }

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

@@ -5,6 +5,7 @@ import com.epmet.dto.form.CollectListFormDTO;
 import com.epmet.dto.form.IcResiCollectGetDetailFormDTO;
 import com.epmet.dto.result.CollectHouseInfoResultDTO;
 import com.epmet.dto.result.CollectListResultDTO;
+import com.epmet.dto.result.CollectPageListDTO;
 import com.epmet.entity.IcResiCollectEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -46,6 +47,15 @@ public interface IcResiCollectDao extends BaseDao<IcResiCollectEntity> {
      */
     List<String> selectLastSubmitId(@Param("customerId") String customerId, @Param("userId") String userId);
 
+    /**
+    * @describe: 我的登记列表
+    * @author wangtong
+    * @date 2022/8/3 14:19
+    * @params [customerId]
+    * @return java.util.List<com.epmet.dto.result.CollectPageListDTO>
+    */
+    List<CollectPageListDTO> getCollectPage(@Param("customerId") String customerId);
+
     /**
      * 获取房屋信息
      * @param formDTO

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectVisitorEntity.java

@@ -78,6 +78,11 @@ public class IcResiCollectVisitorEntity extends BaseEpmetEntity {
      */
 	private String homeName;
 
+	/**
+	 * 详细地址
+	 */
+	private String address;
+
     /**
      * 姓名
      */

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

@@ -2,9 +2,11 @@ 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.form.*;
 import com.epmet.dto.result.CollectHouseInfoResultDTO;
 import com.epmet.dto.result.CollectListResultDTO;
+import com.epmet.dto.result.CollectPageListDTO;
 import com.epmet.dto.result.LatestCollectResDTO;
 import com.epmet.entity.IcResiCollectEntity;
 
@@ -62,6 +64,24 @@ public interface IcResiCollectService extends BaseService<IcResiCollectEntity> {
      */
     void collectCheck(IcResiCollectCheckFormDTO formDTO);
 
+    /**
+    * @describe: 扫描社区/小区二维码进行居民信息登记
+    * @author wangtong
+    * @date 2022/8/2 17:14
+    * @params [formDTO]
+    * @return com.epmet.commons.tools.utils.Result
+    */
+    Result saveCollectInfo(SaveCollectFormDTO formDTO);
+
+    /**
+    * @describe: 我的登记列表
+    * @author wangtong
+    * @date 2022/8/3 14:14
+    * @params [dto]
+    * @return com.epmet.commons.tools.page.PageData<com.epmet.dto.result.CollectPageListDTO>
+    */
+    PageData<CollectPageListDTO> getCollectPage(CollectPageFormDTO dto);
+
     /**
      * 信息采集-获取房屋信息
      * @param formDTO
@@ -69,3 +89,4 @@ public interface IcResiCollectService extends BaseService<IcResiCollectEntity> {
      */
     CollectHouseInfoResultDTO getHouseDetailByCollect(IcResiCollectGetDetailFormDTO formDTO);
 }
+

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

@@ -2,7 +2,9 @@ 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.IcResiCollectVisitorDTO;
+import com.epmet.dto.SaveCollectVisitorFormDTO;
 import com.epmet.entity.IcResiCollectVisitorEntity;
 
 import java.util.List;
@@ -75,4 +77,13 @@ public interface IcResiCollectVisitorService extends BaseService<IcResiCollectVi
      * @date 2022-08-02
      */
     void delete(String[] ids);
-}
+
+    /**
+    * @describe: 保存访客信息
+    * @author wangtong
+    * @date 2022/8/3 10:44
+    * @params [dto]
+    * @return com.epmet.commons.tools.utils.Result
+    */
+    Result saveInfo(SaveCollectVisitorFormDTO dto);
+}

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

@@ -21,7 +21,9 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.CollectHouseInfoResultDTO;
 import com.epmet.dto.result.CollectListResultDTO;
 import com.epmet.dto.result.IcHouseInfoCollectResultDTO;
+import com.epmet.dto.result.CollectPageListDTO;
 import com.epmet.dto.result.LatestCollectResDTO;
+import com.epmet.dto.result.PartyMemberAgeResultDTO;
 import com.epmet.entity.IcResiCollectEntity;
 import com.epmet.entity.IcResiMemberEntity;
 import com.epmet.feign.GovOrgFeignClient;
@@ -136,7 +138,50 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         return null;
     }
 
-    private IcNeighborHoodDTO queryIcNeighborHood(String villageId) {
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result saveCollectInfo(SaveCollectFormDTO formDTO) {
+        IcResiCollectEntity collectInfo = baseDao.selectByAddress(formDTO.getAddress());
+        if (null == collectInfo) {
+            //插入主表
+            IcResiCollectEntity entity = ConvertUtils.sourceToTarget(formDTO, IcResiCollectEntity.class);
+            //根据小区id查询网格相关信息
+            IcNeighborHoodDTO neighborHoodDTO = queryIcNeighborHood(formDTO.getVillageId());
+            entity.setGridId(neighborHoodDTO.getGridId());
+            entity.setAgencyId(neighborHoodDTO.getAgencyId());
+            entity.setPids(neighborHoodDTO.getAgencyPids());
+            entity.setCustomerId(neighborHoodDTO.getCustomerId());
+            entity.setCheckState("0");//待审核
+            baseDao.insert(entity);
+            //插入成员表
+            List<IcResiMemberEntity> memberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class);
+            memberList.forEach(mem -> {
+                if (StringUtils.isNotBlank(mem.getName()) || StringUtils.isNotBlank(mem.getIdNum())) {
+                    //姓名或份身份证号不为空时插入
+                    mem.setIcResiCollectId(entity.getId());
+                    icResiMemberDao.insert(mem);
+                }
+            });
+        } else {
+            //更新主表
+            baseDao.updateRec(collectInfo.getId(), formDTO.getHouseType(), formDTO.getHouseHolderName(), formDTO.getTotalResi(),null);
+            List<IcResiMemberEntity> newMemberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class);
+            //查询之前录入的成员表
+            Map<String, IcResiMemberEntity> memMap = queryOriginMem(collectInfo.getId());
+            saveOrUpdateMem(newMemberList, memMap,collectInfo.getId());
+        }
+        return new Result().ok("提交成功");
+    }
+
+    @Override
+    public PageData<CollectPageListDTO> getCollectPage(CollectPageFormDTO dto) {
+        PageHelper.startPage(dto.getPageNo(), dto.getPageSize());
+        List<CollectPageListDTO> list = baseDao.getCollectPage(dto.getCustomerId());
+        PageInfo<CollectPageListDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
+    public IcNeighborHoodDTO queryIcNeighborHood(String villageId) {
         Result<IcNeighborHoodDTO> res = govOrgOpenFeignClient.getIcNeighbordhoodById(villageId);
         if (!res.success() || null == res.getData()) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "小区信息查询异常", "小区信息查询异常");

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

@@ -3,11 +3,14 @@ package com.epmet.service.impl;
 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.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.IcResiCollectVisitorDao;
+import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.IcResiCollectVisitorDTO;
+import com.epmet.dto.SaveCollectVisitorFormDTO;
 import com.epmet.entity.IcResiCollectVisitorEntity;
 import com.epmet.redis.IcResiCollectVisitorRedis;
 import com.epmet.service.IcResiCollectVisitorService;
@@ -32,6 +35,9 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
     @Autowired
     private IcResiCollectVisitorRedis icResiCollectVisitorRedis;
 
+    @Autowired
+    private IcResiCollectServiceImpl icResiCollectServiceImpl;
+
     @Override
     public PageData<IcResiCollectVisitorDTO> page(Map<String, Object> params) {
         IPage<IcResiCollectVisitorEntity> page = baseDao.selectPage(
@@ -84,4 +90,19 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result saveInfo(SaveCollectVisitorFormDTO dto) {
+        IcResiCollectVisitorEntity entity = ConvertUtils.sourceToTarget(dto, IcResiCollectVisitorEntity.class);
+        //根据小区id查询网格相关信息
+        IcNeighborHoodDTO neighborHoodDTO = icResiCollectServiceImpl.queryIcNeighborHood(dto.getVillageId());
+        entity.setGridId(neighborHoodDTO.getGridId());
+        entity.setAgencyId(neighborHoodDTO.getAgencyId());
+        entity.setPids(neighborHoodDTO.getAgencyPids());
+        entity.setCustomerId(neighborHoodDTO.getCustomerId());
+        insert(entity);
+        return new Result().ok("提交成功");
+    }
+
+}

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

@@ -87,7 +87,8 @@
         <if test="updatedBy != null and updatedBy !=''">
             UPDATED_BY = #{updatedBy},
         </if>
-        UPDATED_TIME = NOW()
+        UPDATED_TIME = NOW(),
+        CHECK_STATE = '0'
         WHERE
             id = #{id}
     </update>
@@ -104,6 +105,36 @@
         ORDER BY
             m.UPDATED_TIME DESC
     </select>
+    <select id="getCollectPage" resultType="com.epmet.dto.result.CollectPageListDTO">
+        select tot.*
+        from (select id,
+						 'resi' as type,
+						 '居民登记' as title,
+						 ADDRESS,
+						 CHECK_STATE,
+						 case CHECK_STATE
+						 when '0' then '待审核'
+						 when '1' then '审核不通过'
+						 when '2' then '审核通过'
+						 else ''
+						 end as checkStateName,
+						 CREATED_TIME
+			from ic_resi_collect
+			where DEL_FLAG='0'
+						and CUSTOMER_ID=#{customerId}
+			union
+			select id,
+						 'visitor' as type,
+						 '访客登记' as title,
+						 ADDRESS,
+						 '2' as checkState,
+						 '审核通过' as checkStateName,
+						 CREATED_TIME
+			from ic_resi_collect_visitor
+			where DEL_FLAG='0'
+				  and CUSTOMER_ID=#{customerId})tot
+            order by tot.CREATED_TIME desc
+    </select>
 
     <select id="getHouseDetailByCollect" resultType="com.epmet.dto.result.CollectHouseInfoResultDTO"
             parameterType="com.epmet.dto.form.IcResiCollectGetDetailFormDTO">