From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamUserSelectController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamUserSelectController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamUserSelectController.java
new file mode 100644
index 0000000..075654f
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamUserSelectController.java
@@ -0,0 +1,53 @@
+package org.jeecg.modules.eam.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.eam.entity.EamEquipment;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.vo.UserSelector;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Description: 鐢ㄦ埛閫夋嫨
+ * @Author: jeecg-boot
+ * @Date: 2025-03-19
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "鐢ㄦ埛閫夋嫨")
+@RestController
+@RequestMapping("/eam/user_select")
+public class EamUserSelectController {
+
+ @Autowired
+ private ISysUserService sysUserService;
+ @Autowired
+ private IEamEquipmentService eamEquipmentService;
+
+ @ApiOperation(value = "鐢ㄦ埛閫夋嫨-閫夋嫨鎿嶄綔浜哄垪琛ㄦ煡璇�", notes = "鐢ㄦ埛閫夋嫨-閫夋嫨鎿嶄綔浜哄垪琛ㄦ煡璇�")
+ @GetMapping(value = "/list")
+ public Result<?> selectOperatorList(@RequestParam(required = false, value = "equipmentId") String equipmentId,
+ @RequestParam("positionCode") String positionCode) {
+ String productionId = null;
+ String equipmentCode = null;
+ if (StringUtils.isNotBlank(equipmentId)) {
+ EamEquipment equipment = eamEquipmentService.getById(equipmentId);
+ if(equipment != null) {
+ productionId = equipment.getOrgId();
+ equipmentCode = equipment.getEquipmentCode();
+ }
+ }
+ List<UserSelector> list = sysUserService.selectOperatorList(equipmentCode, productionId, positionCode);
+ return Result.ok(list);
+ }
+}
--
Gitblit v1.9.3