Commit a7cc17d2 by pengshun

feat: 添加今日对话总结功能

parent f3d8ea05
No preview for this file type
......@@ -59,6 +59,7 @@ public interface ErrorCodeConstants {
ErrorCode KNOWLEDGE_NO_AUTH = new ErrorCode(1_040_009_405, "无权限操作!");
ErrorCode KNOWLEDGE_NO_SPACE = new ErrorCode(1_040_009_406, "知识库容量超额!");
ErrorCode KNOWLEDGE_REPEAT_FILE = new ErrorCode(1_040_009_407, "不可重复上传文件!");
ErrorCode KNOWLEDGE_DOCUMENT_NOT_EXISTS = new ErrorCode(1_040_009_101, "文档不存在!");
ErrorCode KNOWLEDGE_DOCUMENT_FILE_EMPTY = new ErrorCode(1_040_009_102, "文档内容为空!");
......
......@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.analysis.*;
import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.conversation.AiChatConversationRespVO;
import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatAnalysisDO;
import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatConversationDO;
import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatSummaryDO;
import cn.iocoder.yudao.module.ai.service.chat.AiChatAnalysisService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
......@@ -21,7 +22,6 @@ import java.util.List;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@Tag(name = "管理后台 - 聊天分析记录")
@RestController
......@@ -111,4 +111,17 @@ public class AiChatAnalysisController {
return success(BeanUtils.toBean(pageResult, AiChatKeywordCountVO.class));
}
@Operation(summary = "获得分析总结数据")
@GetMapping("/get-summary")
public CommonResult<AiChatSummaryRespVO> getChatSummary(AiChatSummaryReqVO pageReqVO) {
AiChatSummaryDO result = chatAnalysisService.getChatSummaryPage(pageReqVO);
return success(BeanUtils.toBean(result, AiChatSummaryRespVO.class));
}
@Operation(summary = "获得分析总结数据")
@PostMapping("/create-summary")
public CommonResult<Long> createChatSummary(@RequestBody @Valid AiChatSummaryCreateReqVO createReqVO) {
return success(chatAnalysisService.createChatSummary(createReqVO));
}
}
package cn.iocoder.yudao.module.ai.controller.admin.chat.vo.analysis;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.DecimalMax;
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 对话分析记录创建/修改 Request VO")
@Data
public class AiChatSummaryCreateReqVO {
@Schema(description = "分析记录编号", example = "1024")
private Long id;
@Schema(description = "对话编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "wmCYMpJwAAnATZZNG3vu6Qq32Wph0YrQ")
@NotBlank(message = "对话编号不能为空")
private String chatId;
@Schema(description = "总结内容", requiredMode = Schema.RequiredMode.REQUIRED, example = "公租房业务:登录密码是多少?")
private String summary;
@Schema(description = "总结时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1780243200000")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime summaryTime;
}
package cn.iocoder.yudao.module.ai.controller.admin.chat.vo.analysis;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - AI 总结对话分析的分页 Request VO")
@Data
public class AiChatSummaryReqVO {
@Schema(description = "对话编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "wmCYMpJwAAnATZZNG3vu6Qq32Wph0YrQ")
@NotBlank(message = "对话编号不能为空")
private String chatId;
@Schema(description = "今日时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime summaryTime;
}
package cn.iocoder.yudao.module.ai.controller.admin.chat.vo.analysis;
import com.fhs.core.trans.vo.VO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Schema(description = "管理后台 - 对话分析记录 Response VO")
@Data
public class AiChatSummaryRespVO implements VO {
@Schema(description = "分析记录编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id;
@Schema(description = "对话编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "wmCYMpJwAAnATZZNG3vu6Qq32Wph0YrQ")
private String chatId;
@Schema(description = "总结内容", example = "待解决的问题:1. 。。。")
private String summary;
}
......@@ -199,6 +199,15 @@ public class AiKnowledgeDocumentController {
return success(true);
}
@PutMapping("/update-processed-status")
@Operation(summary = "更新文档解析状态")
@PreAuthorize("@ss.hasPermission('ai:knowledge:update')")
public CommonResult<Boolean> updateKnowledgeDocumentProcessedStatus(
@Valid @RequestBody AiKnowledgeDocumentUpdateProcessedStatusReqVO reqVO) {
documentService.updateKnowledgeDocumentProcessedStatus(reqVO);
return success(true);
}
// @DeleteMapping("/delete")
// @Operation(summary = "删除文档")
// @PreAuthorize("@ss.hasPermission('ai:knowledge:delete')")
......
package cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.document;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.validation.InEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -56,4 +58,7 @@ public class AiKnowledgeDocumentRespVO {
@Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, example = "24790")
private String creator;
@Schema(description = "解析状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
private Integer processed;
}
package cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.document;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.validation.InEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Schema(description = "管理后台 - AI 知识库文档更新解析状态 Request VO")
@Data
public class AiKnowledgeDocumentUpdateProcessedStatusReqVO {
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15583")
@NotNull(message = "编号不能为空")
private Long id;
@Schema(description = "解析状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
@NotNull(message = "解析状态不能为空")
@InEnum(CommonStatusEnum.class)
private Integer processed;
}
\ No newline at end of file
package cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.document;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.validation.InEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
......
package cn.iocoder.yudao.module.ai.dal.dataobject.chat;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
/**
* AI Chat 对话 DO
*
* 用户每次发起 Chat 聊天时,会创建一个 {@link AiChatSummaryDO} 对象,将它的消息关联在一起
*
* @author fansili
* @since 2024/4/14 17:35
*/
@TableName(value = "ai_chat_summary", autoResultMap = true)
@KeySequence("ai_chat_summary_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AiChatSummaryDO extends BaseDO {
/**
* 分析记录编号,自增
*/
@TableId
private Long id;
/**
* 对话编号
*/
private String chatId;
/**
* 用户问题
*/
private String summary;
private LocalDateTime summaryTime;
}
......@@ -80,4 +80,6 @@ public class AiKnowledgeDocumentDO extends BaseDO {
private LocalDateTime releaseTime;
private Integer processed;
}
......@@ -5,6 +5,8 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.analysis.AiChatAnalysisPageReqVO;
import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.analysis.AiChatKeywordsPageReqVO;
import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.analysis.AiChatSummaryReqVO;
import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.analysis.AiChatSummaryRespVO;
import cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.document.AiKnowledgeDocumentPageReqVO;
import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatAnalysisDO;
import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatConversationDO;
......
package cn.iocoder.yudao.module.ai.dal.mysql.chat;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.analysis.AiChatSummaryReqVO;
import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.analysis.AiChatSummaryRespVO;
import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatSummaryDO;
import org.apache.ibatis.annotations.Mapper;
/**
* AI 聊天对话 Mapper
*
* @author 芋道源码
*/
@Mapper
public interface AiChatSummaryMapper extends BaseMapperX<AiChatSummaryDO> {
default AiChatSummaryDO selectSummary(AiChatSummaryReqVO reqVo){
return selectOne(new LambdaQueryWrapperX<AiChatSummaryDO>()
.eqIfPresent(AiChatSummaryDO::getChatId, reqVo.getChatId())
.eqIfPresent(AiChatSummaryDO::getSummaryTime, reqVo.getSummaryTime()));
}
}
......@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.document.AiKnowledgeDocumentPageReqVO;
import cn.iocoder.yudao.module.ai.controller.admin.knowledge.vo.knowledge.AiKnowledgeDocumentCreateReqVO;
import cn.iocoder.yudao.module.ai.dal.dataobject.knowledge.AiKnowledgeDocumentDO;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
......@@ -112,4 +113,12 @@ public interface AiKnowledgeDocumentMapper extends BaseMapperX<AiKnowledgeDocume
.setSql(String.format("content_length = CASE WHEN content_length - %d > 0 THEN content_length - %d ELSE 0 END", contentLength, contentLength))
.in(AiKnowledgeDocumentDO::getId, ids));
}
default AiKnowledgeDocumentDO selectByName(AiKnowledgeDocumentCreateReqVO createReqVO){
return selectOne(new LambdaQueryWrapperX<AiKnowledgeDocumentDO>()
.eq(AiKnowledgeDocumentDO::getKnowledgeId, createReqVO.getKnowledgeId())
.eq(AiKnowledgeDocumentDO::getParentId, createReqVO.getParentId())
.like(AiKnowledgeDocumentDO::getName, createReqVO.getName())
);
}
}
......@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.analysis.*;
import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatAnalysisDO;
import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatConversationDO;
import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatSummaryDO;
import java.util.List;
......@@ -25,4 +26,8 @@ public interface AiChatAnalysisService {
AiChatAnalysisStatisticsRespVO getStatistics(AiChatAnalysisStatisticsReqVO pageReqVO);
List<AiChatKeywordCountVO> getChatKeywordsPage(AiChatKeywordsPageReqVO pageReqVO);
AiChatSummaryDO getChatSummaryPage(AiChatSummaryReqVO pageReqVO);
Long createChatSummary(AiChatSummaryCreateReqVO createReqVO);
}
......@@ -3,7 +3,9 @@ package cn.iocoder.yudao.module.ai.service.chat;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.analysis.*;
import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatAnalysisDO;
import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatSummaryDO;
import cn.iocoder.yudao.module.ai.dal.mysql.chat.AiChatAnalysisMapper;
import cn.iocoder.yudao.module.ai.dal.mysql.chat.AiChatSummaryMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
......@@ -37,6 +39,9 @@ public class AiChatAnalysisServiceImpl implements AiChatAnalysisService {
@Resource
private AiChatAnalysisMapper chatAnalysisMapper;
@Resource
private AiChatSummaryMapper chatSummaryMapper;
public AiChatAnalysisDO validateChatAnalysisExists(Long id) {
AiChatAnalysisDO conversation = chatAnalysisMapper.selectById(id);
......@@ -167,6 +172,28 @@ public class AiChatAnalysisServiceImpl implements AiChatAnalysisService {
}
@Override
public AiChatSummaryDO getChatSummaryPage(AiChatSummaryReqVO pageReqVO) {
return chatSummaryMapper.selectSummary(pageReqVO);
}
@Override
public Long createChatSummary(AiChatSummaryCreateReqVO createReqVO) {
List<AiChatAnalysisDO> summary = chatAnalysisMapper.selectByChatId(createReqVO.getChatId());
if (summary.isEmpty()) {
throw exception(CHAT_ANALYSIS_NOT_EXISTS);
}
LocalDateTime summaryTime = createReqVO.getSummaryTime();
if (summaryTime != null) {
summaryTime = summaryTime.withHour(0).withMinute(0).withSecond(0).withNano(0);
}
// 2. 创建 AiChatConversationDO 聊天对话
AiChatSummaryDO conversation = new AiChatSummaryDO().setChatId(createReqVO.getChatId())
.setSummary(createReqVO.getSummary()).setSummaryTime(summaryTime);
chatSummaryMapper.insert(conversation);
return conversation.getId();
}
private Double calculatePercent(Long current, Long previous) {
if (previous == null || previous == 0) {
return current == 0 ? 0.0 : null; // 无法计算百分比时返回null,前端可展示“-”
......
......@@ -133,4 +133,6 @@ public interface AiKnowledgeDocumentService {
void updateKnowledgeDocumentDeletable(AiKnowledgeDocumentUpdateDeletableReqVO reqVO);
PageResult<AiKnowledgeDocumentDO> getKnowledgeDocumentPageByUserId(AiKnowledgeDocumentPageReqVO pageReqVO, Long userId);
void updateKnowledgeDocumentProcessedStatus(AiKnowledgeDocumentUpdateProcessedStatusReqVO reqVO);
}
......@@ -64,6 +64,12 @@ public class AiKnowledgeDocumentServiceImpl implements AiKnowledgeDocumentServic
@Override
public Long createKnowledgeDocument(AiKnowledgeDocumentCreateReqVO createReqVO) {
// 校验重复文件
// 设置状态为直接父级的状态
AiKnowledgeDocumentDO sameKnowDoc = knowledgeDocumentMapper.selectByName(createReqVO);
if (sameKnowDoc != null){
throw exception(KNOWLEDGE_REPEAT_FILE);
}
// 1. 校验参数
knowledgeService.validateKnowledgeExists(createReqVO.getKnowledgeId());
String content = createReqVO.getContent();
......@@ -203,6 +209,16 @@ public class AiKnowledgeDocumentServiceImpl implements AiKnowledgeDocumentServic
List<AiKnowledgeDocumentDO> documentDOs = new ArrayList<>(createListReqVO.getList().size());
for (int i = 0; i < createListReqVO.getList().size(); i++) {
AiKnowledgeDocumentCreateListReqVO.Document documentVO = createListReqVO.getList().get(i);
// 校验重复文件
// 设置状态为直接父级的状态
AiKnowledgeDocumentCreateReqVO createReqVO = new AiKnowledgeDocumentCreateReqVO();
createReqVO.setKnowledgeId(createListReqVO.getKnowledgeId());
createReqVO.setParentId(parentId);
createReqVO.setName(documentVO.getName());
AiKnowledgeDocumentDO sameKnowDoc = knowledgeDocumentMapper.selectByName(createReqVO);
if (sameKnowDoc != null){
continue;
}
documentDOs.add(BeanUtils.toBean(documentVO, AiKnowledgeDocumentDO.class)
.setKnowledgeId(createListReqVO.getKnowledgeId())
.setParentId(parentId)
......@@ -546,6 +562,16 @@ public class AiKnowledgeDocumentServiceImpl implements AiKnowledgeDocumentServic
}
@Override
public void updateKnowledgeDocumentProcessedStatus(AiKnowledgeDocumentUpdateProcessedStatusReqVO reqVO) {
// 1. 校验存在
AiKnowledgeDocumentDO document = validateKnowledgeDocumentExists(reqVO.getId());
// 2. 更新状态
knowledgeDocumentMapper.updateById(new AiKnowledgeDocumentDO()
.setId(reqVO.getId()).setProcessed(reqVO.getProcessed()));
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteKnowledgeDocumentByKnowledgeId(Long knowledgeId) {
// // 1. 获取该知识库下的所有文档
......
......@@ -17,6 +17,8 @@ public interface ErrorCodeConstants {
ErrorCode AUTH_MOBILE_NOT_EXISTS = new ErrorCode(1_002_000_007, "手机号不存在");
ErrorCode AUTH_REGISTER_CAPTCHA_CODE_ERROR = new ErrorCode(1_002_000_008, "验证码不正确,原因:{}");
ErrorCode AUTH_LOGIN_WEAK_PASSWORD = new ErrorCode(1_002_000_009, "弱密码被系统禁用,请修改密码!");
// ========== 菜单模块 1-002-001-000 ==========
ErrorCode MENU_NAME_DUPLICATE = new ErrorCode(1_002_001_000, "已经存在该名字的菜单");
ErrorCode MENU_PARENT_NOT_EXISTS = new ErrorCode(1_002_001_001, "父菜单不存在");
......
......@@ -16,6 +16,8 @@ public enum LoginResultEnum {
CAPTCHA_NOT_FOUND(30), // 图片验证码不存在
CAPTCHA_CODE_ERROR(31), // 图片验证码不正确
WEAK_PASSWORD(40), // 弱密码被禁止登陆
;
/**
......
......@@ -30,10 +30,14 @@ import com.xingyuv.captcha.service.CaptchaService;
import jakarta.annotation.Resource;
import jakarta.validation.Validator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
......@@ -71,6 +75,35 @@ public class AdminAuthServiceImpl implements AdminAuthService {
@Value("${yudao.captcha.enable:true}")
private Boolean captchaEnable;
// 常见弱密码黑名单(静态常量,可放入类中)
private static final Set<String> WEAK_PASSWORD_SET = new HashSet<>(Arrays.asList(
"123456", "password", "12345678", "qwerty", "abc123", "admin", "1234567890"
));
/**
* 弱密码校验函数
* @param rawPassword 明文密码
* @return true-弱密码,false-非弱密码
*/
private boolean isWeakPassword(String rawPassword) {
if (StringUtils.isBlank(rawPassword)) {
return true;
}
// 长度小于 8 位
if (rawPassword.length() < 8) {
return true;
}
// 纯数字或纯字母
if (rawPassword.matches("\\d+") || rawPassword.matches("[a-zA-Z]+")) {
return true;
}
// 命中常见弱密码列表
if (WEAK_PASSWORD_SET.contains(rawPassword.toLowerCase())) {
return true;
}
return false;
}
@Override
public AdminUserDO authenticate(String username, String password) {
final LoginLogTypeEnum logTypeEnum = LoginLogTypeEnum.LOGIN_USERNAME;
......@@ -100,6 +133,14 @@ public class AdminAuthServiceImpl implements AdminAuthService {
// 使用账号密码,进行登录
AdminUserDO user = authenticate(reqVO.getUsername(), reqVO.getPassword());
// 弱密码校验(仅针对用户名密码登录)
if (isWeakPassword(reqVO.getPassword())) {
// 记录登录失败日志
createLoginLog(user.getId(), reqVO.getUsername(),
LoginLogTypeEnum.LOGIN_USERNAME, LoginResultEnum.WEAK_PASSWORD);
throw exception(AUTH_LOGIN_WEAK_PASSWORD);
}
// 如果 socialType 非空,说明需要绑定社交用户
if (reqVO.getSocialType() != null) {
socialUserService.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
......
......@@ -25,6 +25,8 @@ import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.dal.mysql.dept.UserPostMapper;
import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum;
import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum;
import cn.iocoder.yudao.module.system.service.dept.DeptService;
import cn.iocoder.yudao.module.system.service.dept.PostService;
import cn.iocoder.yudao.module.system.service.permission.PermissionService;
......@@ -36,6 +38,7 @@ import com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
import jakarta.validation.ConstraintViolationException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
......@@ -85,6 +88,11 @@ public class AdminUserServiceImpl implements AdminUserService {
@Resource
private ConfigApi configApi;
// 常见弱密码黑名单(静态常量,可放入类中)
private static final Set<String> WEAK_PASSWORD_SET = new HashSet<>(Arrays.asList(
"123456", "password", "12345678", "qwerty", "abc123", "admin", "1234567890"
));
@Override
@Transactional(rollbackFor = Exception.class)
@LogRecord(type = SYSTEM_USER_TYPE, subType = SYSTEM_USER_CREATE_SUB_TYPE, bizNo = "{{#user.id}}",
......@@ -212,6 +220,30 @@ public class AdminUserServiceImpl implements AdminUserService {
return avatar;
}
/**
* 弱密码校验函数
* @param rawPassword 明文密码
* @return true-弱密码,false-非弱密码
*/
private boolean isWeakPassword(String rawPassword) {
if (StringUtils.isBlank(rawPassword)) {
return true;
}
// 长度小于 8 位
if (rawPassword.length() < 8) {
return true;
}
// 纯数字或纯字母
if (rawPassword.matches("\\d+") || rawPassword.matches("[a-zA-Z]+")) {
return true;
}
// 命中常见弱密码列表
if (WEAK_PASSWORD_SET.contains(rawPassword.toLowerCase())) {
return true;
}
return false;
}
@Override
@LogRecord(type = SYSTEM_USER_TYPE, subType = SYSTEM_USER_UPDATE_PASSWORD_SUB_TYPE, bizNo = "{{#id}}",
success = SYSTEM_USER_UPDATE_PASSWORD_SUCCESS)
......@@ -219,6 +251,11 @@ public class AdminUserServiceImpl implements AdminUserService {
// 1. 校验用户存在
AdminUserDO user = validateUserExists(id);
// 弱密码校验(仅针对用户名密码登录)
if (isWeakPassword(password)) {
throw exception(AUTH_LOGIN_WEAK_PASSWORD);
}
// 2. 更新密码
AdminUserDO updateObj = new AdminUserDO();
updateObj.setId(id);
......
......@@ -57,4 +57,8 @@ export const ChatAnalysisApi = {
getChatKeywords: async (params: any) => {
return await request.get({ url: `/ai/chat/analysis/get-keywords`, params })
},
getChatSummary: async (params: any) => {
return await request.get({ url: `/ai/chat/analysis/get-summary`, params })
},
}
......@@ -12,6 +12,7 @@
<el-select
v-model="queryParams.userId"
clearable
filterable
placeholder="请输入用户编号"
class="!w-240px"
>
......
......@@ -21,6 +21,7 @@
<el-select
v-model="queryParams.userId"
clearable
filterable
placeholder="请输入用户编号"
class="!w-240px"
>
......
......@@ -15,6 +15,7 @@
<div class="header-left">
<el-button size="small" @click="handleExpandAllAnalysis">一键展开</el-button>
<el-button size="small" @click="handleCollapseAllAnalysis">一键收起</el-button>
<el-button size="small" @click="handleSummary">今日总结</el-button>
</div>
</el-header>
......@@ -55,6 +56,16 @@
ref="conversationUpdateFormRef"
@success="handleConversationUpdateSuccess"
/>
<!-- 新增:今日总结抽屉 -->
<el-drawer
v-model="summaryDrawerVisible"
:title="drawerTitle"
direction="rtl"
size="40%"
>
<div class="summary-content" v-html="formattedSummary"></div>
</el-drawer>
</el-container>
</template>
......@@ -99,8 +110,20 @@ const enableContext = ref<boolean>(true) // 是否开启上下文
const receiveMessageFullText = ref('')
const receiveMessageDisplayedText = ref('')
// 获取子组件 ref
// const messageRef = ref<InstanceType<typeof MessageList>>()
// ========== 新增:总结抽屉相关 ==========
const summaryDrawerVisible = ref(false) // 抽屉显示状态
const summaryContent = ref('') // 总结原始内容
const drawerTitle = ref('') // 抽屉标题
// 若后端返回的summary包含HTML标签则直接渲染,否则可进行Markdown转换(按需)
const formattedSummary = computed(() => {
// 如果内容是纯文本,可以转换为HTML(如换行转<br>
if (summaryContent.value) {
return summaryContent.value.replace(/\n/g, '<br>')
}
return ''
})
// =====================================
// 一键展开所有分析面板
const handleExpandAllAnalysis = () => {
......@@ -522,6 +545,40 @@ const textRoll = async () => {
let timer = setTimeout(task, textSpeed.value)
} catch {}
}
import dayjs from 'dayjs'
// =========== 新增:今日总结功能 ===========
const handleSummary = async () => {
// 校验是否有选中的对话
if (!activeConversationId.value) {
message.warning('请先选择一个对话')
return
}
// 获取今日日期时间戳(当天0点,毫秒)
const today = new Date()
today.setHours(0, 0, 0, 0)
const dateTimestamp = dayjs(today).format('YYYY-MM-DD HH:mm:ss')
// 生成抽屉标题:例如 “5.17对话分析总结”
const month = today.getMonth() + 1
const day = today.getDate()
drawerTitle.value = `${month}.${day}对话分析总结`
try {
// 调用接口(参数格式根据实际API调整,此处假设接收 conversationId 和 date)
const res = await ChatAnalysisApi.getChatSummary({
chatId: activeConversationId.value,
summaryTime: dateTimestamp
})
// 假设返回数据中 summary 字段为总结内容
summaryContent.value = res?.summary ?? '暂无总结内容'
summaryDrawerVisible.value = true
} catch (error) {
console.error('获取对话总结失败', error)
message.error('获取总结失败,请稍后重试')
}
}
// =====================================
/** 初始化 **/
onMounted(async () => {
......@@ -737,4 +794,14 @@ onMounted(async () => {
padding-top: 5px;
}
}
// 新增:总结抽屉内容样式
.summary-content {
padding: 16px;
font-size: 14px;
line-height: 1.6;
color: #333;
white-space: pre-wrap;
word-break: break-word;
}
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment