访客登记

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

@@ -0,0 +1,116 @@
+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 name;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空")
+	private String mobile;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 来访事由
+     */
+	private String comeReason;
+
+    /**
+     * 人脸照片
+     */
+	private String faceImg;
+
+
+}

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

@@ -10,6 +10,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 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/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

@@ -131,6 +131,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result saveCollectInfo(SaveCollectFormDTO formDTO) {
         IcResiCollectEntity collectInfo = baseDao.selectByAddress(formDTO.getAddress());
         if (null == collectInfo) {
@@ -164,7 +165,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         return new Result().ok("提交成功");
     }
 
-    private IcNeighborHoodDTO queryIcNeighborHood(String villageId) {
+    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("提交成功");
+    }
+
+}