From 25288a313662a26423fde78d89471a4d8494ccff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Sun, 8 Jun 2025 08:40:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dformdata=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=97=B6=E5=8A=A0=E8=BD=BD=E6=95=B0=E6=8D=AE=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98--=E8=AF=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=9C=89=E5=BE=85=E5=85=B7=E4=BD=93=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/kban/KanBanController.java | 56 +++++++++++++++++++ .../controller/kban/KbanController.java | 34 +---------- 2 files changed, 59 insertions(+), 31 deletions(-) create mode 100644 src/main/java/com/dsic/gj_erp/controller/kban/KanBanController.java diff --git a/src/main/java/com/dsic/gj_erp/controller/kban/KanBanController.java b/src/main/java/com/dsic/gj_erp/controller/kban/KanBanController.java new file mode 100644 index 0000000..5882f3e --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/kban/KanBanController.java @@ -0,0 +1,56 @@ +package com.dsic.gj_erp.controller.kban; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.service.KbanService; +import com.dsic.gj_erp.service.jhgk.DmXbjhService; +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.HashMap; +import java.util.concurrent.atomic.AtomicInteger; + +@Controller +@RequestMapping("kban") +@RequiredArgsConstructor +public class KanBanController { + + private final KbanService kbanService; + private final DmXbjhService xbjhService; + private final RedisTemplate redisTemplate; + + private String key="YdjhKban::"; + /** + * 年度切割完成重量 + */ + @RequestMapping("/ndwcl") + public Object getndWcl() { + String lastUpdateDate= (String) redisTemplate.opsForValue().get(key+"mbdcUpateTime"); + DateTime date = DateUtil.date(); + String today=date.toString("yyyyMMdd"); + if (today.equals(lastUpdateDate)){ + return "redirect:/YdjhKban/getMbdc"; + } + String from = DateUtil.beginOfYear(date).toString("yyyy/MM/dd"); + String to = DateUtil.offsetDay(date,1).toString("yyyy/MM/dd"); + AtomicInteger maxVersion = xbjhService.getMaxVersion(); + String nf=DateUtil.thisYear()+""; + //本年度线表总重量 + BigDecimal xbzl = xbjhService.getZlByNfAndVersion(nf, maxVersion.toString()); + //作业计划完成重量 + BigDecimal wgzl = kbanService.getWgzlByTime(from, to); + BigDecimal jhwc = wgzl.divide(new BigDecimal("1000"), 4, RoundingMode.HALF_UP) + .divide(xbzl, 1, RoundingMode.HALF_UP) + .multiply(new BigDecimal("100")); + return new ResultBean<>(new HashMap(){{ + put("jhwc",jhwc); + put("ndgc",wgzl.divide(new BigDecimal("10000000"),2,RoundingMode.HALF_UP)); + }}); + } +} 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 f82fb88..faca600 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 @@ -21,11 +21,14 @@ import com.dsic.gj_erp.service.zyjh.ZyjhService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.io.File; import java.math.BigDecimal; import java.math.RoundingMode; +import java.net.URI; +import java.net.URISyntaxException; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -50,8 +53,6 @@ public class KbanController { private final KbanService kbanService; private final SyMsgService msgService; private final DmSygdMxService service; - private final DmXbjhService xbjhService; - private final RedisTemplate redisTemplate; @Value("${pdfUri}") private String pdfUri; @@ -388,35 +389,6 @@ public class KbanController { return new ResultBean<>(list); } - private String key="YdjhKban::"; - /** - * 年度切割完成重量 - */ - @GetMapping("/ndwcl") - public Object getndWcl(){ - String lastUpdateDate= (String) redisTemplate.opsForValue().get(key+"mbdcUpateTime"); - DateTime date = DateUtil.date(); - String today=date.toString("yyyyMMdd"); - if (today.equals(lastUpdateDate)){ - return "redirect:YdjhKban/getMbdc"; - } - String from = DateUtil.beginOfYear(date).toString("yyyy/MM/dd"); - String to = DateUtil.offsetDay(date,1).toString("yyyy/MM/dd"); - AtomicInteger maxVersion = xbjhService.getMaxVersion(); - String nf=DateUtil.thisYear()+""; - //本年度线表总重量 - BigDecimal xbzl = xbjhService.getZlByNfAndVersion(nf, maxVersion.toString()); - //作业计划完成重量 - BigDecimal wgzl = kbanService.getWgzlByTime(from, to); - BigDecimal jhwc = wgzl.divide(new BigDecimal("1000"), 4, RoundingMode.HALF_UP) - .divide(xbzl, 1, RoundingMode.HALF_UP) - .multiply(new BigDecimal("100")); - return new ResultBean<>(new HashMap(){{ - put("jhwc",jhwc); - put("ndgc",wgzl.divide(new BigDecimal("10000000"),2,RoundingMode.HALF_UP)); - }}); - } - /** * 消息 */