fix: 分享类型，分享人列表

src/main/java/com/lqkj/link/module/authority/repository/UserInfoRepository.java

@@ -118,4 +118,12 @@ public interface UserInfoRepository extends JpaRepository<UserInfo, Integer> {
     void saveSettings(@Param("autosaveTime") Integer autosaveTime,
                       @Param("movingSpeed") Integer movingSpeed,
                       @Param("userCode") String userCode);
+
+
+    @Query(nativeQuery = true,
+            value = "SELECT ui.*, si.share_type FROM user_info ui " +
+                    "LEFT JOIN share_info si on si.user_id = ui.user_id or si.shared_user_id = ui.user_id " +
+                    "WHERE si.zone_id = ?1"
+    )
+    List<Map<String, Object>> viewShareUser(Integer zoneId);
 }

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

@@ -233,10 +233,11 @@ public class ZoneInfoController {
     @PostMapping("/" + VERSION_V1 + "/share")
     public MessageBean<String> share(@RequestParam Integer zoneId,
                                      @RequestParam("shareUserCode") String shareUserCode,
+                                     @RequestParam("shareType") Integer shareType,
                                      HttpServletRequest request) {
         String authHeader = request.getHeader("Authorization");
         String userCode = jwtService.decryptUsernameWithHeader(authHeader);
-        return MessageBean.ok(zoneInfoService.share(zoneId, userCode, shareUserCode), "分享");
+        return MessageBean.ok(zoneInfoService.share(zoneId, userCode, shareUserCode, shareType), "分享");
     }
 
     @Operation(
@@ -400,4 +401,16 @@ public class ZoneInfoController {
         return MessageBean.ok(null, "接受分享");
     }
 
+
+    /**
+     * 查看分享用户
+     * @param zoneId
+     * @return
+     */
+    @PostMapping("/viewShareUser")
+    public MessageBean viewShareUser(@RequestParam Integer zoneId){
+
+        return MessageBean.ok(zoneInfoService.viewShareUser(zoneId), "查看分享用户");
+    }
+
 }

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

@@ -57,4 +57,8 @@ public class ShareInfo {
     @Schema(description = "接受状态")
     private Boolean acceptStatus;
 
+    @Column(name = "share_type")
+    @Schema(description = "分享类型: 1 可查看， 2：可编辑")
+    private Integer shareType;
+
 }

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

@@ -42,7 +42,7 @@ public interface ShareInfoRepository extends JpaRepository<ShareInfo, Integer> {
 
     @Modifying
     @Query(nativeQuery = true,
-            value = "UPDATE share_info SET share_time = NOW(), accept_status = null WHERE zone_id = ?1 AND shared_user_id = ?2"
+            value = "UPDATE share_info SET share_time = NOW(), accept_status = null, share_type = ?3 WHERE zone_id = ?1 AND shared_user_id = ?2"
     )
-    void updateShareTime(Integer zoneId, Integer userId);
+    void updateShareTime(Integer zoneId, Integer userId, Integer shareType);
 }

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

@@ -85,14 +85,15 @@ public interface ZoneInfoRepository extends JpaRepository<ZoneInfo, Integer> {
     @Modifying
     @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 " +
+                "insert into share_info(record_id, zone_id, user_id, share_code, share_time, can_use, shared_user_id, share_type) " +
+                "select nextval('share_info_record_id_seq'), :zoneId, user_id, :shareCode, now(), 7 , :sharedUserId, :shareType " +
                 "from user_info where user_code = :userCode"
     )
     void share(@Param("zoneId") Integer zoneId,
                @Param("userCode") String userCode,
                @Param("shareCode") String shareCode,
-               @Param("sharedUserId") Integer sharedUserId);
+               @Param("sharedUserId") Integer sharedUserId,
+               @Param("shareType") Integer shareType);
 
     @Modifying
     @Query(nativeQuery = true,
@@ -194,7 +195,7 @@ public interface ZoneInfoRepository extends JpaRepository<ZoneInfo, Integer> {
                                           @Param("zoneId") Integer zoneId);
 
     @Query(nativeQuery = true,
-            value = "select zi.*, ui.display_name from zone_info zi, share_info si, user_info ui " +
+            value = "select zi.*, ui.display_name, si.share_type 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, '%') " +

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

@@ -288,16 +288,16 @@ public class ZoneInfoService {
     }
 
     @Transactional
-    public String share(Integer zoneId, String userCode, String shareUserCode) {
+    public String share(Integer zoneId, String userCode, String shareUserCode, Integer shareType) {
         UserInfo shareUserInfo = userInfoRepository.findByUserCode(shareUserCode);
         if (Objects.isNull(shareUserInfo)) throw new RuntimeException("未能找到与该手机号码相关的账户，请确认号码无误");
         String shareCode = UUID.randomUUID().toString();
         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());
+            shareInfoRepository.updateShareTime(zoneId, shareUserInfo.getUserId(), shareType);
         }else {
-            zoneInfoRepository.share(zoneId, userCode, shareCode, shareUserInfo.getUserId());
+            zoneInfoRepository.share(zoneId, userCode, shareCode, shareUserInfo.getUserId(), shareType);
         }
         UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
         NoticeInfo noticeInfo = new NoticeInfo();
@@ -497,4 +497,19 @@ public class ZoneInfoService {
 
 
     }
+
+
+    /**
+     * 查看分享用户
+     * @param zoneId
+     * @return
+     */
+    public List<Map<String, Object>> viewShareUser(Integer zoneId) {
+        var map = userInfoRepository.viewShareUser(zoneId);
+        return map.stream().map(m -> {
+            var mutableMap = new HashMap<>(m);
+            mutableMap.put("user_code", PhoneUtils.encryptPhoneNumber((String) mutableMap.get("user_code")));
+            return mutableMap;
+        }).collect(Collectors.toList());
+    }
 }