From f67aa8b146f0fa901ce4ae183be511d8615cde77 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 17 四月 2025 14:49:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java | 78 +++++++--------------------------------
1 files changed, 14 insertions(+), 64 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java
index 5b0d72c..e658b6b 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceImpl.java
@@ -1,81 +1,31 @@
package com.ruoyi.device.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.deepoove.poi.XWPFTemplate;
-import com.deepoove.poi.config.Configure;
-import com.ruoyi.device.excel.DeviceMaintenanceExport;
+import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
-import com.ruoyi.device.mapper.DeviceMapper;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.DeviceMaintenanceService;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.List;
-
+/**
+ * 璁惧缁存姢淇濆吇
+ */
@Service
public class DeviceMaintenanceImpl extends ServiceImpl<DeviceMaintenanceMapper, DeviceMaintenance> implements DeviceMaintenanceService {
+
+ /**
+ * 璁惧缁存姢鍒嗛〉鏌ヨ
+ * @return
+ */
@Override
- public IPage<DeviceMaintenance> getDeviceMaintenancePage(Page page, Integer deviceId, String deviceNumber) {
- return baseMapper.selectPage(page, Wrappers.<DeviceMaintenance>lambdaQuery()
- .eq(DeviceMaintenance::getDeviceId, deviceId)
- .like(DeviceMaintenance::getDeviceNumber, deviceNumber));
- }
-
- @Override
- public void exportMaintenanceRecord(Integer deviceId, HttpServletResponse response) {
- // 鏌ヨcnas璁惧缁翠慨璁板綍
- List<DeviceMaintenance> deviceMaintenanceList = baseMapper.selectList(Wrappers.<DeviceMaintenance>lambdaQuery()
- .eq(DeviceMaintenance::getDeviceId, deviceId)
- .select(DeviceMaintenance::getDate,
- DeviceMaintenance::getDeviceNumber,
- DeviceMaintenance::getDeviceName,
- DeviceMaintenance::getManagementNumber,
- DeviceMaintenance::getContent,
- DeviceMaintenance::getName,
- DeviceMaintenance::getComments));
-
-
- // 鑾峰彇璺緞
- InputStream inputStream = this.getClass().getResourceAsStream("/static/word/maintenance-records.docx");
- Configure configure = Configure.builder()
- .bind("deviceMaintenanceList", new HackLoopTableRenderPolicy())
- .build();
- // 鑾峰彇璁惧 鍚嶇О 鍜� 缂栧彿
- DeviceMaintenance deviceMaintenance = deviceMaintenanceList.get(0);
- String deviceName = deviceMaintenance.getDeviceName();
- String managementNumber = deviceMaintenance.getManagementNumber();
- XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
- new HashMap<String, Object>() {{
- put("deviceMaintenanceList", deviceMaintenanceList);
- put("deviceName", deviceName);
- put("managementNumber", managementNumber);
- }});
-
- try {
- response.setContentType("application/msword");
- String fileName = URLEncoder.encode(
- "璁惧缁存姢淇濆吇璁板綍", "UTF-8");
- response.setHeader("Content-disposition",
- "attachment;filename=" + fileName + ".docx");
- OutputStream os = response.getOutputStream();
- template.write(os);
- os.flush();
- os.close();
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException("瀵煎嚭澶辫触");
+ public IPage<DeviceMaintenanceDto> selectDeviceMaintenancePage(Page page, DeviceMaintenanceDto deviceMaintenance) {
+ if (deviceMaintenance.getDeviceId() == null) {
+ return new Page();
}
+ return baseMapper.selectDeviceMaintenancePage(page, QueryWrappers.queryWrappers(deviceMaintenance));
}
-
}
--
Gitblit v1.9.3