From 2d7dd7cbfb2b2b31ae9d5831b863d24a3209290a Mon Sep 17 00:00:00 2001 From: yangsb Date: Mon, 29 Apr 2024 09:10:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=BA=E5=8F=B0?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plan/vo/OrderPageReqVOCopy.java | 12 ++++++------ .../executor/service/plan/PlanServiceImpl.java | 6 +++--- .../main/resources/mapper/order/OrderMapper.xml | 3 ++- .../admin/machine/MachineController.java | 9 ++++++++- .../admin/machine/vo/MachineSimpleRespVO.java | 14 ++++++++++++++ .../system/service/machine/MachineService.java | 2 ++ .../system/service/machine/MachineServiceImpl.java | 8 ++++++++ 7 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineSimpleRespVO.java diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java index fb303ff8b..734b1e7a7 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java @@ -32,17 +32,17 @@ public class OrderPageReqVOCopy extends PageParam { @Schema(description = "状态列表") private List stateList; @Schema(description = "矩形") - private boolean rectangle; + private Boolean rectangle; @Schema(description = "异形") - private boolean specialShaped; + private Boolean specialShaped; @Schema(description = "造型") - private boolean sculpt; + private Boolean sculpt; @Schema(description = "有挖穿造型") - private boolean holeThrough; + private Boolean holeThrough; @Schema(description = "有挖穿孔") - private boolean burrow; + private Boolean burrow; @Schema(description = "有二维纹路") - private boolean twoDimensionalToolPath; + private Boolean twoDimensionalToolPath; @Schema(description = "开始时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private Date beginDate; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index 0e0cc8eb7..e7f6374e6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -249,13 +249,13 @@ public class PlanServiceImpl implements PlanService { .isNull("d.order_id") ; List filterTypes = new ArrayList<>(); - if (pageReqVO.isHoleThrough()) { + if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) { filterTypes.add(1); } - if (pageReqVO.isBurrow()) { + if (Objects.nonNull(pageReqVO.getBurrow()) && pageReqVO.getBurrow()) { filterTypes.add(2); } - if (pageReqVO.isTwoDimensionalToolPath()) { + if (Objects.nonNull(pageReqVO.getTwoDimensionalToolPath()) && pageReqVO.getTwoDimensionalToolPath()) { filterTypes.add(4); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml index 619138e77..e7f65eb1e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml @@ -7,8 +7,9 @@ count(c.id) as num, sum(c.area) as area, p.goods_name, p.color, p.material, p.goods_id from `order` a left join order_plate c ON a.id = c.order_id and c.is_cancel = 0 - left join plate p on c.goods_id = p.goods_id + left join order_goods p on c.goods_id = p.goods_id left join order_item d ON c.order_id = d.order_id + left join order_plan_item e on d.id = e.item_id ${ew.customSqlSegment} group by orderId, p.id 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 12bb5c385..7f7fcc87f 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 @@ -1,16 +1,17 @@ package com.cf.imes.module.system.controller.admin.machine; +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.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 org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; @@ -125,5 +126,11 @@ public class MachineController { return success(machineService.getMachineTree(organId)); } + @GetMapping(value = {"/list-all-simple", "/simple-list"}) + @Operation(summary = "获取机台精简信息列表", description = "主要用于前端的下拉选项") + public CommonResult> getSimpleDeptList() { + List list = machineService.simpleList(); + return success(list); + } } \ No newline at end of file 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 new file mode 100644 index 000000000..77627c575 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineSimpleRespVO.java @@ -0,0 +1,14 @@ +package com.cf.imes.module.system.controller.admin.machine.vo; + +import io.swagger.v3.oas.annotations.media.Schema; + +/** + * @author Beal + */ +public class MachineSimpleRespVO { + @Schema(description = "机台id") + private Long id; + + @Schema(description = "机台名称") + private String name; +} 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 e4d967be9..7b05c873d 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 @@ -80,4 +80,6 @@ public interface MachineService { OrganMachineResp organMachineByOrganId(Long organId); PageResult page(MachinePageReqVO pageParam); + + List simpleList(); } \ 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 e963d912a..646db7457 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 @@ -290,6 +290,14 @@ public class MachineServiceImpl implements MachineService { return machineMapper.selectPage(pageParam, new ArrayList<>()); } + @Override + public List simpleList() { + List machineDOS = machineMapper.selectList(new LambdaQueryWrapperX() + .select(MachineDO::getId, MachineDO::getName) + ); + return BeanUtils.toBean(machineDOS, MachineSimpleRespVO.class); + } + private void validateExists(Long id) { if (machineMapper.selectById(id) == null) { throw exception(MACHINE_NOT_EXISTS); From e25acb2125b9beea05704ae8cb760a94c83289b9 Mon Sep 17 00:00:00 2001 From: yangsb Date: Mon, 29 Apr 2024 09:21:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E7=BB=84?= =?UTF-8?q?=E7=BB=87id=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); }