Browse Source
# Conflicts: # epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/v2/PersonTestingV2Controller.java # epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java # epdc-cloud-custom/src/main/resources/application.yml # epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/controller/PopulationInformationController.java # epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/dao/PopulationInformationDao.java # epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/entity/PopulationInformationEntity.java # epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/excel/BaseResidentInformationExcel.java # epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/PopulationInformationService.java # epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HousingInformationServiceImpl.java # epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/PopulationInformationServiceImpl.java # epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java # epdc-cloud-vim-yushan/src/main/resources/mapper/house/PopulationInformationDao.xmlorigin/epidemic_user
26 changed files with 1225 additions and 283 deletions
@ -1 +1 @@ |
|||
Subproject commit 8c5f912270a32bf7cf695349c0681fb6198e2e5e |
|||
Subproject commit 492ca0bd1716eca3439b0604c60ebda5910f62f2 |
|||
@ -0,0 +1,68 @@ |
|||
package com.elink.esua.epdc.vaccine.epidemic.controller.v2; |
|||
|
|||
|
|||
import cn.afterturn.easypoi.excel.entity.ExportParams; |
|||
import com.elink.esua.epdc.commons.api.version.ApiVersion; |
|||
import com.elink.esua.epdc.commons.tools.annotation.LogOperation; |
|||
import com.elink.esua.epdc.commons.tools.constant.Constant; |
|||
import com.elink.esua.epdc.commons.tools.page.PageData; |
|||
import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; |
|||
import com.elink.esua.epdc.commons.tools.utils.Result; |
|||
import com.elink.esua.epdc.commons.tools.validator.AssertUtils; |
|||
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; |
|||
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; |
|||
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; |
|||
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; |
|||
import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordDetailDTO; |
|||
import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordListDTO; |
|||
import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicReportUserInfoDTO; |
|||
import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicUserInfoDTO; |
|||
import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO; |
|||
import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultV2DTO; |
|||
import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO; |
|||
import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultV2DTO; |
|||
import com.elink.esua.epdc.vaccine.epidemic.excel.EpidecmicUserNewExcel; |
|||
import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; |
|||
import com.elink.esua.epdc.vaccine.epidemic.service.impl.EpidemicUserInfoExportServer; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
import javax.servlet.http.HttpServletResponse; |
|||
import java.util.Map; |
|||
|
|||
|
|||
/** |
|||
* 疫情防控信息表 |
|||
* |
|||
* @author Mark sunlightcs@gmail.com |
|||
* @since 1.0.0 2021-01-26 |
|||
*/ |
|||
@ApiVersion(2) |
|||
@RestController |
|||
@RequestMapping("epidemicuserinfo" + Constant.VERSION_CONTROL) |
|||
public class EpidemicUserInfoV2Controller { |
|||
|
|||
@Autowired |
|||
private EpidemicUserInfoService epidemicUserInfoService; |
|||
|
|||
/** |
|||
* @return io.pingyin.common.utils.Result<io.pingyin.common.page.PageData < io.pingyin.modules.epidemic.dto.result.EpidemicPageResultDTO>> |
|||
* @describe: 接种信息列表 |
|||
* @author wangtong |
|||
* @date 2021/4/15 16:40 |
|||
* @params [params] |
|||
*/ |
|||
@GetMapping("getEpidemicPage") |
|||
public Result<PageData<EpidemicPageResultV2DTO>> getEpidemicPage(@RequestParam Map<String, Object> params) { |
|||
// 按人员录入时间倒序排列
|
|||
PageData<EpidemicPageResultV2DTO> page = epidemicUserInfoService.getEpidemicPageV2(params); |
|||
return new Result<PageData<EpidemicPageResultV2DTO>>().ok(page); |
|||
} |
|||
|
|||
@GetMapping("getinfo/{id}") |
|||
public Result<VaccinationInfoResultV2DTO> getinfo(@PathVariable("id") String id) { |
|||
VaccinationInfoResultV2DTO data = epidemicUserInfoService.getInfoV2(id); |
|||
return new Result<VaccinationInfoResultV2DTO>().ok(data); |
|||
} |
|||
} |
|||
@ -0,0 +1,82 @@ |
|||
package com.elink.esua.epdc.vaccine.epidemic.dto; |
|||
|
|||
// import io.swagger.annotations.ApiModel;
|
|||
// import io.swagger.annotations.ApiModelProperty;
|
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
/** |
|||
* 疫情防控信息表 |
|||
* |
|||
* @author Mark sunlightcs@gmail.com |
|||
* @since 1.0.0 2021-01-26 |
|||
*/ |
|||
@Data |
|||
// @ApiModel(value = "疫情防控信息表")
|
|||
public class EpidemicUserInfoDTOV2 implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
// @ApiModelProperty(value = "主键")
|
|||
private String id; |
|||
|
|||
// @ApiModelProperty(value = "姓名")
|
|||
private String userName; |
|||
|
|||
// @ApiModelProperty(value = "身份证号")
|
|||
private String idCard; |
|||
|
|||
// @ApiModelProperty(value = "户籍地code")
|
|||
private String householdRegisterCode; |
|||
|
|||
// @ApiModelProperty(value = "户籍地名称")
|
|||
private String householdRegisterName; |
|||
|
|||
// @ApiModelProperty(value = "户籍地详细地址")
|
|||
private String householdRegisterDetail; |
|||
|
|||
// @ApiModelProperty(value = "乐观锁")
|
|||
private Integer revision; |
|||
|
|||
// @ApiModelProperty(value = "创建人")
|
|||
private String createdBy; |
|||
|
|||
// @ApiModelProperty(value = "创建时间")
|
|||
private Date createdTime; |
|||
|
|||
// @ApiModelProperty(value = "更新人")
|
|||
private String updatedBy; |
|||
|
|||
// @ApiModelProperty(value = "更新时间")
|
|||
private Date updatedTime; |
|||
|
|||
// @ApiModelProperty(value = "逻辑删除标识")
|
|||
private String delFlag; |
|||
|
|||
// @ApiModelProperty(value = "接种次数")
|
|||
private Integer vaccinationNum; |
|||
|
|||
// @ApiModelProperty(value = "接种状态")
|
|||
private Integer vaccinationState; |
|||
|
|||
// @ApiModelProperty(value = "是否接种")
|
|||
private String isInoculate; |
|||
|
|||
private Integer maxDose; |
|||
|
|||
/** |
|||
* 县内居住地名称 |
|||
*/ |
|||
private String liveAddressName; |
|||
/** |
|||
* 社区/村庄 |
|||
*/ |
|||
private String community; |
|||
/** |
|||
* 网格名称 |
|||
*/ |
|||
private String gridName; |
|||
} |
|||
@ -0,0 +1,66 @@ |
|||
package com.elink.esua.epdc.vaccine.epidemic.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @author rongchao |
|||
* @since 2021/8/31 |
|||
*/ |
|||
@Data |
|||
public class EpidemicPageResultV2DTO implements Serializable { |
|||
/** |
|||
* |
|||
*/ |
|||
private String id; |
|||
/** |
|||
* 姓名 |
|||
*/ |
|||
private String residentsName; |
|||
/** |
|||
* 性别 |
|||
*/ |
|||
private String residentsSex; |
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String residentsPhone; |
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
private String residentsIdentityNo; |
|||
/** |
|||
* |
|||
*/ |
|||
private String residentsNation; |
|||
/** |
|||
* 户籍 |
|||
*/ |
|||
private String householdRegistrationPlace; |
|||
/** |
|||
* |
|||
*/ |
|||
private String helpStatus; |
|||
|
|||
/** |
|||
* 出生年月 |
|||
*/ |
|||
private String residentsBirthday; |
|||
/** |
|||
* |
|||
*/ |
|||
private String familyCategory; |
|||
/** |
|||
* 疫苗接种状态 |
|||
*/ |
|||
private String vaccinationState; |
|||
/** |
|||
* 疫苗接种次数 |
|||
*/ |
|||
private String vaccinationNum; |
|||
/** |
|||
* 房屋地址 |
|||
*/ |
|||
private String houseAddress; |
|||
} |
|||
@ -0,0 +1,36 @@ |
|||
package com.elink.esua.epdc.vaccine.epidemic.dto.result; |
|||
|
|||
// import io.swagger.annotations.ApiModel;
|
|||
// import io.swagger.annotations.ApiModelProperty;
|
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
/** |
|||
* 接种信息 |
|||
* |
|||
* @author Mark sunlightcs@gmail.com |
|||
* @since 1.0.0 2021-04-16 |
|||
*/ |
|||
@Data |
|||
public class VaccinationInfoResultV2DTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
private String id; |
|||
private String residentsName; |
|||
private String residentsIdentityNo; |
|||
private String residentsPhone; |
|||
private String residentsSex; |
|||
private String residentsBirthday; |
|||
private Integer vaccinationNum; |
|||
private String vaccinationState; |
|||
private String companyId; |
|||
private String siteId; |
|||
private Integer dose; |
|||
private String batchNo; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
package com.elink.esua.epdc.vaccine.vim.controller.v2; |
|||
|
|||
import com.elink.esua.epdc.commons.api.version.ApiVersion; |
|||
import com.elink.esua.epdc.commons.tools.annotation.LogOperation; |
|||
import com.elink.esua.epdc.commons.tools.constant.Constant; |
|||
import com.elink.esua.epdc.commons.tools.page.PageData; |
|||
import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; |
|||
import com.elink.esua.epdc.commons.tools.utils.Result; |
|||
import com.elink.esua.epdc.commons.tools.validator.AssertUtils; |
|||
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; |
|||
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; |
|||
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; |
|||
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; |
|||
import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO; |
|||
import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoV2DTO; |
|||
import com.elink.esua.epdc.vaccine.vim.dto.result.EpdcAppVimInfoResultDTO; |
|||
import com.elink.esua.epdc.vaccine.vim.excel.VaccinationInfoExcel; |
|||
import com.elink.esua.epdc.vaccine.vim.service.VaccinationInfoService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.*; |
|||
import org.springframework.web.multipart.MultipartFile; |
|||
|
|||
import javax.servlet.http.HttpServletResponse; |
|||
import java.util.List; |
|||
import java.util.Map; |
|||
|
|||
|
|||
/** |
|||
* 接种信息 |
|||
* |
|||
* @author Mark sunlightcs@gmail.com |
|||
* @since 1.0.0 2021-04-16 |
|||
*/ |
|||
@ApiVersion(2) |
|||
@RestController |
|||
@RequestMapping("vaccinationinfo" + Constant.VERSION_CONTROL) |
|||
public class VaccinationInfoV2Controller { |
|||
@Autowired |
|||
private VaccinationInfoService vaccinationInfoService; |
|||
|
|||
|
|||
@PostMapping |
|||
@LogOperation("保存") |
|||
public Result save(@RequestBody VaccinationInfoV2DTO dto) { |
|||
//效验数据
|
|||
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); |
|||
|
|||
return vaccinationInfoService.saveNewV2(dto); |
|||
} |
|||
} |
|||
@ -0,0 +1,110 @@ |
|||
package com.elink.esua.epdc.vaccine.vim.dto; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import lombok.Data; |
|||
import org.springframework.format.annotation.DateTimeFormat; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
/** |
|||
* 接种信息 |
|||
* |
|||
* @author Mark sunlightcs@gmail.com |
|||
* @since 1.0.0 2021-04-16 |
|||
*/ |
|||
@Data |
|||
// @ApiModel(value = "接种信息")
|
|||
public class VaccinationInfoV2DTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
// @ApiModelProperty(value = "ID")
|
|||
private String id; |
|||
|
|||
// @ApiModelProperty(value = "真实姓名")
|
|||
private String residentsName; |
|||
|
|||
// @ApiModelProperty(value = "身份证号")
|
|||
private String residentsIdentityNo; |
|||
|
|||
// @ApiModelProperty(value = "手机号")
|
|||
private String residentsPhone; |
|||
|
|||
// @ApiModelProperty(value = "性别(女性-0，男性-1)")
|
|||
private String sex; |
|||
|
|||
// @ApiModelProperty(value = "接种人县/区")
|
|||
private String county; |
|||
|
|||
// @ApiModelProperty(value = "接种人街道/乡镇")
|
|||
private String street; |
|||
|
|||
// @ApiModelProperty(value = "接种人街道/乡镇ID")
|
|||
private String streetId; |
|||
|
|||
// @ApiModelProperty(value = "接种人社区/村")
|
|||
private String community; |
|||
|
|||
// @ApiModelProperty(value = "接种人网格")
|
|||
private String grid; |
|||
|
|||
// @ApiModelProperty(value = "小区名称")
|
|||
private String villageName; |
|||
|
|||
// @ApiModelProperty(value = "住处（楼栋-单元-房间）")
|
|||
private String dwellingPlace; |
|||
|
|||
// @ApiModelProperty(value = "接种时间")
|
|||
@DateTimeFormat(pattern = "yyyy-MM-dd") |
|||
@JsonFormat(pattern = "yyyy-MM-dd") |
|||
private String vaccinationTime; |
|||
|
|||
// @ApiModelProperty(value = "接种时年龄")
|
|||
private Integer age; |
|||
|
|||
// @ApiModelProperty(value = "剂次，第几针")
|
|||
private Integer dose; |
|||
|
|||
private Integer maxDose; |
|||
|
|||
// @ApiModelProperty(value = "疫苗种类id")
|
|||
private Long vaccineId; |
|||
|
|||
// @ApiModelProperty(value = "生产企业id")
|
|||
private Long companyId; |
|||
private String company; |
|||
|
|||
// @ApiModelProperty(value = "接种单位/地点ID")
|
|||
private Long siteId; |
|||
private String site; |
|||
|
|||
// @ApiModelProperty(value = "疫苗生成批次、批号")
|
|||
private String batchNo; |
|||
|
|||
// @ApiModelProperty(value = "接种状态")
|
|||
private Integer vaccinationState; |
|||
|
|||
// @ApiModelProperty(value = "删除标识 0：未删除，1：已删除")
|
|||
private String delFlag; |
|||
|
|||
// @ApiModelProperty(value = "乐观锁")
|
|||
private Integer revision; |
|||
|
|||
// @ApiModelProperty(value = "创建人")
|
|||
private String createdBy; |
|||
|
|||
// @ApiModelProperty(value = "创建时间")
|
|||
private Date createdTime; |
|||
|
|||
// @ApiModelProperty(value = "更新人")
|
|||
private String updatedBy; |
|||
|
|||
// @ApiModelProperty(value = "更新时间")
|
|||
private Date updatedTime; |
|||
|
|||
// @ApiModelProperty(value = "创建人姓名")
|
|||
private String creatorName; |
|||
|
|||
|
|||
} |
|||
Loading…
Reference in new issue