From 22db0b6b9b3a5905c1793107c2c1c2a00b265091 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei121@163.com>
Date: 星期四, 16 三月 2023 08:59:28 +0800
Subject: [PATCH] 批次改为工单，完善docker配置文件
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOrderController.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 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 b58fdce..9df905d 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
@@ -17,6 +17,7 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.dry.vo.DryOrderVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -26,12 +27,12 @@
import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
- * @Description: 骞茬嚗鎵规
+ * @Description: 骞茬嚗宸ュ崟
* @Author: jeecg-boot
* @Date: 2023-03-08
* @Version: V1.0
*/
-@Api(tags="骞茬嚗鎵规")
+@Api(tags="骞茬嚗宸ュ崟")
@RestController
@RequestMapping("/dry/dryOrder")
@Slf4j
@@ -48,8 +49,8 @@
* @param req
* @return
*/
- //@AutoLog(value = "骞茬嚗鎵规-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="骞茬嚗鎵规-鍒嗛〉鍒楄〃鏌ヨ", notes="骞茬嚗鎵规-鍒嗛〉鍒楄〃鏌ヨ")
+ //@AutoLog(value = "骞茬嚗宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="骞茬嚗宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ", notes="骞茬嚗宸ュ崟-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
public Result<IPage<DryOrder>> queryPageList(DryOrder dryOrder,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -73,8 +74,8 @@
* @param dryOrder
* @return
*/
- @AutoLog(value = "骞茬嚗鎵规-娣诲姞")
- @ApiOperation(value="骞茬嚗鎵规-娣诲姞", notes="骞茬嚗鎵规-娣诲姞")
+ @AutoLog(value = "骞茬嚗宸ュ崟-娣诲姞")
+ @ApiOperation(value="骞茬嚗宸ュ崟-娣诲姞", notes="骞茬嚗宸ュ崟-娣诲姞")
@RequiresPermissions("dry:dry_order:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody DryOrder dryOrder) {
@@ -88,8 +89,8 @@
* @param dryOrder
* @return
*/
- @AutoLog(value = "骞茬嚗鎵规-缂栬緫")
- @ApiOperation(value="骞茬嚗鎵规-缂栬緫", notes="骞茬嚗鎵规-缂栬緫")
+ @AutoLog(value = "骞茬嚗宸ュ崟-缂栬緫")
+ @ApiOperation(value="骞茬嚗宸ュ崟-缂栬緫", notes="骞茬嚗宸ュ崟-缂栬緫")
@RequiresPermissions("dry:dry_order:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody DryOrder dryOrder) {
@@ -103,8 +104,8 @@
* @param id
* @return
*/
- @AutoLog(value = "骞茬嚗鎵规-閫氳繃id鍒犻櫎")
- @ApiOperation(value="骞茬嚗鎵规-閫氳繃id鍒犻櫎", notes="骞茬嚗鎵规-閫氳繃id鍒犻櫎")
+ @AutoLog(value = "骞茬嚗宸ュ崟-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="骞茬嚗宸ュ崟-閫氳繃id鍒犻櫎", notes="骞茬嚗宸ュ崟-閫氳繃id鍒犻櫎")
@RequiresPermissions("dry:dry_order:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -118,8 +119,8 @@
* @param ids
* @return
*/
- @AutoLog(value = "骞茬嚗鎵规-鎵归噺鍒犻櫎")
- @ApiOperation(value="骞茬嚗鎵规-鎵归噺鍒犻櫎", notes="骞茬嚗鎵规-鎵归噺鍒犻櫎")
+ @AutoLog(value = "骞茬嚗宸ュ崟-鎵归噺鍒犻櫎")
+ @ApiOperation(value="骞茬嚗宸ュ崟-鎵归噺鍒犻櫎", notes="骞茬嚗宸ュ崟-鎵归噺鍒犻櫎")
@RequiresPermissions("dry:dry_order:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -133,8 +134,8 @@
* @param id
* @return
*/
- //@AutoLog(value = "骞茬嚗鎵规-閫氳繃id鏌ヨ")
- @ApiOperation(value="骞茬嚗鎵规-閫氳繃id鏌ヨ", notes="骞茬嚗鎵规-閫氳繃id鏌ヨ")
+ //@AutoLog(value = "骞茬嚗宸ュ崟-閫氳繃id鏌ヨ")
+ @ApiOperation(value="骞茬嚗宸ュ崟-閫氳繃id鏌ヨ", notes="骞茬嚗宸ュ崟-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<DryOrder> queryById(@RequestParam(name="id",required=true) String id) {
DryOrder dryOrder = dryOrderService.getById(id);
@@ -153,7 +154,7 @@
@RequiresPermissions("dry:dry_order:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, DryOrder dryOrder) {
- return super.exportXls(request, dryOrder, DryOrder.class, "骞茬嚗鎵规");
+ return super.exportXls(request, dryOrder, DryOrder.class, "骞茬嚗宸ュ崟");
}
/**
@@ -169,4 +170,14 @@
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