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

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.14__activity_add_grid.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `epmet_heart`.`ic_party_activity`
+    ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `AGENCY_ID`;
+ALTER TABLE `epmet_heart`.`latest_act_info`
+    ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `CUSTOMER_ID`;

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

@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/4/12 16:40
+ * @DESC
+ */
+@Data
+public class HousesNameResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -8643628706377635279L;
+
+    private String idCard;
+
+    private String houseName;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -605,4 +605,13 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/customerstaffgrid/getallstaffbygridid")
     Result<List<String>> getAllStaffByGridId(@RequestParam("gridId")String gridId);
+
+    /**
+     * Desc: 根据身份证查询房屋名
+     * @param idCards
+     * @author zxc
+     * @date 2022/4/12 16:42
+     */
+    @PostMapping("/gov/org/ichouse/houses-name")
+    Result<List<HousesNameResultDTO>> getHousesNameByIdCards(@RequestBody List<String> idCards);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -393,4 +393,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<List<String>> getAllStaffByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAllStaffByGridId", gridId);
     }
+
+    @Override
+    public Result<List<HousesNameResultDTO>> getHousesNameByIdCards(List<String> idCards) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getHousesNameByIdCards", idCards);
+    }
 }

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

@@ -30,6 +30,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseListResultDTO;
+import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.service.IcHouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -114,4 +115,15 @@ public class IcHouseController {
         return new Result<List<HouseListResultDTO>>().ok(icHouseService.getHouseList(tokenDto, formDTO));
     }
 
+    /**
+     * Desc: 根据身份证查询房屋名
+     * @param idCards
+     * @author zxc
+     * @date 2022/4/12 16:42
+     */
+    @PostMapping("houses-name")
+    public Result<List<HousesNameResultDTO>> getHousesNameByIdCards(@RequestBody List<String> idCards){
+        return new Result<List<HousesNameResultDTO>>().ok(icHouseService.getHousesNameByIdCards(idCards));
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.result.HouseInfoDTO;
+import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.dto.result.NeighborHoodManageDelResultDTO;
 import com.epmet.entity.IcHouseEntity;
 import com.epmet.excel.IcHouseExcel;
@@ -95,4 +96,12 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      */
     void houseUpdate(@Param("houses") List<ImportGeneralDTO> houses);
 
+    /**
+     * Desc: 根据身份证查询房屋名
+     * @param idCards
+     * @author zxc
+     * @date 2022/4/12 16:42
+     */
+    List<HousesNameResultDTO> getHousesNameByIdCards(List<String> idCards);
+
 }

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

@@ -8,6 +8,7 @@ import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseListResultDTO;
+import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.entity.IcHouseEntity;
 
 import java.util.List;
@@ -116,4 +117,12 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      */
     void houseUpdate(List<ImportGeneralDTO> houses);
 
+    /**
+     * Desc: 根据身份证查询房屋名
+     * @param idCards
+     * @author zxc
+     * @date 2022/4/12 16:42
+     */
+    List<HousesNameResultDTO> getHousesNameByIdCards(List<String> idCards);
+
 }

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

@@ -19,6 +19,7 @@ import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseListResultDTO;
+import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.entity.IcHouseEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
@@ -231,4 +232,18 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         baseDao.houseUpdate(houses);
     }
 
+    /**
+     * Desc: 根据身份证查询房屋名
+     * @param idCards
+     * @author zxc
+     * @date 2022/4/12 16:42
+     */
+    @Override
+    public List<HousesNameResultDTO> getHousesNameByIdCards(List<String> idCards) {
+        if (CollectionUtils.isEmpty(idCards)){
+            return new ArrayList<>();
+        }
+        return baseDao.getHousesNameByIdCards(idCards);
+    }
+
 }

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

@@ -438,4 +438,22 @@
               </foreach>
             )
     </select>
+
+    <!-- 根据身份证查询房屋名 -->
+    <select id="getHousesNameByIdCards" resultType="com.epmet.dto.result.HousesNameResultDTO">
+        SELECT
+            h.OWNER_ID_CARD AS idCard,
+            CONCAT(nh.NEIGHBOR_HOOD_NAME,b.BUILDING_NAME,n.UNIT_NAME,h.DOOR_NAME) AS houseName
+        FROM ic_house h
+        INNER JOIN ic_neighbor_hood nh ON (nh.ID = h.NEIGHBOR_HOOD_ID AND nh.DEL_FLAG = '0')
+        INNER JOIN ic_building b ON (b.ID = h.BUILDING_ID AND b.DEL_FLAG = '0')
+        INNER JOIN ic_building_unit n ON (n.ID = h.BUILDING_UNIT_ID AND n.DEL_FLAG = '0')
+        WHERE h.DEL_FLAG = '0'
+          AND h.OWNER_ID_CARD IN (
+              <foreach collection="idCards" item="i" separator=",">
+                  #{i}
+              </foreach>
+            )
+        GROUP BY h.OWNER_ID_CARD
+    </select>
 </mapper>

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

@@ -1298,6 +1298,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }else if (formDTO.getAttentionType().equals(NumConstant.ONE)){
             list = baseDao.vaccineList(formDTO);
         }
+        List<String> idCards = list.stream().map(m -> m.getIdCard()).distinct().collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(idCards)){
+            Result<List<HousesNameResultDTO>> housesNameByIdCards = govOrgOpenFeignClient.getHousesNameByIdCards(idCards);
+            if (!housesNameByIdCards.success()){
+                throw new EpmetException("查询居民所属房屋失败...");
+            }
+            if (CollectionUtils.isNotEmpty(housesNameByIdCards.getData())){
+                list.forEach(l -> housesNameByIdCards.getData().stream().filter( h -> h.getIdCard().equals(l.getIdCard())).forEach(h -> l.setHouseName(h.getHouseName())));
+            }
+        }
         PageInfo<EpidemicPreventionResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }