fix: 客户端分享等功能

src/main/java/com/lqkj/link/GlobalExceptionHandler.java

@@ -20,6 +20,6 @@ public class GlobalExceptionHandler {
     public MessageBean<String> resolveException(Exception e) {
         logger.error("收到异常", e);
 
-        return MessageBean.error(e.toString());
+        return MessageBean.error(e.getMessage());
     }
 }

src/main/java/com/lqkj/link/module/authority/domain/LoginBody.java

@@ -13,4 +13,7 @@ public class LoginBody {
     private String password;
     @Schema(description = "授权码，RSA加密")
     private String authCode;
+
+    @Schema(description = "登录类型：1后台登录， 2前台登录")
+    private int loginType;
 }

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

@@ -48,6 +48,7 @@ public class UserInfoService {
         guestUser.setHasManage(false);
         guestUser.setLocking(false);
         guestUser.setRefreshResource(false);
+        guestUser.setUpdateTime(new Date());
         register(guestUser, true, null);
         return guestUser.getUserCode();
     }
@@ -257,10 +258,10 @@ public class UserInfoService {
         if (userInfoRepository.hasSameUserCode(userCode)) {
             throw new RuntimeException("该手机号已被注册！");
         }
-        if (userCode.matches("^1[3-9]\\\\d{9}$")){
+        if (!userCode.matches("^(13[0-9]|14[5|7]|15[0|1|2|3|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\\d{8}$")){
             throw new RuntimeException("请输入正确的手机号！");
         }
-        if (password.matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")){
+        if (!password.matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")){
             throw new RuntimeException("密码必须是8-16位数字、大写字母、小写字母！");
         }
 

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

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

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

@@ -2,6 +2,9 @@ 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.ZoneInfo;
+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;
 
@@ -11,12 +14,22 @@ import java.util.List;
 public class NoticeInfoService {
     private final NoticeInfoRepository noticeInfoRepository;
 
+    @Autowired
+    private ZoneInfoRepository zoneInfoRepository;
+
     public NoticeInfoService(NoticeInfoRepository noticeInfoRepository) {
         this.noticeInfoRepository = noticeInfoRepository;
     }
 
     public List<NoticeInfo> queryList(String userCode) {
-        return noticeInfoRepository.queryWithUserCode(userCode);
+        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());
+            }
+        });
+        return noticeInfos;
     }
 
     @Transactional

src/main/java/com/lqkj/link/module/jwt/controller/JwtController.java

@@ -18,6 +18,8 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Objects;
+
 @RestController
 @RequestMapping("/jwt")
 @Tag(name = "授权服务", description = "授权服务")
