From ff87de38cd60344ebc875385a02b8f74481b16d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 10 十一月 2022 21:29:01 +0800
Subject: [PATCH] Merge branch 'local_20221104' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 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 f235929..53aaaa8 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
@@ -29,23 +29,43 @@
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 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);
}
@Override
public R selectDetail(Long id) {
ComPropertyRepairVO vo = comPropertyRepairDao.selectDetail(id);
- vo.setRepairPhone(DesensitizedUtil.mobilePhone(vo.getRepairPhone()));
- vo.setRepairName(DesensitizedUtil.chineseName(vo.getRepairName()));
return R.ok(vo);
}
+
+
}
--
Gitblit v1.7.1