update

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

@@ -2,6 +2,8 @@ package com.epmet.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -19,7 +21,8 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public interface IcEpidemicSpecialAttention{}
+    public interface IcEpidemicSpecialAttentionUpdate{}
+    public interface IcEpidemicSpecialAttentionAdd{}
 
     /**
      * ID
@@ -49,30 +52,30 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {
     /**
      * 是否关注 1：关注，0：取消关注
      */
-    @NotNull(message = "isAttention不能为空",groups = IcEpidemicSpecialAttention.class)
     private Integer isAttention;
 
     /**
      * 关注类型，核酸检测：2，疫苗接种：1
      */
-	private Integer attentionType;
+    @NotNull(message = "attentionType不能为空",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class})
+    private Integer attentionType;
 
     /**
      * 姓名
      */
-	@NotBlank(message = "name不能为空",groups = IcEpidemicSpecialAttention.class)
+	@NotBlank(message = "name不能为空",groups = IcEpidemicSpecialAttentionAdd.class)
     private String name;
 
     /**
      * 手机号
      */
-    @NotBlank(message = "mobile不能为空",groups = IcEpidemicSpecialAttention.class)
+    @NotBlank(message = "mobile不能为空",groups = IcEpidemicSpecialAttentionAdd.class)
     private String mobile;
 
     /**
      * 身份证号
      */
-    @NotBlank(message = "idCard不能为空",groups = IcEpidemicSpecialAttention.class)
+    @NotBlank(message = "idCard不能为空",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class})
     private String idCard;
 
     /**
@@ -115,4 +118,14 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 通知渠道 0小程序通知，1短信通知
+     */
+    private List<String> channel;
+
+    /**
+     * 通知内容
+     */
+    private String content;
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationAddFormDTO.java

@@ -21,8 +21,6 @@ public class VaccinationAddFormDTO implements Serializable {
 
     private static final long serialVersionUID = -4786942219804246138L;
 
-    public interface VaccinationAddForm{}
-
     @Valid
     private List<IcEpidemicSpecialAttentionDTO> list;
 

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

@@ -6,11 +6,7 @@ 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;
-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.*;
 import com.epmet.service.IcEpidemicSpecialAttentionService;
@@ -19,8 +15,6 @@ 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;
 
 
 /**
@@ -58,8 +52,9 @@ public class IcEpidemicSpecialAttentionController {
      * @date 2022/3/28 13:35
      */
     @PostMapping("vaccination-add")
+    @NoRepeatSubmit
     public Result vaccinationAdd(@RequestBody VaccinationAddFormDTO formDTO,@LoginUser TokenDto tokenDto){
-        ValidatorUtils.validateEntity(formDTO, VaccinationAddFormDTO.VaccinationAddForm.class);
+        ValidatorUtils.validateEntity(formDTO, IcEpidemicSpecialAttentionDTO.IcEpidemicSpecialAttentionAdd.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
         icEpidemicSpecialAttentionService.vaccinationAdd(formDTO);
@@ -73,7 +68,9 @@ public class IcEpidemicSpecialAttentionController {
      * @date 2022/3/28 13:45
      */
     @PostMapping("vaccination-update")
+    @NoRepeatSubmit
     public Result vaccinationUpdate(@RequestBody IcEpidemicSpecialAttentionDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, IcEpidemicSpecialAttentionDTO.IcEpidemicSpecialAttentionUpdate.class);
         icEpidemicSpecialAttentionService.vaccinationUpdate(formDTO);
         return new Result();
     }
@@ -85,6 +82,7 @@ public class IcEpidemicSpecialAttentionController {
      * @date 2022/3/28 13:51
      */
     @PostMapping("cancel-attention")
+    @NoRepeatSubmit
     public Result cancelAttention(@RequestBody CancelAttentionPackageFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, CancelAttentionPackageFormDTO.CancelAttentionPackageForm.class);
         icEpidemicSpecialAttentionService.cancelAttention(formDTO);

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

@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -169,7 +170,6 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
             }
         }
         entities.forEach(e -> {
-            
             e.setIsAttention(NumConstant.ONE);
             e.setOrgId(agencyInfo.getId());
             e.setPid(agencyInfo.getPid());
@@ -189,8 +189,17 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
      * @date 2022/3/28 13:45
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void vaccinationUpdate(IcEpidemicSpecialAttentionDTO formDTO) {
-
+        LambdaQueryWrapper<IcEpidemicSpecialAttentionEntity> w = new LambdaQueryWrapper<>();
+        IcEpidemicSpecialAttentionEntity e = new IcEpidemicSpecialAttentionEntity();
+        w.eq(IcEpidemicSpecialAttentionEntity::getIdCard,formDTO.getIdCard())
+                .eq(IcEpidemicSpecialAttentionEntity::getAttentionType,formDTO.getAttentionType());
+        e.setMobile(formDTO.getMobile());
+        e.setReason(formDTO.getReason());
+        e.setRemark(formDTO.getRemark());
+        update(e,w);
+        //TODO 通知
     }
 
     /**