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> getProjects(); + //线表重量 List getEveryMonXbzlByNf(String nf); diff --git a/src/main/java/com/dsic/gj_erp/service/KbanService.java b/src/main/java/com/dsic/gj_erp/service/KbanService.java index 7af1c39..7693e52 100644 --- a/src/main/java/com/dsic/gj_erp/service/KbanService.java +++ b/src/main/java/com/dsic/gj_erp/service/KbanService.java @@ -21,6 +21,10 @@ public class KbanService { private final KbanMapper kbanMapper; + public List> getProjects() { + return kbanMapper.getProjects(); + } + public Map todayZyjhzx() { DateTime date = DateUtil.date(); String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd"); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8ad0969..25cc696 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -43,7 +43,7 @@ mybatis-plus.configuration.batch-size=5000 zxtbm=PS - +spring.resources.static-locations=file:./static diff --git a/src/main/resources/mappers/kban/KbanMapper.xml b/src/main/resources/mappers/kban/KbanMapper.xml index b1314f9..3f354b5 100644 --- a/src/main/resources/mappers/kban/KbanMapper.xml +++ b/src/main/resources/mappers/kban/KbanMapper.xml @@ -192,4 +192,7 @@ WHERE jssj BETWEEN #{from} and #{to} +