Merge branch 'feature/dev/vaccine_prarmeter'

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

@@ -0,0 +1,184 @@
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 新冠病毒疫苗接种人员信息台账
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-22
+ */
+@Data
+public class IcVaccinePrarmeterDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * 组织的pids
+     */
+	private String pids;
+
+    /**
+     * 所属小区ID；
+     */
+	private String villageId;
+
+    /**
+     * 所属小区名称
+     */
+	private String villageName;
+
+    /**
+     * 所属楼宇Id
+     */
+	private String buildId;
+
+    /**
+     * 所属楼宇名称
+     */
+	private String buildName;
+
+    /**
+     * 单元id
+     */
+	private String unitId;
+
+    /**
+     * 单元名
+     */
+	private String unitName;
+
+    /**
+     * 所属家庭Id
+     */
+	private String homeId;
+
+    /**
+     * 房间名
+     */
+	private String homeName;
+
+    /**
+     * 户口性质：0户籍 1外来
+     */
+	private String householdType;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 联系电话
+     */
+	private String mobile;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 是否接种：0否1是
+     */
+	private String isVaccination;
+
+    /**
+     * 第一次接种时间
+     */
+	private String firstVacTime;
+
+    /**
+     * 第一次接种地点
+     */
+	private String firstVacSite;
+
+    /**
+     * 第二次接种时间
+     */
+	private String secondVacTime;
+
+    /**
+     * 第二次接种地点
+     */
+	private String secondVacSite;
+
+    /**
+     * 第三次接种时间
+     */
+	private String thirdVacTime;
+
+    /**
+     * 第三次接种地点
+     */
+	private String thirdVacSite;
+
+    /**
+     * 原因：禁忌症/拒绝接种/其他原因
+     */
+	private String reason;
+
+    /**
+     * 备注
+     */
+	private String note;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

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

@@ -0,0 +1,82 @@
+package com.epmet.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.dto.IcVaccinePrarmeterDTO;
+import com.epmet.excel.IcVaccinePrarmeterExcel;
+import com.epmet.service.IcVaccinePrarmeterService;
+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-08-22
+ */
+@RestController
+@RequestMapping("icVaccinePrarmeter")
+public class IcVaccinePrarmeterController {
+
+    @Autowired
+    private IcVaccinePrarmeterService icVaccinePrarmeterService;
+
+    @RequestMapping("page")
+    public Result<PageData<IcVaccinePrarmeterDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcVaccinePrarmeterDTO> page = icVaccinePrarmeterService.page(params);
+        return new Result<PageData<IcVaccinePrarmeterDTO>>().ok(page);
+    }
+
+    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    public Result<IcVaccinePrarmeterDTO> get(@PathVariable("id") String id){
+        IcVaccinePrarmeterDTO data = icVaccinePrarmeterService.get(id);
+        return new Result<IcVaccinePrarmeterDTO>().ok(data);
+    }
+
+    @NoRepeatSubmit
+    @PostMapping("save")
+    public Result save(@RequestBody IcVaccinePrarmeterDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icVaccinePrarmeterService.save(dto);
+        return new Result();
+    }
+
+    @NoRepeatSubmit
+    @PutMapping("update")
+    public Result update(@RequestBody IcVaccinePrarmeterDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icVaccinePrarmeterService.update(dto);
+        return new Result();
+    }
+
+    @PostMapping("delete")
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icVaccinePrarmeterService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcVaccinePrarmeterDTO> list = icVaccinePrarmeterService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcVaccinePrarmeterExcel.class);
+    }
+
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcVaccinePrarmeterEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 新冠病毒疫苗接种人员信息台账
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-22
+ */
+@Mapper
+public interface IcVaccinePrarmeterDao extends BaseDao<IcVaccinePrarmeterEntity> {
+	
+}

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

