From 4788f8d86807296a3dce75b5dd428c0a8d5828db Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 25 七月 2025 17:12:39 +0800
Subject: [PATCH] 分类字典设置上级是否存在子节点修改
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/AndonOrderController.java | 99 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 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..a889d23 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,26 @@
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.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
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.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.AndonOrder;
import org.jeecg.modules.mdc.service.IAndonOrderService;
+import org.jeecg.modules.mdc.vo.MdcDeviceCalendarVo;
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 javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
/**
* @Description: andon_order
@@ -22,13 +30,94 @@
*/
@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) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ IPage<AndonOrder> pageList= new Page<>();
+ if (StringUtils.isNotBlank(userId)) {
+ pageList = andonOrderService.pageList(userId, andonOrder, pageNo, pageSize, req);
+ }
+ 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 id
+ * @return
+ */
+ @AutoLog(value = "瀹夌伅绠＄悊-鍝嶅簲")
+ @ApiOperation(value = "瀹夌伅绠＄悊-鍝嶅簲", notes = "瀹夌伅绠＄悊-鍝嶅簲")
+ @GetMapping(value = "/responseData")
+ public Result<?> responseData(@RequestParam(name="id",required=true) String id) {
+ andonOrderService.responseData(Arrays.asList(id));
+ return Result.OK("鍝嶅簲鎴愬姛锛�");
+ }
+
+ /**
+ * 瀹夌伅绠＄悊-澶勭悊
+ *
+ * @param andonOrder
+ * @return
+ */
+ @AutoLog(value = "瀹夌伅绠＄悊-澶勭悊")
+ @ApiOperation(value="瀹夌伅绠＄悊-澶勭悊", notes="瀹夌伅绠＄悊-澶勭悊")
+ @PostMapping(value = "/dealWith")
+ public Result<?> dealWith(@RequestBody AndonOrder andonOrder) {
+ andonOrderService.dealWith(andonOrder);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
* 绋嬪簭鍛煎彨
*
* @param andonOrder
--
Gitblit v1.9.3