From 9c3476849cf0b469b6c6dccba8e45a94ac0a82c3 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Wed, 21 Jun 2023 09:17:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E6=80=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csharmonic/param/CsConfigurationParm.java | 4 +++ .../csharmonic/pojo/po/CsConfigurationPO.java | 3 ++ .../csharmonic/pojo/vo/CsConfigurationVO.java | 3 ++ .../controller/CsConfigurationController.java | 1 + .../impl/CsConfigurationServiceImpl.java | 32 +++++++++++++++++++ .../service/impl/CsPagePOServiceImpl.java | 4 +-- 6 files changed, 45 insertions(+), 2 deletions(-) diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java index 601bfa8..418d21d 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java @@ -4,6 +4,7 @@ import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.web.multipart.MultipartFile; import javax.validation.constraints.NotBlank; @@ -27,6 +28,9 @@ public class CsConfigurationParm { private String remark; + private String fileContent; + + @Data diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsConfigurationPO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsConfigurationPO.java index 63ab50f..42d63c1 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsConfigurationPO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsConfigurationPO.java @@ -31,6 +31,9 @@ public class CsConfigurationPO extends BaseEntity { @TableField(value = "`name`") private String name; + @TableField(value = "image_path") + private String imagePath; + @TableField(value = "remark") private String remark; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsConfigurationVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsConfigurationVO.java index e333bf3..d7f5a5b 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsConfigurationVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsConfigurationVO.java @@ -25,6 +25,9 @@ public class CsConfigurationVO extends BaseEntity { @ApiModelProperty(value = "组态项目名称") private String name; + private String fileContent; + + @ApiModelProperty(value = "操作人") private String operater; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java index 36c49bc..8a9e053 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java @@ -77,4 +77,5 @@ public class CsConfigurationController extends BaseController { String filePath = csConfigurationService.uploadImage(issuesFile); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,new MinIoUploadResDTO(issuesFile.getOriginalFilename(),filePath), methodDescribe); } + } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java index e491170..34064b2 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java @@ -22,9 +22,15 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -47,6 +53,8 @@ public class CsConfigurationServiceImpl extends ServiceImpl collect = csConfigurationPOPage.getRecords().stream().map(page -> { CsConfigurationVO csDevModelPageVO = new CsConfigurationVO(); BeanUtils.copyProperties(page, csDevModelPageVO); + if(Objects.isNull(page.getImagePath())){ + csDevModelPageVO.setFileContent(""); + + }else { + InputStream fileStream = fileStorageUtil.getFileStream(page.getImagePath()); + String text = new BufferedReader( + new InputStreamReader(fileStream, StandardCharsets.UTF_8)) + .lines() + .collect(Collectors.joining("\n")); + csDevModelPageVO.setFileContent(text); + } + + csDevModelPageVO.setOperater(collect2.get(csDevModelPageVO.getCreateBy())); return csDevModelPageVO; }).collect(Collectors.toList()); @@ -100,4 +125,11 @@ public class CsConfigurationServiceImpl extends ServiceImpl i QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(StringUtils.isNotBlank (csPageParam.getPid()),CsPagePO.COL_PID,csPageParam.getPid()). like(StringUtils.isNotBlank (csPageParam.getSearchValue()),CsPagePO.COL_NAME,csPageParam.getSearchValue()). - eq ("status",1). - orderByDesc(CsPagePO.COL_CREATE_TIME); + eq ("status",1); +// orderByDesc(CsPagePO.COL_CREATE_TIME); IPage pageData = this.page(new Page<>(csPageParam.getPageNum(), csPageParam.getPageSize()), queryWrapper); List collect1 = pageData.getRecords().stream().map(CsPagePO::getCreateBy).collect(Collectors.toList());