From bdbe40f077aa9ca2ec184707d3eab41af13def03 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 18:12:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java
index 955f90e..44cae34 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_property.service.impl;
+import cn.hutool.core.util.DesensitizedUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,14 +9,13 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.property.ComPropertyRepairVO;
import com.panzhihua.common.utlis.RSAUtils;
-import com.panzhihua.service_property.entity.ComPropertyRepair;
import com.panzhihua.service_property.dao.ComPropertyRepairDao;
+import com.panzhihua.service_property.entity.ComPropertyRepair;
import com.panzhihua.service_property.service.ComPropertyRepairService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.List;
/**
* (ComPropertyRepair)表服务实现类
@@ -28,20 +28,42 @@
public class ComPropertyRepairServiceImpl extends ServiceImpl<ComPropertyRepairDao, ComPropertyRepair> implements ComPropertyRepairService {
@Resource
private ComPropertyRepairDao comPropertyRepairDao;
+
@Override
public R pageList(CommonPage commonPage) {
-// try {
-// commonPage.setUsername(RSAUtils.decrypt(commonPage.getUsername(), Constants.PRIVATE_KEY));
-// commonPage.setPhone(RSAUtils.decrypt(commonPage.getPhone(), Constants.PRIVATE_KEY));
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
- IPage<ComPropertyRepairVO> list=comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()),commonPage);
+ IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
+ return R.ok(list);
+ }
+
+ @Override
+ public R pageListDesensitize(CommonPage commonPage) {
+ try {
+ commonPage.setUsername(RSAUtils.decrypt(commonPage.getUsername(), Constants.PRIVATE_KEY));
+ commonPage.setPhone(RSAUtils.decrypt(commonPage.getPhone(), Constants.PRIVATE_KEY));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ IPage<ComPropertyRepairVO> list = comPropertyRepairDao.pageList(new Page(commonPage.getPage(), commonPage.getSize()), commonPage);
+ for (ComPropertyRepairVO record : list.getRecords()) {
+ record.setRepairName(DesensitizedUtil.mobilePhone(record.getRepairPhone()));
+ record.setRepairName(DesensitizedUtil.chineseName(record.getRepairName()));
+ record.setFeedback(DesensitizedUtil.chineseName(record.getFeedback()));
+ }
return R.ok(list);
}
@Override
public R selectDetail(Long id) {
- return R.ok(comPropertyRepairDao.selectDetail(id));
+ ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
+ return R.ok(vo);
+ }
+
+ @Override
+ public R selectDetailDesensitize(Long id) {
+ ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
+ vo.setRepairPhone(DesensitizedUtil.mobilePhone(vo.getRepairPhone()));
+ vo.setRepairName(DesensitizedUtil.chineseName(vo.getRepairName()));
+ vo.setFeedback(DesensitizedUtil.chineseName(vo.getFeedback()));
+ return R.ok(vo);
}
}
--
Gitblit v1.7.1