@@ -53,13 +55,12 @@ public class JwtController {
         String userCode = loginBody.getUsername();
         String password = loginBody.getPassword();
         String authCode = loginBody.getAuthCode();
-        if (userCode.length() != 172 || password.length() != 172 || authCode.length() != 172) {
+        if (userCode.length() != 172 || password.length() != 172) {
             return MessageBean.error("用户名或密码或授权码错误！");
         }
         userCode = RSAUtils.decryptBase64(userCode);
         password = RSAUtils.decryptBase64(password);
-        authCode = RSAUtils.decryptBase64(authCode);
-
+        if (Objects.nonNull(authCode)) authCode = RSAUtils.decryptBase64(authCode);
         UserInfo userInfo = userDetailService.findByUserCode(userCode);
         if (userInfo == null) {
             return MessageBean.error("账号不存在！");
@@ -70,7 +71,8 @@ public class JwtController {
         if (!passwordEncoder.matches(password, userInfo.getPassword())) {
             return MessageBean.error(userDetailService.lockedUser(userInfo.getUserCode()));
         }
-        if (!authCode.equals(userInfo.getAuthorizationCode())) {
+        if (loginBody.getLoginType() == 0) return MessageBean.error("参数错误请重试！");
+        if (loginBody.getLoginType() == 1 && !authCode.equals(userInfo.getAuthorizationCode())) {
             return MessageBean.error("授权码错误！");
         }
         userDetailService.unlockedUser(userInfo.getUserCode());

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

@@ -232,10 +232,11 @@ public class ZoneInfoController {
     )
     @PostMapping("/" + VERSION_V1 + "/share")
     public MessageBean<String> share(@RequestParam Integer zoneId,
+                                     @RequestParam("shareUserCode") String shareUserCode,
                                      HttpServletRequest request) {
         String authHeader = request.getHeader("Authorization");
         String userCode = jwtService.decryptUsernameWithHeader(authHeader);
-        return MessageBean.ok(zoneInfoService.share(zoneId, userCode), "分享");
+        return MessageBean.ok(zoneInfoService.share(zoneId, userCode, shareUserCode), "分享");
     }
 
     @Operation(
@@ -338,4 +339,20 @@ public class ZoneInfoController {
     public MessageBean<JSONObject> loadTrans(@RequestParam Integer zoneId) {
         return MessageBean.ok(zoneInfoService.readTrans(zoneId), "获取变换接口");
     }
+
+
+    /**
+     * 检查分享状态
+     *
+     * @param zoneId
+     * @param userId
+     * @return
+     */
+    @PostMapping("/checkShareStatus")
+    public MessageBean save(@Parameter(name = "zoneId", description = "作品ID") Integer zoneId,
+                            @Parameter(name = "userId", description = "用户ID") Integer userId) {
+        boolean result = zoneInfoService.checkShareStatus(zoneId, userId);
+        return MessageBean.ok(result, "检查分享状态");
+    }
+
 }

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

@@ -10,6 +10,10 @@ import lombok.Setter;
 
 import java.util.Date;
 
+/**
+ * 点赞信息
+ */
+
 @Entity
 @Table(name = "likes")
 @Getter

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

@@ -0,0 +1,56 @@
+package com.lqkj.link.module.zone.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 分享信息
+ */
+
+@Entity
+@Table(name = "share_info")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ShareInfo {
+
+    @Id
+    @Column(name = "record_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Schema(description = "记录ID")
+    private Integer recordId;
+
+    @Column(name = "user_id")
+    @Schema(description = "分享人ID")
+    private Integer userId;
+
+    @Column(name = "shared_user_id")
+    @Schema(description = "被分享人ID")
+    private Integer sharedUserId;
+
+    @Column(name = "zone_id")
+    @Schema(description = "区域/作品id")
+    private Integer zoneId;
+
+    @Column(name = "share_code")
+    @Schema(description = "随机序号")
+    private String shareCode;
+
+    @Column(name = "can_use")
+    @Schema(description = "有效期（天）")
+    private Integer canUse;
+
+    @Column(name = "share_time")
+    @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @Schema(description = "添加时间")
+    private Date shareTime;
+
+}

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

@@ -0,0 +1,25 @@
+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.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ShareInfoRepository extends JpaRepository<ShareInfo, Integer> {
+
+
+    /**
+     * 根据zoneId和sharedUserId查询
+     * @param zoneId
+     * @param userId
+     * @return
+     */
+    @Query(nativeQuery = true,
+            value = "SELECT * FROM share_info WHERE zone_id = ?1 AND shared_user_id = ?2"
+    )
+    List<ShareInfo> findByZoneIdAndSharedUserId(Integer zoneId, Integer userId);
+}

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

@@ -85,13 +85,14 @@ 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) " +
-                "select nextval('share_info_record_id_seq'), :zoneId, user_id, :shareCode, now(), 7 " +
+                "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" +
                 "from user_info where user_code = :userCode"
     )
     void share(@Param("zoneId") Integer zoneId,
                @Param("userCode") String userCode,
-               @Param("shareCode") String shareCode);
+               @Param("shareCode") String shareCode,
+               @Param("sharedUserId") Integer sharedUserId);
 
     @Modifying
     @Query(nativeQuery = true,

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

@@ -4,15 +4,15 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.lqkj.link.module.authority.domain.UserInfo;
 import com.lqkj.link.module.authority.repository.UserInfoRepository;
+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.GeomInfoRepository;
-import com.lqkj.link.module.zone.repository.LikesInfoRepository;
-import com.lqkj.link.module.zone.repository.ModelInfoRepository;
-import com.lqkj.link.module.zone.repository.ZoneInfoRepository;
+import com.lqkj.link.module.zone.repository.*;
 import com.lqkj.link.util.Unzipper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.aspectj.weaver.ast.Var;
+import org.checkerframework.checker.units.qual.A;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.springframework.beans.BeanUtils;
@@ -40,6 +40,12 @@ public class ZoneInfoService {
     @Autowired
     private LikesInfoRepository likesInfoRepository;
 
+    @Autowired
+    private NoticeInfoRepository noticeInfoRepository;
+
+    @Autowired
+    private ShareInfoRepository shareInfoRepository;
+
     public ZoneInfoService(ZoneInfoRepository zoneInfoRepository, UserInfoRepository userInfoRepository,
                            GeomInfoRepository geomInfoRepository, ModelInfoRepository modelInfoRepository) {
         this.zoneInfoRepository = zoneInfoRepository;
@@ -277,9 +283,20 @@ public class ZoneInfoService {
     }
 
     @Transactional
-    public String share(Integer zoneId, String userCode) {
+    public String share(Integer zoneId, String userCode, String shareUserCode) {
+        UserInfo shareUserInfo = userInfoRepository.findByUserCode(shareUserCode);
+        if (Objects.isNull(shareUserInfo)) throw new RuntimeException("分享用户不存在！请核验手机号");
         String shareCode = UUID.randomUUID().toString();
-        zoneInfoRepository.share(zoneId, userCode, shareCode);
+        zoneInfoRepository.share(zoneId, userCode, shareCode, shareUserInfo.getUserId());
+        UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
+        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.setCreateTime(new Date());
+        noticeInfo.setZoneId(zoneId);
+        noticeInfoRepository.save(noticeInfo);
         return shareCode;
     }
 
@@ -371,4 +388,16 @@ public class ZoneInfoService {
         return zoneInfoRepository.findById(zoneId).get().getInitLocation();
     }
 
+    /**
+     * 检查分享状态
+     * @param zoneId
+     * @param userId
+     * @return
+     */
+    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();
+    }
 }

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

@@ -12,6 +12,7 @@ import java.nio.charset.StandardCharsets;
 import java.security.Security;
 import java.util.Base64;
 import java.util.Date;
+import java.util.Objects;
 import java.util.Random;
 
 
@@ -74,7 +75,7 @@ public class AESUtils {
         }
         UserInfo encryptUser = JSON.parseObject(JSON.toJSONString(object), UserInfo.class);
         encryptUser.setUserCode(encrypt(encryptUser.getUserCode(), key));
-        encryptUser.setAuthorizationCode(encrypt(encryptUser.getAuthorizationCode(), key));
+        if (Objects.nonNull(encryptUser.getAuthorizationCode())) encryptUser.setAuthorizationCode(encrypt(encryptUser.getAuthorizationCode(), key));
         encryptUser.setUpdateTime(updateTime);
         encryptUser.setLockTime(lockTime);
         return encryptUser;

src/main/resources/db/migration/V4__2.0.1.sql

@@ -0,0 +1,7 @@
+alter table share_info add column shared_user_id INT4;
+comment on column share_info.shared_user_id is
+'被分享人id: shared_user_id';
+
+alter table notice_info add column zone_id INT4;
+comment on column notice_info.zone_id is
+'作品id: zone_id';