From 175b43ca6ac2369f8b6c862d6d7a102fed9d07d6 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 17 Jun 2022 17:18:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=AE=B6=E5=BA=AD=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EpidemicUserInfoServiceImpl.java     |  1 +
 .../controller/AppFamilyController.java       | 18 +++++++++++++
 .../personroom/dao/EpidemicUnitOwnerDao.java  |  4 +++
 .../service/EpidemicBuildingUnitService.java  |  3 +++
 .../service/EpidemicUnitOwnerService.java     | 10 +++++++
 .../impl/EpidemicBuildingUnitServiceImpl.java |  1 +
 .../impl/EpidemicUnitOwnerServiceImpl.java    | 26 +++++++++++++++++++
 .../personroom/EpidemicUnitOwnerDao.xml       | 24 +++++++++++++++++
 8 files changed, 87 insertions(+)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
index 3dd23eb..23ec561 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@@ -1703,6 +1703,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             formDTO.setDeptName(parentAndAllDeptDTO.getGrid());
             // 新增epidemic_user_info
             EpidemicUserInfoEntity epidemicUserInfoEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUserInfoEntity.class);
+            epidemicUserInfoEntity.setDeptId(Long.parseLong(formDTO.getDeptId()));
             baseDao.insert(epidemicUserInfoEntity);
 
             // 新增epidemic_user_inout_record
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java
index b7f819b..c3b39e6 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java
@@ -24,6 +24,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.personroom.form.*;
 import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService;
 import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService;
+import com.elink.esua.epdc.vaccine.personroom.service.EpidemicUnitOwnerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,6 +45,9 @@ public class AppFamilyController {
     @Autowired
     private EpidemicBuildingUnitService epidemicBuildingUnitService;
 
+    @Autowired
+    private EpidemicUnitOwnerService epidemicUnitOwnerService;
+
     /**
      * 获取成员信息
      *
@@ -128,5 +132,19 @@ public class AppFamilyController {
         return epidemicUserInfoService.bindingFamily(formDTO);
     }
 
+    /**
+     * 获取跳转方向
+     *
+     * @param formDTO
+     * @return
+     * @Author wanggongfeng
+     */
+    @GetMapping("getSkipDirection")
+    public Result getSkipDirection(@RequestBody GetSkipDirectionFormDTO formDTO){
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
+        return epidemicUnitOwnerService.getSkipDirection(formDTO);
+    }
+
 
 }
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java
index 9bfde1b..2710878 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicUnitOwnerDao.java
@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.vaccine.personroom.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.personroom.form.GetSkipDirectionFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO;
 import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -82,4 +83,7 @@ public interface EpidemicUnitOwnerDao extends BaseDao<EpidemicUnitOwnerEntity> {
      */
     List<FamilyMemberInfoResultDTO> getFamilyMemberInfoByUnitId(@Param("unitId") Long unitId);
 
+    Integer getCurrentBouseNum(GetSkipDirectionFormDTO formDTO);
+    Integer getNotCurrentBouseNum(GetSkipDirectionFormDTO formDTO);
+
 }
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
index 80e9073..b791624 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epidemic.DictOptionDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.GetSkipDirectionFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.HouseInfoFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO;
@@ -210,4 +211,6 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
 
 
 
+
+
 }
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicUnitOwnerService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicUnitOwnerService.java
index 6d3632e..32f6171 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicUnitOwnerService.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicUnitOwnerService.java
@@ -20,7 +20,9 @@ package com.elink.esua.epdc.vaccine.personroom.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO;
+import com.elink.esua.epdc.dto.personroom.form.GetSkipDirectionFormDTO;
 import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity;
 
 import java.util.List;
@@ -125,4 +127,12 @@ public interface EpidemicUnitOwnerService extends BaseService<EpidemicUnitOwnerE
      * @date 2022/6/6 10:12
      */
     void deletePhysicalByIdCardAndUnitId(String idCard, Long unitId);
