From 8b4d7246fb735d965195201e80178b5d1528a486 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 18 四月 2025 14:48:49 +0800
Subject: [PATCH] 1.设备使用授权导出 2.设备维护保养导出

---
 cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java |  115 ++++++++++++++++++++++++---------------------------------
 1 files changed, 49 insertions(+), 66 deletions(-)

diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index 9420f41..46fadff 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -1,98 +1,81 @@
 package com.ruoyi.device.controller;
 
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.write.metadata.style.WriteCellStyle;
-import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.common.numgen.NumberGenerator;
-import com.ruoyi.device.excel.DeviceMaintenanceExport;
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.device.dto.DeviceMaintenanceDto;
 import com.ruoyi.device.pojo.DeviceMaintenance;
 import com.ruoyi.device.service.DeviceMaintenanceService;
+import com.ruoyi.system.mapper.UserMapper;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
 
 /**
  * todo: 瀛欐渤婊�
  */
 @RestController
-@RequestMapping("/device-maintain")
+@Api(tags = "璁惧缁存姢淇濆吇")
+@RequestMapping("/deviceMaintain")
 public class DeviceMaintenanceController {
 
     @Autowired
     private DeviceMaintenanceService deviceMaintenanceService;
 
     @Autowired
-    private NumberGenerator<DeviceMaintenance> numberGenerator;
-    //澧�
-    @PostMapping()
-    public Result create(@RequestBody DeviceMaintenance deviceMaintenance){
-        String year = new SimpleDateFormat("yy", Locale.CHINESE).format(new Date());
-        String month = new SimpleDateFormat("MM", Locale.CHINESE).format(new Date());
-        String processNumber = numberGenerator.generateNumberWithPrefix(3, "DG-TC-23FM " + month + "-" + year + month, DeviceMaintenance::getDeviceNumber);
-        deviceMaintenance.setDeviceNumber(processNumber);
-        return Result.success(deviceMaintenanceService.save(deviceMaintenance));
+    private UserMapper userMapper;
+
+
+    /**
+     * 璁惧缁存姢鍒嗛〉鏌ヨ
+     * @param deviceMaintenance
+     * @return
+     */
+    @ApiOperation(value = "璁惧缁存姢鍒嗛〉鏌ヨ")
+    @GetMapping("/selectDeviceMaintenancePage")
+    public Result selectDeviceMaintenancePage(Page page, DeviceMaintenanceDto deviceMaintenance){
+        return Result.success(deviceMaintenanceService.selectDeviceMaintenancePage(page, deviceMaintenance));
     }
 
-    //閫氳繃deviceId鏌ヨ缁存姢鏁版嵁
-    @GetMapping("/getDeviceMaintenancePage")
-    public Result getDeviceMaintenancePage(@RequestParam("deviceId") Integer deviceId, Page page, String deviceNumber){
-        return Result.success(deviceMaintenanceService.getDeviceMaintenancePage(page, deviceId, deviceNumber));
-    }
 
-    //鍒�
-    @DeleteMapping("/delete/{id}")
-    public void deleteDeviceFault(@PathVariable Integer id) {
-        deviceMaintenanceService.removeById(id);
-    }
+    /**
+     * 鏂板淇敼璁惧缁存姢淇濆吇
+     * @param deviceMaintenance
+     * @return
+     */
+    @ApiOperation(value = "鏂板淇敼璁惧缁存姢淇濆吇")
+    @PostMapping("/addDeviceMaintenance")
+    public Result addDeviceMaintenance(@RequestBody DeviceMaintenance deviceMaintenance){
+        if (deviceMaintenance.getDeviceId() == null) {
+            throw new RuntimeException("缂哄皯璁惧id");
+        }
+        User user = userMapper.selectById(deviceMaintenance.getMaintenanceUserId());
+        deviceMaintenance.setMaintenanceUserName(user.getName());
 
-    @GetMapping("/deviceMaintenanceExport")
-    public Result deviceMaintenanceExport(@RequestParam("deviceId") Integer deviceId, HttpServletResponse response) throws IOException {
-        List<DeviceMaintenanceExport> list = deviceMaintenanceService.deviceMaintenanceExport(deviceId);
-        response.setHeader("requestType","excel");
-        response.setHeader("Access-Control-Expose-Headers", "requestType");
-        // 璁剧疆鍗曞厓鏍兼牱寮�
-        // 淇濆瓨鍒扮涓�涓猻heet涓�
-        EasyExcel.write(response.getOutputStream())
-                .head(DeviceMaintenanceExport.class)
-                .registerWriteHandler(getHorizontalCellStyleStrategy((short) 12))
-                .sheet()
-                .doWrite(list);
-        return Result.success();
-    }
-
-    @ApiOperation(value = "璁惧缁存姢璁板綍瀵煎嚭")
-    @GetMapping("/exportMaintenanceRecord")
-    public void exportMaintenanceRecord(@RequestParam("deviceId") Integer deviceId, HttpServletResponse response) throws Exception {
-        deviceMaintenanceService.exportMaintenanceRecord(deviceId, response);
+        return Result.success(deviceMaintenanceService.saveOrUpdate(deviceMaintenance));
     }
 
     /**
-     * 鍗曞厓鏍兼牱寮忕瓥鐣�
+     * 鍒犻櫎淇敼璁惧缁存姢淇濆吇
+     * @param id
+     * @return
      */
-    public static HorizontalCellStyleStrategy getHorizontalCellStyleStrategy(Short fontHeightInPoints) {
-        // 鍐呭鐨勭瓥鐣�
-        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
-
-        // 銆愭按骞冲眳涓渶瑕佷娇鐢ㄤ互涓嬩袱琛屻��
-        // 璁剧疆鏂囧瓧宸﹀彸灞呬腑
-        contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
-        // 璁剧疆鏂囧瓧涓婁笅灞呬腑
-        contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
-        // 璁剧疆 鑷姩鎹㈣
-        contentWriteCellStyle.setWrapped(true);
-
-        // 鏍峰紡绛栫暐
-        return new HorizontalCellStyleStrategy(null, contentWriteCellStyle);
+    @ApiOperation(value = "鍒犻櫎淇敼璁惧缁存姢淇濆吇")
+    @DeleteMapping("/deleteDeviceMaintenance")
+    public Result deleteDeviceMaintenance(Integer id){
+        return Result.success(deviceMaintenanceService.removeById(id));
     }
+
+    /**
+     * 瀵煎嚭璁惧缁存姢淇濆吇
+     */
+    @ApiOperation("瀵煎嚭璁惧缁存姢淇濆吇")
+    @GetMapping("/exportDeviceMaintenance")
+    public void exportDeviceMaintenance(@RequestParam("deviceId") Integer deviceId, HttpServletResponse response) {
+        deviceMaintenanceService.exportDeviceMaintenance(deviceId, response);
+    }
+
 }

--
Gitblit v1.9.3