防疫信息详情

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

@@ -79,7 +79,8 @@ public class IcEpidemicPreventionController{
     }
 
     @PostMapping("info")
-    public Result<EpidemicPreventionInfoDTO> info(@RequestBody EpidemicPreventionFormDTO formDTO) {
+    public Result<EpidemicPreventionInfoDTO> info(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         EpidemicPreventionInfoDTO result = icResiUserService.getEpidemicPreventionInfo(formDTO);
         return new Result<EpidemicPreventionInfoDTO>().ok(result);
     }

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

@@ -77,5 +77,5 @@ public interface IcNatService extends BaseService<IcNatEntity> {
      * @Author zhaoqifeng
      * @Date 2022/3/29 16:29
      */
-    List<NatListDTO> getNatList(String idCard);
+    List<NatListDTO> getNatList(String customerId, String idCard);
 }

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

@@ -3,6 +3,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcResiVaccineDTO;
+import com.epmet.dto.result.VaccineListDTO;
 import com.epmet.entity.IcResiVaccineEntity;
 
 import java.util.List;
@@ -75,4 +76,14 @@ public interface IcResiVaccineService extends BaseService<IcResiVaccineEntity> {
      * @date 2022-03-28
      */
     void delete(String[] ids);
+
+    /**
+     * 获取居民疫苗接种信息
+     *
+     * @Param idCard
+     * @Return {@link List< VaccineListDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/3/30 10:24
+     */
+    List<VaccineListDTO> getVaccineList(String customerId, String idCard);
 }

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

@@ -6,6 +6,7 @@ import com.epmet.dto.IcTripReportRecordDTO;
 import com.epmet.dto.form.IcTripReportFormDTO;
 import com.epmet.dto.form.MyReportedTripFormDTO;
 import com.epmet.dto.form.PageTripReportFormDTO;
+import com.epmet.dto.result.TripListDTO;
 import com.epmet.entity.IcTripReportRecordEntity;
 
 import java.util.List;
@@ -82,4 +83,14 @@ public interface IcTripReportRecordService extends BaseService<IcTripReportRecor
      * @return
      */
     List<IcTripReportRecordDTO> resiList(MyReportedTripFormDTO formDTO);
+
+    /**
+     * 获取居民行程信息
+     *
+     * @Param idCard
+     * @Return {@link List< TripListDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/3/30 10:31
+     */
+    List<TripListDTO> tripList(String customerId, String idCard);
 }

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

@@ -342,8 +342,9 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
      * @Date 2022/3/29 16:29
      */
     @Override
-    public List<NatListDTO> getNatList(String idCard) {
+    public List<NatListDTO> getNatList(String customerId, String idCard) {
         LambdaQueryWrapper<IcNatEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcNatEntity::getCustomerId, customerId);
         wrapper.eq(IcNatEntity::getIdCard, idCard);
         wrapper.orderByDesc(IcNatEntity::getNatTime);
         List<IcNatEntity> list = baseDao.selectList(wrapper);

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

@@ -120,6 +120,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private RedisTemplate redisTemplate;
     @Resource
     private IcNatService icNatService;
+    @Resource
+    private IcResiVaccineService icResiVaccineService;
+    @Resource
+    private IcTripReportRecordService icTripReportRecordService;
 
     private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
@@ -1326,10 +1330,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         IcResiUserEntity icResiUser = baseDao.selectById(formDTO.getId());
         if (null != icResiUser) {
             //核酸检测
-            List<NatListDTO> natList = icNatService.getNatList(icResiUser.getIdCard());
+            List<NatListDTO> natList = icNatService.getNatList(formDTO.getCustomerId(), icResiUser.getIdCard());
             result.setNatList(natList);
-            //TODO 疫苗接种
-            //TODO 行程信息
+            //疫苗接种
+            List<VaccineListDTO> vaccineList = icResiVaccineService.getVaccineList(formDTO.getCustomerId(), icResiUser.getIdCard());
+            result.setVaccineList(vaccineList);
+            //行程信息
+            List<TripListDTO> tripList = icTripReportRecordService.tripList(formDTO.getCustomerId(), icResiUser.getIdCard());
+            result.setTripList(tripList);
         }
         return result;
     }

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

@@ -1,23 +1,28 @@
 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;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dao.IcResiVaccineDao;
 import com.epmet.dto.IcResiVaccineDTO;
+import com.epmet.dto.result.VaccineListDTO;
 import com.epmet.entity.IcResiVaccineEntity;
 import com.epmet.service.IcResiVaccineService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 居民疫苗情况
@@ -80,4 +85,32 @@ public class IcResiVaccineServiceImpl extends BaseServiceImpl<IcResiVaccineDao,
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * 获取居民疫苗接种信息
+     *
+     * @param idCard
+     * @Param idCard
+     * @Return {@link List<  VaccineListDTO >}
+     * @Author zhaoqifeng
+     * @Date 2022/3/30 10:24
+     */
+    @Override
+    public List<VaccineListDTO> getVaccineList(String customerId, String idCard) {
+        LambdaQueryWrapper<IcResiVaccineEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcResiVaccineEntity::getCustomerId, customerId);
+        wrapper.eq(IcResiVaccineEntity::getIdCard, idCard);
+        wrapper.orderByDesc(IcResiVaccineEntity::getInoculateTime);
+        List<IcResiVaccineEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> {
+            VaccineListDTO dto = new VaccineListDTO();
+            dto.setAddress(item.getInoculateAddress());
+            dto.setManufactor(item.getManufacturer());
+            dto.setVaccinateTime(DateUtils.format(item.getInoculateTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE));
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.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.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -13,12 +14,14 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.IcResiUserConstant;
 import com.epmet.dao.IcTripReportRecordDao;
 import com.epmet.dao.UserBaseInfoDao;
 import com.epmet.dto.IcEpidemicSpecialAttentionDTO;
 import com.epmet.dto.IcTripReportRecordDTO;
 import com.epmet.dto.form.*;
+import com.epmet.dto.result.TripListDTO;
 import com.epmet.entity.IcTripReportRecordEntity;
 import com.epmet.service.IcEpidemicSpecialAttentionService;
 import com.epmet.service.IcNoticeService;
@@ -263,5 +266,34 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         return result.getList();
     }
 
+    /**
+     * 获取居民行程信息
+     *
+     * @param idCard
+     * @Param idCard
+     * @Return {@link List<  TripListDTO >}
+     * @Author zhaoqifeng
+     * @Date 2022/3/30 10:31
+     */
+    @Override
+    public List<TripListDTO> tripList(String customerId, String idCard) {
+        LambdaQueryWrapper<IcTripReportRecordEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcTripReportRecordEntity::getCustomerId, customerId);
+        wrapper.eq(IcTripReportRecordEntity::getIdCard, idCard);
+        wrapper.orderByDesc(IcTripReportRecordEntity::getArriveDate);
+        List<IcTripReportRecordEntity> list = baseDao.selectList(wrapper);
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> {
+            TripListDTO dto = new TripListDTO();
+            dto.setArrivalTime(DateUtils.format(item.getArriveDate(), DateUtils.DATE_PATTERN));
+            dto.setFromRegion(item.getSourceAddress());
+            dto.setLeaveTime(DateUtils.format(item.getLeaveDate(), DateUtils.DATE_PATTERN));
+            dto.setRemark(item.getRemark());
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
 
 }