From d6f2a3d6c68cc2626b3a1baef7383e66a0f7a58e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 13:36:24 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java
index 9aad64f..54e08a8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/api/ComPropertyRepairApi.java
@@ -1,9 +1,11 @@
package com.panzhihua.service_property.api;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.model.dtos.property.CommonPage;
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.service.ComPropertyRepairService;
import org.springframework.beans.BeanUtils;
@@ -35,6 +37,8 @@
return this.comPropertyRepairService.pageList(commonPage);
}
+
+
/**
* 通过主键查询单条数据
*
@@ -42,7 +46,7 @@
* @return 单条数据
*/
@GetMapping("{id}")
- public R selectOne(@PathVariable("id") Integer id) {
+ public R selectOne(@PathVariable("id") Long id) {
return this.comPropertyRepairService.selectDetail(id);
}
@@ -58,6 +62,15 @@
if(comPropertyRepairVO!=null){
BeanUtils.copyProperties(comPropertyRepairVO,comPropertyRepair);
}
+ ComPropertyRepairVO vo=comPropertyRepairVO;
+ try {
+ comPropertyRepair.setRepairName(RSAUtils.decrypt(comPropertyRepairVO.getRepairName(), Constants.PRIVATE_KEY));
+ comPropertyRepair.setRepairPhone(RSAUtils.decrypt(comPropertyRepairVO.getRepairPhone(), Constants.PRIVATE_KEY));
+ } catch (Exception e) {
+ e.printStackTrace();
+ comPropertyRepair.setRepairName(comPropertyRepairVO.getRepairName());
+ comPropertyRepair.setRepairPhone(comPropertyRepairVO.getRepairPhone());
+ }
return R.ok(this.comPropertyRepairService.save(comPropertyRepair));
}
--
Gitblit v1.7.1