From 242725f795b4cca830421c07f714a3ec36af0add Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 02 七月 2024 13:59:39 +0800
Subject: [PATCH] feat: 代码初始化、腾讯云短信SDK
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java | 97 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
index 8a75f63..6554c0b 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
@@ -1,13 +1,20 @@
package com.ruoyi.admin.controller;
-
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.entity.RecoveryClassify;
import com.ruoyi.admin.entity.RecoveryServe;
+import com.ruoyi.admin.entity.RecoveryServePrice;
+import com.ruoyi.admin.request.RecoveryServePriceRequest;
+import com.ruoyi.admin.request.RecoveryServeRequest;
+import com.ruoyi.admin.service.RecoveryClassifyService;
+import com.ruoyi.admin.service.RecoveryServePriceService;
import com.ruoyi.admin.service.RecoveryServeService;
+import com.ruoyi.admin.vo.RecoveryServeResultVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -15,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -34,6 +42,10 @@
@Resource
private RecoveryServeService recoveryServeService;
+ @Resource
+ private RecoveryClassifyService recoveryClassifyService;
+ @Resource
+ private RecoveryServePriceService recoveryServePriceService;
/**
* 回收服务分页列表
@@ -41,6 +53,7 @@
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
+ @RequiresPermissions("serve_recycling_list")
@ApiOperation(value = "回收服务分页查询列表", tags = {"后台-回收管理-回收服务管理"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -64,39 +77,104 @@
}
/**
+ * 回收服务列表
+ */
+ @RequiresPermissions("serve_recycling_list")
+ @ApiOperation(value = "回收服务列表", tags = {"后台-回收管理-回收服务管理"})
+ @GetMapping(value = "/list")
+ public R<List<RecoveryServe>> queryPageList() {
+ return R.ok(recoveryServeService.lambdaQuery().eq(RecoveryServe::getIsDelete, 0)
+ .orderByDesc(RecoveryServe::getCreateTime).list());
+ }
+
+ /**
+ * 所属分类列表
+ */
+ @RequiresPermissions("serve_recycling_list")
+ @ApiOperation(value = "所属分类列表", tags = {"后台-回收管理-回收服务管理"})
+ @GetMapping(value = "/typeList")
+ public R<List<RecoveryClassify>> typeList() {
+ return R.ok(recoveryClassifyService.lambdaQuery()
+ .orderByDesc(RecoveryClassify::getCreateTime).list());
+ }
+
+ /**
* 回收服务详情
*
* @param id 回收服务id
*/
+ @RequiresPermissions("serve_recycling_list")
@ApiOperation(value = "回收服务详情", tags = {"后台-回收管理-回收服务管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@ApiImplicitParam(value = "回收服务id", name = "id", dataType = "Integer", required = true)
})
- public R<RecoveryServe> detail(@RequestParam Integer id) {
- return R.ok(recoveryServeService.getById(id));
+ public R<RecoveryServeResultVO> detail(@RequestParam Integer id) {
+ RecoveryServe recoveryServe = recoveryServeService.getById(id);
+ List<RecoveryServePrice> priceList = recoveryServePriceService.lambdaQuery()
+ .eq(RecoveryServePrice::getRecoveryServeId, id)
+ .eq(RecoveryServePrice::getIsDelete, 0).list();
+ return R.ok(new RecoveryServeResultVO(recoveryServe, priceList));
}
/**
* 新增回收服务
*
- * @param recoveryServe 回收服务信息
+ * @param recoveryServeRequest 回收服务信息
*/
+ @RequiresPermissions("serve_recycling_list")
@ApiOperation(value = "新增回收服务", tags = {"后台-回收管理-回收服务管理"})
@PostMapping(value = "/save")
- public R<String> save(@RequestBody RecoveryServe recoveryServe) {
- return recoveryServeService.save(recoveryServe) ? R.ok() : R.fail();
+ public R<String> save(@RequestBody RecoveryServeRequest recoveryServeRequest) {
+ RecoveryServe serve = recoveryServeRequest.getServe();
+ boolean save = recoveryServeService.save(serve);
+ // 城市及对饮回收价
+ if (null != recoveryServeRequest.getPriceList()) {
+ for (RecoveryServePriceRequest data : recoveryServeRequest.getPriceList()) {
+ BigDecimal recoveryPrice = data.getRecoveryPrice();
+ String city = data.getCity();
+ // 信息封装
+ RecoveryServePrice price = new RecoveryServePrice();
+ price.setRecoveryServeId(serve.getId());
+ price.setRecoveryPrice(recoveryPrice);
+ price.setCity(city);
+ save = save && recoveryServePriceService.save(price);
+ }
+ }
+ return save ? R.ok() : R.fail();
}
/**
* 修改回收服务
*
- * @param recoveryServe 回收服务信息
+ * @param recoveryServeRequest 回收服务信息
*/
+ @RequiresPermissions("serve_recycling_list")
@ApiOperation(value = "修改回收服务", tags = {"后台-回收管理-回收服务管理"})
@PostMapping(value = "/update")
- public R<String> update(@RequestBody RecoveryServe recoveryServe) {
- return recoveryServeService.updateById(recoveryServe) ? R.ok() : R.fail();
+ public R<String> update(@RequestBody RecoveryServeRequest recoveryServeRequest) {
+ RecoveryServe serve = recoveryServeRequest.getServe();
+ serve.setId(recoveryServeRequest.getId());
+ boolean update = recoveryServeService.updateById(serve);
+ // 城市及对应回收价
+ update = update && recoveryServePriceService.lambdaUpdate()
+ .set(RecoveryServePrice::getIsDelete, 1)
+ .eq(RecoveryServePrice::getRecoveryServeId, recoveryServeRequest.getId())
+ .update();
+ // 新增省市及回收价
+ if (null != recoveryServeRequest.getPriceList()) {
+ for (RecoveryServePriceRequest data : recoveryServeRequest.getPriceList()) {
+ BigDecimal recoveryPrice = data.getRecoveryPrice();
+ String city = data.getCity();
+ // 信息封装
+ RecoveryServePrice price = new RecoveryServePrice();
+ price.setRecoveryServeId(serve.getId());
+ price.setRecoveryPrice(recoveryPrice);
+ price.setCity(city);
+ update = update && recoveryServePriceService.save(price);
+ }
+ }
+ return update ? R.ok() : R.fail();
}
/**
@@ -104,6 +182,7 @@
*
* @param ids 回收服务多条id拼接
*/
+ @RequiresPermissions("serve_recycling_list")
@ApiOperation(value = "批量删除回收服务", tags = {"后台-回收管理-回收服务管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
--
Gitblit v1.7.1