业务层修改，属性组前台数据获取

muyu-modules/muyu-file/pom.xml

@@ -74,6 +74,10 @@
             <artifactId>aliyun-sdk-oss</artifactId>
             <version>3.12.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-security</artifactId>
+        </dependency>
 
     </dependencies>
 

muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java

@@ -2,8 +2,10 @@ package com.muyu.file.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.file.FileUtils;
+import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.file.service.ISysFileService;
 import com.muyu.common.system.domain.SysFile;
+import com.muyu.file.utils.OSSCloudClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +13,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 文件请求处理
  *
@@ -40,4 +46,28 @@ public class SysFileController {
             return Result.error(e.getMessage());
         }
     }
+
+    @PostMapping("imagesUpload")
+    public Result<SysFile> imagesUpload(MultipartFile file) {
+        OSSCloudClient client = OSSCloudClient.getInstance();
+        SysFile sysFile = new SysFile();
+        try {
+            String filePath = client.uploadFile(file.getName(), SecurityUtils.getUsername(), "D:\\muyu\\images");
+            System.out.println(filePath);
+            System.out.println(client.fileExist(filePath));
+            String format = new SimpleDateFormat("/yyyyMMdd/").format(new Date());
+            List<String> list = client.listFiles(format);
+            sysFile.setName(file.getName());
+            sysFile.setUrl(filePath);
+            for(String s : list) {
+                System.out.println(s);
+                client.deleteFile(s);
+            }
+            client.deleteFile("https://zhaohy-bucket.oss-cn-guangzhou.aliyuncs.com/static/images/1/"+format);
+        }catch (Exception e){
+            log.warn("文件上传异常{【】}",e.getMessage());
+            return Result.error(e.getMessage());
+        }
+        return Result.success(sysFile);
+    }
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/AttributeGroup.java

@@ -39,6 +39,7 @@ public class AttributeGroup extends BaseEntity
 
     private List<Attribute> attributeList;
     private List<Long> checkedAttributeIds;
+    private List<Long> asAttributeIds;
 
     /** 状态 */
     @Excel(name = "状态")

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/AsAttributeGroupMapper.java

@@ -60,4 +60,6 @@ public interface AsAttributeGroupMapper extends BaseMapper<AsAttributeGroup>
      * @return 结果
      */
     public int deleteAsAttributeGroupByIds(Long[] ids);
+
+    public int deleteAsAttributeGroupByGroupId(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IAsAttributeGroupService.java

@@ -60,4 +60,6 @@ public interface IAsAttributeGroupService extends IService<AsAttributeGroup>
      * @return 结果
      */
     public int deleteAsAttributeGroupById(Long id);
+
+    public int deleteAsAttributeGroupByGroupId(Long id);
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/1

@@ -0,0 +1,22 @@
+{
+    "name": null,
+    "remark": null,
+    "rules": [
+        {
+            "rule": null,
+            "values": []
+        }
+    ]
+}
+
+
+{
+    "id": 1,
+    "ruleName": "ceshi",
+    "ruleAttr": [
+        "rule": {
+            "ruleName": "aa",
+            "ruleValue": []
+        }
+    ]
+}

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AsAttributeGroupServiceImpl.java

@@ -96,4 +96,9 @@ public class AsAttributeGroupServiceImpl extends ServiceImpl<AsAttributeGroupMap
     {
         return asAttributeGroupMapper.deleteAsAttributeGroupById(id);
     }
+
+    @Override
+    public int deleteAsAttributeGroupByGroupId(Long id) {
+        return asAttributeGroupMapper.deleteAsAttributeGroupByGroupId(id);
+    }
 }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java

@@ -54,13 +54,16 @@ public class AttributeGroupServiceImpl extends ServiceImpl<AttributeGroupMapper,
     private void setAttributeList(AttributeGroup group) {
         List<Attribute> attributeLongs = new ArrayList<>();
         List<Long> longs = new ArrayList<>();
+        List<Long> asIds = new ArrayList<>();
         List<AsAttributeGroup> asAttributeGroups = asAttributeGroupService.selectAsAttributeGroupList(AsAttributeGroup.builder()
                 .groupId(group.getId())
                 .build());
         asAttributeGroups.forEach(asAttributeGroup -> attributeLongs.add(attributeService.selectAttributeById(asAttributeGroup.getAttributeId())));
         asAttributeGroups.forEach(asAttributeGroup -> longs.add(attributeService.selectAttributeById(asAttributeGroup.getAttributeId()).getId()));
+        asAttributeGroups.forEach(asAttributeGroup -> asIds.add(asAttributeGroup.getId()));
         group.setAttributeList(attributeLongs);
         group.setCheckedAttributeIds(longs);
+        group.setAsAttributeIds(asIds);
 
 
     }
@@ -108,13 +111,18 @@ public class AttributeGroupServiceImpl extends ServiceImpl<AttributeGroupMapper,
     @Override
     public int updateAttributeGroup(AttributeGroupReq attributeGroupReq) {
         AttributeGroup attributeGroup = AttributeGroupReq.updateBuilder(attributeGroupReq);
+        this.setAttributeList(attributeGroup);
         int i = attributeGroupMapper.updateAttributeGroup(attributeGroup);
         List<AsAttributeGroup> asAttributeGroups =
                 attributeGroupReq.getCheckedAttributeIds().stream()
                         .map(attributeId -> AsAttributeGroup
                                 .saveBuilder(attributeGroup.getId(), attributeId))
                         .toList();
+        asAttributeGroupService.removeBatchByIds(attributeGroup.getAsAttributeIds());
+//        asAttributeGroupService.deleteAsAttributeGroupByIds(attributeGroup.getAsAttributeIds());
         asAttributeGroupService.saveBatch(asAttributeGroups);
+//        asAttributeGroupService.saveOrUpdateBatch(asAttributeGroups);
+
 //        asAttributeGroups.forEach(asAttributeGroup -> asAttributeGroupService.updateAsAttributeGroup(asAttributeGroup));
         return asAttributeGroups.size();
     }

muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/AsAttributeGroupMapper.xml

@@ -80,4 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteAsAttributeGroupByGroupId">
+        delete from as_attribute_group where group_id = #{id}
+    </delete>
 </mapper>