@@ -0,0 +1,154 @@
+package com.epmet.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-08-22
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_vaccine_prarmeter")
+public class IcVaccinePrarmeterEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 网格名称
+     */
+	private String gridName;
+
+    /**
+     * 组织Id
+     */
+	private String agencyId;
+
+    /**
+     * 组织的pids
+     */
+	private String pids;
+
+    /**
+     * 所属小区ID；
+     */
+	private String villageId;
+
+    /**
+     * 所属小区名称
+     */
+	private String villageName;
+
+    /**
+     * 所属楼宇Id
+     */
+	private String buildId;
+
+    /**
+     * 所属楼宇名称
+     */
+	private String buildName;
+
+    /**
+     * 单元id
+     */
+	private String unitId;
+
+    /**
+     * 单元名
+     */
+	private String unitName;
+
+    /**
+     * 所属家庭Id
+     */
+	private String homeId;
+
+    /**
+     * 房间名
+     */
+	private String homeName;
+
+    /**
+     * 户口性质：0户籍 1外来
+     */
+	private String householdType;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 联系电话
+     */
+	private String mobile;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 是否接种：0否1是
+     */
+	private String isVaccination;
+
+    /**
+     * 第一次接种时间
+     */
+	private String firstVacTime;
+
+    /**
+     * 第一次接种地点
+     */
+	private String firstVacSite;
+
+    /**
+     * 第二次接种时间
+     */
+	private String secondVacTime;
+
+    /**
+     * 第二次接种地点
+     */
+	private String secondVacSite;
+
+    /**
+     * 第三次接种时间
+     */
+	private String thirdVacTime;
+
+    /**
+     * 第三次接种地点
+     */
+	private String thirdVacSite;
+
+    /**
+     * 原因：禁忌症/拒绝接种/其他原因
+     */
+	private String reason;
+
+    /**
+     * 备注
+     */
+	private String note;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVaccinePrarmeterExcel.java

@@ -0,0 +1,117 @@
+package com.epmet.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-08-22
+ */
+@Data
+public class IcVaccinePrarmeterExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "客户Id customer.id")
+    private String customerId;
+
+    @Excel(name = "网格ID")
+    private String gridId;
+
+    @Excel(name = "网格名称")
+    private String gridName;
+
+    @Excel(name = "组织Id")
+    private String agencyId;
+
+    @Excel(name = "组织的pids")
+    private String pids;
+
+    @Excel(name = "所属小区ID；")
+    private String villageId;
+
+    @Excel(name = "所属小区名称")
+    private String villageName;
+
+    @Excel(name = "所属楼宇Id")
+    private String buildId;
+
+    @Excel(name = "所属楼宇名称")
+    private String buildName;
+
+    @Excel(name = "单元id")
+    private String unitId;
+
+    @Excel(name = "单元名")
+    private String unitName;
+
+    @Excel(name = "所属家庭Id")
+    private String homeId;
+
+    @Excel(name = "房间名")
+    private String homeName;
+
+    @Excel(name = "户口性质：0户籍 1外来")
+    private String householdType;
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "联系电话")
+    private String mobile;
+
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    @Excel(name = "是否接种：0否1是")
+    private String isVaccination;
+
+    @Excel(name = "第一次接种时间")
+    private String firstVacTime;
+
+    @Excel(name = "第一次接种地点")
+    private String firstVacSite;
+
+    @Excel(name = "第二次接种时间")
+    private String secondVacTime;
+
+    @Excel(name = "第二次接种地点")
+    private String secondVacSite;
+
+    @Excel(name = "第三次接种时间")
+    private String thirdVacTime;
+
+    @Excel(name = "第三次接种地点")
+    private String thirdVacSite;
+
+    @Excel(name = "原因：禁忌症/拒绝接种/其他原因")
+    private String reason;
+
+    @Excel(name = "备注")
+    private String note;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer 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;
+
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcVaccinePrarmeterRedis.java

@@ -0,0 +1,30 @@
+package com.epmet.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-08-22
+ */
+@Component
+public class IcVaccinePrarmeterRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

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

