From c090ce607dd7a7f6a22da66fab3d209893bfe47f Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 15 May 2023 17:04:30 +0800 Subject: [PATCH] =?UTF-8?q?OTA-=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=A4=87=E6=A1=88-=E5=A4=84=E7=90=86=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=8D=E7=A7=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/controller/OtaBaSjListController.java | 1 + .../jero/modules/ota/entity/OtaBaSjList.java | 5 +++ .../ota/service/IOtaBaSjListService.java | 7 +++++ .../service/impl/OtaBaSjListServiceImpl.java | 31 +++++++++++++++++++ 4 files changed, 44 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index 472fed758..5cbc98052 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -90,6 +90,7 @@ public class OtaBaSjListController extends JeroController pageList = otaBaSjListService.page(page, queryWrapper); + this.otaBaSjListService.disposeData(pageList.getRecords(),otaBaSjList); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java index dc0e38564..74a0b8adc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjList.java @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -163,6 +164,10 @@ public class OtaBaSjList implements Serializable { @ApiModelProperty(value = "升级状态") private java.lang.String sjzt; + // 任务名称 + @TableField(exist = false) + private String rwmc; + public void updateData(OtaBaSjSjmbcx otaBaSjSjmbcx) { this.cpdjbh = otaBaSjSjmbcx.getBabh(); this.ggpc = otaBaSjSjmbcx.getBapc(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java index 8546e69e4..ebbd83ddd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java @@ -73,4 +73,11 @@ public interface IOtaBaSjListService extends IService { void importData(MultipartFile file, String cut, StringBuilder errMsg) throws Exception; void exportData(String otaId, HttpServletResponse response, HttpServletRequest request) throws Exception; + + /** + * 处理数据 + * @param datas + * @param otaBaSjList + */ + void disposeData(List datas, OtaBaSjList otaBaSjList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java index eed1392ca..6ca655012 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjListServiceImpl.java @@ -1,13 +1,16 @@ package com.jero.modules.ota.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.modules.ota.entity.OtaBaSjList; import com.jero.modules.ota.entity.OtaBaSjLsjl; +import com.jero.modules.ota.entity.OtaBaSjQtsjxx; import com.jero.modules.ota.entity.OtaBaSjSjmbcx; import com.jero.modules.ota.mapper.OtaBaSjListMapper; import com.jero.modules.ota.service.*; import com.jero.modules.ota.utils.ImportFileUtil; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -21,6 +24,7 @@ import java.io.FileOutputStream; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @Description: 升级备案-升级活动备案列表 @@ -229,4 +233,31 @@ public class OtaBaSjListServiceImpl extends ServiceImpl datas, OtaBaSjList otaBaSjList) { + if(CollectionUtils.isNotEmpty(datas)){ + List otaBaSjListIdList = datas.stream().map(OtaBaSjList::getId).distinct().collect(Collectors.toList()); + QueryWrapper otaBaSjQtsjxxQueryWrap = new QueryWrapper<>(); + otaBaSjQtsjxxQueryWrap.lambda().in(OtaBaSjQtsjxx::getOtaId,otaBaSjListIdList); + List otaBaSjQtsjxxList = this.otaBaSjQtsjxxService.list(otaBaSjQtsjxxQueryWrap); + datas.forEach(data -> { + if (CollectionUtils.isNotEmpty(otaBaSjQtsjxxList)) { + String rwmc = otaBaSjQtsjxxList.stream().filter(otaBaSjQtsjxx -> { + boolean flag = false; + if(StringUtils.equals(otaBaSjQtsjxx.getOtaId(), data.getId())){ + flag = true; + } + return flag; + }).map(OtaBaSjQtsjxx::getRwmc).collect(Collectors.joining(",")); + data.setRwmc(rwmc); + } + }); + } + } }