fix: 客户端游客登录/注册/点赞等功能 v1

pom.xml

@@ -153,6 +153,11 @@
             <artifactId>calcite-core</artifactId>
             <version>1.37.0</version>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.25</version>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/lqkj/link/config/WebSecurityConfig.java

@@ -38,6 +38,8 @@ public class WebSecurityConfig {
                         .requestMatchers(
                                 "/jwt/token",
                                 "/jwt/getAdminToken",
+                                "jwt/getGuestToken",
+                                "/user/manage/register",
                                 "/encrypt/**",
                                 "/swagger-ui.html",
                                 "/swagger-ui/**",

src/main/java/com/lqkj/link/module/authority/controller/UserInfoController.java

@@ -22,7 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+import java.util.Objects;
 
 import static com.lqkj.link.APIVersion.VERSION_V1;
 
@@ -194,4 +194,27 @@ public class UserInfoController {
         userInfoService.resourceRefreshed(userCode);
         return MessageBean.ok(null, "更新用户刷新资源状态");
     }
+
+    @Operation(
+            summary = "注册用户接口",
+            description = "注册用户接口",
+            requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
+                    description = "用户实体",
+                    required = true,
+                    content = @Content(
+                            mediaType = "application/json",
+                            schema = @Schema(implementation = UserInfo.class)
+                    )
+            )
+    )
+    @PostMapping("/manage/register")
+    public MessageBean register(@RequestBody UserInfo userInfo, HttpServletRequest request) {
+        String authHeader = request.getHeader("Authorization");
+        String userCode = null;
+        if (Objects.nonNull(authHeader)){
+             userCode = jwtService.decryptUsernameWithHeader(authHeader);
+        }
+        userInfoService.register(userInfo, false, userCode);
+        return MessageBean.ok(null, "保存用户接口");
+    }
 }

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

@@ -1,8 +1,11 @@
 package com.lqkj.link.module.authority.service;
 
+import cn.hutool.core.util.RandomUtil;
 import com.lqkj.link.module.authority.domain.UserInfo;
 import com.lqkj.link.module.authority.repository.UserInfoRepository;
+import com.lqkj.link.module.jwt.service.JwtService;
 import com.lqkj.link.util.RSAUtils;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -11,11 +14,15 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 