+
+    /**
+     * 获取跳转方向
+     * @param formDTO
+     * @return
+     */
+    Result getSkipDirection(GetSkipDirectionFormDTO formDTO);
+
 }
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
index 80b2999..0567b79 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
@@ -38,6 +38,7 @@ import com.elink.esua.epdc.dto.house.result.EpdcPopulationErrorResultDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.GetSkipDirectionFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.HouseInfoFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.*;
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java
index 0b37734..d4ce3ae 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicUnitOwnerServiceImpl.java
@@ -23,7 +23,10 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO;
+import com.elink.esua.epdc.dto.personroom.form.GetSkipDirectionFormDTO;
+import com.elink.esua.epdc.dto.personroom.result.GetSkipDirectionResultDTO;
 import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicUnitOwnerDao;
 import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity;
 import com.elink.esua.epdc.vaccine.personroom.redis.EpidemicUnitOwnerRedis;
@@ -121,4 +124,27 @@ public class EpidemicUnitOwnerServiceImpl extends BaseServiceImpl<EpidemicUnitOw
     public void deletePhysicalByIdCardAndUnitId(String idCard, Long unitId) {
         baseDao.deletePhysicalByIdCardAndUnitId(idCard, unitId);
     }
+
+    @Override
+    public Result<GetSkipDirectionResultDTO> getSkipDirection(GetSkipDirectionFormDTO formDTO) {
+        /**
+         * 1. 留在当前页面，进行注册、绑定
+         * 2. 跳转到 该房屋信息的页面
+         * 3. 显示 无权访问
+         */
+        GetSkipDirectionResultDTO getSkipDirectionResultDTO = new GetSkipDirectionResultDTO();
+        // 获取是否绑定当前房屋
+        Integer isCurrentBouse = baseDao.getCurrentBouseNum(formDTO);
+        // 获取是否绑定非当前房屋
+        Integer isNotCurrentBouse = baseDao.getNotCurrentBouseNum(formDTO);
+        if(isCurrentBouse > 0){
+            getSkipDirectionResultDTO.setType("2");
+        }else if(isNotCurrentBouse > 0){
+            getSkipDirectionResultDTO.setType("3");
+        }else{
+            getSkipDirectionResultDTO.setType("1");
+        }
+
+        return new Result<GetSkipDirectionResultDTO>().ok(getSkipDirectionResultDTO);
+    }
 }
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml
index 3c0e968..34b988f 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml
@@ -83,4 +83,28 @@
         where ui.DEL_FLAG = '0'
         and ui.ID_CARD in (select euo.ID_CARD from epidemic_unit_owner euo where euo.DEL_FLAG = '0' and euo.UNIT_ID = #{unitId})
     </select>
+
+    <select id="getCurrentBouseNum" resultType="java.lang.Integer"
+            parameterType="com.elink.esua.epdc.dto.personroom.form.GetSkipDirectionFormDTO">
+        select
+        count(ow.ID)
+        from epidemic_unit_owner ow
+        left join epidemic_building_unit un on ow.UNIT_ID = un.ID and un.DEL_FLAG = '0'
+        where ow.DEL_FLAG = '0'
+        and ow.ID_CARD = #{idCard}
+        and un.ROOM_CODE = #{roomCode}
+
+    </select>
+
+    <select id="getNotCurrentBouseNum" resultType="java.lang.Integer"
+            parameterType="com.elink.esua.epdc.dto.personroom.form.GetSkipDirectionFormDTO">
+        select
+        count(ow.ID)
+        from epidemic_unit_owner ow
+        left join epidemic_building_unit un on ow.UNIT_ID = un.ID and un.DEL_FLAG = '0'
+        where ow.DEL_FLAG = '0'
+        and ow.ID_CARD = #{idCard}
+        and un.ROOM_CODE != #{roomCode}
+
+    </select>
 </mapper>