Merge branch 'feature/visit_zhy' into dev

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/VisitVisitorDTO.java

@@ -0,0 +1,129 @@
+package com.epmet.plugin.power.dto.visit;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@Data
+public class VisitVisitorDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 身份证
+     */
+	private String idCard;
+
+    /**
+     * 性别
+     */
+	private String gender;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 人员类型 0：访客 1：租客
+     */
+	private String type;
+
+    /**
+     * 审核状态 0：未审核 1：审核通过 2：审核不通过（房东使用）
+     */
+	private String state;
+
+    /**
+     * 审核原因
+     */
+	private String reason;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 来访事由
+     */
+	private String visitReason;
+
+    /**
+     * 头像
+     */
+	private String faceImg;
+
+    /**
+     * 小区
+     */
+	private String residential;
+
+    /**
+     * 楼栋
+     */
+	private String building;
+
+    /**
+     * 单元
+     */
+	private String unit;
+
+    /**
+     * 房屋
+     */
+	private String room;
+
+    /**
+     * 二维码地区code
+     */
+    private String areaCode;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/VisitVisitorFormDTO.java

@@ -0,0 +1,87 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@Data
+public class VisitVisitorFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 姓名
+     */
+    @NotBlank(message = "姓名不能为空",groups = {AddGroup.class, UpdateGroup.class})
+	private String name;
+
+    /**
+     * 身份证
+     */
+    @NotBlank(message = "身份证号不能为空",groups = {AddGroup.class, UpdateGroup.class})
+	private String idCard;
+
+    /**
+     * 性别
+     */
+    @NotBlank(message = "性别不能为空",groups = {AddGroup.class, UpdateGroup.class})
+	private String gender;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "联系方式不能为空",groups = {AddGroup.class, UpdateGroup.class})
+	private String mobile;
+
+    /**
+     * 人员类型 0：访客 1：租客
+     */
+	private String type;
+
+    /**
+     * 来访事由
+     */
+	private String visitReason;
+
+    /**
+     * 头像
+     */
+	private String faceImg;
+
+    /**
+     * 小区
+     */
+	private String residential;
+
+    /**
+     * 楼栋
+     */
+	private String building;
+
+    /**
+     * 单元
+     */
+	private String unit;
+
+    /**
+     * 房屋
+     */
+	private String room;
+
+    /**
+     * 二维码地区code
+     */
+    private String areaCode;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java

@@ -120,8 +120,9 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
         Map<String, Object> params = new HashMap<>(4);
         params.put("idCard", dto.getIdCard());
         params.put("state", NumConstant.ONE_STR);
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
         if (!list(params).isEmpty()) {
-            return new Result().error("用户已通过审核");
+            return new Result().error("提交失败，用户已通过审核");
         }
 
 //        List<IcResiUserAttachmentDTO> images = new ArrayList<>();

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/controller/VisitVisitorController.java

@@ -0,0 +1,90 @@
+package com.epmet.plugin.power.modules.visit.controller;
+
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+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.plugin.power.dto.visit.VisitVisitorDTO;
+import com.epmet.plugin.power.dto.visit.form.VisitVisitorFormDTO;
+import com.epmet.plugin.power.modules.visit.excel.VisitVisitorExcel;
+import com.epmet.plugin.power.modules.visit.service.VisitVisitorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@RestController
+@RequestMapping("visitVisitor")
+public class VisitVisitorController {
+
+    @Autowired
+    private VisitVisitorService visitVisitorService;
+
+    @RequestMapping("page")
+    public Result<PageData<VisitVisitorDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<VisitVisitorDTO> page = visitVisitorService.page(params);
+        return new Result<PageData<VisitVisitorDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<VisitVisitorDTO> get(@PathVariable("id") String id){
+        VisitVisitorDTO data = visitVisitorService.get(id);
+        return new Result<VisitVisitorDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody VisitVisitorDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        visitVisitorService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("update")
+    public Result update(@RequestBody VisitVisitorDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        visitVisitorService.update(dto);
+        return new Result();
+    }
+
+    @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        visitVisitorService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<VisitVisitorDTO> list = visitVisitorService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, VisitVisitorExcel.class);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("visit")
+    public Result visit(@RequestBody VisitVisitorFormDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        visitVisitorService.visit(dto);
+        return new Result();
+    }
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/dao/VisitVisitorDao.java

@@ -0,0 +1,16 @@
+package com.epmet.plugin.power.modules.visit.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.modules.visit.entity.VisitVisitorEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@Mapper
+public interface VisitVisitorDao extends BaseDao<VisitVisitorEntity> {
+	
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/entity/VisitVisitorEntity.java

@@ -0,0 +1,99 @@
+package com.epmet.plugin.power.modules.visit.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("pli_visit_visitor")
+public class VisitVisitorEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 身份证
+     */
+	private String idCard;
+
+    /**
+     * 性别
+     */
+	private String gender;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 人员类型 0：访客 1：租客
+     */
+	private String type;
+
+    /**
+     * 审核状态 0：未审核 1：审核通过 2：审核不通过（房东使用）
+     */
+	private String state;
+
+    /**
+     * 审核原因
+     */
+	private String reason;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 来访事由
+     */
+	private String visitReason;
+
+    /**
+     * 头像
+     */
+	private String faceImg;
+
+    /**
+     * 小区
+     */
+	private String residential;
+
+    /**
+     * 楼栋
+     */
+	private String building;
+
+    /**
+     * 单元
+     */
+	private String unit;
+
+    /**
+     * 房屋
+     */
+	private String room;
+
+	/**
+	 * 二维码地区code
+	 */
+	private String areaCode;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/excel/VisitVisitorExcel.java

@@ -0,0 +1,81 @@
+package com.epmet.plugin.power.modules.visit.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@Data
+public class VisitVisitorExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "身份证")
+    private String idCard;
+
+    @Excel(name = "性别")
+    private String gender;
+
+    @Excel(name = "手机号")
+    private String mobile;
+
+    @Excel(name = "人员类型 0：访客 1：租客")
+    private String type;
+
+    @Excel(name = "审核状态 0：未审核 1：审核通过 2：审核不通过（房东使用）")
+    private String state;
+
+    @Excel(name = "审核原因")
+    private String reason;
+
+    @Excel(name = "删除标记 0：未删除，1：已删除")
+    private String delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "来访事由")
+    private String visitReason;
+
+    @Excel(name = "头像")
+    private String faceImg;
+
+    @Excel(name = "小区")
+    private String residential;
+
+    @Excel(name = "楼栋")
+    private String building;
+
+    @Excel(name = "单元")
+    private String unit;
+
+    @Excel(name = "房屋")
+    private String room;
+
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/redis/VisitVisitorRedis.java

