取消关注

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

@@ -1,33 +0,0 @@
-package com.epmet.dto.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-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;
-
-    public interface CancelAttentionForm{}
-
-    /**
-     * 身份证
-     */
-    @NotBlank(message = "idCard不能为空",groups = CancelAttentionForm.class)
-    private String idCard;
-
-    /**
-     * 关注类型，核酸检测：2，疫苗接种：1
-     */
-    @NotNull(message = "attentionType不能为空",groups = CancelAttentionForm.class)
-    private Integer attentionType ;
-}

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

@@ -3,6 +3,8 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
@@ -15,6 +17,19 @@ import java.util.List;
 public class CancelAttentionPackageFormDTO implements Serializable {
 
     private static final long serialVersionUID = 2198470055930997870L;
-    @Valid
-    private List<CancelAttentionFormDTO> list;
+
+    public interface CancelAttentionPackageForm{}
+
+
+    /**
+     * 身份证
+     */
+    @NotNull(message = "idCard不能为空",groups = CancelAttentionPackageForm.class)
+    private List<String> idCards;
+
+    /**
+     * 关注类型，核酸检测：2，疫苗接种：1
+     */
+    @NotNull(message = "attentionType不能为空",groups = CancelAttentionPackageForm.class)
+    private Integer attentionType ;
 }

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

@@ -86,7 +86,7 @@ public class IcEpidemicSpecialAttentionController {
      */
     @PostMapping("cancel-attention")
     public Result cancelAttention(@RequestBody CancelAttentionPackageFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO, CancelAttentionFormDTO.CancelAttentionForm.class);
+        ValidatorUtils.validateEntity(formDTO, CancelAttentionPackageFormDTO.CancelAttentionPackageForm.class);
         icEpidemicSpecialAttentionService.cancelAttention(formDTO);
         return new Result();
     }

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

@@ -5,6 +5,7 @@ import com.epmet.dto.form.VaccinationListFormDTO;
 import com.epmet.dto.result.VaccinationListResultDTO;
 import com.epmet.entity.IcEpidemicSpecialAttentionEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -33,4 +34,22 @@ public interface IcEpidemicSpecialAttentionDao extends BaseDao<IcEpidemicSpecial
      */
     List<VaccinationListResultDTO> natList(VaccinationListFormDTO formDTO);
 
+    /**
+     * Desc: 取消关注
+     * @param list
+     * @param attentionType
+     * @author zxc
+     * @date 2022/3/28 16:59
+     */
+    void cancelAttention(@Param("list")List<String> list,@Param("attentionType")Integer attentionType);
+
+    /**
+     * Desc: 查询已经存在的关注
+     * @param attentionType
+     * @param list
+     * @author zxc
+     * @date 2022/3/28 17:29
+     */
+    List<String> getExistList(@Param("attentionType")Integer attentionType,@Param("list")List<String> list);
+
 }

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

@@ -3,7 +3,6 @@ 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.CancelAttentionPackageFormDTO;
 import com.epmet.dto.form.VaccinationAddFormDTO;
 import com.epmet.dto.form.VaccinationListFormDTO;
@@ -107,7 +106,7 @@ public interface IcEpidemicSpecialAttentionService extends BaseService<IcEpidemi
 
     /**
      * Desc: 取消关注
-     * @param list
+     * @param formDTO
      * @author zxc
      * @date 2022/3/28 13:51
      */

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

@@ -20,6 +20,7 @@ import com.epmet.entity.IcEpidemicSpecialAttentionEntity;
 import com.epmet.service.IcEpidemicSpecialAttentionService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,6 +30,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 疫情特别关注
@@ -153,7 +155,21 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
             throw new EpmetException("未查询到组织信息"+staffInfo.getAgencyId());
         }
         List<IcEpidemicSpecialAttentionEntity> entities = ConvertUtils.sourceToTarget(formDTO.getList(), IcEpidemicSpecialAttentionEntity.class);
+        List<String> idCards = entities.stream().map(m -> m.getIdCard()).collect(Collectors.toList());
+        Integer attentionType = entities.get(NumConstant.ZERO).getAttentionType();
+        List<String> existList = baseDao.getExistList(attentionType, idCards);
+        if (CollectionUtils.isNotEmpty(existList)){
+            for (String s : existList) {
+                for (int i = NumConstant.ZERO; i < entities.size(); i++) {
+                    if (s.equals(entities.get(i).getIdCard())){
+                        entities.remove(i);
+                        continue;
+                    }
+                }
+            }
+        }
         entities.forEach(e -> {
+            
             e.setIsAttention(NumConstant.ONE);
             e.setOrgId(agencyInfo.getId());
             e.setPid(agencyInfo.getPid());
@@ -179,13 +195,16 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
 
     /**
      * Desc: 取消关注
-     * @param list
+     * @param formDTO
      * @author zxc
      * @date 2022/3/28 13:51
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void cancelAttention(CancelAttentionPackageFormDTO formDTO) {
-
+        if (CollectionUtils.isNotEmpty(formDTO.getIdCards())){
+            baseDao.cancelAttention(formDTO.getIdCards(), formDTO.getAttentionType());
+        }
     }
 
 }

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

@@ -3,6 +3,20 @@
 
 <mapper namespace="com.epmet.dao.IcEpidemicSpecialAttentionDao">
 
+    <!-- 取消关注 -->
+    <update id="cancelAttention">
+        UPDATE ic_epidemic_special_attention
+        SET UPDATED_TIME = NOW(),
+            IS_ATTENTION = 0
+        WHERE del_flag = 0
+          AND attention_type = #{attentionType}
+          AND id_card IN (
+              <foreach collection="list" item="l" separator=",">
+                  #{l}
+              </foreach>
+            )
+    </update>
+
     <!-- 疫苗接种关注名单 -->
     <select id="vaccinationList" resultType="com.epmet.dto.result.VaccinationListResultDTO">
         SELECT
@@ -63,5 +77,19 @@
         ORDER BY a.CREATED_TIME DESC
     </select>
 
+    <!-- 查询已经存在的关注 -->
+    <select id="getExistList" resultType="java.lang.String">
+        SELECT
+            ID_CARD
+        FROM ic_epidemic_special_attention
+        WHERE DEL_FLAG = 0
+          AND ATTENTION_TYPE = #{attentionType}
+          AND ID_CARD IN (
+                <foreach collection="list" item="l" separator=",">
+                    #{l}
+                </foreach>
+            )
+    </select>
+
 
 </mapper>