From f144f017681eeefc6d09fa2cc2c10add6baf3aea Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 30 六月 2025 16:50:42 +0800
Subject: [PATCH] 安灯管理

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/AndonOrderController.java |   68 +++++++++++++++++++++++++++++++--
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java               |    2 +
 2 files changed, 65 insertions(+), 5 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 7d707f5..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,18 +1,24 @@
 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;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 
 /**
 * @Description: andon_order
@@ -22,11 +28,61 @@
 */
 @Api(tags="andon_order")
 @RestController
-@RequestMapping("/AndonOrder/andonOrder")
+@RequestMapping("/mdc/andonOrder")
 @Slf4j
 public class AndonOrderController extends JeecgController<AndonOrder, IAndonOrderService> {
    @Autowired
    private IAndonOrderService andonOrderService;
+
+    /**
+     * 鍒嗛〉鍒楄〃鏌ヨ
+     *
+     * @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);
+    }
 
     /**
      * 绋嬪簭鍛煎彨
@@ -41,4 +97,6 @@
         andonOrderService.procedureCall(andonOrder);
         return Result.OK("鍛煎彨鎴愬姛锛�");
     }
+
+
 }
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java
index 5a81906..b12d4ba 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java
@@ -63,6 +63,7 @@
      */
     @Excel(name = "瀹夌伅浜�", width = 15)
     @ApiModelProperty(value = "瀹夌伅浜�")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     private String operator;
     /**
      * 鍛煎彨鍘熷洜
@@ -83,6 +84,7 @@
      */
     @Excel(name = "鍝嶅簲浜�", width = 15)
     @ApiModelProperty(value = "鍝嶅簲浜�")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     private String responder;
     /**
      * 鍝嶅簲鏃堕棿

--
Gitblit v1.9.3