From 724929d92dcf2a3a5cb44e8351dc0a68b294b354 Mon Sep 17 00:00:00 2001 From: lijiaqi Date: Wed, 18 Sep 2024 11:38:08 +0800 Subject: [PATCH] =?UTF-8?q?feat(coding):=20=E5=9C=A8=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=92=8C=E5=88=86=E7=B1=BB=E5=AE=9E=E4=BD=93=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=E5=B9=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在属性和属性分类实体中引入排序字段，以便对它们进行有序管理。更新相关服务方法以支持排序字段的查询，确保数据能够按排序字段进行升序处理。 --- .../module/drone/coding/entity/Attribute.java | 3 ++ .../entity/AttributeClassification.java | 3 ++ .../AttributeClassificationService.java | 5 +++- .../coding/service/AttributeService.java | 2 ++ .../drone/coding/service/BatchesService.java | 19 ++++++++++--- .../drone/coding/service/CodeService.java | 2 +- .../drone/coding/service/MfcService.java | 28 +++++++++++++++---- .../drone/coding/service/RuleService.java | 3 ++ .../coding/vo/AttributeClassificationVo.java | 5 ++++ .../module/drone/coding/vo/AttributeVo.java | 4 +++ 10 files changed, 62 insertions(+), 12 deletions(-) diff --git a/src/main/java/cn/workde/module/drone/coding/entity/Attribute.java b/src/main/java/cn/workde/module/drone/coding/entity/Attribute.java index d2b99dd..809f104 100644 --- a/src/main/java/cn/workde/module/drone/coding/entity/Attribute.java +++ b/src/main/java/cn/workde/module/drone/coding/entity/Attribute.java @@ -37,5 +37,8 @@ public class Attribute extends BaseEntity { @Schema(description = "是否锁定") private Boolean locked; + @Schema(description = "排序") + private Integer sortNo; + } diff --git a/src/main/java/cn/workde/module/drone/coding/entity/AttributeClassification.java b/src/main/java/cn/workde/module/drone/coding/entity/AttributeClassification.java index 7776fad..454cdd3 100644 --- a/src/main/java/cn/workde/module/drone/coding/entity/AttributeClassification.java +++ b/src/main/java/cn/workde/module/drone/coding/entity/AttributeClassification.java @@ -25,5 +25,8 @@ public class AttributeClassification extends BaseEntity { @Schema(description = "属性分类名称") private String attributeClassificationName; + @Schema(description = "排序") + private Integer sortNo; + } diff --git a/src/main/java/cn/workde/module/drone/coding/service/AttributeClassificationService.java b/src/main/java/cn/workde/module/drone/coding/service/AttributeClassificationService.java index c2705ca..bd0ce12 100644 --- a/src/main/java/cn/workde/module/drone/coding/service/AttributeClassificationService.java +++ b/src/main/java/cn/workde/module/drone/coding/service/AttributeClassificationService.java @@ -91,11 +91,14 @@ public class AttributeClassificationService extends BaseService() .lambda() .like(StrUtil.isNotBlank(vo.getAttributeClassificationName()), AttributeClassification::getAttributeClassificationName, vo.getAttributeClassificationName()) + .orderByAsc(AttributeClassification::getSortNo) )); } public Result> getAttributeClassificationList() { - return Result.data(this.list()); + return Result.data(this.list(new QueryWrapper() + .lambda() + .orderByAsc(AttributeClassification::getSortNo))); } } diff --git a/src/main/java/cn/workde/module/drone/coding/service/AttributeService.java b/src/main/java/cn/workde/module/drone/coding/service/AttributeService.java index f2fa2de..42d11a1 100644 --- a/src/main/java/cn/workde/module/drone/coding/service/AttributeService.java +++ b/src/main/java/cn/workde/module/drone/coding/service/AttributeService.java @@ -102,6 +102,7 @@ public class AttributeService extends BaseService { .like(StrUtil.isNotBlank(vo.getAttributeDescription()), Attribute::getAttributeDescription, vo.getAttributeDescription()) .like(StrUtil.isNotBlank(vo.getAttributeRemarks()), Attribute::getAttributeRemarks, vo.getAttributeRemarks()) .like(StrUtil.isNotBlank(vo.getAttributeName()), Attribute::getAttributeName, vo.getAttributeName()) + .orderByAsc(Attribute::getSortNo) ))); } @@ -109,6 +110,7 @@ public class AttributeService extends BaseService { return Result.data(AttributeWrapper.INSTANCE.toDto(this.list(new QueryWrapper() .lambda() .eq(StrUtil.isNotBlank(attributeClassificationId), Attribute::getAttributeClassificationId, attributeClassificationId) + .orderByAsc(Attribute::getSortNo) ))); } diff --git a/src/main/java/cn/workde/module/drone/coding/service/BatchesService.java b/src/main/java/cn/workde/module/drone/coding/service/BatchesService.java index 830d91a..428360d 100644 --- a/src/main/java/cn/workde/module/drone/coding/service/BatchesService.java +++ b/src/main/java/cn/workde/module/drone/coding/service/BatchesService.java @@ -6,16 +6,19 @@ import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import cn.workde.core.base.BaseService; import cn.workde.core.data.dto.Result; +import cn.workde.core.util.SpringUtil; import cn.workde.module.drone.coding.dto.AttributeValueDto; import cn.workde.module.drone.coding.dto.BatchesDto; import cn.workde.module.drone.coding.dto.CodeDto; import cn.workde.module.drone.coding.entity.*; +import cn.workde.module.drone.coding.mapper.AttributeValueMapper; import cn.workde.module.drone.coding.mapper.BatchesMapper; import cn.workde.module.drone.coding.vo.AttributeValueVo2; import cn.workde.module.drone.coding.vo.BatchesVo; import cn.workde.module.drone.coding.wrapper.BatchesWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import jakarta.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -127,12 +130,16 @@ public class BatchesService extends BaseService { .like(StrUtil.isNotBlank(vo.getBatchesDescription()), Batches::getBatchesDescription, vo.getBatchesDescription()) .eq(StrUtil.isNotBlank(vo.getMfcId()), Batches::getMfcId, vo.getMfcId()) .eq(StrUtil.isNotBlank(vo.getRuleId()), Batches::getRuleId, vo.getRuleId()) + .orderByAsc(Batches::getCreatedAt) ); return Result.data(BatchesWrapper.INSTANCE.toDto(paged)); } public Result> getBatchesList() { - List list = this.list(new QueryWrapper()); + List list = this.list(new QueryWrapper() + .lambda() + .orderByAsc(Batches::getCreatedAt) + ); return Result.data(BatchesWrapper.INSTANCE.toDto(list)); } @@ -148,6 +155,7 @@ public class BatchesService extends BaseService { new QueryWrapper() .lambda() .inSql(AttributeClassification::getId, "select distinct attribute_classification_id from dss_drone_coding_attribute_value where mfc_id = '" + mfcId + "'") + .orderByAsc(AttributeClassification::getSortNo) ); if (CollUtil.isNotEmpty(attributeClassifications)) { List attributeClassificationDtoList = new ArrayList(); @@ -156,11 +164,14 @@ public class BatchesService extends BaseService { attributeClassificationDTO.setAttributeClassificationId(attributeClassification.getId()); attributeClassificationDTO.setAttributeClassificationName(attributeClassification.getAttributeClassificationName()); //获取属性值 - List attributeValues = attributeValueService.list( - new QueryWrapper() - .lambda() + List attributeValues = SpringUtil.getBean(AttributeValueMapper.class).selectJoinList( + AttributeValue.class, + new MPJLambdaWrapper() + .selectAll(AttributeValue.class) + .leftJoin(Attribute.class, Attribute::getId, AttributeValue::getAttributeId) .eq(AttributeValue::getMfcId, mfcId) .eq(AttributeValue::getAttributeClassificationId, attributeClassification.getId()) + .orderByAsc(Attribute::getSortNo) ); if (CollUtil.isNotEmpty(attributeValues)) { List attributeDtoList = new ArrayList(); diff --git a/src/main/java/cn/workde/module/drone/coding/service/CodeService.java b/src/main/java/cn/workde/module/drone/coding/service/CodeService.java index 51df583..874cabe 100644 --- a/src/main/java/cn/workde/module/drone/coding/service/CodeService.java +++ b/src/main/java/cn/workde/module/drone/coding/service/CodeService.java @@ -265,7 +265,7 @@ public class CodeService extends BaseService{ .like(StrUtil.isNotBlank(mfcCode), Code::getMfcCode, mfcCode) .like(StrUtil.isNotBlank(ruleCode), Code::getRuleCode, ruleCode) .like(StrUtil.isNotBlank(snCode), Code::getSnCode, snCode) - .orderByDesc(Code::getCreatedAt) + .orderByAsc(Code::getCode) ); return Result.data(CodeWrapper.INSTANCE.toDto(paged)); } diff --git a/src/main/java/cn/workde/module/drone/coding/service/MfcService.java b/src/main/java/cn/workde/module/drone/coding/service/MfcService.java index 38830e7..f97f03c 100644 --- a/src/main/java/cn/workde/module/drone/coding/service/MfcService.java +++ b/src/main/java/cn/workde/module/drone/coding/service/MfcService.java @@ -6,15 +6,18 @@ import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import cn.workde.core.base.BaseService; import cn.workde.core.data.dto.Result; +import cn.workde.core.util.SpringUtil; import cn.workde.module.drone.coding.dto.AttributeClassificationDto; import cn.workde.module.drone.coding.dto.AttributeValueDto; import cn.workde.module.drone.coding.entity.*; +import cn.workde.module.drone.coding.mapper.AttributeValueMapper; import cn.workde.module.drone.coding.mapper.MfcMapper; import cn.workde.module.drone.coding.vo.AttributeValueVo; import cn.workde.module.drone.coding.vo.AttributeValueVo2; import cn.workde.module.drone.coding.vo.MfcVo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import jakarta.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -123,24 +126,32 @@ public class MfcService extends BaseService { } public Result> getMfcPageList(Page page, MfcVo vo) { - Page paged = this.page(page, new QueryWrapper() + Page paged = this.page(page, new QueryWrapper() .lambda() .like(StrUtil.isNotBlank(vo.getMfcCode()), Mfc::getMfcCode, vo.getMfcCode()) .like(StrUtil.isNotBlank(vo.getMfcName()), Mfc::getMfcName, vo.getMfcName()) .like(StrUtil.isNotBlank(vo.getMfcDescription()), Mfc::getMfcDescription, vo.getMfcDescription()) + .orderByAsc(Mfc::getCreatedAt) ); return Result.data(paged); } public Result> getMfcList() { - List list = this.list(); + List list = this.list(new QueryWrapper() + .lambda() + .orderByAsc(Mfc::getCreatedAt) + ); return Result.data(list); } public Result> getAttributeOptions() { //获取所有属性分类 - List attributeClassificationList = attributeClassificationService.list(); + List attributeClassificationList = attributeClassificationService.list( + new QueryWrapper() + .lambda() + .orderByAsc(AttributeClassification::getSortNo) + ); if (ObjUtil.isNotNull(attributeClassificationList)) { List attributeClassificationDtoList = new ArrayList(); attributeClassificationList.forEach(attributeClassification -> { @@ -150,6 +161,7 @@ public class MfcService extends BaseService { List attributeList = attributeService.list(new QueryWrapper() .lambda() .eq(Attribute::getAttributeClassificationId, attributeClassification.getId()) + .orderByAsc(Attribute::getSortNo) ); attributeClassificationDto.setAttributeList(attributeList); attributeClassificationDtoList.add(attributeClassificationDto); @@ -245,6 +257,7 @@ public class MfcService extends BaseService { new QueryWrapper() .lambda() .inSql(AttributeClassification::getId, "select distinct attribute_classification_id from dss_drone_coding_attribute_value where mfc_id = '" + mfcId + "'") + .orderByAsc(AttributeClassification::getSortNo) ); if (CollUtil.isNotEmpty(attributeClassifications)) { List attributeClassificationDtoList = new ArrayList(); @@ -253,11 +266,14 @@ public class MfcService extends BaseService { attributeClassificationDTO.setAttributeClassificationId(attributeClassification.getId()); attributeClassificationDTO.setAttributeClassificationName(attributeClassification.getAttributeClassificationName()); //获取属性值 - List attributeValues = attributeValueService.list( - new QueryWrapper() - .lambda() + List attributeValues = SpringUtil.getBean(AttributeValueMapper.class).selectJoinList( + AttributeValue.class, + new MPJLambdaWrapper() + .selectAll(AttributeValue.class) + .leftJoin(Attribute.class, Attribute::getId, AttributeValue::getAttributeId) .eq(AttributeValue::getMfcId, mfcId) .eq(AttributeValue::getAttributeClassificationId, attributeClassification.getId()) + .orderByAsc(Attribute::getSortNo) ); if (CollUtil.isNotEmpty(attributeValues)) { List attributeDtoList = new ArrayList(); diff --git a/src/main/java/cn/workde/module/drone/coding/service/RuleService.java b/src/main/java/cn/workde/module/drone/coding/service/RuleService.java index ee65681..3e1ec8e 100644 --- a/src/main/java/cn/workde/module/drone/coding/service/RuleService.java +++ b/src/main/java/cn/workde/module/drone/coding/service/RuleService.java @@ -123,12 +123,15 @@ public class RuleService extends BaseService { .like(StrUtil.isNotBlank(vo.getRuleCode()), Rule::getRuleCode, vo.getRuleCode()) .like(StrUtil.isNotBlank(vo.getRuleName()), Rule::getRuleName, vo.getRuleName()) .like(StrUtil.isNotBlank(vo.getRuleDescription()), Rule::getRuleDescription, vo.getRuleDescription()) + .orderByAsc(Rule::getCreatedAt) ); return Result.data(paged); } public Result> getRuleList() { List list = this.list(new QueryWrapper() + .lambda() + .orderByAsc(Rule::getCreatedAt) ); return Result.data(list); } diff --git a/src/main/java/cn/workde/module/drone/coding/vo/AttributeClassificationVo.java b/src/main/java/cn/workde/module/drone/coding/vo/AttributeClassificationVo.java index 49dc5a0..1247d98 100644 --- a/src/main/java/cn/workde/module/drone/coding/vo/AttributeClassificationVo.java +++ b/src/main/java/cn/workde/module/drone/coding/vo/AttributeClassificationVo.java @@ -2,6 +2,7 @@ package cn.workde.module.drone.coding.vo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; @Data @@ -10,4 +11,8 @@ public class AttributeClassificationVo { @Schema(description = "属性分类名称") @NotBlank(message = "属性分类名称不能为空") private String attributeClassificationName; + + @Schema(description = "排序") + @NotNull(message = "排序不能为空") + private Integer sortNo; } diff --git a/src/main/java/cn/workde/module/drone/coding/vo/AttributeVo.java b/src/main/java/cn/workde/module/drone/coding/vo/AttributeVo.java index ac9d7d0..0716685 100644 --- a/src/main/java/cn/workde/module/drone/coding/vo/AttributeVo.java +++ b/src/main/java/cn/workde/module/drone/coding/vo/AttributeVo.java @@ -26,4 +26,8 @@ public class AttributeVo { @Schema(description = "是否锁定") @NotNull(message = "请选择是否锁定") private Boolean locked; + + @Schema(description = "排序") + @NotNull(message = "请输入排序") + private Integer sortNo; }