@@ -0,0 +1,78 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcVaccinePrarmeterDTO;
+import com.epmet.entity.IcVaccinePrarmeterEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 新冠病毒疫苗接种人员信息台账
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-22
+ */
+public interface IcVaccinePrarmeterService extends BaseService<IcVaccinePrarmeterEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcVaccinePrarmeterDTO>
+     * @author generator
+     * @date 2022-08-22
+     */
+    PageData<IcVaccinePrarmeterDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcVaccinePrarmeterDTO>
+     * @author generator
+     * @date 2022-08-22
+     */
+    List<IcVaccinePrarmeterDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcVaccinePrarmeterDTO
+     * @author generator
+     * @date 2022-08-22
+     */
+    IcVaccinePrarmeterDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-08-22
+     */
+    void save(IcVaccinePrarmeterDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-08-22
+     */
+    void update(IcVaccinePrarmeterDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-08-22
+     */
+    void delete(String[] ids);
+}

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

@@ -0,0 +1,87 @@
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IcVaccinePrarmeterDao;
+import com.epmet.dto.IcVaccinePrarmeterDTO;
+import com.epmet.entity.IcVaccinePrarmeterEntity;
+import com.epmet.redis.IcVaccinePrarmeterRedis;
+import com.epmet.service.IcVaccinePrarmeterService;
+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-08-22
+ */
+@Service
+public class IcVaccinePrarmeterServiceImpl extends BaseServiceImpl<IcVaccinePrarmeterDao, IcVaccinePrarmeterEntity> implements IcVaccinePrarmeterService {
+
+    @Autowired
+    private IcVaccinePrarmeterRedis icVaccinePrarmeterRedis;
+
+    @Override
+    public PageData<IcVaccinePrarmeterDTO> page(Map<String, Object> params) {
+        IPage<IcVaccinePrarmeterEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcVaccinePrarmeterDTO.class);
+    }
+
+    @Override
+    public List<IcVaccinePrarmeterDTO> list(Map<String, Object> params) {
+        List<IcVaccinePrarmeterEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcVaccinePrarmeterDTO.class);
+    }
+
+    private QueryWrapper<IcVaccinePrarmeterEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcVaccinePrarmeterEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcVaccinePrarmeterDTO get(String id) {
+        IcVaccinePrarmeterEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcVaccinePrarmeterDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcVaccinePrarmeterDTO dto) {
+        IcVaccinePrarmeterEntity entity = ConvertUtils.sourceToTarget(dto, IcVaccinePrarmeterEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcVaccinePrarmeterDTO dto) {
+        IcVaccinePrarmeterEntity entity = ConvertUtils.sourceToTarget(dto, IcVaccinePrarmeterEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

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

@@ -0,0 +1,43 @@
+<?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.dao.IcVaccinePrarmeterDao">
+
+    <resultMap type="com.epmet.entity.IcVaccinePrarmeterEntity" id="icVaccinePrarmeterMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="pids" column="PIDS"/>
+        <result property="villageId" column="VILLAGE_ID"/>
+        <result property="villageName" column="VILLAGE_NAME"/>
+        <result property="buildId" column="BUILD_ID"/>
+        <result property="buildName" column="BUILD_NAME"/>
+        <result property="unitId" column="UNIT_ID"/>
+        <result property="unitName" column="UNIT_NAME"/>
+        <result property="homeId" column="HOME_ID"/>
+        <result property="homeName" column="HOME_NAME"/>
+        <result property="householdType" column="HOUSEHOLD_TYPE"/>
+        <result property="name" column="NAME"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="idCard" column="ID_CARD"/>
+        <result property="isVaccination" column="IS_VACCINATION"/>
+        <result property="firstVacTime" column="FIRST_VAC_TIME"/>
+        <result property="firstVacSite" column="FIRST_VAC_SITE"/>
+        <result property="secondVacTime" column="SECOND_VAC_TIME"/>
+        <result property="secondVacSite" column="SECOND_VAC_SITE"/>
+        <result property="thirdVacTime" column="THIRD_VAC_TIME"/>
+        <result property="thirdVacSite" column="THIRD_VAC_SITE"/>
+        <result property="reason" column="REASON"/>
+        <result property="note" column="NOTE"/>
+        <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"/>
+    </resultMap>
+
+
+</mapper>