@@ -0,0 +1,30 @@
+package com.epmet.plugin.power.modules.visit.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@Component
+public class VisitVisitorRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/VisitVisitorService.java

@@ -0,0 +1,90 @@
+package com.epmet.plugin.power.modules.visit.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.plugin.power.dto.visit.VisitVisitorDTO;
+import com.epmet.plugin.power.dto.visit.form.VisitVisitorFormDTO;
+import com.epmet.plugin.power.modules.visit.entity.VisitVisitorEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+public interface VisitVisitorService extends BaseService<VisitVisitorEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<VisitVisitorDTO>
+     * @author generator
+     * @date 2022-07-26
+     */
+    PageData<VisitVisitorDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<VisitVisitorDTO>
+     * @author generator
+     * @date 2022-07-26
+     */
+    List<VisitVisitorDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return VisitVisitorDTO
+     * @author generator
+     * @date 2022-07-26
+     */
+    VisitVisitorDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-07-26
+     */
+    void save(VisitVisitorDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-07-26
+     */
+    void update(VisitVisitorDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-07-26
+     */
+    void delete(String[] ids);
+
+    /**
+     * 访客来访
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-07-26
+     */
+    void visit(VisitVisitorFormDTO dto);
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/impl/VisitVisitorServiceImpl.java

@@ -0,0 +1,96 @@
+package com.epmet.plugin.power.modules.visit.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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.plugin.power.dto.visit.VisitVisitorDTO;
+import com.epmet.plugin.power.dto.visit.form.VisitVisitorFormDTO;
+import com.epmet.plugin.power.modules.visit.dao.VisitVisitorDao;
+import com.epmet.plugin.power.modules.visit.entity.VisitVisitorEntity;
+import com.epmet.plugin.power.modules.visit.redis.VisitVisitorRedis;
+import com.epmet.plugin.power.modules.visit.service.VisitVisitorService;
+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.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@Service
+public class VisitVisitorServiceImpl extends BaseServiceImpl<VisitVisitorDao, VisitVisitorEntity> implements VisitVisitorService {
+
+    @Autowired
+    private VisitVisitorRedis visitVisitorRedis;
+
+    @Override
+    public PageData<VisitVisitorDTO> page(Map<String, Object> params) {
+        IPage<VisitVisitorEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, VisitVisitorDTO.class);
+    }
+
+    @Override
+    public List<VisitVisitorDTO> list(Map<String, Object> params) {
+        List<VisitVisitorEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, VisitVisitorDTO.class);
+    }
+
+    private QueryWrapper<VisitVisitorEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<VisitVisitorEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public VisitVisitorDTO get(String id) {
+        VisitVisitorEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, VisitVisitorDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(VisitVisitorDTO dto) {
+        VisitVisitorEntity entity = ConvertUtils.sourceToTarget(dto, VisitVisitorEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(VisitVisitorDTO dto) {
+        VisitVisitorEntity entity = ConvertUtils.sourceToTarget(dto, VisitVisitorEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void visit(VisitVisitorFormDTO dto) {
+        VisitVisitorEntity entity = ConvertUtils.sourceToTarget(dto, VisitVisitorEntity.class);
+        insert(entity);
+    }
+
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/visit/VisitVisitorDao.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.plugin.power.modules.visit.dao.VisitVisitorDao">
+
+    <resultMap type="com.epmet.plugin.power.modules.visit.entity.VisitVisitorEntity" id="visitVisitorMap">
+        <result property="id" column="ID"/>
+        <result property="name" column="NAME"/>
+        <result property="idCard" column="ID_CARD"/>
+        <result property="gender" column="GENDER"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="type" column="TYPE"/>
+        <result property="state" column="STATE"/>
+        <result property="reason" column="REASON"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="visitReason" column="VISIT_REASON"/>
+        <result property="faceImg" column="FACE_IMG"/>
+        <result property="residential" column="RESIDENTIAL"/>
+        <result property="building" column="BUILDING"/>
+        <result property="unit" column="UNIT"/>
+        <result property="room" column="ROOM"/>
+    </resultMap>
+
+
+</mapper>