Merge remote-tracking branch 'origin/master'

guyue

1 天以前 b7ff8446a58d59e7df8a588104c231c7af7d8573

Merge remote-tracking branch 'origin/master'

 src/main/java/com/linghu/controller/KeywordController.java

@@ -51,6 +51,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

@RestController
@@ -154,12 +155,20 @@
        if (isNow == 0) {
            List<PlatformProportionVO> result = keywordMapper.getResultByTypeId(keywordId, questionId,
                    keyword.getNum() , typeId);
            // 检查列表是否为空或只包含null元素
            boolean isValid = result != null && result.stream()
                    .anyMatch(Objects::nonNull);

            return ResponseResult.success(result);
            return isValid ? ResponseResult.success(result)
                    : ResponseResult.success(new ArrayList<>());
        }else {
            List<PlatformProportionVO> result = keywordMapper.getResultByTypeId(keywordId, questionId, 1, typeId);
            boolean isValid = result != null && result.stream()
                    .anyMatch(Objects::nonNull);

            return ResponseResult.success(result);
            return isValid ? ResponseResult.success(result)
                    : ResponseResult.success(new ArrayList<>());

        }

    }
@@ -209,11 +218,19 @@
        if (isNow == 0) {
            List<ResultListVO> result = keywordMapper.getResultByPlatformId(keywordId, questionId, keyword.getNum(),
                    platformId);
            return ResponseResult.success(result);
            boolean isValid = result != null && result.stream()
                    .anyMatch(Objects::nonNull);

            return isValid ? ResponseResult.success(result)
                    : ResponseResult.success(new ArrayList<>());
        } else {
            List<ResultListVO> result = keywordMapper.getResultByPlatformId(keywordId, questionId, 1,
                    platformId);
            return ResponseResult.success(result);
            boolean isValid = result != null && result.stream()
                    .anyMatch(Objects::nonNull);

            return isValid ? ResponseResult.success(result)
                    : ResponseResult.success(new ArrayList<>());
        }

    }

 src/main/java/com/linghu/controller/PlatformController.java

@@ -197,7 +197,7 @@
                platformService.saveBatch(platforms);
                return ResponseResult.success("成功导入" + platforms.size() + "条数据");
            } else {
                return ResponseResult.error("没有有效数据可导入");
                return ResponseResult.success();
            }

        } catch (Exception e) {

 src/main/java/com/linghu/controller/UserController.java

@@ -43,7 +43,7 @@
    public ResponseResult add(@RequestBody User user) {
        List<User> list = userService.list(new LambdaQueryWrapper<User>().eq(User::getUser_email, user.getUser_email()));
        if (list != null && list.size() > 0) {
            return ResponseResult.error("该邮箱已存在");
            return ResponseResult.success("该邮箱已存在");
        }
        user.setStatus("正常");
        userService.save(user);
@@ -66,7 +66,7 @@
                        .ne(User::getUser_id, user.getUser_id())
                .eq(User::getUser_email, user.getUser_email()));
        if (list != null && list.size() > 0) {
            return ResponseResult.error("该邮箱已存在");
            return ResponseResult.success("该邮箱已存在");
        }
        userService.updateById(user);
        return ResponseResult.success();

 src/main/java/com/linghu/service/KeywordService.java

 src/main/resources/mapper/keywordMapper.xml

@@ -93,6 +93,7 @@
            <if test="typeId != null">
                AND p.type_id = #{typeId}
            </if>
        GROUP BY t.type_name,p.platform_name
        ORDER BY
        r.repetition_num  DESC
    </select>
@@ -117,6 +118,7 @@
            <if test="platformId != null">
                AND r.platform_id = #{platformId}
            </if>

        ORDER BY
        r.repetition_num,
        r.create_time DESC