From ade42fdf88dcd01100f017ff647a2d4a095d51c5 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 20 Oct 2022 16:52:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4org=E7=9A=84=E6=98=8E?=
 =?UTF-8?q?=E6=96=87=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/IcHouseController.java   | 11 -----
 .../com/epmet/service/IcHouseService.java     |  7 ---
 .../service/impl/IcHouseServiceImpl.java      | 47 -------------------
 3 files changed, 65 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
index 00a9076821..e7b5ac7e56 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
@@ -154,15 +154,4 @@ public class IcHouseController {
         return icHouseService.checkHomeInfo(formDTO);
     }
 
-    /**
-     * Desc: 数据明文查询
-     * @param formDTO
-     * @author zxc
-     * @date 2022/10/17 13:45
-     */
-    @PostMapping("detailByType")
-    public Result<DetailByTypeResultDTO> detailByType(@RequestBody DetailByTypeFormDTO formDTO,@LoginUser TokenDto tokenDto){
-        ValidatorUtils.validateEntity(formDTO, DetailByTypeFormDTO.DetailByTypeForm.class);
-        return new Result<DetailByTypeResultDTO>().ok(icHouseService.detailByType(formDTO,tokenDto));
-    }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
index 0b2e40f86d..0855d78104 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
@@ -138,12 +138,5 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      */
     Result checkHomeInfo(CheckHouseInfoFormDTO formDTO);
 
-    /**
-     * Desc: 数据明文查询
-     * @param formDTO
-     * @author zxc
-     * @date 2022/10/17 13:45
-     */
-    DetailByTypeResultDTO detailByType(DetailByTypeFormDTO formDTO, TokenDto tokenDto);
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index a44882b549..943d6f9eee 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -416,51 +416,4 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
 
         return new Result<CheckHomeInfoResultInfo>().ok(checkHomeInfoResultInfo);
     }
-
-    /**
-     * Desc: 数据明文查询
-     * @param formDTO
-     * @author zxc
-     * @date 2022/10/17 13:45
-     */
-    @Override
-    public DetailByTypeResultDTO detailByType(DetailByTypeFormDTO formDTO, TokenDto tokenDto) {
-        DetailByTypeResultDTO result = new DetailByTypeResultDTO();
-        String customerId = tokenDto.getCustomerId();
-        String userId = tokenDto.getUserId();
-        CheckMQMsg msg = new CheckMQMsg();
-        if (formDTO.getType().equals(NeighborhoodConstant.HOUSE)){
-            HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(customerId, formDTO.getId());
-            if (null == houseInfo){
-                throw new EpmetException("查询房屋信息失败："+formDTO.getId());
-            }
-            result.setMobile(houseInfo.getOwnerPhone());
-            result.setIdCard(houseInfo.getOwnerIdCard());
-            msg.setContent("查看"+houseInfo.getAllName()+"房屋的敏感信息");
-            msg.setType("checkHouse");
-            msg.setTypeDisplay("查看"+houseInfo.getAllName()+"房屋的敏感信息");
-        }else if (formDTO.getType().equals(NeighborhoodConstant.IC_RESI_USER)){
-            IcResiUserInfoCache icResiUserInfo = CustomerResiUserRedis.getIcResiUserInfo(formDTO.getId());
-            if (null == icResiUserInfo){
-                throw new EpmetException("查询icResiUser失败："+formDTO.getId());
-            }
-            result.setIdCard(icResiUserInfo.getIdCard());
-            result.setMobile(icResiUserInfo.getMobile());
-            msg.setContent("查看"+icResiUserInfo.getName()+"的敏感信息");
-            msg.setType("checkIcResiUser");
-            msg.setTypeDisplay("查看"+icResiUserInfo.getName()+"的敏感信息");
-        }
-        // 发送mq消息
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-        msg.setOperateTime(new Date());
-        msg.setUserId(userId);
-        msg.setFromApp(tokenDto.getApp());
-        msg.setIp(IpUtils.getIpAddr(request));
-        msg.setFromClient(tokenDto.getClient());
-        SystemMsgFormDTO form = new SystemMsgFormDTO();
-        form.setMessageType(TopicConstants.CHECK_OR_EXPORT);
-        form.setContent(msg);
-        epmetMessageOpenFeignClient.sendSystemMsgByMQ(form);
-        return result;
-    }
 }