From 50c1706b77559b4862f65dbd8e0d454b235677a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=A8=E8=9B=8B?= <14958938+qianqiao5-6-7@user.noreply.gitee.com> Date: Thu, 14 Nov 2024 10:23:30 +0800 Subject: [PATCH] =?UTF-8?q?2024-11-14=EF=BC=88=E5=B1=9E=E6=80=A7=E7=BB=84?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/common/log/enums/BusinessType.java | 4 ++ .../muyu/product/domain/AsAttributeGroup.java | 4 +- .../muyu/product/domain/AttributeGroup.java | 6 +- .../domain/req/AttributeGroupEditReq.java | 6 ++ .../domain/req/AttributeGroupUpdReq.java | 34 +++++++++ .../domain/resp/AttributeGroupUpd.java | 31 ++++++++ .../controller/AttributeGroupController.java | 10 ++- .../mapper/AsAttributeGroupMapper.java | 7 ++ .../product/mapper/AttributeGroupMapper.java | 3 + .../service/AsAttributeGroupService.java | 1 + .../service/AttributeGroupService.java | 21 ++++-- .../impl/AttributeGroupServiceImpl.java | 70 +++++++++++++++++-- .../mapper/product/AsAttributeGroupMapper.xml | 11 +++ .../mapper/product/AttributeGroupMapper.xml | 24 +++---- .../system/controller/SysWyzController.java | 10 +++ .../com/muyu/system/mapper/SysWyzMapper.java | 8 +++ .../muyu/system/service/SysWyzService.java | 4 ++ .../service/impl/SysWyzServiceImpl.java | 8 +++ .../resources/mapper/system/SysWyzMapper.xml | 6 ++ 19 files changed, 239 insertions(+), 29 deletions(-) create mode 100644 muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupUpdReq.java create mode 100644 muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpd.java create mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysWyzController.java create mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysWyzMapper.java create mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysWyzService.java create mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysWyzServiceImpl.java create mode 100644 muyu-modules/muyu-system/src/main/resources/mapper/system/SysWyzMapper.xml diff --git a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessType.java b/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessType.java index 2e928c7..d435a0f 100644 --- a/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessType.java +++ b/muyu-common/muyu-common-log/src/main/java/com/muyu/common/log/enums/BusinessType.java @@ -21,6 +21,10 @@ public enum BusinessType { */ UPDATE, + /** + * 修改（吴彦祖） + */ + UPDATE_CUSTOMIZE, /** * 删除 */ diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java index d3d6cff..92bbc92 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AsAttributeGroup.java @@ -45,11 +45,11 @@ public class AsAttributeGroup extends BaseEntity { private Long attributeId; - public static AsAttributeGroup buildGroup (Long attributeGroupId, - Long attributeId) { + public static AsAttributeGroup buildGroup (Long attributeGroupId, Long attributeId) { return AsAttributeGroup.builder() .groupId(attributeGroupId) .attributeId(attributeId) .build(); } + } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java index e9450e2..ea8fc3d 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java @@ -74,9 +74,9 @@ public class AttributeGroup extends BaseEntity { * 修改构造器 */ public static AttributeGroup editBuild(Long id, AttributeGroupEditReq attributeGroupEditReq){ - return AttributeGroup.builder() - .id(id) - .name(attributeGroupEditReq.getName()) + + + return AttributeGroup.builder().id(id).name(attributeGroupEditReq.getName()) .states(attributeGroupEditReq.getStates()) .build(); } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java index 35a1b47..2bac1db 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupEditReq.java @@ -1,7 +1,10 @@ package com.muyu.product.domain.req; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.product.domain.AttributeInfo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -33,5 +36,8 @@ public class AttributeGroupEditReq extends BaseEntity { @ApiModelProperty(name = "状态", value = "状态", required = true) private String states; + /** 属性id 集合 */ + @ApiModelProperty(name = "属性集合", value = "属性集合", required = true) + private List attributeList; } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupUpdReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupUpdReq.java new file mode 100644 index 0000000..568b974 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/AttributeGroupUpdReq.java @@ -0,0 +1,34 @@ +package com.muyu.product.domain.req; + +import com.muyu.product.domain.AttributeInfo; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class AttributeGroupUpdReq { + + /** + *属性组id + */ + private Long id; + /** + * 组名称 + */ + private String name; + /** + * 备注 + */ + private String remark; + /** + * 属性id 集合 + */ + + private List attributeList; +} diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpd.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpd.java new file mode 100644 index 0000000..f6781f7 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpd.java @@ -0,0 +1,31 @@ +package com.muyu.product.domain.resp; + +import com.muyu.product.domain.AttributeInfo; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class AttributeGroupUpd { + /** 属性组编号 */ + private Long id; + + /** 组名称 */ + private String name; + + /** 状态 */ + private String states; + + /** + * 属性id 集合 + */ + + private List attributeList; + +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java index bd489a0..4502c93 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java @@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.muyu.product.domain.model.AttributeGroupSaveModel; import com.muyu.product.domain.resp.AttributeGroupPageResp; +import com.muyu.product.domain.resp.AttributeGroupUpd; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -74,8 +75,8 @@ public class AttributeGroupController extends BaseController { @RequiresPermissions("product:attributeGroup:query") @GetMapping(value = "/{id}") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) - public Result getInfo(@PathVariable("id") Long id) { - return Result.success(attributeGroupService.getById(id)); + public Result getInfo(@PathVariable("id") Long id) { + return Result.success(attributeGroupService.getByIdUpd(id)); } /** @@ -99,7 +100,8 @@ public class AttributeGroupController extends BaseController { @PutMapping("/{id}") @ApiOperation("修改属性组") public Result edit(@PathVariable Long id, @RequestBody AttributeGroupEditReq attributeGroupEditReq) { - return toAjax(attributeGroupService.updateById(AttributeGroup.editBuild(id,attributeGroupEditReq))); + attributeGroupService.updateAttribute(id,attributeGroupEditReq); + return Result.success("修改成功"); } /** @@ -113,4 +115,6 @@ public class AttributeGroupController extends BaseController { public Result remove(@PathVariable List ids) { return toAjax(attributeGroupService.removeBatchByIds(ids)); } + + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java index 1b420df..5720ef0 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java @@ -3,6 +3,8 @@ package com.muyu.product.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AsAttributeGroup; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 属性与组中间Mapper接口 @@ -10,6 +12,11 @@ import com.muyu.product.domain.AsAttributeGroup; * @author DongZeLiang * @date 2024-02-27 */ +@Mapper public interface AsAttributeGroupMapper extends BaseMapper { + //删除 属性组 + void delete(Long id); + //添加 属性组 + void add(@Param("groupId") Long groupId, @Param("id") Long id); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java index 9f1acd3..00432a9 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AttributeGroupMapper.java @@ -3,6 +3,7 @@ package com.muyu.product.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.product.domain.AttributeGroup; +import org.apache.ibatis.annotations.Mapper; /** * 属性组Mapper接口 @@ -10,6 +11,8 @@ import com.muyu.product.domain.AttributeGroup; * @author DongZeLiang * @date 2024-02-27 */ +@Mapper public interface AttributeGroupMapper extends BaseMapper { + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java index db672c4..6286c0f 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AsAttributeGroupService.java @@ -15,6 +15,7 @@ public interface AsAttributeGroupService extends IService { * 查询属性与组中间列表 * * @param asAttributeGroup 属性与组中间 + * * @return 属性与组中间集合 */ public List list(AsAttributeGroup asAttributeGroup); diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java index 9527f88..05521a2 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/AttributeGroupService.java @@ -1,13 +1,14 @@ package com.muyu.product.service; -import java.util.List; - +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.product.domain.AttributeGroup; -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.product.domain.AttributeInfo; import com.muyu.product.domain.model.AttributeGroupSaveModel; +import com.muyu.product.domain.req.AttributeGroupEditReq; import com.muyu.product.domain.resp.AttributeGroupPageResp; +import com.muyu.product.domain.resp.AttributeGroupUpd; + +import java.util.List; /** * 属性组Service接口 @@ -39,4 +40,16 @@ public interface AttributeGroupService extends IService { */ public Boolean save(AttributeGroupSaveModel attributeGroupSaveModel); + /** + * 吴彦祖 的 修改 属性 + */ + void updateAttribute(Long id, AttributeGroupEditReq attributeGroupEditReq); + /** + * 吴彦祖 的 回显属性组 + * @param id + * @return + */ + AttributeGroupUpd getByIdUpd(Long id); + + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java index 85f52d1..77554cd 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java @@ -9,7 +9,10 @@ import com.muyu.product.domain.AsAttributeGroup; import com.muyu.product.domain.AttributeGroup; import com.muyu.product.domain.AttributeInfo; import com.muyu.product.domain.model.AttributeGroupSaveModel; +import com.muyu.product.domain.req.AttributeGroupEditReq; import com.muyu.product.domain.resp.AttributeGroupPageResp; +import com.muyu.product.domain.resp.AttributeGroupUpd; +import com.muyu.product.mapper.AsAttributeGroupMapper; import com.muyu.product.mapper.AttributeGroupMapper; import com.muyu.product.service.AsAttributeGroupService; import com.muyu.product.service.AttributeGroupService; @@ -19,9 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; -import java.util.function.Function; -import java.util.stream.Stream; /** * 属性组Service业务层处理 @@ -33,12 +35,17 @@ import java.util.stream.Stream; @Service public class AttributeGroupServiceImpl extends ServiceImpl implements AttributeGroupService { + //属性与组中间列表 @Autowired private AsAttributeGroupService attributeGroupService; + //商品属性Service接口 @Autowired private AttributeInfoService attributeInfoService; + @Autowired + private AsAttributeGroupMapper attributeGroupMapper; + /** * 分页查询 * @@ -86,9 +93,7 @@ public class AttributeGroupServiceImpl extends ServiceImpl list = attributeGroupEditReq.getAttributeList(); + //添加 + for (AttributeInfo info : list) { + attributeGroupMapper.add(id,info.getId()); + } + } + + + /** + * 吴彦祖 的 回显属性组 + * @param id + * @return + */ + @Override + public AttributeGroupUpd getByIdUpd(Long id) { + //获取当前id的 组 + AttributeGroup byId = this.getById(id); + //查询 该 组 的 属性 集合 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + //返回 + wrapper.eq(AsAttributeGroup::getGroupId,id); + List asAttributeGroups=attributeGroupService.list(wrapper); + //判断当前会显得 属性及 是否为空 + if (asAttributeGroups.size() != 0){ + List longList = asAttributeGroups.stream() + .map(AsAttributeGroup::getAttributeId)//属性 + .toList(); + List attributeInfos = attributeInfoService.listByIds(longList); + return AttributeGroupUpd.builder() + .id(byId.getId()) + .name(byId.getName()) + .attributeList(//属性 + attributeInfos + ).build();//修改回显时信息 + } + List list =new ArrayList<>(); + List attributeInfos = attributeInfoService.listByIds(list); + + + return AttributeGroupUpd.builder() + .id(byId.getId()) + .name(byId.getName()) + .attributeList(//属性 + attributeInfos + ).build();//修改回显时信息 + } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml index 05c468d..a32cc85 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml @@ -18,4 +18,15 @@ select id, group_id, attribute_id, remark, create_by, create_time, update_by, update_time from as_attribute_group + + + INSERT INTO `product`.`as_attribute_group` (`id`, `group_id`, `attribute_id`, `remark`, `create_by`, + `create_time`, `update_by`, `update_time`) + VALUES (0,#{groupId}, #{id}, NULL, NULL, NULL, NULL, NULL); + + + + delete from `as_attribute_group` where group_id =#{id} + + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AttributeGroupMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AttributeGroupMapper.xml index 5edd11f..f5ae866 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AttributeGroupMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AttributeGroupMapper.xml @@ -1,21 +1,19 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - + + + + + + + + - - select id, name, states, create_by, create_time, updata_by, updata_time, remark from attribute_group - + diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysWyzController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysWyzController.java new file mode 100644 index 0000000..b2e0049 --- /dev/null +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysWyzController.java @@ -0,0 +1,10 @@ +package com.muyu.system.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("wyz") +public class SysWyzController { + +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysWyzMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysWyzMapper.java new file mode 100644 index 0000000..a0bf0ba --- /dev/null +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysWyzMapper.java @@ -0,0 +1,8 @@ +package com.muyu.system.mapper; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SysWyzMapper { + +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysWyzService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysWyzService.java new file mode 100644 index 0000000..119ba92 --- /dev/null +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysWyzService.java @@ -0,0 +1,4 @@ +package com.muyu.system.service; + +public interface SysWyzService { +} diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysWyzServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysWyzServiceImpl.java new file mode 100644 index 0000000..df3f04a --- /dev/null +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysWyzServiceImpl.java @@ -0,0 +1,8 @@ +package com.muyu.system.service.impl; + +import com.muyu.system.service.SysWyzService; +import org.springframework.stereotype.Service; + +@Service +public class SysWyzServiceImpl implements SysWyzService { +} diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysWyzMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysWyzMapper.xml new file mode 100644 index 0000000..8b874e4 --- /dev/null +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysWyzMapper.xml @@ -0,0 +1,6 @@ + + + +