From a5124e8db48ebf47a0874bff6b4e0d431a72df1b Mon Sep 17 00:00:00 2001 From: huguanghan Date: Tue, 24 Dec 2024 16:45:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=AE=BE=E5=A4=87=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EquipmentController.java | 17 ++++++ .../domain/dto/SysGenExtPropsDto.java | 36 ------------ .../equipment/entity/SysGenExtProps.java | 56 ------------------- .../service/SysEquipmentService.java | 5 ++ .../service/impl/SysEquipmentServiceImpl.java | 19 +++++-- 5 files changed, 37 insertions(+), 96 deletions(-) diff --git a/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java b/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java index bc38a7c9..a9b1ebd8 100644 --- a/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java +++ b/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java @@ -13,6 +13,7 @@ import com.das.modules.equipment.domain.vo.SysEquipmentVo; import com.das.modules.equipment.entity.SysEquipmentDocs; import com.das.modules.equipment.entity.SysGenExtProps; import com.das.modules.equipment.service.SysEquipmentService; +import io.micrometer.common.util.StringUtils; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; @@ -200,4 +201,20 @@ public class EquipmentController { List upload = sysEquipmentService.upload(deviceId, component,folderName, fileList); return R.success(upload); } + + @RequestMapping(value = "/file/getList", method = RequestMethod.POST) + public R> getFileList(Long deviceId, String component) { + List fileList = sysEquipmentService.getFileList(deviceId, component); + return R.success(fileList); + } + + @RequestMapping(value = "/file/read", method = RequestMethod.GET) + public void readFile(String path, HttpServletResponse response) throws IOException { + if (StringUtils.isBlank(path)){ + throw new ServiceException("请输入浏览的文件路径"); + } + response.setContentType("application/octet-stream"); + sysEquipmentService.readFileToSteam(path, response.getOutputStream()); + + } } diff --git a/das/src/main/java/com/das/modules/equipment/domain/dto/SysGenExtPropsDto.java b/das/src/main/java/com/das/modules/equipment/domain/dto/SysGenExtPropsDto.java index 6f4201c1..93887550 100644 --- a/das/src/main/java/com/das/modules/equipment/domain/dto/SysGenExtPropsDto.java +++ b/das/src/main/java/com/das/modules/equipment/domain/dto/SysGenExtPropsDto.java @@ -18,89 +18,53 @@ public class SysGenExtPropsDto { @JsonSerialize(using = ToStringSerializer.class) private Long id; - private String fanName; - - private String fanNumber; - - private String fanType; - - private String fanTypeDetails; - private String pitchSystemModel; private String pitchSystemManufacturer; - private String pitchSystemDetails; - private String blade1Model; private String blade1Manufacturer; - private String blade1Details; - private String blade1BearingModel; private String blade1BearingManufacturer; - private String blade1BearingDetails; - private String blade2Model; private String blade2Manufacturer; - private String blade2Details; - private String blade2BearingModel; private String blade2BearingManufacturer; - private String blade2BearingDetails; - private String blade3Model; private String blade3Manufacturer; - private String blade3Details; - private String blade3BearingModel; private String blade3BearingManufacturer; - private String blade3BearingDetails; - private String mainBearingModel; private String mainBearingManufacturer; - private String mainBearingDetails; - private String gearboxModel; private String gearboxManufacturer; - private String gearboxDetails; - private String generatorModel; private String generatorManufacturer; - private String generatorDetails; - private String converterModel; private String converterManufacturer; - private String converterDetails; - private String mainControlSystemModel; private String mainControlSystemManufacturer; private String mainControlSystemSoftwareVersion; - - private String mainControlSystemSoftwareVersionDetails; - - private String towerBaseCabinetDetails; - - private String nacelleCabinetDetails; } diff --git a/das/src/main/java/com/das/modules/equipment/entity/SysGenExtProps.java b/das/src/main/java/com/das/modules/equipment/entity/SysGenExtProps.java index 5fa833fc..ab5de0fc 100644 --- a/das/src/main/java/com/das/modules/equipment/entity/SysGenExtProps.java +++ b/das/src/main/java/com/das/modules/equipment/entity/SysGenExtProps.java @@ -20,18 +20,6 @@ public class SysGenExtProps { @JsonSerialize(using = ToStringSerializer.class) private Long id; - @TableField(value = "fan_name") - private String fanName; - - @TableField(value = "fan_Number") - private String fanNumber; - - @TableField(value = "fan_type") - private String fanType; - - @TableField(value = "fan_type_details") - private String fanTypeDetails; - // Pitch System @TableField(value = "pitch_system_model") private String pitchSystemModel; @@ -39,9 +27,6 @@ public class SysGenExtProps { @TableField(value = "pitch_system_manufacturer") private String pitchSystemManufacturer; - @TableField(value = "pitch_system_details") - private String pitchSystemDetails; - // Blade 1 @TableField(value = "blade1_model") private String blade1Model; @@ -49,18 +34,12 @@ public class SysGenExtProps { @TableField(value = "blade1_manufacturer") private String blade1Manufacturer; - @TableField(value = "blade1_details") - private String blade1Details; - @TableField(value = "blade1_bearing_model") private String blade1BearingModel; @TableField(value = "blade1_bearing_manufacturer") private String blade1BearingManufacturer; - @TableField(value = "blade1_bearing_details") - private String blade1BearingDetails; - // Blade 2 @TableField(value = "blade2_model") private String blade2Model; @@ -68,18 +47,12 @@ public class SysGenExtProps { @TableField(value = "blade2_manufacturer") private String blade2Manufacturer; - @TableField(value = "blade2_details") - private String blade2Details; - @TableField(value = "blade2_bearing_model") private String blade2BearingModel; @TableField(value = "blade2_bearing_manufacturer") private String blade2BearingManufacturer; - @TableField(value = "blade2_bearing_details") - private String blade2BearingDetails; - // Blade 3 @TableField(value = "blade3_model") private String blade3Model; @@ -87,18 +60,12 @@ public class SysGenExtProps { @TableField(value = "blade3_manufacturer") private String blade3Manufacturer; - @TableField(value = "blade3_details") - private String blade3Details; - @TableField(value = "blade3_bearing_model") private String blade3BearingModel; @TableField(value = "blade3_bearing_manufacturer") private String blade3BearingManufacturer; - @TableField(value = "blade3_bearing_details") - private String blade3BearingDetails; - // Main Bearing @TableField(value = "main_bearing_model") private String mainBearingModel; @@ -106,9 +73,6 @@ public class SysGenExtProps { @TableField(value = "main_bearing_manufacturer") private String mainBearingManufacturer; - @TableField(value = "main_bearing_details") - private String mainBearingDetails; - // Gearbox @TableField(value = "gearbox_model") private String gearboxModel; @@ -116,9 +80,6 @@ public class SysGenExtProps { @TableField(value = "gearbox_manufacturer") private String gearboxManufacturer; - @TableField(value = "gearbox_details") - private String gearboxDetails; - // Generator @TableField(value = "generator_model") private String generatorModel; @@ -126,9 +87,6 @@ public class SysGenExtProps { @TableField(value = "generator_manufacturer") private String generatorManufacturer; - @TableField(value = "generator_details") - private String generatorDetails; - // Converter @TableField(value = "converter_model") private String converterModel; @@ -136,9 +94,6 @@ public class SysGenExtProps { @TableField(value = "converter_manufacturer") private String converterManufacturer; - @TableField(value = "converter_details") - private String converterDetails; - // Main Control System @TableField(value = "main_control_system_model") private String mainControlSystemModel; @@ -148,15 +103,4 @@ public class SysGenExtProps { @TableField(value = "main_control_system_software_version") private String mainControlSystemSoftwareVersion; - - @TableField(value = "main_control_system_software_version_details") - private String mainControlSystemSoftwareVersionDetails; - - // Cabinet Details - - @TableField(value = "tower_base_cabinet_details") - private String towerBaseCabinetDetails; - - @TableField(value = "nacelle_cabinet_details") - private String nacelleCabinetDetails; } diff --git a/das/src/main/java/com/das/modules/equipment/service/SysEquipmentService.java b/das/src/main/java/com/das/modules/equipment/service/SysEquipmentService.java index 29ac88ca..6ae6453a 100644 --- a/das/src/main/java/com/das/modules/equipment/service/SysEquipmentService.java +++ b/das/src/main/java/com/das/modules/equipment/service/SysEquipmentService.java @@ -11,6 +11,7 @@ import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.io.OutputStream; import java.text.ParseException; import java.util.List; @@ -40,4 +41,8 @@ public interface SysEquipmentService { SysGenExtProps querySysEquipmentExtProps(Long id); List upload(Long deviceId, String component,String folderName, List fileList) throws Exception; + + List getFileList(Long deviceId, String component); + + void readFileToSteam(String path, OutputStream stream); } diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java index 6c216ad9..9134390f 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java @@ -54,12 +54,10 @@ import org.springframework.web.multipart.MultipartFile; import java.awt.*; import java.awt.image.BufferedImage; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.nio.file.Path; import java.rmi.ServerException; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -460,6 +458,19 @@ public class SysEquipmentServiceImpl implements SysEquipmentService { return result; } + @Override + public List getFileList(Long deviceId, String component) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DEVICEID",deviceId); + queryWrapper.eq("COMPONENT",component); + return sysEquipmentDocsMapper.selectList(queryWrapper); + } + + @Override + public void readFileToSteam(String path, OutputStream stream) { + minioViewsServcie.readFileToStream(path, stream); + } + public File scale(MultipartFile file) throws IOException { // 获取原始文件名和文件类型 String originalFileName = file.getOriginalFilename();