Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoDTO.java

@@ -78,4 +78,10 @@ public class HouseInfoDTO implements Serializable {
     private String allName;
 
     private String customerId;
+
+    private String agencyId;
+    /**
+     * eg：市北区-阜新路街道-南宁社区
+     */
+    private String agencyPathName;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -291,4 +291,16 @@ public class HouseController implements ResultDataResolver {
         return new Result();
     }
 
+    /**
+     * 获取房屋信息
+     * @param houseId
+     * @return
+     */
+    @PostMapping("gethouseinfo/{houseId}")
+    public Result<HouseInfoDTO> getHouseInfo(@LoginUser TokenDto tokenDto,@PathVariable("houseId") String houseId){
+        if(StringUtils.isBlank(houseId)){
+            return new Result<>();
+        }
+        return new Result<HouseInfoDTO>().ok(houseService.getHouseInfoDTO(tokenDto.getCustomerId(),houseId));
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java

@@ -26,7 +26,6 @@ import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.excel.IcHouseExcel;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
@@ -79,4 +78,6 @@ public interface HouseService {
      */
     void allDelete(NeighborHoodManageDelFormDTO formDTO);
 
+
+    HouseInfoDTO getHouseInfoDTO(String customerId,String houseId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -13,7 +13,9 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
+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.utils.Result;
 import com.epmet.constant.CustomerGridConstant;
@@ -457,4 +459,16 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             }
         }
     }
+
+    @Override
+    public HouseInfoDTO getHouseInfoDTO(String customerId, String houseId) {
+        HouseInfoDTO houseInfo = icHouseRedis.getHouseInfo(houseId, customerId);
+        if (null != houseInfo && StringUtils.isNotBlank(houseInfo.getAgencyId())) {
+            AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(houseInfo.getAgencyId());
+            houseInfo.setAgencyPathName(agencyInfoCache.getAllParentName().concat(StrConstant.HYPHEN).concat(agencyInfoCache.getOrganizationName()));
+        } else {
+            houseInfo.setAgencyPathName(StrConstant.EPMETY_STR);
+        }
+        return houseInfo;
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -368,7 +368,8 @@
         IFNULL(ib.LONGITUDE,'') as buildingLongitude,
         IFNULL(ib.LATITUDE,'') as buildingLatitude,
         ih.CUSTOMER_ID AS customerId,
-        concat(IFNULL(n.NEIGHBOR_HOOD_NAME,''),IFNULL(ib.BUILDING_NAME,''),IFNULL(u.UNIT_NAME,''),IFNULL(ih.HOUSE_NAME,'')) AS allName
+        concat(IFNULL(n.NEIGHBOR_HOOD_NAME,''),IFNULL(ib.BUILDING_NAME,''),IFNULL(u.UNIT_NAME,''),IFNULL(ih.HOUSE_NAME,'')) AS allName,
+        n.AGENCY_ID as agencyId
         FROM ic_house ih
         left JOIN ic_neighbor_hood n ON ( ih.NEIGHBOR_HOOD_ID = n.id AND n.DEL_FLAG = '0')
         left JOIN ic_building ib ON ( ih.BUILDING_ID = ib.id AND ib.DEL_FLAG = '0')

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

@@ -68,7 +68,7 @@ public class IcTripReportFormDTO implements Serializable {
     /**
      * 现居地编码
      */
-    @NotBlank(message = "现居地编码不能为空", groups = {ResiUserRequired.class,PcAddRequired.class,PcUpdateRequired.class})
+    @NotBlank(message = "现居地编码不能为空", groups = {ResiUserRequired.class})
     private String presentAddressCode;
 
     /**
@@ -86,7 +86,7 @@ public class IcTripReportFormDTO implements Serializable {
     /**
      * 来源地区编码
      */
-    @NotBlank(message = "来自地区编码不能为空", groups = {ResiUserRequired.class,PcAddRequired.class,PcUpdateRequired.class})
+    @NotBlank(message = "来自地区编码不能为空", groups = {ResiUserRequired.class})
     private String sourceAddressCode;
 
     /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DemandUserResDTO.java

@@ -13,4 +13,5 @@ public class DemandUserResDTO implements Serializable {
     private String gridId;
     private String idCard;
     private String agencyId;
+    private String houseId;
 }

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

@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -7,6 +8,7 @@ import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ExcelPoiUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -15,7 +17,9 @@ import com.epmet.dto.IcEpidemicSpecialAttentionDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.excel.NatExportExcel;
+import com.epmet.excel.NatImportExcel;
 import com.epmet.excel.VaccinationExportExcel;
+import com.epmet.excel.VaccinationImportExcel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcEpidemicSpecialAttentionService;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +30,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -173,4 +180,22 @@ public class IcEpidemicSpecialAttentionController {
 
     }
 
+    @PostMapping("export-template")
+    public void exportTemplate(HttpServletResponse response, @RequestBody VaccinationListFormDTO formDTO) throws Exception {
+        TemplateExportParams templatePath = new TemplateExportParams();
+        String fileName = "";
+        Map<String,Object> map = new HashMap<>();
+        // 关注类型，核酸检测：2，疫苗接种：1，行程上报：0
+        if (formDTO.getAttentionType().equals(NumConstant.ONE)){
+            templatePath.setTemplateUrl("excel/attention_vaccination_template.xlsx");
+            fileName = "疫苗接种关注名单导入模板";
+            map.put("maplist",new ArrayList<VaccinationImportExcel>());
+        }else if (formDTO.getAttentionType().equals(NumConstant.TWO)){
+            templatePath.setTemplateUrl("excel/attention_nat_template.xlsx");
+            fileName = "核酸检测关注名单导入模板";
+            map.put("maplist",new ArrayList<NatImportExcel>());
+        }
+        ExcelPoiUtils.exportExcel(templatePath ,map,fileName,response);
+    }
+
 }

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

@@ -0,0 +1,30 @@
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.epmet.commons.tools.utils.ExcelVerifyInfo;
+import lombok.Data;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/29 10:24
+ * @DESC
+ */
+@Data
+public class NatImportExcel extends ExcelVerifyInfo {
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "电话")
+    private String mobile;
+
+    @Excel(name = "身份证")
+    private String idCard;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    @Excel(name = "关注原因")
+    private String reason;
+
+}

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

@@ -0,0 +1,27 @@
+package com.epmet.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.epmet.commons.tools.utils.ExcelVerifyInfo;
+import lombok.Data;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/29 10:24
+ * @DESC
+ */
+@Data
+public class VaccinationImportExcel extends ExcelVerifyInfo {
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "电话")
+    private String mobile;
+
+    @Excel(name = "身份证")
+    private String idCard;
+
+    @Excel(name = "备注")
+    private String remark;
+
+}

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

