修改审核管理bug，调整材质管理

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.lqkj</groupId>
     <artifactId>link</artifactId>
-    <version>2.0.0</version>
+    <version>1.1.0</version>
     <name>LINK-SERVER</name>
     <description>LINK-SERVER</description>
     <properties>

src/main/java/com/lqkj/link/module/audit/controller/AuditRecordController.java

@@ -61,8 +61,8 @@ public class AuditRecordController {
     )
     @PostMapping("/manage/delete")
     public MessageBean delete(@RequestParam List<Integer> recordIds) {
-        auditRecordService.delete(recordIds);
-        return MessageBean.ok(null, "审核记录删除接口");
+        String delete = auditRecordService.delete(recordIds);
+        return MessageBean.ok(null, delete);
     }
 
     @Operation(

src/main/java/com/lqkj/link/module/audit/service/AuditRecordService.java

@@ -16,6 +16,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 
 @Service
 public class AuditRecordService {
@@ -37,8 +39,26 @@ public class AuditRecordService {
     }
 
     @Transactional
-    public void delete(List<Integer> recordIds) {
+    public String delete(List<Integer> recordIds) {
+        List<AuditRecord> allById = auditRecordRepository.findAllById(recordIds);
+        AtomicBoolean status = new AtomicBoolean(false);
+        StringBuffer zoneName = new StringBuffer();
+        allById.forEach(auditRecord -> {
+            Integer zoneId = auditRecord.getZoneId();
+            ZoneInfo zoneInfo = zoneInfoRepository.findById(zoneId).get();
+            if (zoneInfo.getAuthStatus() == 1) {
+               status.set(true);
+               recordIds.remove(auditRecord.getRecordId());
+               zoneName.append(zoneInfo.getZoneName());
+               zoneName.append(",");
+            }
+
+        });
         auditRecordRepository.batchDelete(recordIds);
+        if (!status.get()){
+            return "删除成功！";
+        }
+        return "作品" + zoneName + "正处于审核中，删除失败！";
     }
 
     @Transactional

src/main/java/com/lqkj/link/module/authority/service/DatabaseUserDetailService.java

@@ -87,7 +87,7 @@ public class DatabaseUserDetailService implements UserDetailsService {
                 return "账号已被冻结,请稍后重试";
             }
             userInfoRepository.save(userInfo);
-            return "账号、密码或授权码输入错误," + (4 - loginErrorCount) +"次错误后,账号将会冻结1小时";
+            return "账号或密码输入错误," + (4 - loginErrorCount) +"次错误后,账号将会冻结1小时";
         }
     }
 

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

@@ -1,12 +1,16 @@
 package com.lqkj.link.module.zone.domain;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.hypersistence.utils.hibernate.type.json.JsonType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.hibernate.annotations.Type;
 
 import java.util.Date;
 
@@ -60,8 +64,11 @@ public class MaterialInfo {
     @Transient
     private String name;
 
+    @Type(JsonType.class)
+    @Column(name = "json_value", columnDefinition = "jsonb")
+    private JSONObject jsonValue;
+
     public String getName() {
         return materialId.toString();
     }
-
 }

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

@@ -30,9 +30,6 @@ public class MaterialInfoServiceImpl implements MaterialInfoService {
     @Transactional
     @Override
     public void sava(MaterialInfo materialInfo) {
-        if (materialInfo.getCompressFileName() != null) {
-            materialInfo.setMaterialName(StringUtils.split(materialInfo.getCompressFileName(), ".")[0]);
-        }
         if ((Objects.nonNull(materialInfo.getMaterialId()) && materialInfoRepository.hasSameNameWithoutOne(materialInfo.getMaterialId(), materialInfo.getMaterialName()))
             || (Objects.isNull(materialInfo.getMaterialId()) && materialInfoRepository.hasSameName(materialInfo.getMaterialName()))) {
             throw new RuntimeException("材质名称不能重复!");
@@ -61,56 +58,56 @@ public class MaterialInfoServiceImpl implements MaterialInfoService {
     @Override
     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, 1, new Date(), null, null));
-                        } 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);
-        }
+//        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, 1, new Date(), null, null, ));
+//                        } 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);
+//        }
     }
 
     @Override

src/main/resources/db/migration/V12__2.0.7.sql

@@ -0,0 +1,4 @@
+ALTER TABLE material_info
+    add COLUMN if not exists json_value jsonb;
+comment on column material_info.json_value is 'json文件内容';
+