diff --git a/sql/mysql/tenant_add_ai_fields_to_system_tenant.sql b/sql/mysql/tenant_add_ai_fields_to_system_tenant.sql new file mode 100644 index 0000000..f60deae --- /dev/null +++ b/sql/mysql/tenant_add_ai_fields_to_system_tenant.sql @@ -0,0 +1,7 @@ +-- ---------------------------- +-- 在 system_tenant 表中添加租户提示词字段 +-- 执行前请备份数据 +-- ---------------------------- + +ALTER TABLE `system_tenant` + ADD COLUMN `tenant_prompt` varchar(2000) NULL DEFAULT '' COMMENT '租户提示词' AFTER `account_count`; diff --git a/sql/mysql/tenant_add_prompt_dify_ip.sql b/sql/mysql/tenant_add_prompt_dify_ip.sql new file mode 100644 index 0000000..5dcd224 --- /dev/null +++ b/sql/mysql/tenant_add_prompt_dify_ip.sql @@ -0,0 +1,9 @@ +-- ---------------------------- +-- 租户表新增字段：租户提示词、Dify 路径 +-- 执行前请备份数据 +-- Dify 路径支持：域名、IP、IP:端口 等格式 +-- ---------------------------- + +ALTER TABLE `system_tenant` + ADD COLUMN `tenant_prompt` varchar(2000) NULL DEFAULT '' COMMENT '租户提示词' AFTER `account_count`, + ADD COLUMN `dify_path` varchar(500) NULL DEFAULT '' COMMENT 'Dify 路径（支持域名、IP、IP:端口）' AFTER `tenant_prompt`; diff --git a/sql/mysql/tenant_dify_ip_to_path.sql b/sql/mysql/tenant_dify_ip_to_path.sql new file mode 100644 index 0000000..77f4e0f --- /dev/null +++ b/sql/mysql/tenant_dify_ip_to_path.sql @@ -0,0 +1,8 @@ +-- ---------------------------- +-- 将 dify_ip 字段重命名为 dify_path（支持域名、IP、IP:端口） +-- 仅当已执行过 tenant_add_prompt_dify_ip.sql 且存在 dify_ip 时执行 +-- 执行前请备份数据 +-- ---------------------------- + +ALTER TABLE `system_tenant` + CHANGE COLUMN `dify_ip` `dify_path` varchar(500) NULL DEFAULT '' COMMENT 'Dify 路径（支持域名、IP、IP:端口）'; diff --git a/sql/mysql/tenant_remove_ai_config_menu.sql b/sql/mysql/tenant_remove_ai_config_menu.sql new file mode 100644 index 0000000..48ae4a4 --- /dev/null +++ b/sql/mysql/tenant_remove_ai_config_menu.sql @@ -0,0 +1,7 @@ +-- ---------------------------- +-- 若曾执行过 tenant_ai_config_menu.sql，可执行本脚本删除租户 AI 配置菜单 +-- 执行前请备份数据 +-- ---------------------------- + +DELETE FROM `system_role_menu` WHERE `menu_id` IN (2800, 2801, 2802); +DELETE FROM `system_menu` WHERE `id` IN (2800, 2801, 2802); diff --git a/sql/mysql/ydoyun_ai_assistant_report.sql b/sql/mysql/ydoyun_ai_assistant_report.sql new file mode 100644 index 0000000..4fd2ffa --- /dev/null +++ b/sql/mysql/ydoyun_ai_assistant_report.sql @@ -0,0 +1,23 @@ +-- AI 决策助手报告单据表：存储各模块的报告内容及截图 +CREATE TABLE IF NOT EXISTS `ydoyun_ai_assistant_report` ( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `module_name` varchar(128) NOT NULL DEFAULT '' COMMENT '模块名称（当前组件名称）', + `module_code` varchar(128) DEFAULT '' COMMENT '模块编码，如 SupplierPerformance:main', + `reporter` varchar(64) NOT NULL DEFAULT '' COMMENT '报告人', + `reporter_id` bigint NOT NULL DEFAULT 0 COMMENT '报告人ID', + `report_time` date NOT NULL COMMENT '报告时间（年月日）', + `report_content` text COMMENT '报告内容', + `screenshot_url` varchar(512) DEFAULT '' COMMENT '模块截图上传后的URL', + `creator` varchar(64) DEFAULT '' NULL COMMENT '创建者', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP NOT NULL COMMENT '创建时间', + `updater` varchar(64) DEFAULT '' NULL COMMENT '更新者', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) DEFAULT b'0' NOT NULL COMMENT '是否删除', + `tenant_id` bigint DEFAULT 0 NOT NULL COMMENT '租户编号', + PRIMARY KEY (`id`), + KEY `idx_module_name` (`module_name`), + KEY `idx_module_code` (`module_code`), + KEY `idx_reporter_id` (`reporter_id`), + KEY `idx_report_time` (`report_time`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='AI 决策助手报告单据表'; diff --git a/sql/mysql/ydoyun_ai_assistant_report_add_module_code.sql b/sql/mysql/ydoyun_ai_assistant_report_add_module_code.sql new file mode 100644 index 0000000..f493d67 --- /dev/null +++ b/sql/mysql/ydoyun_ai_assistant_report_add_module_code.sql @@ -0,0 +1,3 @@ +-- 为已存在的 ydoyun_ai_assistant_report 表添加 module_code 字段（若表已创建可单独执行） +ALTER TABLE `ydoyun_ai_assistant_report` + ADD COLUMN `module_code` varchar(128) DEFAULT '' COMMENT '模块编码，如 SupplierPerformance:main' AFTER `module_name`; diff --git a/yudao-module-report/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportDragConfiguration.java b/yudao-module-report/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportDragConfiguration.java new file mode 100644 index 0000000..d2c3dfe --- /dev/null +++ b/yudao-module-report/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportDragConfiguration.java @@ -0,0 +1,24 @@ +package cn.iocoder.yudao.module.report.framework.jmreport.config; + +import cn.iocoder.yudao.module.report.framework.jmreport.core.service.JmOnlDragExternalServiceImpl; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +/** + * 积木 BI 仪表盘扩展配置（依赖 jimubi 的 IOnlDragExternalService） + * 仅当 IOnlDragExternalService 存在于 classpath 时生效，避免 jimubi 版本不兼容导致启动失败 + * + * @author 芋道源码 + */ +@Configuration(proxyBeanMethods = false) +@ConditionalOnClass(name = "org.jeecg.modules.drag.service.IOnlDragExternalService") +public class JmReportDragConfiguration { + + @Bean + @Primary + public JmOnlDragExternalServiceImpl jmOnlDragExternalService2() { + return new JmOnlDragExternalServiceImpl(); + } +} diff --git a/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/AiAssistantReportController.java b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/AiAssistantReportController.java new file mode 100644 index 0000000..445da5e --- /dev/null +++ b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/AiAssistantReportController.java @@ -0,0 +1,81 @@ +package cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportPageReqVO; +import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportRespVO; +import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportSaveReqVO; +import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.ReportCountByDateVO; +import cn.iocoder.yudao.module.ydoyun.service.aiassistantreport.AiAssistantReportService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.time.LocalDate; +import java.util.List; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - AI 决策助手报告单据") +@RestController +@RequestMapping("/ydoyun/ai-assistant-report") +@RequiredArgsConstructor +@Validated +public class AiAssistantReportController { + + private final AiAssistantReportService aiAssistantReportService; + + @PostMapping("/save") + @Operation(summary = "保存报告单据") + public CommonResult saveReport(@Valid @RequestBody AiAssistantReportSaveReqVO saveReqVO) { + return success(aiAssistantReportService.saveReport(saveReqVO)); + } + + @GetMapping("/my-list") + @Operation(summary = "查询当前人当前模块的历史报告") + public CommonResult> getMyReportList( + @Parameter(description = "报告人ID", required = true) @RequestParam("reporterId") Long reporterId, + @Parameter(description = "模块编码（可选，为空查所有）") @RequestParam(value = "moduleCode", required = false) String moduleCode) { + return success(aiAssistantReportService.getMyReportList(reporterId, moduleCode)); + } + + @GetMapping("/my-report-dates") + @Operation(summary = "查询有报告的日期列表（用于日历点状图，不提供补写）") + public CommonResult> getMyReportDates( + @Parameter(description = "报告人ID", required = true) @RequestParam("reporterId") Long reporterId, + @Parameter(description = "模块编码（可选）") @RequestParam(value = "moduleCode", required = false) String moduleCode, + @Parameter(description = "开始日期", required = true) @RequestParam("startDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate, + @Parameter(description = "结束日期", required = true) @RequestParam("endDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate) { + return success(aiAssistantReportService.getMyReportDates(reporterId, moduleCode, startDate, endDate)); + } + + @GetMapping("/list-by-date") + @Operation(summary = "按日期查询报告列表（日历点击查看详情）") + public CommonResult> getListByDate( + @Parameter(description = "报告人ID", required = true) @RequestParam("reporterId") Long reporterId, + @Parameter(description = "模块编码（可选）") @RequestParam(value = "moduleCode", required = false) String moduleCode, + @Parameter(description = "报告日期", required = true) @RequestParam("reportDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate reportDate) { + return success(aiAssistantReportService.getListByDate(reporterId, moduleCode, reportDate)); + } + + @GetMapping("/my-page") + @Operation(summary = "分页查询当前人历史报告（按最新记录排序）") + public CommonResult> getMyReportPage(@Valid AiAssistantReportPageReqVO reqVO) { + return success(aiAssistantReportService.getMyReportPage(reqVO)); + } + + @GetMapping("/report-count-by-date") + @Operation(summary = "按日期聚合报告提交数量（用于轨迹图）") + public CommonResult> getReportCountByDate( + @Parameter(description = "报告人ID", required = true) @RequestParam("reporterId") Long reporterId, + @Parameter(description = "模块编码（可选）") @RequestParam(value = "moduleCode", required = false) String moduleCode, + @Parameter(description = "开始日期", required = true) @RequestParam("startDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate, + @Parameter(description = "结束日期", required = true) @RequestParam("endDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate) { + return success(aiAssistantReportService.getReportCountByDate(reporterId, moduleCode, startDate, endDate)); + } +} diff --git a/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/vo/AiAssistantReportPageReqVO.java b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/vo/AiAssistantReportPageReqVO.java new file mode 100644 index 0000000..688334d --- /dev/null +++ b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/vo/AiAssistantReportPageReqVO.java @@ -0,0 +1,29 @@ +package cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo; + +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; + +@Schema(description = "管理后台 - AI 决策助手报告分页 Request VO") +@Data +public class AiAssistantReportPageReqVO extends PageParam { + + @Schema(description = "报告人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long reporterId; + + @Schema(description = "模块编码") + private String moduleCode; + + @Schema(description = "报告时间-开始") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDate reportTimeStart; + + @Schema(description = "报告时间-结束") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDate reportTimeEnd; +} diff --git a/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/vo/AiAssistantReportRespVO.java b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/vo/AiAssistantReportRespVO.java new file mode 100644 index 0000000..b0a268d --- /dev/null +++ b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/vo/AiAssistantReportRespVO.java @@ -0,0 +1,37 @@ +package cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDate; +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 决策助手报告单据 Response VO") +@Data +public class AiAssistantReportRespVO { + + @Schema(description = "主键ID") + private Long id; + @Schema(description = "模块名称") + private String moduleName; + @Schema(description = "模块编码") + private String moduleCode; + @Schema(description = "报告人") + private String reporter; + @Schema(description = "报告人ID") + private Long reporterId; + @Schema(description = "报告时间（年月日）") + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDate reportTime; + @Schema(description = "报告内容") + private String reportContent; + @Schema(description = "模块截图URL") + private String screenshotUrl; + @Schema(description = "创建时间") + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime createTime; +} diff --git a/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/vo/AiAssistantReportSaveReqVO.java b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/vo/AiAssistantReportSaveReqVO.java new file mode 100644 index 0000000..1995655 --- /dev/null +++ b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/vo/AiAssistantReportSaveReqVO.java @@ -0,0 +1,42 @@ +package cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.time.LocalDate; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; + +@Schema(description = "管理后台 - AI 决策助手报告单据 保存 Request VO") +@Data +public class AiAssistantReportSaveReqVO { + + @Schema(description = "模块名称（当前组件名称）", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "模块名称不能为空") + private String moduleName; + + @Schema(description = "模块编码，如 SupplierPerformance:main") + private String moduleCode; + + @Schema(description = "报告人", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "报告人不能为空") + private String reporter; + + @Schema(description = "报告人ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "报告人ID不能为空") + private Long reporterId; + + @Schema(description = "报告时间（年月日）", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "报告时间不能为空") + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDate reportTime; + + @Schema(description = "报告内容") + private String reportContent; + + @Schema(description = "模块截图URL") + private String screenshotUrl; +} diff --git a/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/vo/ReportCountByDateVO.java b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/vo/ReportCountByDateVO.java new file mode 100644 index 0000000..f978742 --- /dev/null +++ b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/controller/admin/aiassistantreport/vo/ReportCountByDateVO.java @@ -0,0 +1,17 @@ +package cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDate; + +@Schema(description = "按日期聚合报告数量（用于轨迹图）") +@Data +public class ReportCountByDateVO { + + @Schema(description = "报告日期") + private LocalDate reportTime; + + @Schema(description = "该日提交数量") + private Long count; +} diff --git a/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/dal/dataobject/aiassistantreport/AiAssistantReportDO.java b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/dal/dataobject/aiassistantreport/AiAssistantReportDO.java new file mode 100644 index 0000000..67c5bc3 --- /dev/null +++ b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/dal/dataobject/aiassistantreport/AiAssistantReportDO.java @@ -0,0 +1,42 @@ +package cn.iocoder.yudao.module.ydoyun.dal.dataobject.aiassistantreport; + +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import lombok.*; + +import java.time.LocalDate; + +/** + * AI 决策助手报告单据 DO + * + * @author 衣朵云 + */ +@TableName("ydoyun_ai_assistant_report") +@KeySequence("ydoyun_ai_assistant_report_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AiAssistantReportDO extends TenantBaseDO { + + @TableId + private Long id; + /** 模块名称（当前组件名称） */ + private String moduleName; + /** 模块编码，如 SupplierPerformance:main */ + private String moduleCode; + /** 报告人 */ + private String reporter; + /** 报告人ID */ + private Long reporterId; + /** 报告时间（年月日） */ + private LocalDate reportTime; + /** 报告内容 */ + private String reportContent; + /** 模块截图URL */ + private String screenshotUrl; +} diff --git a/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/dal/mysql/aiassistantreport/AiAssistantReportMapper.java b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/dal/mysql/aiassistantreport/AiAssistantReportMapper.java new file mode 100644 index 0000000..f758301 --- /dev/null +++ b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/dal/mysql/aiassistantreport/AiAssistantReportMapper.java @@ -0,0 +1,82 @@ +package cn.iocoder.yudao.module.ydoyun.dal.mysql.aiassistantreport; + +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.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportPageReqVO; +import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.ReportCountByDateVO; +import cn.iocoder.yudao.module.ydoyun.dal.dataobject.aiassistantreport.AiAssistantReportDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.time.LocalDate; +import java.util.List; + +/** + * AI 决策助手报告单据 Mapper + * + * @author 衣朵云 + */ +@Mapper +public interface AiAssistantReportMapper extends BaseMapperX { + + default List selectListByReporterAndModule(Long reporterId, String moduleCode) { + return selectList(new LambdaQueryWrapperX() + .eq(AiAssistantReportDO::getReporterId, reporterId) + .eqIfPresent(AiAssistantReportDO::getModuleCode, moduleCode) + .orderByDesc(AiAssistantReportDO::getReportTime) + .orderByDesc(AiAssistantReportDO::getCreateTime) + .last("LIMIT 50")); + } + + default List selectListByDate(Long reporterId, String moduleCode, LocalDate reportDate) { + return selectList(new LambdaQueryWrapperX() + .eq(AiAssistantReportDO::getReporterId, reporterId) + .eqIfPresent(AiAssistantReportDO::getModuleCode, moduleCode) + .eq(AiAssistantReportDO::getReportTime, reportDate) + .orderByDesc(AiAssistantReportDO::getCreateTime)); + } + + /** + * 查询指定范围内有报告的去重日期列表（用于日历展示） + */ + @Select("") + List selectDistinctReportDates( + @Param("reporterId") Long reporterId, + @Param("moduleCode") String moduleCode, + @Param("startDate") LocalDate startDate, + @Param("endDate") LocalDate endDate); + + default PageResult selectPage(AiAssistantReportPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eq(AiAssistantReportDO::getReporterId, reqVO.getReporterId()) + .eqIfPresent(AiAssistantReportDO::getModuleCode, reqVO.getModuleCode()) + .geIfPresent(AiAssistantReportDO::getReportTime, reqVO.getReportTimeStart()) + .leIfPresent(AiAssistantReportDO::getReportTime, reqVO.getReportTimeEnd()) + .orderByDesc(AiAssistantReportDO::getReportTime) + .orderByDesc(AiAssistantReportDO::getCreateTime)); + } + + /** + * 按日期聚合报告提交数量（用于轨迹图） + */ + @Select("") + List selectReportCountByDate( + @Param("reporterId") Long reporterId, + @Param("moduleCode") String moduleCode, + @Param("startDate") LocalDate startDate, + @Param("endDate") LocalDate endDate); +} diff --git a/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/service/aiassistantreport/AiAssistantReportService.java b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/service/aiassistantreport/AiAssistantReportService.java new file mode 100644 index 0000000..c100546 --- /dev/null +++ b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/service/aiassistantreport/AiAssistantReportService.java @@ -0,0 +1,76 @@ +package cn.iocoder.yudao.module.ydoyun.service.aiassistantreport; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportPageReqVO; +import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportRespVO; +import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportSaveReqVO; +import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.ReportCountByDateVO; + +import javax.validation.Valid; +import java.time.LocalDate; +import java.util.List; + +/** + * AI 决策助手报告单据 Service + * + * @author 衣朵云 + */ +public interface AiAssistantReportService { + + /** + * 保存报告单据 + * + * @param saveReqVO 保存参数 + * @return 主键ID + */ + Long saveReport(@Valid AiAssistantReportSaveReqVO saveReqVO); + + /** + * 查询当前人当前模块的历史报告列表 + * + * @param reporterId 报告人ID + * @param moduleCode 模块编码（可选，为空时查询该用户所有模块） + * @return 报告列表，按报告时间倒序，最多50条 + */ + List getMyReportList(Long reporterId, String moduleCode); + + /** + * 查询指定日期范围内有报告的日期列表（去重，用于日历点状图） + * + * @param reporterId 报告人ID + * @param moduleCode 模块编码（可选） + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 有报告的日期列表 + */ + List getMyReportDates(Long reporterId, String moduleCode, LocalDate startDate, LocalDate endDate); + + /** + * 按日期查询报告列表（用于日历点击查看详情） + * + * @param reporterId 报告人ID + * @param moduleCode 模块编码（可选） + * @param reportDate 报告日期 + * @return 该日期的报告列表 + */ + List getListByDate(Long reporterId, String moduleCode, LocalDate reportDate); + + /** + * 分页查询当前人历史报告（按最新记录排序） + * + * @param reqVO 分页及查询条件 + * @return 分页结果 + */ + PageResult getMyReportPage(AiAssistantReportPageReqVO reqVO); + + /** + * 按日期聚合报告提交数量（用于轨迹图，与分页列表解耦） + * + * @param reporterId 报告人ID + * @param moduleCode 模块编码（可选） + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return 每日提交数量列表 + */ + List getReportCountByDate(Long reporterId, String moduleCode, LocalDate startDate, LocalDate endDate); +} diff --git a/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/service/aiassistantreport/AiAssistantReportServiceImpl.java b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/service/aiassistantreport/AiAssistantReportServiceImpl.java new file mode 100644 index 0000000..d19e076 --- /dev/null +++ b/yudao-module-ydoyun/src/main/java/cn/iocoder/yudao/module/ydoyun/service/aiassistantreport/AiAssistantReportServiceImpl.java @@ -0,0 +1,64 @@ +package cn.iocoder.yudao.module.ydoyun.service.aiassistantreport; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportPageReqVO; +import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportRespVO; +import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.AiAssistantReportSaveReqVO; +import cn.iocoder.yudao.module.ydoyun.controller.admin.aiassistantreport.vo.ReportCountByDateVO; +import cn.iocoder.yudao.module.ydoyun.dal.dataobject.aiassistantreport.AiAssistantReportDO; +import cn.iocoder.yudao.module.ydoyun.dal.mysql.aiassistantreport.AiAssistantReportMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.time.LocalDate; +import java.util.List; + +/** + * AI 决策助手报告单据 Service 实现类 + * + * @author 衣朵云 + */ +@Service +@Validated +public class AiAssistantReportServiceImpl implements AiAssistantReportService { + + @Resource + private AiAssistantReportMapper aiAssistantReportMapper; + + @Override + public Long saveReport(AiAssistantReportSaveReqVO saveReqVO) { + AiAssistantReportDO entity = BeanUtils.toBean(saveReqVO, AiAssistantReportDO.class); + aiAssistantReportMapper.insert(entity); + return entity.getId(); + } + + @Override + public List getMyReportList(Long reporterId, String moduleCode) { + List list = aiAssistantReportMapper.selectListByReporterAndModule(reporterId, moduleCode); + return BeanUtils.toBean(list, AiAssistantReportRespVO.class); + } + + @Override + public List getMyReportDates(Long reporterId, String moduleCode, LocalDate startDate, LocalDate endDate) { + return aiAssistantReportMapper.selectDistinctReportDates(reporterId, moduleCode, startDate, endDate); + } + + @Override + public List getListByDate(Long reporterId, String moduleCode, LocalDate reportDate) { + List list = aiAssistantReportMapper.selectListByDate(reporterId, moduleCode, reportDate); + return BeanUtils.toBean(list, AiAssistantReportRespVO.class); + } + + @Override + public PageResult getMyReportPage(AiAssistantReportPageReqVO reqVO) { + PageResult page = aiAssistantReportMapper.selectPage(reqVO); + return BeanUtils.toBean(page, AiAssistantReportRespVO.class); + } + + @Override + public List getReportCountByDate(Long reporterId, String moduleCode, LocalDate startDate, LocalDate endDate) { + return aiAssistantReportMapper.selectReportCountByDate(reporterId, moduleCode, startDate, endDate); + } +}