fix: 删除作品，通知等功能调整

src/main/java/com/lqkj/link/module/bulletin/domain/NoticeInfo.java

@@ -43,7 +43,7 @@ public class NoticeInfo {
     @Schema(description = "查看时间")
     private Date viewTime;
     @Column(name = "type")
-    @Schema(description = "信息类型，1更新日志，2系统公告，3审核通知，4分享通知")
+    @Schema(description = "信息类型，1更新日志，2系统公告，3审核通知，4分享通知, 5协作拒绝通知, 删除作品通知")
     private Integer type;
 
     @Column(name = "zone_id")
@@ -53,4 +53,7 @@ public class NoticeInfo {
     @Transient
     private Integer authStatus;
 
+    @Transient
+    private Boolean acceptStatus;
+
 }

src/main/java/com/lqkj/link/module/bulletin/service/NoticeInfoService.java

@@ -2,13 +2,16 @@ package com.lqkj.link.module.bulletin.service;
 
 import com.lqkj.link.module.bulletin.domain.NoticeInfo;
 import com.lqkj.link.module.bulletin.repository.NoticeInfoRepository;
+import com.lqkj.link.module.zone.domain.ShareInfo;
 import com.lqkj.link.module.zone.domain.ZoneInfo;
+import com.lqkj.link.module.zone.repository.ShareInfoRepository;
 import com.lqkj.link.module.zone.repository.ZoneInfoRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class NoticeInfoService {
@@ -17,6 +20,9 @@ public class NoticeInfoService {
     @Autowired
     private ZoneInfoRepository zoneInfoRepository;
 
+    @Autowired
+    private ShareInfoRepository shareInfoRepository;
+
     public NoticeInfoService(NoticeInfoRepository noticeInfoRepository) {
         this.noticeInfoRepository = noticeInfoRepository;
     }
@@ -25,8 +31,8 @@ public class NoticeInfoService {
         List<NoticeInfo> noticeInfos = noticeInfoRepository.queryWithUserCode(userCode);
         noticeInfos.stream().forEach(noticeInfo -> {
             if (noticeInfo.getType() == 4) {
-                ZoneInfo zoneInfo = zoneInfoRepository.findById(noticeInfo.getZoneId()).get();
-                noticeInfo.setAuthStatus(zoneInfo.getAuthStatus());
+                ShareInfo shareInfo = shareInfoRepository.findByZoneIdAndSharedUserId(noticeInfo.getZoneId(), noticeInfo.getUserId()).get(0);
+                noticeInfo.setAcceptStatus(Objects.isNull(shareInfo) ? false : shareInfo.getAcceptStatus());
             }
         });
         return noticeInfos;

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

@@ -365,9 +365,9 @@ public class ZoneInfoController {
      */
     @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){
+                                                                 @RequestParam() 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), "获取分享中心");
 
     }

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

@@ -41,7 +41,7 @@ public class MaterialInfo {
     private String materialIcon;
 
     @Column(name = "json_file_name")
-    @Schema(description = "材质图标")
+    @Schema(description = "json文件名")
     private String compressFileName;
 
     @Column(name = "material_type")

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

@@ -53,4 +53,8 @@ public class ShareInfo {
     @Schema(description = "添加时间")
     private Date shareTime;
 
+    @Column(name = "accept_status")
+    @Schema(description = "接受状态")
+    private Boolean acceptStatus;
+
 }

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

@@ -3,6 +3,7 @@ package com.lqkj.link.module.zone.repository;
 import com.lqkj.link.module.zone.domain.ShareInfo;
 import com.lqkj.link.module.zone.domain.ZoneInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
@@ -22,4 +23,20 @@ public interface ShareInfoRepository extends JpaRepository<ShareInfo, Integer> {
             value = "SELECT * FROM share_info WHERE zone_id = ?1 AND shared_user_id = ?2"
     )
     List<ShareInfo> findByZoneIdAndSharedUserId(Integer zoneId, Integer userId);
+
+    /**
+     * 根据zoneId查询
+     * @param zoneId
+     * @return
+     */
+    @Query(nativeQuery = true,
+            value = "SELECT * FROM share_info WHERE zone_id = ?1"
+    )
+    List<ShareInfo> findByZoneId(Integer zoneId);
+
+    @Modifying
+    @Query(nativeQuery = true,
+            value = "DELETE FROM share_info WHERE zone_id = ?1"
+    )
+    void deleteByZoneId(Integer zoneId);
 }

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

@@ -86,7 +86,7 @@ public interface ZoneInfoRepository extends JpaRepository<ZoneInfo, Integer> {
     @Query(nativeQuery = true,
         value = "with t1 as (update zone_info set share_count = coalesce(share_count, 0) + 1 where zone_id = :zoneId)" +
                 "insert into share_info(record_id, zone_id, user_id, share_code, share_time, can_use, shared_user_id) " +
-                "select nextval('share_info_record_id_seq'), :zoneId, user_id, :shareCode, now(), 7 , :sharedUserId" +
+                "select nextval('share_info_record_id_seq'), :zoneId, user_id, :shareCode, now(), 7 , :sharedUserId " +
                 "from user_info where user_code = :userCode"
     )
     void share(@Param("zoneId") Integer zoneId,
@@ -194,9 +194,11 @@ public interface ZoneInfoRepository extends JpaRepository<ZoneInfo, Integer> {
                                           @Param("zoneId") Integer zoneId);
 
     @Query(nativeQuery = true,
-            value = "select zi.* from zone_info zi, share_info si " +
+            value = "select zi.*, ui.display_name from zone_info zi, share_info si, user_info ui " +
                     "where zi.zone_id = si.zone_id and si.shared_user_id = :userId " +
+                    "and si.accept_status = true " +
                     "and zi.zone_name like concat('%', :name, '%') " +
+                    "and ui.user_id = zi.user_id " +
                     "order by zi.update_time desc"
     )
     Page<Map<String, Object>> pageQueryshareCenter(@Param("name") String name,
@@ -205,7 +207,8 @@ public interface ZoneInfoRepository extends JpaRepository<ZoneInfo, Integer> {
 
     @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, '%') " +
+                    "where zi.zone_id = si.zone_id and si.shared_user_id = :userId and si.accept_status = true " +
+                    "and zone_name like concat('%', :keyword, '%') " +
                     "order by zone_name"
     )
     List<String> autoCompleteShare(@Param("keyword") String keyword,

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

@@ -8,6 +8,7 @@ import com.lqkj.link.module.bulletin.domain.NoticeInfo;
 import com.lqkj.link.module.bulletin.repository.NoticeInfoRepository;
 import com.lqkj.link.module.zone.domain.*;
 import com.lqkj.link.module.zone.repository.*;
+import com.lqkj.link.util.PhoneUtils;
 import com.lqkj.link.util.Unzipper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
@@ -27,6 +28,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -293,8 +296,8 @@ public class ZoneInfoService {
         NoticeInfo noticeInfo = new NoticeInfo();
         noticeInfo.setUserId(shareUserInfo.getUserId());
         noticeInfo.setType(4);
-        noticeInfo.setContent(userInfo.getUserCode().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2") + "邀请你参加作品协作，与他（她）共建场景。");
-        noticeInfo.setHasView(true);
+        noticeInfo.setContent(PhoneUtils.encryptPhoneNumber(userInfo.getUserCode()) + "邀请你参加作品协作，与他（她）共建场景。");
+        noticeInfo.setHasView(false);
         noticeInfo.setCreateTime(new Date());
         noticeInfo.setZoneId(zoneId);
         noticeInfoRepository.save(noticeInfo);
@@ -315,6 +318,7 @@ public class ZoneInfoService {
         return null;
     }
 
+    @Transactional
     public String deleteWork(Integer zoneId, String userCode) {
         if(!zoneInfoRepository.existsById(zoneId)){
             return "该作品不存在！";
@@ -325,10 +329,33 @@ public class ZoneInfoService {
         if (!zoneInfoRepository.canBeDeleteWithAuthStatus(zoneId)) {
             return "不能删除正在审核的作品！";
         }
+        notifySharer(zoneId);
+        shareInfoRepository.deleteByZoneId(zoneId);
         zoneInfoRepository.deleteById(zoneId);
         return null;
     }
 
+
+
+    /**
+     * 通知分享者
+     * @param zoneId
+     */
+    private void notifySharer(Integer zoneId) {
+        List<NoticeInfo>  noticeInfos = new ArrayList<>();
+        shareInfoRepository.findByZoneId(zoneId).forEach(shareInfo -> {
+            NoticeInfo noticeInfo = new NoticeInfo();
+            noticeInfo.setUserId(shareInfo.getSharedUserId());
+            noticeInfo.setType(6);
+            noticeInfo.setContent("经决定对团队进行调整。很遗憾地通知您，您将不再作为该项目的协作者。我们感谢您到目前为止的贡献。");
+            noticeInfo.setHasView(false);
+            noticeInfo.setCreateTime(new Date());
+            noticeInfo.setZoneId(zoneId);
+            noticeInfos.add(noticeInfo);
+        });
+        noticeInfoRepository.saveAll(noticeInfos);
+    }
+
     @Transactional
     public Map<String, Object> create(String name, Integer templateId, String userCode) {
         Map<String, Object> result = new HashMap<>();
@@ -413,7 +440,15 @@ public class ZoneInfoService {
      */
     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);
+        Page<Map<String, Object>> maps = zoneInfoRepository.pageQueryshareCenter(name, userId, pageable);
+        List<Map<String, Object>> result = new ArrayList<>();
+        maps.getContent().forEach(map -> {
+            String update_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(map.get("update_time"));
+            HashMap<String, Object> resultMap = new HashMap<>(map);
+            resultMap.put("update_time", update_time);
+            result.add(resultMap);
+        });
+        return new PageImpl<>(result, PageRequest.of(page, pageSize), maps.getTotalElements());
     }
 
 
@@ -435,5 +470,20 @@ public class ZoneInfoService {
     @Transactional
     public void acceptShare(Integer zoneId, Integer userId, Boolean acceptStatus) {
         zoneInfoRepository.acceptShare(zoneId, userId, acceptStatus);
+        if (!acceptStatus) {
+            UserInfo userInfo = userInfoRepository.findById(userId).get();
+            ShareInfo shareInfo = shareInfoRepository.findByZoneIdAndSharedUserId(zoneId, userId).get(0);
+            NoticeInfo noticeInfo = new NoticeInfo();
+            noticeInfo.setAcceptStatus(false);
+            noticeInfo.setCreateTime(new Date());
+            noticeInfo.setHasView(false);
+            noticeInfo.setUserId(shareInfo.getUserId());
+            noticeInfo.setType(5);
+            noticeInfo.setContent("手机号为" + PhoneUtils.encryptPhoneNumber(userInfo.getUserCode()) + "的用户拒绝参加您的作品协作！");
+            noticeInfo.setZoneId(zoneId);
+            noticeInfoRepository.save(noticeInfo);
+        }
+
+
     }
 }

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

@@ -1,23 +1,18 @@
 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
@@ -35,6 +30,7 @@ public class MaterialInfoServiceImpl implements MaterialInfoService {
     @Transactional
     @Override
     public void sava(MaterialInfo materialInfo) {
+        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("材质名称不能重复!");

src/main/java/com/lqkj/link/util/PhoneUtils.java

@@ -0,0 +1,30 @@
+package com.lqkj.link.util;
+
+public class PhoneUtils {
+
+    /**
+     * 加密手机号中间四位为*
+     * @param phoneNumber 原始手机号码
+     * @return 加密后的手机号码
+     * @throws IllegalArgumentException 如果手机号长度不等于11位
+     */
+    public static String encryptPhoneNumber(String phoneNumber) {
+        // 检查手机号长度是否为11位i
+        if ("meta-link".equals(phoneNumber)) return phoneNumber;
+        if (phoneNumber == null || phoneNumber.length() != 11) {
+            throw new IllegalArgumentException("手机号长度不正确");
+        }
+
+        // 将手机号分为前三位、中间四位、后四位
+        String prefix = phoneNumber.substring(0, 3);
+        String middle = phoneNumber.substring(3, 7); // 中间四位
+        String suffix = phoneNumber.substring(7);
+
+        // 中间四位加密为*
+        middle = "****";
+
+        // 拼接加密后的手机号
+        String encryptedNumber = prefix + middle + suffix;
+        return encryptedNumber;
+    }
+}