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 | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 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 2b63b2a..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
@@ -6,18 +6,20 @@
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.*;
-import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
/**
@@ -50,9 +52,12 @@
@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);
+ 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);
}
@@ -85,6 +90,34 @@
}
/**
+ * 瀹夌伅绠＄悊-鍝嶅簲
+ *
+ * @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
@@ -97,6 +130,4 @@
andonOrderService.procedureCall(andonOrder);
return Result.OK("鍛煎彨鎴愬姛锛�");
}
-
-
}
--
Gitblit v1.9.3