From 9252a7ea2e0e3768ef8df0f2e89a074a73eadac3 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Wed, 31 May 2023 15:02:34 +0800 Subject: [PATCH] =?UTF-8?q?#20230529=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shxy/xymanager_common/util/UploadUtils.java | 2 +- .../xymanager_service/impl/UploadServiceImpl.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/UploadUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/UploadUtils.java index f08ed86..eb2842e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/UploadUtils.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/UploadUtils.java @@ -25,7 +25,7 @@ public class UploadUtils public static String upload(MultipartFile file,String path) throws IOException { String fileName = file.getOriginalFilename(); String newName = UUID.randomUUID().toString()+fileName.substring(fileName.indexOf(".")); - File saveFile = new File(path+newName); + File saveFile = new File(path,newName); if(!saveFile.getParentFile().exists()){ saveFile.getParentFile().mkdirs(); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UploadServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UploadServiceImpl.java index 19bffd9..e7606fb 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UploadServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/UploadServiceImpl.java @@ -1,11 +1,15 @@ package com.shxy.xymanager_service.impl; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import cn.hutool.core.collection.CollectionUtil; import com.github.pagehelper.PageInfo; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.dto.TerminalApkInfoDto; import com.shxy.xymanager_common.entity.TerminalUpload; import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_common.exception.Asserts; +import com.shxy.xymanager_common.model.LineListModel; import com.shxy.xymanager_common.model.TerminalApkInfoListModel; import com.shxy.xymanager_common.model.TerminalListModel; import com.shxy.xymanager_common.page.PageUtils; @@ -24,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.swing.text.html.parser.Entity; import java.io.IOException; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -79,6 +84,13 @@ public class UploadServiceImpl implements UploadService { int pagesize = vo.getPagesize(); PageUtils.SetPage(pageindex, pagesize); List apkInfoDtoList = uploadDao.selectAll(); + boolean empty = CollectionUtil.isEmpty(apkInfoDtoList); + if (empty) { + model.setList(new ArrayList<>()); + } else { + List beans = BeanUtil.copyToList(apkInfoDtoList, TerminalApkInfoListModel.ApkBean.class, CopyOptions.create().ignoreCase()); + model.setList(beans); + } PageInfo pageData = PageUtils.getPageData(apkInfoDtoList); int currentpage = pageData.getPageNum(); model.setCurrentpage(currentpage);