+
 @Service
 public class DatabaseUserDetailService implements UserDetailsService {
 
     private final UserInfoRepository userInfoRepository;
 
+
+
+
     public DatabaseUserDetailService(UserInfoRepository userInfoRepository) {
         this.userInfoRepository = userInfoRepository;
     }

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

@@ -1,9 +1,12 @@
 package com.lqkj.link.module.authority.service;
 
+import cn.hutool.core.util.RandomUtil;
 import com.lqkj.link.module.authority.domain.UserInfo;
 import com.lqkj.link.module.authority.repository.RoleInfoRepository;
 import com.lqkj.link.module.authority.repository.UserInfoRepository;
+import com.lqkj.link.util.RSAUtils;
 import jakarta.annotation.PostConstruct;
+import org.bouncycastle.jcajce.PKIXCertRevocationCheckerParameters;
 import org.springframework.transaction.annotation.Transactional;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
@@ -28,6 +31,27 @@ public class UserInfoService {
         this.roleInfoRepository = roleInfoRepository;
     }
 
+    /**
+     * 游客登录
+     * @return
+     */
+    @Transactional
+    public String getGuestToken() {
+        UserInfo guestUser = new UserInfo();
+        guestUser.setUserCode(RandomUtil.randomNumbers(8));
+        guestUser.setDisplayName("游客");
+        if (userInfoRepository.findByUserCode(guestUser.getUserCode()) != null){
+            throw new RuntimeException("当前体验人数较多，请稍后重试！");
+        }
+        guestUser.setPassword(passwordEncoder.encode("88888888"));
+        guestUser.setHasAuth(false);
+        guestUser.setHasManage(false);
+        guestUser.setLocking(false);
+        guestUser.setRefreshResource(false);
+        register(guestUser, true, null);
+        return guestUser.getUserCode();
+    }
+
     @PostConstruct
     public void initSuperUser() {
         if (!userInfoRepository.existsById(1)) {
@@ -176,4 +200,69 @@ public class UserInfoService {
     public void resourceRefreshed(String userCode) {
         userInfoRepository.resourceRefreshed();
     }
+
+    /**
+     * 注册
+     * @param userInfo
+     */
+    @Transactional
+    public void register(UserInfo userInfo, boolean isGuest, String userCode) {
+        if (!isGuest){
+            userInfo.setUserCode(RSAUtils.decryptBase64(userInfo.getUserCode()));
+            if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() == 172) {
+                userInfo.setPassword(RSAUtils.decryptBase64(userInfo.getPassword()));
+            }
+            checkerParameters(userInfo.getUserCode(), userInfo.getPassword());
+            assemblyParameter(userInfo, userCode);
+        }
+        userInfoRepository.save(userInfo);
+
+    }
+
+    /**
+     * 组装参数
+     * @param userInfo
+     * @param userCode
+     */
+    private void assemblyParameter(UserInfo userInfo, String userCode) {
+        if (Objects.nonNull(userCode)){
+            UserInfo guestUser = userInfoRepository.findByUserCode(userCode);
+            userInfo.setUserId(guestUser.getUserId());
+            userInfo.setDisplayName(userInfo.getUserCode());
+            userInfo.setPassword(passwordEncoder.encode(userInfo.getPassword()));
+        }else {
+            userInfo.setLocking(false);
+            userInfo.setPassword(passwordEncoder.encode(userInfo.getPassword()));
+            userInfo.setUpdateTime(new Date());
+            userInfo.setRefreshResource(false);
+            userInfo.setHasAuth(false);
+            userInfo.setDisplayName(userInfo.getUserCode());
+            userInfo.setHasManage(false);
+            userInfo.setUpdateTime(new Date());
+            userInfo.setLocking(false);
+        }
+    }
+    /**
+     * 验证参数
+     * @param userCode 用户账号
+     * @param password 用户密码
+     */
+    private void checkerParameters(String userCode, String password) {
+        if (StringUtils.isBlank(userCode)) {
+            throw new RuntimeException("账号不能为空！");
+        }
+        if (StringUtils.isBlank(password)) {
+            throw new RuntimeException("密码不能为空！");
+        }
+        if (userInfoRepository.hasSameUserCode(userCode)) {
+            throw new RuntimeException("该手机号已被注册！");
+        }
+        if (userCode.matches("^1[3-9]\\\\d{9}$")){
+            throw new RuntimeException("请输入正确的手机号！");
+        }
+        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/jwt/controller/JwtController.java

@@ -1,6 +1,7 @@
 package com.lqkj.link.module.jwt.controller;
 
 import com.lqkj.link.message.MessageBean;
+import com.lqkj.link.module.authority.service.UserInfoService;
 import com.lqkj.link.module.jwt.service.JwtService;
 import com.lqkj.link.module.authority.domain.LoginBody;
 import com.lqkj.link.module.authority.domain.UserInfo;
@@ -11,11 +12,11 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/jwt")
@@ -23,9 +24,13 @@ import org.springframework.web.bind.annotation.RestController;
 public class JwtController {
 
     private final DatabaseUserDetailService userDetailService;
+
     private final JwtService jwtService;
     private final PasswordEncoder passwordEncoder;
 
+    @Autowired
+    private UserInfoService userInfoService;
+
     public JwtController(DatabaseUserDetailService userDetailService, JwtService jwtService, PasswordEncoder passwordEncoder) {
         this.userDetailService = userDetailService;
         this.jwtService = jwtService;
@@ -93,4 +98,16 @@ public class JwtController {
     public MessageBean<String> getAdminToken() {
         return MessageBean.ok(jwtService.generateToken("meta-link"), "登录");
     }
+
+
+    @Operation(
+            summary = "游客登录",
+            description = "游客登录"
+    )
+    @GetMapping("/getGuestToken")
+    public MessageBean<String> getGuestToken() {
+        String userCode = userInfoService.getGuestToken();
+        String token = jwtService.generateToken(userCode);
+        return MessageBean.ok(token, "登录");
+    }
 }

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

@@ -0,0 +1,36 @@
+package com.lqkj.link.module.zone.controller;
+
+import com.lqkj.link.message.MessageBean;
+import com.lqkj.link.module.zone.service.LikesInfoService;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/likes")
+@Tag(name = "点赞", description = "点赞")
+public class LikesInfoController {
+
+    @Autowired
+    private LikesInfoService likesInfoService;
+
+    /**
+     * 作品点赞
+     *
+     * @param zoneId
+     * @param userCode
+     * @return
+     */
+    @PostMapping("/save")
+    public MessageBean save(@Parameter(name = "zoneId", description = "作品ID") Integer zoneId,
+                           @Parameter(name = "userCode", description = "用户ID") Integer userCode,
+                            @Parameter(name = "isLike", description = "是否点赞") Boolean isLike) {
+        likesInfoService.save(zoneId, userCode, isLike);
+        return MessageBean.ok(null, "点赞/取消点赞成功");
+    }
+
+
+}

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

@@ -198,9 +198,13 @@ public class ZoneInfoController {
     @PostMapping("/" + VERSION_V1 + "/resourceCenter")
     public MessageBean<Page<Map<String, Object>>> resourceCenter(@RequestParam(required = false, defaultValue = "") String name,
                                                                  @RequestParam(required = false, defaultValue = "0") Integer searchType,
+                                                                 @RequestParam(required = false, defaultValue = "0") Integer orderType,
                                                                  @RequestParam(required = false, defaultValue = "0") Integer page,
-                                                                 @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
-        return MessageBean.ok(zoneInfoService.resourceCenter(name, searchType, page, pageSize), "资源中心");
+                                                                 @RequestParam(required = false, defaultValue = "10") Integer pageSize,
+                                                                 HttpServletRequest request) {
+        String authHeader = request.getHeader("Authorization");
+        String userCode = jwtService.decryptUsernameWithHeader(authHeader);
+        return MessageBean.ok(zoneInfoService.resourceCenter(name, searchType, page, pageSize, orderType, userCode), "资源中心");
     }
 
     @Operation(

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

@@ -0,0 +1,40 @@
+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 = "likes")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class LikesInfo {
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Schema(description = "点赞ID")
+    private Integer id;
+
+    @Column(name = "user_id")
+    @Schema(description = "作者用户ID")
+    private Integer userId;
+
+    @Column(name = "zone_id")
+    @Schema(description = "区域/作品id")
+    private Integer zoneId;
+
+    @Column(name = "create_time")
+    @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @Schema(description = "添加时间")
+    private Date createTime;
+
+}

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

@@ -59,4 +59,7 @@ public class ZoneInfo {
     private String templateFilePath;
     @Column(name = "template_use")
     private Integer templateUse;
+    @Column(name = "like_count")
+    @Schema(description = "点赞次数")
+    private Integer likeCount;
 }

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

@@ -0,0 +1,30 @@
+package com.lqkj.link.module.zone.repository;
+
+import com.lqkj.link.module.zone.domain.LikesInfo;
+import com.lqkj.link.module.zone.domain.ZoneInfo;
+import io.swagger.v3.oas.annotations.Parameter;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface LikesInfoRepository extends JpaRepository<LikesInfo, Integer> {
+
+    @Modifying
+    @Query(nativeQuery = true,
+            value = "delete from likes where user_id = :userId and zone_id = :zoneId"
+    )
+    void deleteByUserIdandZoneId(@Param("userId") Integer userId, @Param("zoneId") Integer zoneId);
+
+    @Query(nativeQuery = true,
+            value = "select count(*) > 0 from likes where user_id = :userId and zone_id = :zoneId"
+    )
+    boolean isLiked(@Param("zoneId") Integer zoneId, @Param("userId") Integer userId);
+}

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

@@ -65,17 +65,22 @@ public interface ZoneInfoRepository extends JpaRepository<ZoneInfo, Integer> {
     @Query(nativeQuery = true,
         value = "select zi.zone_id as \"zoneId\", zi.zone_name as \"zoneName\"," +
                 "zi.thumbnail, ui.head_img as \"headImg\", ui.display_name as \"displayName\"," +
-                "zi.share_count as \"shareCount\", zi.view_count as \"viewCount\", ui.user_id as \"authorId\" " +
+                "zi.share_count as \"shareCount\", zi.view_count as \"viewCount\", " +
+                "ui.user_id as \"authorId\", zi.like_count as \"likeCount\" " +
                 "from zone_info zi left join user_info ui " +
                 "on zi.user_id = ui.user_id " +
                 "where zone_name like concat('%', :name, '%') " +
                 "and (zi.user_id is null or zi.auth_status = 2) " +
                 "and (:searchType = 0 or (:searchType = 1 and zi.user_id is null) or (:searchType = 2 and zi.user_id is not null)) " +
-                "order by zi.update_time desc "
+                "order by " +
+                "CASE WHEN :orderType = 0 THEN zi.update_time END DESC," +
+                "CASE WHEN :orderType = 1 THEN zi.like_count END DESC," +
+                "CASE WHEN :orderType = 2 THEN zi.view_count END DESC;"
     )
     Page<Map<String, Object>> pageQueryResourceCenter(@Param("name") String name,
                                            @Param("searchType") Integer searchType,
-                                           Pageable pageable);
+                                           Pageable pageable,
+                                           @Param("orderType") Integer orderType);
 
     @Modifying
     @Query(nativeQuery = true,

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

@@ -0,0 +1,13 @@
+package com.lqkj.link.module.zone.service;
+
+public interface LikesInfoService {
+
+    /**
+     * 作品点赞
+     *
+     * @param zoneId
+     * @param userCode
+     * @return
+     */
+    void save(Integer zoneId, Integer userCode, boolean isLike);
+}

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

@@ -6,13 +6,19 @@ import com.lqkj.link.module.authority.domain.UserInfo;
 import com.lqkj.link.module.authority.repository.UserInfoRepository;
 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.util.Unzipper;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
+import org.aspectj.weaver.ast.Var;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.GeometryFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -31,6 +37,9 @@ public class ZoneInfoService {
     private final GeomInfoRepository geomInfoRepository;
     private final ModelInfoRepository modelInfoRepository;
 
+    @Autowired
+    private LikesInfoRepository likesInfoRepository;
+
     public ZoneInfoService(ZoneInfoRepository zoneInfoRepository, UserInfoRepository userInfoRepository,
                            GeomInfoRepository geomInfoRepository, ModelInfoRepository modelInfoRepository) {
         this.zoneInfoRepository = zoneInfoRepository;
@@ -242,9 +251,24 @@ public class ZoneInfoService {
         return zoneInfoRepository.pageQueryMyWork(userCode, name, pageable);
     }
 
-    public Page<Map<String, Object>> resourceCenter(String name, Integer searchType, Integer page, Integer pageSize) {
+    public Page<Map<String, Object>> resourceCenter(String name, Integer searchType, Integer page, Integer pageSize, Integer orderType, String userCode) {
         Pageable pageable = PageRequest.of(page, pageSize);
-        return zoneInfoRepository.pageQueryResourceCenter(name, searchType, pageable);
+        Page<Map<String, Object>> maps = zoneInfoRepository.pageQueryResourceCenter(name, searchType, pageable, orderType);
+        List<Map<String, Object>> result = new ArrayList<>();
+
+        maps.getContent().forEach(map -> {
+            Integer zoneId = (Integer) map.get("zoneId");
+            UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
+            boolean isLiked = likesInfoRepository.isLiked(zoneId, userInfo.getUserId());
+            HashMap<String, Object> zoneInfo = new HashMap<>(map);
+            if (isLiked) {
+                zoneInfo.put("isLiked", true);
+            } else {
+                zoneInfo.put("isLiked", false);
+            }
+            result.add(zoneInfo);
+        });
+        return new PageImpl<>(result, PageRequest.of(page, pageSize), maps.getTotalElements());
     }
 
     public Page<Map<String, Object>> auditCenter(String name, Integer searchType, Integer page, Integer pageSize) {
@@ -303,7 +327,7 @@ public class ZoneInfoService {
 
         ZoneInfo zoneInfo = new ZoneInfo(null, userInfo.getUserId(), name, template == null ? null : template.getInitLocation(),
                 template == null ? null : template.getThumbnail(), 0, new Date(), 0, 0,
-                null, null, 0);
+                null, null, 0, 0);
         ZoneInfo newInfo = zoneInfoRepository.save(zoneInfo);
 
         if (templateId != null) {

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

@@ -0,0 +1,59 @@
+package com.lqkj.link.module.zone.service.impl;
+
+import com.lqkj.link.module.zone.domain.LikesInfo;
+import com.lqkj.link.module.zone.domain.ZoneInfo;
+import com.lqkj.link.module.zone.repository.LikesInfoRepository;
+import com.lqkj.link.module.zone.repository.ZoneInfoRepository;
+import com.lqkj.link.module.zone.service.LikesInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+@Service
+public class LikesInfoServiceImpl implements LikesInfoService {
+
+    @Autowired
+    private LikesInfoRepository likesInfoRepository;
+
+    @Autowired
+    private ZoneInfoRepository zoneInfoRepository;
+
+
+    @Transactional
+    @Override
+    public void save(Integer zoneId, Integer userId, boolean isLike) {
+        if (isLike){
+        LikesInfo likesInfo = new LikesInfo();
+        likesInfo.setZoneId(zoneId);
+        likesInfo.setUserId(userId);
+        likesInfoRepository.save(likesInfo);
+        updateZoneLikeCount(zoneId, isLike);
+        }
+        else {
+            likesInfoRepository.deleteByUserIdandZoneId(userId, zoneId);
+            updateZoneLikeCount(zoneId, isLike);
+        }
+
+
+    }
+
+    /**
+     * 更新作品点赞数
+     * @param zoneId
+     */
+
+    private void updateZoneLikeCount(Integer zoneId, boolean isLike) {
+        ZoneInfo zoneInfo = zoneInfoRepository.findById(zoneId).get();
+        if (isLike){
+            zoneInfo.setLikeCount(zoneInfo.getLikeCount() + 1);
+        }
+        else {
+            zoneInfo.setLikeCount(zoneInfo.getLikeCount() - 1);
+        }
+        zoneInfo.setUpdateTime(new Date());
+        zoneInfoRepository.save(zoneInfo);
+
+    }
+}

src/main/resources/db/migration/V3__2.0.0.sql

@@ -0,0 +1,20 @@
+alter table zone_info add column like_count INT4 default 0;
+comment on column zone_info.like_count is
+'点赞数: like_count';
+create table Likes (
+    id SERIAL not null,
+    user_id INT4 not null,
+    zone_id INT4 not null,
+    create_time TIMESTAMP default current_timestamp,
+    constraint PK_LIKES primary key (id)
+);
+comment on table Likes is
+'点赞表: Likes';
+comment on column Likes.id is
+'id: id';
+comment on column Likes.user_id is
+'用户id: user_id';
+comment on column Likes.zone_id is
+'点赞的作品id: zone_id';
+comment on column Likes.create_time is
+'点赞时间: create_time'