From 444feeeb659443a7c26c979e27dc9d2dadab03c0 Mon Sep 17 00:00:00 2001
From: du <13220750630.163.com>
Date: 星期五, 30 五月 2025 14:21:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplatePageReqVO.java | 3 +
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/template/TemplateServiceImpl.java | 18 ++++++++-
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/util/PPTUtil.java | 2
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplateRespVO.java | 4 +
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/dataobject/template/TemplateDO.java | 3 +
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/TemplateController.java | 2
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplateSaveReqVO.java | 7 ++-
yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/template/TemplateMapper.java | 36 ++++++++++++++++--
8 files changed, 61 insertions(+), 14 deletions(-)
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/TemplateController.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/TemplateController.java
index 866e673..906e1cb 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/TemplateController.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/TemplateController.java
@@ -92,4 +92,4 @@
BeanUtils.toBean(list, TemplateRespVO.class));
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplatePageReqVO.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplatePageReqVO.java
index d7c5ca6..fa92304 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplatePageReqVO.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplatePageReqVO.java
@@ -64,4 +64,5 @@
@Schema(description = "妯℃澘鍚嶇О")
private String templateName;;
-}
\ No newline at end of file
+ private Integer zg;
+}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplateRespVO.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplateRespVO.java
index b78925b..ac01ce1 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplateRespVO.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplateRespVO.java
@@ -76,4 +76,6 @@
@Schema(description = "妯℃澘灏哄")
private String templateSize;
-}
\ No newline at end of file
+ private Integer zg;
+ private String creator;
+}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplateSaveReqVO.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplateSaveReqVO.java
index da74ba7..138b199 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplateSaveReqVO.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/controller/admin/template/vo/TemplateSaveReqVO.java
@@ -57,8 +57,8 @@
@NotNull(message = "鏁板瓧浜鸿窛绂诲乏渚т綅缃笉鑳戒负绌�")
private BigDecimal humanY;
- @Schema(description = "鑳屾櫙鍥剧墖", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "鑳屾櫙鍥剧墖涓嶈兘涓虹┖")
+ //@Schema(description = "鑳屾櫙鍥剧墖", requiredMode = Schema.RequiredMode.REQUIRED)
+ //@NotEmpty(message = "鑳屾櫙鍥剧墖涓嶈兘涓虹┖")
private String bgImage;
@Schema(description = "鏁堟灉鍥�")
@@ -70,4 +70,5 @@
@Schema(description = "妯℃澘灏哄")
private String templateSize;
-}
\ No newline at end of file
+ private Integer zg;
+}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/dataobject/template/TemplateDO.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/dataobject/template/TemplateDO.java
index 1265c8c..93ea6c6 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/dataobject/template/TemplateDO.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/dataobject/template/TemplateDO.java
@@ -86,4 +86,5 @@
// 妯℃澘灏哄
private String templateSize;
-}
\ No newline at end of file
+ private Integer zg;
+}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/template/TemplateMapper.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/template/TemplateMapper.java
index 15fcfa6..a658b82 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/template/TemplateMapper.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/dal/mysql/template/TemplateMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
import cn.iocoder.yudao.module.digitalcourse.dal.dataobject.template.TemplateDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.digitalcourse.controller.admin.template.vo.*;
@@ -18,7 +19,8 @@
public interface TemplateMapper extends BaseMapperX<TemplateDO> {
default PageResult<TemplateDO> selectPage(TemplatePageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<TemplateDO>()
+ Long loginUserId = WebFrameworkUtils.getLoginUserId();
+ LambdaQueryWrapperX<TemplateDO> wrapper = new LambdaQueryWrapperX<TemplateDO>()
.eqIfPresent(TemplateDO::getShowBackground, reqVO.getShowBackground())
.eqIfPresent(TemplateDO::getShowDigitalHuman, reqVO.getShowDigitalHuman())
.eqIfPresent(TemplateDO::getShowPpt, reqVO.getShowPpt())
@@ -31,8 +33,34 @@
.eqIfPresent(TemplateDO::getHumanX, reqVO.getHumanX())
.eqIfPresent(TemplateDO::getHumanY, reqVO.getHumanY())
.eqIfPresent(TemplateDO::getBgImage, reqVO.getBgImage())
- .betweenIfPresent(TemplateDO::getCreateTime, reqVO.getCreateTime())
- .orderByAsc(TemplateDO::getId));
+ .betweenIfPresent(TemplateDO::getCreateTime, reqVO.getCreateTime());
+ Integer zgParam = reqVO.getZg();
+ if (loginUserId != 1) {
+ if (zgParam != null) {
+ if (zgParam == 1) {
+ wrapper.eq(TemplateDO::getZg, 1);
+ } else if (zgParam == 2) {
+ wrapper.eq(TemplateDO::getZg, 2).eq(TemplateDO::getCreator, loginUserId);
+ }
+ } else {
+ // zg 鏈紶锛屾煡 zg = 1 鎴� (zg = 2 涓� creator = 鑷繁)
+ wrapper.and(w -> w.eq(TemplateDO::getZg, 1)
+ .or()
+ .eq(TemplateDO::getZg, 2).eq(TemplateDO::getCreator, loginUserId));
+ }
+ }else {
+ if (zgParam != null) {
+ if (zgParam == 1) {
+ wrapper.eq(TemplateDO::getZg, 1);
+ } else if (zgParam == 2) {
+ wrapper.eq(TemplateDO::getZg, 2);
+ }
+ }
+ }
+
+
+ wrapper.orderByAsc(TemplateDO::getId);
+ return selectPage(reqVO, wrapper);
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/template/TemplateServiceImpl.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/template/TemplateServiceImpl.java
index 5f714d9..82eee2c 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/template/TemplateServiceImpl.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/service/template/TemplateServiceImpl.java
@@ -1,5 +1,8 @@
package cn.iocoder.yudao.module.digitalcourse.service.template;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -31,6 +34,10 @@
@Override
public Long createTemplate(TemplateSaveReqVO createReqVO) {
+ Integer zg = createReqVO.getZg();
+ if (zg != null && zg != 1) {
+ createReqVO.setZg(2);
+ }
// 鎻掑叆
TemplateDO template = BeanUtils.toBean(createReqVO, TemplateDO.class);
templateMapper.insert(template);
@@ -66,9 +73,16 @@
return templateMapper.selectById(id);
}
+ @Autowired
+ private AdminUserApi adminUserApi;
@Override
public PageResult<TemplateDO> getTemplatePage(TemplatePageReqVO pageReqVO) {
- return templateMapper.selectPage(pageReqVO);
+ PageResult<TemplateDO> templateDOPageResult = templateMapper.selectPage(pageReqVO);
+ for (TemplateDO templateDO : templateDOPageResult.getList()) {
+ AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(templateDO.getCreator()));
+ templateDO.setCreator(user.getNickname());
+ }
+ return templateDOPageResult;
}
-}
\ No newline at end of file
+}
diff --git a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/util/PPTUtil.java b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/util/PPTUtil.java
index f917600..c772981 100644
--- a/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/util/PPTUtil.java
+++ b/yudao-module-digitalcourse/yudao-module-digitalcourse-biz/src/main/java/cn/iocoder/yudao/module/digitalcourse/util/PPTUtil.java
@@ -193,7 +193,7 @@
File pdfFile = File.createTempFile("ppt_to_pdf_"+tempFileName, ".pdf");
String command;
if (isWindows()) {
- command = String.format("\"E:\\LibreOffice\\LibreOffice\\program\\soffice.exe\" --headless --convert-to pdf --outdir %s %s", pdfFile.getParent(), pptFile.getAbsolutePath());
+ command = String.format("\"C:\\Program Files\\LibreOffice\\program\\soffice.com\" --headless --convert-to pdf --outdir %s %s", pdfFile.getParent(), pptFile.getAbsolutePath());
} else {
command = String.format("libreoffice --headless --convert-to pdf --outdir %s %s", pdfFile.getParent(), pptFile.getAbsolutePath());
}
--
Gitblit v1.9.3