@@ -299,7 +299,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
             for (int i = 0; i < list.size(); i++) {
                 list.get(i).setNum(i+1);
                 list.get(i).setAttentionType(attentionType);
-                list.get(i).setChannel(getChannel(list.get(i).getChannelString()));
+//                list.get(i).setChannel(getChannel(list.get(i).getChannelString()));
                 if (StringUtils.isBlank(list.get(i).getName()) && !list.get(i).getAddStatus()){
                     errorInfo.add(getErrorInfo(list.get(i), "姓名不能为空",i+1));
                     list.get(i).setAddStatus(true);
@@ -316,6 +316,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
                     continue;
                 }
             }
+            if (list.size() > errorInfo.size()){
                 Map<String, Long> groupByIdCard = list.stream().collect(Collectors.groupingBy(ImportEpidemicSpecialAttention::getIdCard, Collectors.counting()));
                 groupByIdCard.forEach((idCard,count) -> {
                     if (Integer.valueOf(count.toString()).compareTo(1) != 0){
@@ -340,6 +341,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
                         }
                     }
                 }
+            }
             Map<Boolean, List<ImportEpidemicSpecialAttention>> groupByStatus = list.stream().collect(Collectors.groupingBy(ImportEpidemicSpecialAttention::getAddStatus));
             List<ImportEpidemicSpecialAttention> needInsert = groupByStatus.get(false);
             if (CollectionUtils.isNotEmpty(needInsert)){
@@ -352,8 +354,8 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
                     e.setCustomerId(tokenDto.getCustomerId());
                 });
                 insertBatch(entities);
