Merge remote-tracking branch 'origin/huacheng_test' into local_20221014

yanghui

2022-10-21 5f3cf501f9f6c216df17ee8af6618b55b537d21a

 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);
    }



    /**
     * 通过主键查询单条数据
     *
@@ -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));
    }