From 893f67f82ad421b15f4c6be3f98c33097ba08369 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 18 Mar 2025 08:46:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/DevInfoController.java | 6 ++-- .../service/impl/DevInfoServiceImpl.java | 28 ++++++++---------- .../resources/template/MaDevTemplate.xlsx | Bin 12310 -> 12314 bytes 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java index b537cd8..0982988 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java @@ -13,7 +13,9 @@ import com.bonus.material.device.domain.DevInfo; import com.bonus.material.device.domain.dto.DevInfoImpDto; import com.bonus.material.device.domain.dto.InfoMotionDto; import com.bonus.material.device.domain.vo.DevInfoVo; +import com.bonus.material.device.domain.vo.DevTemplateVo; import com.bonus.material.device.service.DevInfoService; +import com.bonus.system.api.domain.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -249,8 +251,8 @@ public class DevInfoController extends BaseController { */ @ApiOperation(value = "设备批量导入模版下载") @PostMapping("/downLoadDev") - public void downLoadDev(){ - HttpServletResponse resp = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getResponse(); + public void downLoadDev() { + HttpServletResponse resp = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse(); devInfoService.downLoadDev(resp); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index c6a9d16..e9f6323 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -979,23 +979,19 @@ public class DevInfoServiceImpl implements DevInfoService { Map> map = maDevList.stream().collect(Collectors.groupingBy(DevTemplateVo::getDeviceName)); for (Map.Entry> entry : map.entrySet()) { // 如果map的数量大于1，则进行遍历 - if (entry.getValue().size() > 1) { - DevTemplateVo devTemplateVo = entry.getValue().get(0); - DevTemplateVo dto = new DevTemplateVo(); - List devTemplateVos = entry.getValue(); - for (DevTemplateVo templateVo : devTemplateVos) { - dto.setIdentifyCode(StringUtils.isNotBlank(templateVo.getIdentifyCode()) ? templateVo.getIdentifyCode() : null); - dto.setCheckMan(StringUtils.isNotBlank(templateVo.getCheckMan()) ? templateVo.getCheckMan() : null); - dto.setCheckDate(StringUtils.isNotBlank(templateVo.getCheckDate()) ? templateVo.getCheckDate() : null); - dto.setNextCheckDate(StringUtils.isNotBlank(templateVo.getNextCheckDate()) ? templateVo.getNextCheckDate() : null); - dtoList.add(dto); - } - devTemplateVo.setDtoList(dtoList); - templateVos.add(devTemplateVo); - } else { - DevTemplateVo devTemplateVo = entry.getValue().get(0); - templateVos.add(devTemplateVo); + DevTemplateVo devTemplateVo = entry.getValue().get(0); + DevTemplateVo dto = new DevTemplateVo(); + List devTemplateVos = entry.getValue(); + for (DevTemplateVo templateVo : devTemplateVos) { + dto.setIdentifyCode(StringUtils.isNotBlank(templateVo.getIdentifyCode()) ? templateVo.getIdentifyCode() : null); + dto.setCheckMan(StringUtils.isNotBlank(templateVo.getCheckMan()) ? templateVo.getCheckMan() : null); + dto.setCheckDate(StringUtils.isNotBlank(templateVo.getCheckDate()) ? templateVo.getCheckDate() : null); + dto.setNextCheckDate(StringUtils.isNotBlank(templateVo.getNextCheckDate()) ? templateVo.getNextCheckDate() : null); + dtoList.add(dto); } + devTemplateVo.setDtoList(dtoList); + templateVos.add(devTemplateVo); + } } return AjaxResult.success(templateVos); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/template/MaDevTemplate.xlsx b/bonus-modules/bonus-material-mall/src/main/resources/template/MaDevTemplate.xlsx index ff3cd35da3d108ff6b8b289624c98e36acf14dae..13b12e6e9fa67a1ef1e7b32197199b6474e32d20 100644 GIT binary patch delta 1235 zcmV;^1T6cOV47gCr2z$OX(IYRld1tKe@)Wb&4soDm0dX)tTORNLUOhhn=~ZRZf|c_ zyE;+44F8ue|2fI#2UQ0jU|rSd9MOoN0JLairFS`cDi`4`3Y_O!^19KGqa!#pFRrgL zVVGzvtZZYz`U+gonY3fV?pF^(wruWrjRPgd4J`+*d`>0wD1E+ zoNoR@2R(0Bb)xJzf6{bcz|hkQ42|BGB#NErisk^n_eYRy|BMtp1|e>z-rhXsm}UHi%F2g>#b1#&_hYSM(~zySYF!F19iry$R!uN!MWz)|R( zo4x`s`j`{sB*v5NHh;!h9TBKEM9^EJ5C>y_Y8$9(iD1twL_tdg{h275MqbditJYy_ z4ZXD<+f{Qoqd5ii);z$$j00hZsUzn1YH8az!F3_9F60yy+zl_a@Y;c@1AjC+-9`|;Cdgd^Li{VD zi={vFeYgjShTj1mmOvyJNmxBCy}5gWgil(;rv?E|=@5P&u^J*qeZ+c*2>OW6Lqym| zY=($&A8|iKO!|n2AtLG{z6=r5KH}>T5%&>L#eLg+SSQ(nPKzd-|P-Ju9V? z(+u3~;Yl0^-cZ>7;5vw=jJ)wh@k(1nkf}Sapwime0UkUGG4?PdL&mwX6DUJ^&n;EQ z%Be_2#g@H7g@F>m1%s!}yl4wlaiIiZO4qH1Y-3n-ZS0=l<$tr`2mB)f7%G!6DixFT zD=GnblOHTI0iBamERzLnX(IYRlj|&00R@vlEkFTZlYuQT0mYNDEj9t{lj$u-0f>_^ zE&V{xEm0dX)Y%=jiLUOhhn=~ZRZf|c| zyE;+44F8ue|2fI#M^!~1U|m`39MKU$5ol4%Qtxy0v{}TrC~}@_$*WpJj!xjvytux~ zgkhq#u(GuQ>q~G^Flonx$1Qqupb}#T(xPP6)Zde+oR8 z+;iLtV>1|0uasg?ns-}u0x2+5pg?4@TQ)`L~<&kJ30L8{W9Oqi*!d+CP@&>5MfG{e7% zOp2}}6Bf7!8HHEbSI2X*9p67}D;B6oNHU4ZI8Nw>%vd^QguG<)$j2UXXqoVomHQa|{!=mQmNggOw4ltB5 zMhB&;x$Da0Kno%mtOO;gF)DI**hrpr<&B!rVE1v&lsXD}HhV0r;Uf)x;KPV6r;!vM0;W;qCzf&-s^2jO3v+3)`+7ECP zdgrDuz>7ZQ1UZTEW4n!Ue^o~`YKfq?L?I5w{?s;5)e^y;SBQd^2>LToG>yEVZC9r`_?jSh2?+78 zh%S}>-1p%YBpQAPcvu3FU?gGnwDcD42@*bO5uX|aIHg1QeZ*>r81)hBAtLA_J`WLL zAF&xC#(l(>A!5=;+z$~^AMr3mO#6thL&U6)Foh&WJ&&E8>O!DwJ!v9Wkv;uR#GaMX z$!P{|_V8pj3%s%YPQi5$O&NLPi{h2Gh#*sUTtS_+vjaSL6k_aQNQR7aWhYRE^qyO) zj+Il9ii$0Jg$e^Df(r%@n|aS-RB@pMVM^DnhHPV4VCr@c@bW*i>=BcP=^spOdmKHUY+y=`KJ4Ym+K3JOO@_XD=Zfq|3M=0RsR4 x#RmWY7ytkO000000RSKX00624lK}`7lesT10^tXf0SFqC1TYW=vnv1q008iiFx&tD