先把框框提上

3 years ago · c16a7e9080
8 changed files with 403 additions and 4 deletions
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java
@ -4,6 +4,9 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;

+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+

 /**
 * 疫情特别关注
@ -16,6 +19,8 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {

    private static final long serialVersionUID = 1L;

+    public interface IcEpidemicSpecialAttention{}
+
    /**
     * ID
     */
@ -44,7 +49,8 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {
    /**
     * 是否关注 1：关注，0：取消关注
     */
-	private Integer isAttention;
+    @NotNull(message = "isAttention不能为空",groups = IcEpidemicSpecialAttention.class)
+    private Integer isAttention;

    /**
     * 关注类型，核酸检测：2，疫苗接种：1
@ -54,17 +60,20 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {
    /**
     * 姓名
     */
-	private String name;
+	@NotBlank(message = "name不能为空",groups = IcEpidemicSpecialAttention.class)
+    private String name;

    /**
     * 手机号
     */
-	private String mobile;
+    @NotBlank(message = "mobile不能为空",groups = IcEpidemicSpecialAttention.class)
+    private String mobile;

    /**
     * 身份证号
     */
-	private String idCard;
+    @NotBlank(message = "idCard不能为空",groups = IcEpidemicSpecialAttention.class)
+    private String idCard;

    /**
     * 原因
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CancelAttentionFormDTO.java
@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/28 13:47
+ * @DESC
+ */
+@Data
+public class CancelAttentionFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2252387281427013057L;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 关注类型，核酸检测：2，疫苗接种：1
+     */
+    private Integer attentionType ;
+}
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/NatListFormDTO.java
@ -0,0 +1,46 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/28 10:30
+ * @DESC
+ */
+@Data
+public class NatListFormDTO extends PageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -498378123902522370L;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 名字
+     */
+    private String name;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 关注原因
+     */
+    private String reason;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private String userId;
+    private String customerId;
+}
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationAddFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationAddFormDTO.java
@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import com.epmet.dto.IcEpidemicSpecialAttentionDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.Valid;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/28 10:46
+ * @DESC
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class VaccinationAddFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -4786942219804246138L;
+
+    public interface VaccinationAddForm{}
+
+    @Valid
+    private List<IcEpidemicSpecialAttentionDTO> list;
+
+    private String userId;
+
+    private String customerId;
+}
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java
@ -0,0 +1,42 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/28 10:30
+ * @DESC
+ */
+@Data
+public class VaccinationListFormDTO extends PageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -498378993902522370L;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 名字
+     */
+    private String name;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 疫苗接种次数
+     */
+    private Integer vaccinationCount;
+
+    private String userId;
+    private String customerId;
+}
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java
@ -1,7 +1,10 @@
 package com.epmet.controller;

+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@ -9,10 +12,16 @@ 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.IcEpidemicSpecialAttentionDTO;
+import com.epmet.dto.form.CancelAttentionFormDTO;
+import com.epmet.dto.form.NatListFormDTO;
+import com.epmet.dto.form.VaccinationAddFormDTO;
+import com.epmet.dto.form.VaccinationListFormDTO;
 import com.epmet.service.IcEpidemicSpecialAttentionService;
 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;

@ -68,6 +77,131 @@ public class IcEpidemicSpecialAttentionController {
        return new Result();
    }

+    /**
+     * Desc: 【疫苗接种关注名单】列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/3/28 10:29
+     */
+    @PostMapping("vaccination-list")
+    public Result<PageData> vaccinationList(@RequestBody VaccinationListFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<PageData>().ok(icEpidemicSpecialAttentionService.vaccinationList(formDTO));
+    }
+
+    /**
+     * Desc: 【疫苗接种关注名单】列表
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/3/28 10:42
+     */
+    @PostMapping("nat-list")
+    public Result<PageData> natList(@RequestBody NatListFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<PageData>().ok(icEpidemicSpecialAttentionService.natList(formDTO));
+    }
+
+    /**
+     * Desc:【疫苗接种关注名单，核酸检测关注名单】新增
+     * @param list
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/3/28 13:35
+     */
+    @PostMapping("vaccination-add")
+    public Result vaccinationAdd(@RequestBody List<IcEpidemicSpecialAttentionDTO> list,@LoginUser TokenDto tokenDto){
+        VaccinationAddFormDTO formDTO = new VaccinationAddFormDTO();
+        formDTO.setList(list);
+        ValidatorUtils.validateEntity(formDTO, VaccinationAddFormDTO.VaccinationAddForm.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        icEpidemicSpecialAttentionService.vaccinationAdd(formDTO);
+        return new Result();
+    }
+
+    /**
+     * Desc:【疫苗接种关注名单，核酸检测关注名单】修改
+     * @param formDTO
+     * @author zxc
+     * @date 2022/3/28 13:45
+     */
+    @PostMapping("vaccination-update")
+    public Result vaccinationUpdate(@RequestBody IcEpidemicSpecialAttentionDTO formDTO){
+        icEpidemicSpecialAttentionService.vaccinationUpdate(formDTO);
+        return new Result();
+    }
+
+    /**
+     * Desc: 取消关注
+     * @param list
+     * @author zxc
+     * @date 2022/3/28 13:51
+     */
+    @PostMapping("cancel-attention")
+    public Result cancelAttention(@RequestBody List<CancelAttentionFormDTO> list){
+        icEpidemicSpecialAttentionService.cancelAttention(list);
+        return new Result();
+    }
+
+    /**
+     * Desc: 【疫苗接种关注名单】导入
+     * @param
+     * @author zxc
+     * @date 2022/3/28 13:40
+     */
+    @PostMapping("vaccination-import")
+    public Result vaccinationImport(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file){
+
+        return new Result();
+    }
+
+    /**
+     * Desc: 【疫苗接种关注名单】导出
+     * @param response
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/3/28 13:57
+     */
+    @PostMapping("vaccination-export")
+    public void vaccinationExport(HttpServletResponse response,@RequestBody VaccinationListFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+    }
+
+    /**
+     * Desc: 【核酸检测关注名单】导入
+     * @param
+     * @author zxc
+     * @date 2022/3/28 13:40
+     */
+    @PostMapping("nat-import")
+    public Result natImport(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file){
+
+        return new Result();
+    }
+
+    /**
+     * Desc: 【核酸检测关注名单】导出
+     * @param response
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/3/28 13:59
+     */
+    @PostMapping("nat-export")
+    public void natExport(HttpServletResponse response,@RequestBody NatListFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+
+    }


 }
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcEpidemicSpecialAttentionService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcEpidemicSpecialAttentionService.java
@ -3,6 +3,10 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcEpidemicSpecialAttentionDTO;
+import com.epmet.dto.form.CancelAttentionFormDTO;
+import com.epmet.dto.form.NatListFormDTO;
+import com.epmet.dto.form.VaccinationAddFormDTO;
+import com.epmet.dto.form.VaccinationListFormDTO;
 import com.epmet.entity.IcEpidemicSpecialAttentionEntity;

 import java.util.List;
