From b6ffab054a06ad7f0f401e29dd3b3b0625160f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Tue, 19 Nov 2024 10:29:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=9C=8B=E6=9D=BFpdf=E7=9B=B8=E5=85=B3?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 14 ++++++++
.../controller/kban/KbanController.java | 33 +++++++++++++++++++
.../com/dsic/gj_erp/mapper/KbanMapper.java | 2 ++
.../com/dsic/gj_erp/service/KbanService.java | 4 +++
src/main/resources/application.properties | 2 +-
.../resources/mappers/kban/KbanMapper.xml | 3 ++
6 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5daf058..43f4223 100644
--- a/pom.xml
+++ b/pom.xml
@@ -291,6 +291,20 @@
spring-boot-maven-plugin
2.3.4.RELEASE
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+
+ com.dsic.gj_erp.GjErpApplication
+
+
+ ./
+
+
+
+
com.mysema.maven
apt-maven-plugin
diff --git a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
index 9126471..d202b53 100644
--- a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
@@ -1,5 +1,7 @@
package com.dsic.gj_erp.controller.kban;
+import java.io.File;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -8,6 +10,12 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
+import cn.hutool.core.util.StrUtil;
+import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
+import com.dsic.gj_erp.service.jcsj.DmBomService;
+import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -51,6 +59,31 @@ public class KbanController {
private final SyMsgService msgService;
private final DmSygdMxService service;
+
+ /**
+ * 船只批量获取接口
+ */
+ @GetMapping("/getProject")
+ public ResultBean> getProject() {
+ return new ResultBean<>(kbanService.getProjects());
+ }
+
+ /**
+ * 根据船号和批量获取pdf列表
+ */
+ @GetMapping("/pdfList")
+ public ResultBean> pdfList(String dcCh,String dcPl) {
+ String absolutePath = FileUtil.getWebRoot().getAbsolutePath();
+ List ls;
+ try {
+ ls = FileUtil.loopFiles(StrUtil.format("{}/../static/upload/{}/{}/PDF",absolutePath, dcCh, dcPl));
+ }catch (Exception e){
+ ls = FileUtil.loopFiles(StrUtil.format("{}/static/upload/{}/{}/PDF",absolutePath, dcCh, dcPl));
+ }
+
+ return new ResultBean<>(ls.stream().map(FileUtil::getPrefix));
+ }
+
/**
* 30天作业区完成情况折线图
*/
diff --git a/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java b/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java
index 8a22480..96e251a 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java
@@ -10,6 +10,8 @@ import com.dsic.gj_erp.bean.jhgk.DmYdjh;
@Mapper
public interface KbanMapper {
+ List