From 954da9f9b77549cf08f1672c23b184764443b246 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 11 Dec 2024 12:13:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/biz/domain}/MaTypeProperty.java | 6 +++++- .../java/com/bonus/common/biz/domain/TreeBuild.java | 2 +- .../java/com/bonus/common/biz/domain/TreeNode.java | 2 +- .../bonus/material/device/domain/vo/DevInfoVo.java | 2 -- .../bonus/material/device/mapper/DevInfoMapper.java | 1 - .../home/service/impl/MaTypeInfoServiceImpl.java | 8 ++------ .../com/bonus/material/ma/mapper/MaTypeMapper.java | 3 ++- .../material/ma/service/impl/MaTypeServiceImpl.java | 12 +++++------- .../main/java/com/bonus/material/ma/vo/MaType.java | 3 ++- .../java/com/bonus/material/ma/vo/TreeSelect.java | 13 +++++++------ .../mapper/material/ma/MaMachineTypeMapper.xml | 10 ++++++---- 11 files changed, 31 insertions(+), 31 deletions(-) rename {bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/vo => bonus-common-biz/src/main/java/com/bonus/common/biz/domain}/MaTypeProperty.java (64%) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/vo/MaTypeProperty.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/MaTypeProperty.java similarity index 64% rename from bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/vo/MaTypeProperty.java rename to bonus-common-biz/src/main/java/com/bonus/common/biz/domain/MaTypeProperty.java index 5f4b75c..5e2e776 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/vo/MaTypeProperty.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/MaTypeProperty.java @@ -1,4 +1,4 @@ -package com.bonus.material.ma.vo; +package com.bonus.common.biz.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,4 +14,8 @@ public class MaTypeProperty { @ApiModelProperty(value = "属性名称") private String propertyName; + /** 是否必填(0:否, 1:是) */ + @ApiModelProperty(value = "是否必填(0:否, 1:是)") + private String mustHave; + } diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeBuild.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeBuild.java index c9bff05..3f4fa1f 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeBuild.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeBuild.java @@ -66,7 +66,7 @@ public class TreeBuild { // 判断当前节点的父节点ID是否等于根节点的ID，即当前节点为其下的子节点 if (treeNode.getParentId() == pNode.getId()) { if (!"1".equals(pNode.getLevel())) { - treeNode.setPropertyNames(pNode.getPropertyNames()); + treeNode.setMaTypeProperties(pNode.getMaTypeProperties()); } // 再递归进行判断当前节点的情况，调用自身方法 childTree.add(buildChildTree(treeNode)); diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeNode.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeNode.java index 07f2ba3..37e522d 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeNode.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeNode.java @@ -48,7 +48,7 @@ public class TreeNode { private String remark; - private List propertyNames; + private List maTypeProperties; @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children = new ArrayList<>(); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java index 3fe2f30..8d60201 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java @@ -1,14 +1,12 @@ package com.bonus.material.device.domain.vo; import com.bonus.material.device.domain.DevInfo; -import com.bonus.material.ma.vo.MaTypeProperty; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.util.Date; import java.util.List; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java index 0e1e20c..a3b8c4b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java @@ -10,7 +10,6 @@ import com.bonus.material.device.domain.dto.InfoMotionDto; import com.bonus.material.device.domain.vo.DevInfoPropertyVo; import com.bonus.material.device.domain.vo.DevInfoVo; import com.bonus.material.device.domain.vo.LeaseVo; -import com.bonus.material.ma.vo.MaTypeProperty; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/impl/MaTypeInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/impl/MaTypeInfoServiceImpl.java index 264e631..683768e 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/impl/MaTypeInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/home/service/impl/MaTypeInfoServiceImpl.java @@ -9,8 +9,7 @@ import com.bonus.material.device.domain.vo.DevInfoVo; import com.bonus.material.home.mapper.MaTypeInfoMapper; import com.bonus.material.home.service.MaTypeInfoSevice; import com.bonus.material.ma.mapper.MaTypeMapper; -import com.bonus.material.ma.vo.MaType; -import com.bonus.material.ma.vo.MaTypeProperty; +import com.bonus.common.biz.domain.MaTypeProperty; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -63,10 +62,7 @@ public class MaTypeInfoServiceImpl implements MaTypeInfoSevice { maTypePropertiesMap = maTypeProperties.stream().collect(Collectors.groupingBy(MaTypeProperty::getTypeId)); } for (TreeNode treeNode : treeNodes) { - List tmpPropList = maTypePropertiesMap.get(treeNode.getId()); - if (!org.springframework.util.CollectionUtils.isEmpty(tmpPropList)) { - treeNode.setPropertyNames(tmpPropList.stream().map(o -> o.getPropertyName()).collect(Collectors.toList())); - } + treeNode.setMaTypeProperties(maTypePropertiesMap.get(treeNode.getId())); } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/mapper/MaTypeMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/mapper/MaTypeMapper.java index b018b70..bbbefd2 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/mapper/MaTypeMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/mapper/MaTypeMapper.java @@ -1,5 +1,6 @@ package com.bonus.material.ma.mapper; +import com.bonus.common.biz.domain.MaTypeProperty; import com.bonus.material.ma.vo.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -92,5 +93,5 @@ public interface MaTypeMapper { int deleteMaTypePropertyNames(@Param("typeId")Long typeId); - int insertMaTypePropertyNames(@Param("typeId")Long typeId, @Param("list") List propertyNames); + int insertMaTypePropertyNames(@Param("typeId")Long typeId, @Param("list") List properties); } \ No newline at end of file diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/service/impl/MaTypeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/service/impl/MaTypeServiceImpl.java index 9abeca9..3be356c 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/service/impl/MaTypeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/service/impl/MaTypeServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.material.ma.service.impl; +import com.bonus.common.biz.domain.MaTypeProperty; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.material.ma.mapper.MaTypeFileMapper; @@ -131,10 +132,10 @@ public class MaTypeServiceImpl implements ITypeService { maType.setUpdateTime(DateUtils.getNowDate()); int i = maTypeMapper.updateType(maType); //保存配置属性 - if (!CollectionUtils.isEmpty(maType.getPropertyNames())) { + if (!CollectionUtils.isEmpty(maType.getMaTypeProperties())) { maTypeMapper.deleteMaTypePropertyNames(maType.getTypeId()); - List maTypeProperties = maType.getPropertyNames(); - maTypeProperties.removeIf(String::isEmpty); + List maTypeProperties = maType.getMaTypeProperties(); + //maTypeProperties.removeIf(MaTypeProperty::isNull); maTypeMapper.insertMaTypePropertyNames(maType.getTypeId(), maTypeProperties); } // 图片路径保存 @@ -225,10 +226,7 @@ public class MaTypeServiceImpl implements ITypeService { maTypePropertiesMap = maTypeProperties.stream().collect(Collectors.groupingBy(MaTypeProperty::getTypeId)); } for (MaType maType : maTypes) { - List tmpPropList = maTypePropertiesMap.get(maType.getTypeId()); - if (!CollectionUtils.isEmpty(tmpPropList)) { - maType.setPropertyNames(tmpPropList.stream().map(o -> o.getPropertyName()).collect(Collectors.toList())); - } + maType.setMaTypeProperties(maTypePropertiesMap.get(maType.getTypeId())); } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/vo/MaType.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/vo/MaType.java index 2b634bb..2b467f6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/vo/MaType.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/vo/MaType.java @@ -1,5 +1,6 @@ package com.bonus.material.ma.vo; +import com.bonus.common.biz.domain.MaTypeProperty; import com.bonus.common.core.annotation.Excel; import com.bonus.common.core.web.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; @@ -217,5 +218,5 @@ public class MaType extends BaseEntity { private List typeIds; - private List propertyNames; + private List maTypeProperties; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/vo/TreeSelect.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/vo/TreeSelect.java index cbdd00b..88a1ab8 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/vo/TreeSelect.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/vo/TreeSelect.java @@ -1,5 +1,6 @@ package com.bonus.material.ma.vo; +import com.bonus.common.biz.domain.MaTypeProperty; import com.fasterxml.jackson.annotation.JsonInclude; import java.io.Serializable; @@ -27,7 +28,7 @@ public class TreeSelect implements Serializable private String companyId; - private List propertyNames; + private List maTypeProperties; /** 子节点 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) @@ -53,7 +54,7 @@ public class TreeSelect implements Serializable this.id = maType.getTypeId(); this.label = maType.getTypeName(); this.companyId = maType.getCompanyId(); - this.propertyNames = maType.getPropertyNames(); + this.maTypeProperties = maType.getMaTypeProperties(); this.children = maType.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); } // public TreeSelect(SysDept dept) @@ -109,12 +110,12 @@ public class TreeSelect implements Serializable this.companyId = companyId; } - public List getPropertyNames() { - return propertyNames; + public List getMaTypeProperties() { + return maTypeProperties; } - public void setPropertyNames(List propertyNames) { - this.propertyNames = propertyNames; + public void setMaTypeProperties(List maTypeProperties) { + this.maTypeProperties = maTypeProperties; } public List getChildren() diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/ma/MaMachineTypeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/ma/MaMachineTypeMapper.xml index ba379e4..407dcfd 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/ma/MaMachineTypeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/ma/MaMachineTypeMapper.xml @@ -455,9 +455,10 @@ and del_flag = 0 - select type_id as typeId, - property_name as propertyName + property_name as propertyName, + must_have as mustHave from ma_type_properties @@ -467,12 +468,13 @@ insert into - ma_type_properties(type_id, property_name, create_time) + ma_type_properties(type_id, property_name, must_have, create_time) values ( #{typeId}, - #{item}, + #{item.propertyName}, + #{item.mustHave}, now() )