From 679a244ce19309fd8a7e23ff7401dc527c15a7e2 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 10 七月 2025 00:20:43 +0800
Subject: [PATCH] 新增
---
src/main/java/com/linghu/controller/OrderController.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 96 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/linghu/controller/OrderController.java b/src/main/java/com/linghu/controller/OrderController.java
index 8ce2d69..a26b7d2 100644
--- a/src/main/java/com/linghu/controller/OrderController.java
+++ b/src/main/java/com/linghu/controller/OrderController.java
@@ -4,8 +4,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.util.BeanUtil;
import com.linghu.model.common.ResponseResult;
+import com.linghu.model.entity.Keyword;
import com.linghu.model.entity.Orders;
+import com.linghu.model.dto.KeywordDto;
import com.linghu.model.dto.OrderDto;
+import com.linghu.model.page.CustomPage;
+import com.linghu.service.KeywordService;
import com.linghu.service.OrderService;
import io.swagger.annotations.Api;
@@ -14,6 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.Date;
@@ -29,6 +34,9 @@
@Autowired
private OrderService orderService;
+
+ @Autowired
+ private KeywordService keywordService;
/**
* 新增订单
@@ -63,10 +71,17 @@
order.setCreate_time(LocalDateTime.now());
boolean save = orderService.save(order);
// 保存关键词
- boolean saveOrderWithKeywords = orderService.saveOrderWithKeywords(orderDto,order.getOrder_id());
+ boolean saveOrderWithKeywords = orderService.saveOrderWithKeywords(orderDto, order.getOrder_id());
if (!saveOrderWithKeywords) {
return ResponseResult.error("添加关键词失败");
}
+ //更新关键词数量
+ LambdaQueryWrapper<Keyword> queryKeywordsQueryWrapper = new LambdaQueryWrapper<>();
+ queryKeywordsQueryWrapper.eq(Keyword::getOrder_id, order.getOrder_id());
+ int count1 = keywordService.count(queryKeywordsQueryWrapper);
+ order.setKeyword_num(count1);
+ order.setUpdate_time(LocalDateTime.now());
+ orderService.updateById(order);
if (save) {
return ResponseResult.success(order);
@@ -97,22 +112,36 @@
*/
@PutMapping
@ApiOperation(value = "更新订单")
- public ResponseResult<Void> update(@RequestBody Orders order) {
- if (order.getOrder_id() == null) {
+ public ResponseResult<Void> update(@RequestBody OrderDto orderDto) {
+ if (orderDto.getOrder_id() == null) {
return ResponseResult.error("订单ID不能为空");
}
- if (order.getClient_name() == null || order.getClient_name().trim().isEmpty()) {
+ if (orderDto.getClient_name() == null || orderDto.getClient_name().trim().isEmpty()) {
return ResponseResult.error("客户名称不能为空");
}
- Orders existingOrder = orderService.getById(order.getOrder_id());
+ Orders existingOrder = orderService.getById(orderDto.getOrder_id());
if (existingOrder == null) {
return ResponseResult.error("订单不存在");
}
- order.setUpdate_time(LocalDateTime.now());
+ orderDto.setUpdate_time(LocalDateTime.now());
+ if (orderDto.getKeywords()!= null&&orderDto.getKeywords().trim().length() > 0){
+ // 保存关键词
+ boolean saveOrderWithKeywords = orderService.saveOrderWithKeywords(orderDto, orderDto.getOrder_id());
+ if (!saveOrderWithKeywords) {
+ return ResponseResult.error("添加关键词失败");
+ }
+ }
+ //更新关键词数量
+ LambdaQueryWrapper<Keyword> queryKeywordsQueryWrapper = new LambdaQueryWrapper<>();
+ queryKeywordsQueryWrapper.eq(Keyword::getOrder_id, orderDto.getOrder_id());
+ int count1 = keywordService.count(queryKeywordsQueryWrapper);
+ orderDto.setKeyword_num(count1);
- if (orderService.updateById(order)) {
+
+
+ if (orderService.updateById(orderDto)) {
return ResponseResult.success();
}
return ResponseResult.error("更新订单失败");
@@ -136,15 +165,15 @@
*/
@GetMapping
@ApiOperation("查询订单列表")
- public ResponseResult<List<Orders>> list(
+ public ResponseResult<CustomPage<Orders>> list(
@RequestParam(required = false) Integer pageNum,
@RequestParam(required = false) Integer pageSize,
@RequestParam(required = false) String clientName,
@RequestParam(required = false) Integer status,
- @RequestParam(required = false) String createTime) {
+ @RequestParam(required = false) String timeRange) {
LambdaQueryWrapper<Orders> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(Orders::getDel_flag, 0); // 只查询未删除的订单
+ queryWrapper.eq(Orders::getDel_flag, 0);
// 添加查询条件
if (clientName != null && !clientName.trim().isEmpty()) {
@@ -153,19 +182,70 @@
if (status != null) {
queryWrapper.eq(Orders::getStatus, status);
}
- if (createTime != null) {
- queryWrapper.like(Orders::getCreate_time, createTime);
- }
+ // 改造时间筛选逻辑
+ if (timeRange != null && !timeRange.trim().isEmpty()) {
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime startTime = null;
+ switch (timeRange.trim()) {
+ case "week":
+ startTime = now.minusWeeks(1);
+ break;
+ case "month":
+ startTime = now.minusMonths(1);
+ break;
+ case "threeMonths":
+ startTime = now.minusMonths(3);
+ break;
+ case "year":
+ startTime = now.minusYears(1);
+ break;
+ default:
+ // 可添加日志记录无效参数
+ break;
+ }
+ if (startTime != null) {
+ queryWrapper.ge(Orders::getCreate_time, startTime);
+ }
+ }
// 分页查询
if (pageNum != null && pageSize != null) {
Page<Orders> pageInfo = new Page<>(pageNum, pageSize);
Page<Orders> result = orderService.page(pageInfo, queryWrapper);
- return ResponseResult.success(result.getRecords());
+ return ResponseResult.success(new CustomPage<>(result));
}
- // 不分页
+ // 不分页查询：手动创建 CustomPage
List<Orders> list = orderService.list(queryWrapper);
- return ResponseResult.success(list);
+ CustomPage<Orders> page = new CustomPage<>(new Page<>());
+ page.setRecords(list);
+ page.setTotal(list.size());
+
+ return ResponseResult.success(page);
+ }
+
+ /**
+ * 获取客户列表
+ * @param
+ * @return
+ */
+ @GetMapping("/clientList")
+ @ApiOperation("获取客户列表")
+ public ResponseResult<CustomPage<String>> getClientList(@RequestParam(required = false) String clientName,
+ @RequestParam(required = false,defaultValue = "1") Integer pageNum,
+ @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+
+ Page<String> result = orderService.getClientList(clientName,pageNum, pageSize);
+
+
+ return ResponseResult.success(new CustomPage<>( result));
+ }
+
+
+ @GetMapping("/{orderId}/keywordList")
+ @ApiOperation("获取订单关联的关键词及提问词")
+ public ResponseResult<List<KeywordDto>> getKeywordList(@PathVariable String orderId){
+ List<KeywordDto> result = orderService.getKeywordListByOrderId(orderId);
+ return ResponseResult.success(result);
}
}
\ No newline at end of file
--
Gitblit v1.7.1