花城E+防疫修改

101captain

2022-05-06 76fa702eea1f96a9d7eb3f41a852cc6db8b2aae6

花城E+防疫修改

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java

@@ -4,12 +4,14 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordTimeVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.reserve.FiveCount;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -62,12 +64,14 @@
    /**
     * 新增数据
     *
     * @param comActAcidRecordVO 实体对象
     * @param comActAcidRecord 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
    public R insert(@RequestBody ComActAcidRecordTimeVO comActAcidRecord) {
        ComActAcidRecordVO comActAcidRecordVO=new ComActAcidRecordVO();
        BeanUtils.copyProperties(comActAcidRecord,comActAcidRecordVO);
        comActAcidRecordVO.setUserId(this.getUserId());
        comActAcidRecordVO.setCreateTime(new Date());
        return this.communityService.insertComActAcidRecord(comActAcidRecordVO);

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordTimeVO.java

New file
@@ -0,0 +1,162 @@
package com.panzhihua.common.model.vos.community.acid;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * (ComActAcidRecord)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 相关功能
 *
 * @author zzj
 * @since 2022-04-12 15:29:57
 */
@Data
@ApiModel("防疫登记实体")
public class ComActAcidRecordTimeVO implements Serializable {

    private static final long serialVersionUID = 681488919320181854L;

    private Long id;

    /**
     * 姓名
     */
    @ApiModelProperty(value = "姓名")
    private String name;

    /**
     * 身份证
     */
    @ApiModelProperty(value = "身份证")
    private String idCard;

    /**
     * 手机号
     */
    @ApiModelProperty(value = "手机号")
    private String phone;

    /**
     * 出发城市
     */
    @ApiModelProperty(value = "出发城市")
    private String departureCity;

    /**
     * 出发地址
     */
    @ApiModelProperty(value = "出发地址")
    private String departureAddress;

    /**
     * 出发日期
     */
    @ApiModelProperty(value = "出发日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date departureDate;

    /**
     * 旅居城市
     */
    @ApiModelProperty(value = "旅居城市")
    private String touristCity;

    /**
     * 在攀居住地
     */
    @ApiModelProperty(value = "在攀居住地")
    private String localCity;

    /**
     * 在攀地址
     */
    @ApiModelProperty(value = "在攀地址")
    private String localAddress;

    /**
     * 到达日期
     */
    @ApiModelProperty(value = "到达日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date arriveDate;

    /**
     * 健康码颜色
     */
    @ApiModelProperty(value = "健康码颜色")
    private String colorMark;

    /**
     * 行程码
     */
    @ApiModelProperty(value = "行程码")
    private String travelCard;

    /**
     * 危险区
     */
    @ApiModelProperty(value = "危险区")
    private String dangerArea;

    /**
     * 境外城市
     */
    @ApiModelProperty(value = "境外城市")
    private String outsideCity;

    /**
     * 疫苗接种
     */
    @ApiModelProperty(value = "疫苗接种")
    private String vaccination;

    /**
     * 核酸检测
     */
    @ApiModelProperty(value = "核酸检测")
    private String acidTest;

    /**
     * 填报类型 1自己填报 2为他人填报
     */
    @ApiModelProperty(value = "填报类型 1自己填报 2为他人填报")
    private Integer type;

    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;

    @ApiModelProperty("定位地址")
    private String realAddress;

    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createTime;

    @ApiModelProperty("健康码截图")
    private String colorImage;

    @ApiModelProperty("行程码截图")
    private String travelImage;

    @ApiModelProperty("48小时核酸截图")
    private String acidImage;

    @ApiModelProperty("疫苗接种截图")
    private String vaccinationImage;


    public interface type{
        int zj=1;
        int tr=2;
    }

}