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/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java index 11ca823..59dd63e 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyRepairApi.java @@ -2,11 +2,13 @@ import cn.hutool.core.date.DateUtil; import com.panzhihua.applets.model.dtos.IDTO; +import com.panzhihua.common.constants.Constants; import com.panzhihua.common.controller.BaseController; 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.service.property.PropertyService; +import com.panzhihua.common.utlis.RSAUtils; import com.panzhihua.common.utlis.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; @@ -37,6 +39,18 @@ } /** + * 分页查询所有数据 + * @return 所有数据 + */ + @ApiOperation("小程序列表接口-脱敏") + @PostMapping("/desensitize/queryAll") + public R selectAllDesensitize(@RequestBody CommonPage commonPage) { + commonPage.setUserId(this.getUserId()); + return this.propertyService.comPropertyRepairSelectAllDesensitize(commonPage); + } + + + /** * 小程序添加报修 * @param comPropertyRepairVO * @return @@ -47,6 +61,26 @@ comPropertyRepairVO.setCreateTime(DateUtil.date()); comPropertyRepairVO.setCreateBy(this.getUserId()); comPropertyRepairVO.setRepairStatus(ComPropertyRepairVO.status.dcl); + return this.propertyService.comPropertyRepairInsert(comPropertyRepairVO); + } + + /** + * 小程序添加报修 脱敏 + * @param comPropertyRepairVO + * @return + */ + @ApiOperation("小程序添加报修-脱敏") + @PostMapping("desensitizeInsert") + public R desensitizeInsert(@RequestBody ComPropertyRepairVO comPropertyRepairVO) { + comPropertyRepairVO.setCreateTime(DateUtil.date()); + comPropertyRepairVO.setCreateBy(this.getUserId()); + comPropertyRepairVO.setRepairStatus(ComPropertyRepairVO.status.dcl); + try { + comPropertyRepairVO.setRepairName(RSAUtils.decrypt(comPropertyRepairVO.getRepairName(), Constants.PRIVATE_KEY)); + comPropertyRepairVO.setRepairPhone(RSAUtils.decrypt(comPropertyRepairVO.getRepairPhone(), Constants.PRIVATE_KEY)); + } catch (Exception e) { + e.printStackTrace(); + } return this.propertyService.comPropertyRepairInsert(comPropertyRepairVO); } @@ -95,6 +129,21 @@ return this.propertyService.comPropertyRepairSelectOne(id); } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @ApiOperation("详情接口") + @GetMapping("desensitize/{id}") + public R selectOneDesensitize(@PathVariable("id") Long id) { + return this.propertyService.comPropertyRepairSelectOneDesensitize(id); + } + + + /** * 删除数据 * -- Gitblit v1.7.1