Merge branch 'dev_epidemic_situation' into develop

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

@@ -2,6 +2,8 @@ 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;
 
@@ -15,13 +17,17 @@ 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

@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.Valid;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/28 16:48
+ * @DESC
+ */
+@Data
+public class CancelAttentionPackageFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2198470055930997870L;
+    @Valid
+    private List<CancelAttentionFormDTO> list;
+}

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

@@ -12,10 +12,7 @@ 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.*;
-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.*;
@@ -55,15 +52,13 @@ public class IcEpidemicSpecialAttentionController {
 
     /**
      * Desc:【疫苗接种关注名单，核酸检测关注名单】新增
-     * @param list
+     * @param formDTO
      * @param tokenDto
      * @author zxc
      * @date 2022/3/28 13:35
      */
     @PostMapping("vaccination-add")
-    public Result vaccinationAdd(@RequestBody List<IcEpidemicSpecialAttentionDTO> list,@LoginUser TokenDto tokenDto){
+    public Result vaccinationAdd(@RequestBody VaccinationAddFormDTO formDTO,@LoginUser TokenDto tokenDto){
-        VaccinationAddFormDTO formDTO = new VaccinationAddFormDTO();
-        formDTO.setList(list);
         ValidatorUtils.validateEntity(formDTO, VaccinationAddFormDTO.VaccinationAddForm.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
@@ -85,13 +80,14 @@ public class IcEpidemicSpecialAttentionController {
 
     /**
      * Desc: 取消关注
-     * @param list
+     * @param formDTO
      * @author zxc
      * @date 2022/3/28 13:51
      */
     @PostMapping("cancel-attention")
-    public Result cancelAttention(@RequestBody List<CancelAttentionFormDTO> list){
+    public Result cancelAttention(@RequestBody CancelAttentionPackageFormDTO formDTO){
-        icEpidemicSpecialAttentionService.cancelAttention(list);
+        ValidatorUtils.validateEntity(formDTO, CancelAttentionFormDTO.CancelAttentionForm.class);
+        icEpidemicSpecialAttentionService.cancelAttention(formDTO);
         return new Result();
     }
 

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

@@ -11,12 +11,16 @@ import com.epmet.dto.form.MyNatListFormDTO;
 import com.epmet.dto.result.MyNatListResultDTO;
 import com.epmet.dto.result.NatListResultDTO;
 import com.epmet.service.IcNatService;
+import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.http.HttpHeaders;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
 import java.util.List;
 
 
@@ -120,5 +124,29 @@ public class IcNatController {
         return new Result();
     }
 
+    /**
+     * @Author sun
+     * @Description 【核酸】核酸检测信息下载模板
+     **/
+    @RequestMapping(value = "import-template-download", method = {RequestMethod.GET, RequestMethod.POST})
+    public void downloadTemplate(HttpServletResponse response) throws IOException {
+        response.setCharacterEncoding("UTF-8");
+        response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition");
+        //response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel");
+        response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("社区自组织导入模板", "UTF-8") + ".xlsx");
+
+        InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/ic_nat.xlsx");
+        try {
+            ServletOutputStream os = response.getOutputStream();
+            IOUtils.copy(is, os);
+        } finally {
+            if (is != null) {
+                is.close();
+            }
+        }
+
+    }
+
 
 }

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

@@ -4,6 +4,7 @@ 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;
 import com.epmet.entity.IcEpidemicSpecialAttentionEntity;
@@ -110,5 +111,5 @@ public interface IcEpidemicSpecialAttentionService extends BaseService<IcEpidemi
      * @author zxc
      * @date 2022/3/28 13:51
      */
-    void cancelAttention(List<CancelAttentionFormDTO> list);
+    void cancelAttention(CancelAttentionPackageFormDTO formDTO);
 }

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

@@ -7,15 +7,14 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 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.*;
-import com.epmet.dto.form.NatListFormDTO;
-import com.epmet.dto.form.VaccinationAddFormDTO;
-import com.epmet.dto.form.VaccinationListFormDTO;
 import com.epmet.dto.result.VaccinationListResultDTO;
 import com.epmet.entity.IcEpidemicSpecialAttentionEntity;
 import com.epmet.service.IcEpidemicSpecialAttentionService;
@@ -100,10 +99,10 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
      */
     @Override
     public PageData vaccinationList(VaccinationListFormDTO formDTO) {
-        PageData result = new PageData(new ArrayList(), NumConstant.ZERO_L);
+        PageData<VaccinationListResultDTO> result = new PageData(new ArrayList(), NumConstant.ZERO_L);
         CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
         if (null == staffInfo){
-            throw new EpmetException("为查询到工作人员信息"+formDTO.getUserId());
+            throw new EpmetException("未查询到工作人员信息"+formDTO.getUserId());
         }
         formDTO.setOrgId(staffInfo.getAgencyId());
         // 关注类型，核酸检测：2，疫苗接种：1
@@ -128,6 +127,11 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
                 result.setTotal(list.size());
             }
         }
+        int i = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        for (VaccinationListResultDTO v : result.getList()) {
+            i += 1;
+            v.setSort(i);
+        }
         return result;
     }
 
@@ -138,8 +142,26 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
      * @date 2022/3/28 13:35
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void vaccinationAdd(VaccinationAddFormDTO formDTO) {
-
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
+        if (null == staffInfo){
+            throw new EpmetException("未查询到工作人员信息"+formDTO.getUserId());
+        }
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
+        if (null == agencyInfo){
+            throw new EpmetException("未查询到组织信息"+staffInfo.getAgencyId());
+        }
+        List<IcEpidemicSpecialAttentionEntity> entities = ConvertUtils.sourceToTarget(formDTO.getList(), IcEpidemicSpecialAttentionEntity.class);
+        entities.forEach(e -> {
+            e.setIsAttention(NumConstant.ONE);
+            e.setOrgId(agencyInfo.getId());
+            e.setPid(agencyInfo.getPid());
+            e.setPids(agencyInfo.getPids());
+            e.setCustomerId(formDTO.getCustomerId());
+        });
+        insertBatch(entities);
+        //TODO 发送通知
     }
 
     /**
@@ -162,7 +184,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
      * @date 2022/3/28 13:51
      */
     @Override
-    public void cancelAttention(List<CancelAttentionFormDTO> list) {
+    public void cancelAttention(CancelAttentionPackageFormDTO formDTO) {
 
     }