-                // send msg
+                // send msg 产品说导入不用发通知
-                List<ImportEpidemicSpecialAttention> needSendList = needInsert.stream().filter(l -> CollectionUtils.isNotEmpty(l.getChannel())).collect(Collectors.toList());
+                /*List<ImportEpidemicSpecialAttention> needSendList = needInsert.stream().filter(l -> CollectionUtils.isNotEmpty(l.getChannel())).collect(Collectors.toList());
                 if (CollectionUtils.isNotEmpty(needSendList)) {
                     SendNoticeFormDTO dto = new SendNoticeFormDTO();
                     List<SendNoticeFormDTO.UserListBean> userListBeans = ConvertUtils.sourceToTarget(needSendList, SendNoticeFormDTO.UserListBean.class);
@@ -364,7 +366,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
                     dto.setContent(needSendList.get(NumConstant.ZERO).getContent());
                     dto.setStaffId(tokenDto.getUserId());
                     noticeService.sendNotice(dto);
-                }
+                }*/
             }
             if (CollectionUtils.isNotEmpty(errorInfo)){
                 String url = importOssUpload(errorInfo, EpidemicSpecialAttentionErrorModel.class);

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.31__modifty_trip_reportv2.sql

@@ -0,0 +1,2 @@
+alter table ic_trip_report_record MODIFY COLUMN PRESENT_ADDRESS_CODE VARCHAR(32) COMMENT '现居地编码';
+alter table ic_trip_report_record MODIFY COLUMN SOURCE_ADDRESS_CODE VARCHAR(32) COMMENT '来源地区编码';

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

@@ -24,10 +24,10 @@
             a.MOBILE,
             a.ID_CARD,
             a.REMARK,
-            IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = '1' AND ID_CARD = #{idCard} ORDER BY CREATED_TIME LIMIT 1),'') AS lastInformTime,
+            IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime,
-            COUNT(v.ID) AS vaccinationCount
+            IFNULL(v.vaccinationCount,0) AS vaccinationCount
         FROM ic_epidemic_special_attention a
-        LEFT JOIN ic_resi_vaccine v ON (v.ID_CARD = a.ID_CARD AND v.DEL_FLAG = '0')
+        LEFT JOIN (SELECT id_card ,count(1) AS vaccinationCount FROM ic_resi_vaccine WHERE DEL_FLAG = 0 GROUP BY ID_CARD) v ON (v.ID_CARD = a.ID_CARD)
         WHERE a.DEL_FLAG = 0
           AND a.ORG_ID = #{orgId}
           AND ATTENTION_TYPE = #{attentionType}
@@ -54,7 +54,7 @@
         a.ID_CARD,
         a.REMARK,
         a.REASON,
-        IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = '1' AND ID_CARD = #{idCard} ORDER BY CREATED_TIME LIMIT 1),'') AS lastInformTime
+        IFNULL((SELECT DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') FROM ic_notice WHERE DEL_FLAG = '0' AND ORIGIN = #{attentionType} AND ID_CARD = a.ID_CARD ORDER BY CREATED_TIME DESC LIMIT 1),'') AS lastInformTime
         FROM ic_epidemic_special_attention a
         WHERE a.DEL_FLAG = 0
         AND a.ORG_ID = #{orgId}

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

@@ -302,7 +302,8 @@
         concat(ir.`NAME`,'(',ir.MOBILE,')')as label,
         ir.grid_id as gridId,
         ir.ID_CARD as idCard,
-        ir.AGENCY_ID as agencyId
+        ir.AGENCY_ID as agencyId,
+        ir.HOME_ID as houseId
     FROM
         ic_resi_user ir
     WHERE