diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/MoneyBigScreenController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/MoneyBigScreenController.java new file mode 100644 index 00000000..d2c6e86e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/MoneyBigScreenController.java @@ -0,0 +1,15 @@ +package org.dromara.bigscreen.controller; + +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author lilemy + * @date 2025-08-21 14:28 + */ +@Validated +@RestController +@RequestMapping("/money/big/screen") +public class MoneyBigScreenController { +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java new file mode 100644 index 00000000..a712a43d --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java @@ -0,0 +1,15 @@ +package org.dromara.bigscreen.controller; + +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author lilemy + * @date 2025-08-21 14:27 + */ +@Validated +@RestController +@RequestMapping("/project/big/screen") +public class ProjectBigScreenController { +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/MoneyBigScreenService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/MoneyBigScreenService.java new file mode 100644 index 00000000..c2b472c0 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/MoneyBigScreenService.java @@ -0,0 +1,8 @@ +package org.dromara.bigscreen.service; + +/** + * @author lilemy + * @date 2025-08-21 14:29 + */ +public interface MoneyBigScreenService { +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/ProjectBigScreenService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/ProjectBigScreenService.java new file mode 100644 index 00000000..686f8b7e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/ProjectBigScreenService.java @@ -0,0 +1,8 @@ +package org.dromara.bigscreen.service; + +/** + * @author lilemy + * @date 2025-08-21 14:28 + */ +public interface ProjectBigScreenService { +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/MoneyBigScreenServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/MoneyBigScreenServiceImpl.java new file mode 100644 index 00000000..a9aed898 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/MoneyBigScreenServiceImpl.java @@ -0,0 +1,12 @@ +package org.dromara.bigscreen.service.impl; + +import org.dromara.bigscreen.service.MoneyBigScreenService; +import org.springframework.stereotype.Service; + +/** + * @author lilemy + * @date 2025-08-21 14:29 + */ +@Service +public class MoneyBigScreenServiceImpl implements MoneyBigScreenService { +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java new file mode 100644 index 00000000..d21b79ee --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java @@ -0,0 +1,12 @@ +package org.dromara.bigscreen.service.impl; + +import org.dromara.bigscreen.service.ProjectBigScreenService; +import org.springframework.stereotype.Service; + +/** + * @author lilemy + * @date 2025-08-21 14:29 + */ +@Service +public class ProjectBigScreenServiceImpl implements ProjectBigScreenService { +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusPurchaseDoc.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusPurchaseDoc.java index 17a61181..4db63744 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusPurchaseDoc.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/BusPurchaseDoc.java @@ -1,9 +1,10 @@ package org.dromara.cailiaoshebei.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; import java.time.LocalDate; @@ -131,5 +132,10 @@ public class BusPurchaseDoc extends BaseEntity { /** * 计划基础ID */ - private Long mrpBaseId; + private Long mrpBaseId; + + /** + * PDF 文件id + */ + private Long pdfFileId; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusPurchaseDocVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusPurchaseDocVo.java index bf8b27eb..9f4ec375 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusPurchaseDocVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/domain/vo/BusPurchaseDocVo.java @@ -1,18 +1,14 @@ package org.dromara.cailiaoshebei.domain.vo; -import org.dromara.cailiaoshebei.domain.BusPurchaseDoc; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.cailiaoshebei.domain.bo.BusPlanDocAssociationBo; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.cailiaoshebei.domain.BusPurchaseDoc; import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; -import java.util.Date; import java.util.List; @@ -152,7 +148,7 @@ public class BusPurchaseDocVo implements Serializable { /** * 计划基础ID */ - private Long mrpBaseId; + private Long mrpBaseId; /** * 计划编号 @@ -164,6 +160,11 @@ public class BusPurchaseDocVo implements Serializable { */ private String docType; + /** + * PDF 文件id + */ + private Long pdfFileId; + /** * 关联计划 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusPurchaseDocServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusPurchaseDocServiceImpl.java index 10007ad9..86607ae3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusPurchaseDocServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusPurchaseDocServiceImpl.java @@ -13,7 +13,9 @@ import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.docx4j.Docx4J; import org.docx4j.openpackaging.exceptions.Docx4JException; +import org.docx4j.openpackaging.packages.WordprocessingMLPackage; import org.dromara.cailiaoshebei.controller.constant; import org.dromara.cailiaoshebei.domain.BusMaterialbatchdemandplan; import org.dromara.cailiaoshebei.domain.BusPlanDocAssociation; @@ -43,6 +45,8 @@ import org.dromara.common.oss.exception.OssException; import org.dromara.common.utils.documentOperations.WordToPdfToImg; import org.dromara.project.domain.BusProject; import org.dromara.project.service.IBusProjectService; +import org.dromara.system.domain.vo.SysOssVo; +import org.dromara.system.service.ISysOssService; import org.springframework.beans.BeanUtils; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; @@ -51,6 +55,8 @@ import org.springframework.transaction.annotation.Transactional; import java.io.*; import java.math.BigDecimal; +import java.net.FileNameMap; +import java.net.URLConnection; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -82,6 +88,8 @@ public class BusPurchaseDocServiceImpl extends ServiceImpl