From a3344947e1ff54fcae8f09140ab0d05e2ba26f31 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 25 十月 2024 15:17:36 +0800
Subject: [PATCH] 新增配方记录功能并优化相关实体和VO
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 10 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java
index 9df905d..c88e53a 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java
@@ -1,8 +1,13 @@
package org.jeecg.modules.dry.controller;
import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.config.TenantContext;
import org.jeecg.common.system.query.QueryGenerator;
@@ -17,6 +22,8 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.dry.service.IDryOrderTrendService;
+import org.jeecg.modules.dry.vo.DryOrderTrendVo;
import org.jeecg.modules.dry.vo.DryOrderVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -39,6 +46,9 @@
public class DryOrderController extends JeecgController<DryOrder, IDryOrderService> {
@Autowired
private IDryOrderService dryOrderService;
+
+ @Autowired
+ private IDryOrderTrendService dryOrderTrendService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -67,6 +77,16 @@
IPage<DryOrder> pageList = dryOrderService.page(page, queryWrapper);
return Result.OK(pageList);
}
+
+
+ @ApiOperation(value="鏈堢敓浜ф儏鍐垫瑙�", notes="")
+ @GetMapping(value = "/monthOverview")
+ public Result<?> queryMonthOverview(@RequestParam(name="month") String month) {
+ int tenantId = oConvertUtils.getInt(TenantContext.getTenant(),0);
+ List<String> list = dryOrderService.queryMonthOverview(month, tenantId);
+ return Result.ok(list);
+ }
+
/**
* 娣诲姞
@@ -128,7 +148,22 @@
return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
}
- /**
+ /**
+ * 鎵归噺涓嬪彂宸ュ崟
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "骞茬嚗宸ュ崟-鎵归噺涓嬪彂")
+ @ApiOperation(value="骞茬嚗宸ュ崟-鎵归噺涓嬪彂", notes="骞茬嚗宸ュ崟-鎵归噺涓嬪彂")
+ @RequiresPermissions("dry:dry_order:edit")
+ @PostMapping(value = "/sendBatch")
+ public Result<String> sendBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.dryOrderService.sendByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺涓嬪彂鎴愬姛!");
+ }
+
+
+ /**
* 閫氳繃id鏌ヨ
*
* @param id
@@ -144,6 +179,20 @@
}
return Result.OK(dryOrder);
}
+
+ @ApiOperation(value="骞茬嚗宸ュ崟-鏌ヨ杩囩▼瓒嬪娍鏁版嵁", notes="鏌ヨ杩囩▼瓒嬪娍鏁版嵁")
+ @GetMapping(value = "/queryOrderTrendById")
+ public Result<DryOrderVo> queryOrderTrendById(@RequestParam(name="id",required=true) String id) {
+ DryOrder dryOrder = dryOrderService.getById(id);
+ DryOrderVo orderVo;
+ if(dryOrder ==null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ orderVo = BeanUtil.toBean(dryOrder, DryOrderVo.class);
+ List<DryOrderTrendVo> trendVos = dryOrderTrendService.listByOrderId(orderVo.getId());
+ orderVo.setDetailList(trendVos);
+ return Result.OK(orderVo);
+ }
/**
* 瀵煎嚭excel
@@ -170,14 +219,5 @@
return super.importExcel(request, response, DryOrder.class);
}
-
-
- @ApiOperation(value="鎺ユ敹瀹炴椂鏁版嵁", notes="璁惧瀹炴椂鏁版嵁涓婁紶")
- @PostMapping("/sendRealTimeData")
- public void realTimeData(@RequestBody DryOrderVo orderVo) {
- System.out.println("鎺ユ敹鍒板疄鏃舵暟鎹細" + orderVo.toString());
- service.saveRealTimeData(orderVo);
-
- }
}
--
Gitblit v1.9.3