@ -75,4 +79,44 @@ public interface IcEpidemicSpecialAttentionService extends BaseService<IcEpidemi
     * @date 2022-03-28
     */
    void delete(String[] ids);
+
+    /**
+     * Desc: 【疫苗接种关注名单】列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/3/28 10:29
+     */
+    PageData vaccinationList(VaccinationListFormDTO formDTO);
+
+    /**
+     * Desc: 【疫苗接种关注名单】列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/3/28 10:42
+     */
+    PageData natList(NatListFormDTO formDTO);
+
+    /**
+     * Desc:【疫苗接种关注名单，核酸检测关注名单】新增
+     * @param formDTO
+     * @author zxc
+     * @date 2022/3/28 13:35
+     */
+    void vaccinationAdd(VaccinationAddFormDTO formDTO);
+
+    /**
+     * Desc:【疫苗接种关注名单，核酸检测关注名单】修改
+     * @param formDTO
+     * @author zxc
+     * @date 2022/3/28 13:45
+     */
+    void vaccinationUpdate(IcEpidemicSpecialAttentionDTO formDTO);
+
+    /**
+     * Desc: 取消关注
+     * @param list
+     * @author zxc
+     * @date 2022/3/28 13:51
+     */
+    void cancelAttention(List<CancelAttentionFormDTO> list);
 }
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java
@ -3,11 +3,16 @@ 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.NumConstant;
 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.IcEpidemicSpecialAttentionDao;
 import com.epmet.dto.IcEpidemicSpecialAttentionDTO;
+import com.epmet.dto.form.CancelAttentionFormDTO;
+import com.epmet.dto.form.NatListFormDTO;
+import com.epmet.dto.form.VaccinationAddFormDTO;
+import com.epmet.dto.form.VaccinationListFormDTO;
 import com.epmet.entity.IcEpidemicSpecialAttentionEntity;
 import com.epmet.service.IcEpidemicSpecialAttentionService;
 import org.apache.commons.lang3.StringUtils;
@ -15,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@ -80,4 +86,63 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
        baseDao.deleteBatchIds(Arrays.asList(ids));
    }

+    /**
+     * Desc: 【疫苗接种关注名单】列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/3/28 10:29
+     */
+    @Override
+    public PageData vaccinationList(VaccinationListFormDTO formDTO) {
+        PageData result = new PageData(new ArrayList(), NumConstant.ZERO_L);
+
+        return result;
+    }
+
+    /**
+     * Desc: 【疫苗接种关注名单】列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/3/28 10:42
+     */
+    @Override
+    public PageData natList(NatListFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * Desc:【疫苗接种关注名单，核酸检测关注名单】新增
+     * @param formDTO
+     * @author zxc
+     * @date 2022/3/28 13:35
+     */
+    @Override
+    public void vaccinationAdd(VaccinationAddFormDTO formDTO) {
+
+    }
+
+    /**
+     * Desc:【疫苗接种关注名单，核酸检测关注名单】修改
+     * 修改的时候通知渠道和通知内容是空的，如果他再次写了就是再次发送一条通知 不是修改之前发过的通知
+     * 除了 姓名 身份证 都能修改
+     * @param formDTO
+     * @author zxc
+     * @date 2022/3/28 13:45
+     */
+    @Override
+    public void vaccinationUpdate(IcEpidemicSpecialAttentionDTO formDTO) {
+
+    }
+
+    /**
+     * Desc: 取消关注
+     * @param list
+     * @author zxc
+     * @date 2022/3/28 13:51
+     */
+    @Override
+    public void cancelAttention(List<CancelAttentionFormDTO> list) {
+
+    }
+
 }