fix: 分享功能优化

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

@@ -59,8 +59,9 @@ public class MaterialInfoController {
     public MessageBean<Page<MaterialInfo>> pageQueryTemplate(@RequestParam(required = false, defaultValue = "") String name,
                                                              @RequestParam(required = false, defaultValue = "0") Integer page,
                                                              @RequestParam(required = false) Integer materialType,
+                                                             @RequestParam(required = false) Integer userId,
                                                              @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
-        return MessageBean.ok(materialInfoService.pageQuery(name, page, pageSize, materialType), "材质分页接口");
+        return MessageBean.ok(materialInfoService.pageQuery(name, page, pageSize, materialType, userId), "材质分页接口");
 
     }
 

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

@@ -41,8 +41,11 @@ public interface MaterialInfoRepository extends JpaRepository<MaterialInfo, Inte
             value = "select * from material_info where " +
                     "(:materialName = '' or material_name like concat('%', :materialName, '%')) " +
                     "and material_type = :materialType " +
+                    "and (:userId is null or user_id = :userId) " +
                     "order by update_time"
     )
     Page<MaterialInfo> pageQuery(@Param("materialName") String materialName,
-                                 @Param("materialType") Integer materialType,Pageable pageable);
+                                 @Param("materialType") Integer materialType,
+                                 Pageable pageable,
+                                 @Param("userId") Integer userId);
 }

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

@@ -39,4 +39,10 @@ public interface ShareInfoRepository extends JpaRepository<ShareInfo, Integer> {
             value = "DELETE FROM share_info WHERE zone_id = ?1"
     )
     void deleteByZoneId(Integer zoneId);
+
+    @Modifying
+    @Query(nativeQuery = true,
+            value = "UPDATE share_info SET share_time = NOW(), accept_status = null WHERE zone_id = ?1 AND shared_user_id = ?2"
+    )
+    void updateShareTime(Integer zoneId, Integer userId);
 }

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

@@ -30,7 +30,7 @@ public interface MaterialInfoService {
      * @param pageSize
      * @return
      */
-    Page<MaterialInfo> pageQuery(String name, Integer page, Integer pageSize, Integer materialType);
+    Page<MaterialInfo> pageQuery(String name, Integer page, Integer pageSize, Integer materialType, Integer userId);
 
 
     /**

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

@@ -40,6 +40,8 @@ public class ZoneInfoService {
     private final GeomInfoRepository geomInfoRepository;
     private final ModelInfoRepository modelInfoRepository;
 
+    private static final Long ONEDAY = 24 * 60 * 60 * 1000L;
+
     @Autowired
     private LikesInfoRepository likesInfoRepository;
 
@@ -290,8 +292,13 @@ public class ZoneInfoService {
         UserInfo shareUserInfo = userInfoRepository.findByUserCode(shareUserCode);
         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());
+        List<ShareInfo> shareInfoList = shareInfoRepository.findByZoneIdAndSharedUserId(zoneId, shareUserInfo.getUserId());
+        if (shareInfoList.size() > 0 && (shareTime(shareInfoList.get(0)) > System.currentTimeMillis())) throw new RuntimeException("该账户已分享过该作品");
+        else if (shareInfoList.size() > 0 && (shareTime(shareInfoList.get(0)) < System.currentTimeMillis())) {
+            shareInfoRepository.updateShareTime(zoneId, shareUserInfo.getUserId());
+        }else {
+            zoneInfoRepository.share(zoneId, userCode, shareCode, shareUserInfo.getUserId());
+        }
         UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
         NoticeInfo noticeInfo = new NoticeInfo();
         noticeInfo.setUserId(shareUserInfo.getUserId());
@@ -304,6 +311,10 @@ public class ZoneInfoService {
         return shareCode;
     }
 
+    private Long shareTime(ShareInfo shareInfo){
+        return shareInfo.getShareTime().getTime() + shareInfo.getCanUse() * ONEDAY;
+    }
+
     @Transactional
     public void view(Integer zoneId, String userCode) {
         zoneInfoRepository.view(zoneId, userCode);
@@ -426,8 +437,7 @@ public class ZoneInfoService {
     public boolean checkShareStatus(Integer zoneId, Integer userId) {
         List<ShareInfo> shareInfos = shareInfoRepository.findByZoneIdAndSharedUserId(zoneId, userId);
         if (shareInfos.size() < 1) return false;
-        ShareInfo shareInfo = shareInfos.get(0);
-        return (shareInfo.getShareTime().getTime() + (shareInfo.getCanUse() * 1000 * 60 * 60)) > System.currentTimeMillis();
+        return shareTime(shareInfos.get(0)) > System.currentTimeMillis();
     }
 
 

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

@@ -50,9 +50,9 @@ public class MaterialInfoServiceImpl implements MaterialInfoService {
 
 
     @Override
-    public Page<MaterialInfo> pageQuery(String name, Integer page, Integer pageSize, Integer materialType) {
+    public Page<MaterialInfo> pageQuery(String name, Integer page, Integer pageSize, Integer materialType, Integer userId) {
         Pageable pageable = PageRequest.of(page, pageSize);
-        return materialInfoRepository.pageQuery(name, materialType, pageable);
+        return materialInfoRepository.pageQuery(name, materialType, pageable, userId);
     }
 
     @Transactional