From 212eb8010c66c321dcdfc617725b37885573a44e Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 02 七月 2025 21:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/AndonOrderController.java | 110 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 84 insertions(+), 26 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/AndonOrderController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/AndonOrderController.java
index a9a33ee..2b63b2a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/AndonOrderController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/AndonOrderController.java
@@ -1,44 +1,102 @@
package org.jeecg.modules.mdc.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.mdc.entity.AndonOrder;
import org.jeecg.modules.mdc.service.IAndonOrderService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
- /**
- * @Description: andon_order
- * @Author: jeecg-boot
- * @Date: 2025-06-11
- * @Version: V1.0
- */
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+* @Description: andon_order
+* @Author: jeecg-boot
+* @Date: 2025-06-11
+* @Version: V1.0
+*/
@Api(tags="andon_order")
@RestController
-@RequestMapping("/AndonOrder/andonOrder")
+@RequestMapping("/mdc/andonOrder")
@Slf4j
public class AndonOrderController extends JeecgController<AndonOrder, IAndonOrderService> {
- @Autowired
- private IAndonOrderService andonOrderService;
+ @Autowired
+ private IAndonOrderService andonOrderService;
- /**
- * 绋嬪簭鍛煎彨
- *
- * @param andonOrder
- * @return
- */
- @AutoLog(value = "瀹夌伅宸ュ崟-绋嬪簭鍛煎彨")
- @ApiOperation(value = "瀹夌伅宸ュ崟-绋嬪簭鍛煎彨", notes = "瀹夌伅宸ュ崟-绋嬪簭鍛煎彨")
- @PostMapping(value = "/procedureCall")
- public Result<?> procedureCall(@RequestBody AndonOrder andonOrder) {
- andonOrderService.procedureCall(andonOrder);
- return Result.OK("鍛煎彨鎴愬姛锛�");
- }
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param andonOrder
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "瀹夌伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value="瀹夌伅-鍒嗛〉鍒楄〃鏌ヨ", notes="瀹夌伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(AndonOrder andonOrder,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<AndonOrder> queryWrapper = QueryGenerator.initQueryWrapper(andonOrder, req.getParameterMap());
+ Page<AndonOrder> page = new Page<AndonOrder>(pageNo, pageSize);
+ IPage<AndonOrder> pageList = andonOrderService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param andonOrder
+ * @return
+ */
+ @AutoLog(value = "瀹夌伅-娣诲姞")
+ @ApiOperation(value="瀹夌伅-娣诲姞", notes="瀹夌伅-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody AndonOrder andonOrder) {
+ andonOrderService.save(andonOrder);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "瀹夌伅-閫氳繃id鏌ヨ")
+ @ApiOperation(value="瀹夌伅-閫氳繃id鏌ヨ", notes="瀹夌伅-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+ AndonOrder andonOrder = andonOrderService.getById(id);
+ return Result.OK(andonOrder);
+ }
+
+ /**
+ * 绋嬪簭鍛煎彨
+ *
+ * @param andonOrder
+ * @return
+ */
+ @AutoLog(value = "瀹夌伅宸ュ崟-绋嬪簭鍛煎彨")
+ @ApiOperation(value = "瀹夌伅宸ュ崟-绋嬪簭鍛煎彨", notes = "瀹夌伅宸ュ崟-绋嬪簭鍛煎彨")
+ @PostMapping(value = "/procedureCall")
+ public Result<?> procedureCall(@RequestBody AndonOrder andonOrder) {
+ andonOrderService.procedureCall(andonOrder);
+ return Result.OK("鍛煎彨鎴愬姛锛�");
+ }
+
+
}
--
Gitblit v1.9.3