From e25acb2125b9beea05704ae8cb760a94c83289b9 Mon Sep 17 00:00:00 2001 From: yangsb Date: Mon, 29 Apr 2024 09:21:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E4=B8=8B=E6=8B=89=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?id=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/machine/MachineController.java | 10 ++++++++-- .../admin/machine/vo/MachineSimpleRespVO.java | 2 ++ .../module/system/service/machine/MachineService.java | 2 +- .../system/service/machine/MachineServiceImpl.java | 5 ++++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java index 7f7fcc87f..93279a23b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java @@ -4,18 +4,23 @@ import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.es.core.valid.CreateGroup; import com.cf.imes.framework.es.core.valid.UpdateGroup; import com.cf.imes.framework.operatelog.core.annotations.OperateLog; +import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.module.system.controller.admin.machine.vo.*; import com.cf.imes.module.system.dal.dataobject.dept.DeptDO; import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; import com.cf.imes.module.system.service.machine.MachineService; import com.cf.imes.module.system.service.machine.MachineTemplateService; import org.springframework.web.bind.annotation.*; + import javax.annotation.Resource; + import org.springframework.validation.annotation.Validated; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; + import javax.validation.*; + import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.util.object.BeanUtils; @@ -128,8 +133,9 @@ public class MachineController { @GetMapping(value = {"/list-all-simple", "/simple-list"}) @Operation(summary = "获取机台精简信息列表", description = "主要用于前端的下拉选项") - public CommonResult> getSimpleDeptList() { - List list = machineService.simpleList(); + public CommonResult> getSimpleDeptList(@RequestParam(required = false) Long organId) { + organId = organId == null ? OrganContextHolder.getOrganId() : organId; + List list = machineService.simpleList(organId); return success(list); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineSimpleRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineSimpleRespVO.java index 77627c575..272a033e5 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineSimpleRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineSimpleRespVO.java @@ -1,10 +1,12 @@ package com.cf.imes.module.system.controller.admin.machine.vo; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; /** * @author Beal */ +@Data public class MachineSimpleRespVO { @Schema(description = "机台id") private Long id; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java index 7b05c873d..61b6cf0ff 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java @@ -81,5 +81,5 @@ public interface MachineService { PageResult page(MachinePageReqVO pageParam); - List simpleList(); + List simpleList(Long organId); } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java index 646db7457..6efc62230 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cf.imes.framework.es.core.dal.ESDocument; import com.cf.imes.framework.es.core.service.ESDocumentService; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.cf.imes.framework.organ.core.aop.OrganIgnore; import com.cf.imes.framework.security.core.LoginUser; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.system.controller.admin.machine.vo.*; @@ -291,9 +292,11 @@ public class MachineServiceImpl implements MachineService { } @Override - public List simpleList() { + @OrganIgnore + public List simpleList(Long organId) { List machineDOS = machineMapper.selectList(new LambdaQueryWrapperX() .select(MachineDO::getId, MachineDO::getName) + .eq(MachineDO::getOrganId, organId) ); return BeanUtils.toBean(machineDOS, MachineSimpleRespVO.class); }