From 9457c81e1391679153566a1680ca4c57bfec60ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 29 Mar 2023 20:45:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/enums/OtaTitleEnum.java | 2 +- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 31 +------------------ .../impl/OtaBaSjGgnrfsServiceImpl.java | 21 +++++++------ .../impl/OtaBaSjSjfzbhServiceImpl.java | 15 +++++---- 4 files changed, 21 insertions(+), 48 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 6eaed06d2..b73fb784a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -197,7 +197,7 @@ public enum OtaTitleEnum { GZBG("gzbg", "告知实施的变更", "0"), GZSCNR("gzscnr", "告知了对用户手册的全部更新内容", "0"), GZYHFS("gzyhfs", "告知用户方式（可多选）", "0"), - XGWJ("xgwj", "用户告知相关文件", "0"), +// XGWJ("xgwj", "用户告知相关文件", "0"), RWMC("rwmc", "任务名称", "0"), SJFBSJ("sjfbsj", "升级发布时间", "0"), SJJZSJ("sjjzsj", "升级计划截止时间", "0"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index a1fc4e36c..a46356589 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -116,36 +116,7 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl fileList = ossFileService.getFileInfos(nf); - if (ObjectUtils.isNotEmpty(fileList)) { - for (OSSFile f : fileList) { - reList.add(cu.addAttRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, "附件", f.getFileName())); - } - } - } - } - String[] oldFjList = {}; - if (StringUtils.isNotEmpty(oldFjStr)) { - oldFjList = oldFjStr.split(","); - } - for (String of : oldFjList) { - if (StringUtils.isEmpty(fj) || !fj.contains(of)) { - List fileList = ossFileService.getFileInfos(of); - if (ObjectUtils.isNotEmpty(fileList)) { - for (OSSFile f : fileList) { - reList.add(cu.delAttRecord(otaId, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, "附件", f.getFileName())); - } - } - } - } - - + reList.addAll(cu.comparisonRecord(otaId, fj, oldFjStr, OtaModuleEnum.CX_KZXSJDJSFZGNMCYCS, "附件", ossFileService)); otaBaCxTxjlService.saveBatch(reList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java index a3aeb236c..fd23adce6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java @@ -1,10 +1,9 @@ package com.jero.modules.ota.service.impl; -import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; -import com.jero.modules.ota.entity.AttachmentEO; -import com.jero.modules.ota.entity.OtaBaCxAqcs; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.ota.entity.OtaBaCxTxjl; import com.jero.modules.ota.entity.OtaBaSjGgnrfs; import com.jero.modules.ota.enums.OtaModuleEnum; @@ -18,16 +17,13 @@ import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; - -import java.io.File; -import java.util.List; -import java.util.Date; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.util.Date; +import java.util.List; /** * @Description: 升级备案-用户告知内容及方式 @@ -50,6 +46,9 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaSjGgnrfs.getOtaId(), OtaModuleEnum.SJ_YHGZNRFS, otaBaSjGgnrfsOld, otaBaSjGgnrfs, sysDictService); + + reList.addAll(cu.comparisonRecord(otaBaSjGgnrfs.getOtaId(), otaBaSjGgnrfs.getXgwj(), oldFjStr, OtaModuleEnum.SJ_YHGZNRFS, "附件", ossFileService)); otaBaCxTxjlService.saveBatch(reList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java index 5b9ef816e..506a01738 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjfzbhServiceImpl.java @@ -107,15 +107,14 @@ public class OtaBaSjSjfzbhServiceImpl extends ServiceImpl reList = cu.comparisonListRecord(otaId, OtaModuleEnum.SJ_SJJSMCBH, OtaTitleEnum.GNMC.getName(), oldList, newList, sysDictService); saveOrUpdateBatch(newList); - otaBaCxTxjlService.saveBatch(reList); String fj = (String) json.get("fj"); - if (StringUtils.isNotEmpty(fj)) { - OtaBaSjList otaBaSjList = otaBaSjListService.queryById(otaId); - if (ObjectUtils.isNotEmpty(otaBaSjList)) { - otaBaSjList.setSjjsfj(fj); - otaBaSjListService.editById(otaBaSjList); - } - } + OtaBaSjList otaBaSjList = otaBaSjListService.queryById(otaId); + String oldFjStr = otaBaSjList.getSjjsfj(); + otaBaSjList.setSjjsfj(fj); + otaBaSjListService.editById(otaBaSjList); + reList.addAll(cu.comparisonRecord(otaId, fj, oldFjStr, OtaModuleEnum.SJ_SJJSMCBH, "附件", ossFileService)); + otaBaCxTxjlService.saveBatch(reList); + } }