yanghui
2022-11-10 ff87de38cd60344ebc875385a02b8f74481b16d0
Merge branch 'local_20221104' into haucheng_panzhihua

# Conflicts:
# springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java
1个文件已修改
38 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/service/impl/ComPropertyRepairServiceImpl.java 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
    }
}