fix: 批量添加材质，分享中心功能

src/main/java/com/lqkj/link/module/zone/controller/MaterialInfoController.java

@@ -66,12 +66,12 @@ public class MaterialInfoController {
 
     /**
      * 批量添加材质
-     * @param file
+     * @param compressFilePath
      * @return
      */
     @PostMapping("/batchAdd")
-    public MessageBean batchAdd(MultipartFile file){
-        materialInfoService.batchAdd(file);
+    public MessageBean batchAdd(@RequestParam("compressFilePath") String compressFilePath){
+        materialInfoService.batchAdd(compressFilePath);
         return MessageBean.ok(null, "批量添加材质成功");
     }
 

src/main/java/com/lqkj/link/module/zone/controller/ZoneInfoController.java

@@ -346,7 +346,6 @@ public class ZoneInfoController {
      *
      * @param zoneId
      * @param userId
-     * @return
      */
     @PostMapping("/checkShareStatus")
     public MessageBean save(@Parameter(name = "zoneId", description = "作品ID") Integer zoneId,
@@ -355,4 +354,50 @@ public class ZoneInfoController {
         return MessageBean.ok(result, "检查分享状态");
     }
 
+
+    /**
+     * 获取分享中心数据
+     * @param name
+     * @param userId
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    @PostMapping("/getShareCenter")
+    public MessageBean<Page<Map<String, Object>>> getShareCenter(@RequestParam(required = false, defaultValue = "") String name,
+                                                                     @RequestParam(required = false) Integer userId,
+                                                                     @RequestParam(required = false, defaultValue = "0") Integer page,
+                                                                     @RequestParam(required = false, defaultValue = "10") Integer pageSize){
+        return MessageBean.ok(zoneInfoService.shareCenter(name, userId, page, pageSize), "获取分享中心");
+
+    }
+
+    /**
+     * 分享中心自动补全接口
+     * @param keyword
+     * @param userId
+     * @return
+     */
+    @PostMapping("/autoCompleteShare")
+    public MessageListBean<String> autoCompleteShare(@RequestParam(required = false, defaultValue = "") String keyword,
+                                                                 @RequestParam(required = false) Integer userId){
+        return MessageListBean.ok(zoneInfoService.autoCompleteShare(keyword, userId), "获取分享中心");
+
+    }
+
+
+    /**
+     * 接受分享
+     * @param zoneId
+     * @param userId
+     * @return
+     */
+    @PostMapping("/acceptShare")
+    public MessageBean acceptShare(@RequestParam Integer zoneId,
+                                  @RequestParam Integer userId,
+                                   @RequestParam Boolean acceptStatus){
+        zoneInfoService.acceptShare(zoneId, userId, acceptStatus);
+        return MessageBean.ok(null, "接受分享");
+    }
+
 }

src/main/java/com/lqkj/link/module/zone/domain/MaterialInfo.java

@@ -40,6 +40,10 @@ public class MaterialInfo {
     @Schema(description = "材质图标")
     private String materialIcon;
 
+    @Column(name = "json_file_name")
+    @Schema(description = "材质图标")
+    private String compressFileName;
+
     @Column(name = "update_time")
     @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @Schema(description = "更新时间")

src/main/java/com/lqkj/link/module/zone/repository/MaterialInfoRepository.java

@@ -20,7 +20,7 @@ public interface MaterialInfoRepository extends JpaRepository<MaterialInfo, Inte
      * @return
      */
     @Query(nativeQuery = true,
-            value = "select count(*) > 0 from material_info where material_name = :materialName and category_id != :materialId"
+            value = "select count(*) > 0 from material_info where material_name = :materialName and material_id != :materialId"
     )
     boolean hasSameNameWithoutOne(@Param("materialId") Integer materialId,
                                   @Param("materialName")String materialName);

src/main/java/com/lqkj/link/module/zone/repository/ZoneInfoRepository.java

@@ -192,4 +192,31 @@ public interface ZoneInfoRepository extends JpaRepository<ZoneInfo, Integer> {
     )
     Boolean hasSameTemplateNameWithoutOne(@Param("zoneName") String zoneName,
                                           @Param("zoneId") Integer zoneId);
+
+    @Query(nativeQuery = true,
+            value = "select zi.* from zone_info zi, share_info si " +
+                    "where zi.zone_id = si.zone_id and si.shared_user_id = :userId " +
+                    "and zi.zone_name like concat('%', :name, '%') " +
+                    "order by zi.update_time desc"
+    )
+    Page<Map<String, Object>> pageQueryshareCenter(@Param("name") String name,
+                                                   @Param("userId") Integer userId, Pageable pageable);
+
+
+    @Query(nativeQuery = true,
+            value = "select distinct(zone_name) as \"name\" from zone_info zi, share_info si " +
+                    "where where zi.zone_id = si.zone_id and si.shared_user_id = :userId and zone_name like concat('%', :keyword, '%') " +
+                    "order by zone_name"
+    )
+    List<String> autoCompleteShare(@Param("keyword") String keyword,
+                                   @Param("userId") Integer userId);
+
+
+    @Modifying
+    @Query(nativeQuery = true,
+            value = "update share_info set accept_status = :acceptStatus where zone_id = :zoneId and shared_user_id = :userId"
+    )
+    void acceptShare(@Param("zoneId") Integer zoneId,
+                     @Param("userId") Integer userId,
+                     @Param("acceptStatus") Boolean acceptStatus);
 }

src/main/java/com/lqkj/link/module/zone/service/MaterialInfoService.java

@@ -35,7 +35,7 @@ public interface MaterialInfoService {
 
     /**
      * 批量添加材质
-     * @param file
+     * @param compressFilePath
      */
-    void batchAdd(MultipartFile file);
+    void batchAdd(String compressFilePath);
 }

src/main/java/com/lqkj/link/module/zone/service/ZoneInfoService.java

@@ -285,8 +285,9 @@ public class ZoneInfoService {
     @Transactional
     public String share(Integer zoneId, String userCode, String shareUserCode) {
         UserInfo shareUserInfo = userInfoRepository.findByUserCode(shareUserCode);
-        if (Objects.isNull(shareUserInfo)) throw new RuntimeException("分享用户不存在！请核验手机号");
+        if (Objects.isNull(shareUserInfo)) throw new RuntimeException("未能找到与该手机号码相关的账户，请确认号码无误");
         String shareCode = UUID.randomUUID().toString();
+        if (shareInfoRepository.findByZoneIdAndSharedUserId(zoneId, shareUserInfo.getUserId()).size() > 0) throw new RuntimeException("该账户已分享过该作品");
         zoneInfoRepository.share(zoneId, userCode, shareCode, shareUserInfo.getUserId());
         UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
         NoticeInfo noticeInfo = new NoticeInfo();
@@ -400,4 +401,39 @@ public class ZoneInfoService {
         ShareInfo shareInfo = shareInfos.get(0);
         return (shareInfo.getShareTime().getTime() + (shareInfo.getCanUse() * 1000 * 60 * 60)) > System.currentTimeMillis();
     }
+
+
+    /**
+     * 获取分享中心数据
+     * @param name
+     * @param userId
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    public Page<Map<String, Object>> shareCenter(String name, Integer userId, Integer page, Integer pageSize) {
+        Pageable pageable = PageRequest.of(page, pageSize);
+        return zoneInfoRepository.pageQueryshareCenter(name, userId, pageable);
+    }
+
+
+    /**
+     * 分享中心自动补全接口
+     * @param keyword
+     * @param userId
+     * @return
+     */
+    public List<String> autoCompleteShare(String keyword, Integer userId) {
+        return zoneInfoRepository.autoCompleteShare(keyword, userId);
+    }
+
+    /**
+     * 接受分享
+     * @param zoneId
+     * @param userId
+     */
+    @Transactional
+    public void acceptShare(Integer zoneId, Integer userId, Boolean acceptStatus) {
+        zoneInfoRepository.acceptShare(zoneId, userId, acceptStatus);
+    }
 }

src/main/java/com/lqkj/link/module/zone/service/impl/MaterialInfoServiceImpl.java

@@ -1,11 +1,14 @@
 package com.lqkj.link.module.zone.service.impl;
 
+import cn.hutool.core.util.RandomUtil;
 import com.lqkj.link.message.MessageBean;
 import com.lqkj.link.module.authority.repository.UserInfoRepository;
 import com.lqkj.link.module.zone.domain.MaterialInfo;
 import com.lqkj.link.module.zone.domain.ModelCategory;
+import com.lqkj.link.module.zone.domain.ModelInfo;
 import com.lqkj.link.module.zone.repository.MaterialInfoRepository;
 import com.lqkj.link.module.zone.service.MaterialInfoService;
+import com.lqkj.link.util.Unzipper;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -15,10 +18,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class MaterialInfoServiceImpl implements MaterialInfoService {
@@ -56,14 +59,60 @@ public class MaterialInfoServiceImpl implements MaterialInfoService {
         return materialInfoRepository.pageQuery(name, pageable);
     }
 
+    @Transactional
     @Override
-    public void batchAdd(MultipartFile file) {
-        String fileName = file.getOriginalFilename();
-        String suffix = fileName == null ? "" : fileName.substring(fileName.lastIndexOf(".") + 1);
-        if (!suffix.equals("zip")) {
-            throw new RuntimeException("上传文件类型必须是zip格式的材质文件");
+    public void batchAdd(String compressFilePath) {
+
+        try {
+            String unzipPath = "./upload/resource/material" + RandomUtil.randomNumbers(5) + "/";
+            Unzipper.unZipFiles(new File("." + compressFilePath), unzipPath);
+            Map<String, MaterialInfo> materialMap = materialInfoRepository.findAll().stream().collect(Collectors.toMap(MaterialInfo::getMaterialName, materialInfo -> materialInfo));
+
+            String modelFolderPath = unzipPath + "model";
+            File materialModelDir = new File(modelFolderPath);
+            if (materialModelDir.isDirectory()){
+                List<MaterialInfo> materialInfoList = new ArrayList<>();
+                File[] jsonFiles = materialModelDir.listFiles();
+                assert jsonFiles != null;
+                for (File jsonFile : jsonFiles) {
+                    if (jsonFile.isFile() && jsonFile.getName().endsWith(".json")) {
+                        String modelFileName = jsonFile.getName();
+                        String modelPath = unzipPath + "model/";
+                        if (modelFileName.matches(".*[一-龥]+.*")) {
+                            // 如果包含中文，重命名
+                            String newFileName = UUID.randomUUID() + ".json";
+                            modelPath += newFileName;
+                            boolean rename = jsonFile.renameTo(new File(modelPath));
+                            System.out.println(rename);
+                            // 材质图标也要重命名
+                            File oldIconFile = new File(unzipPath + "icon/" + modelFileName.replace(".json", ".png"));
+                            if (oldIconFile.exists()) {
+                                File newIconFile = new File(unzipPath + "icon/" + newFileName.replace(".json", ".png"));
+                                rename = oldIconFile.renameTo(newIconFile);
+                                System.out.println(rename);
+                            }
+                        } else {
+                            modelPath += modelFileName;
+                        }
+                        if (!materialMap.containsKey(modelFileName.substring(0, modelFileName.lastIndexOf(".")))) {
+                            materialInfoList.add(new MaterialInfo(null, modelFileName.substring(0, modelFileName.lastIndexOf(".")), modelPath.substring(1),
+                                    modelPath.replace("model", "icon").replace("json", "png").substring(1), modelFileName, new Date()));
+                        } else {
+                            MaterialInfo materialInfo = materialMap.get(modelFileName.substring(0, modelFileName.lastIndexOf(".")));
+                            materialInfo.setMaterialIcon(modelPath.replace("model", "icon").replace("json", "png").substring(1));
+                            materialInfo.setCompressFileName(modelFileName.substring(1));
+                            materialInfo.setJsonPath(modelPath);
+                            materialInfo.setUpdateTime(new Date());
+                            materialInfoList.add(materialInfo);
+                        }
+                    }
+                }
+                materialInfoRepository.saveAll(materialInfoList);
+            }
+            userInfoRepository.updateRefreshStatus();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         }
-        materialInfoRepository.saveAll(new ArrayList<>());
     }