From 5c2aba3d326b6f9a3673e53c96e74e3b748cfe38 Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Wed, 25 Jun 2025 14:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=20=E4=B8=8D=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9Enull=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/rest/app/APPDeviceController.java  | 36 -------------------
 .../src/main/resources/config/application.yml |  4 +--
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/fys-system/src/main/java/com/fuyuanshen/modules/system/rest/app/APPDeviceController.java b/fys-system/src/main/java/com/fuyuanshen/modules/system/rest/app/APPDeviceController.java
index c956892..4652ead 100644
--- a/fys-system/src/main/java/com/fuyuanshen/modules/system/rest/app/APPDeviceController.java
+++ b/fys-system/src/main/java/com/fuyuanshen/modules/system/rest/app/APPDeviceController.java
@@ -1,56 +1,20 @@
 package com.fuyuanshen.modules.system.rest.app;
 
-import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fuyuanshen.annotation.Log;
-import com.fuyuanshen.exception.BadRequestException;
-import com.fuyuanshen.modules.system.constant.UserConstants;
-import com.fuyuanshen.modules.system.domain.Device;
-import com.fuyuanshen.modules.system.domain.User;
 import com.fuyuanshen.modules.system.domain.app.APPDevice;
 import com.fuyuanshen.modules.system.domain.app.APPDeviceType;
-import com.fuyuanshen.modules.system.domain.dto.CustomerVo;
-import com.fuyuanshen.modules.system.domain.dto.DeviceExcelImportDTO;
-import com.fuyuanshen.modules.system.domain.dto.DeviceForm;
 import com.fuyuanshen.modules.system.domain.dto.DeviceQueryCriteria;
 import com.fuyuanshen.modules.system.domain.dto.app.APPUnbindDTO;
-import com.fuyuanshen.modules.system.listener.excel.DeviceImportParams;
-import com.fuyuanshen.modules.system.listener.excel.UploadDeviceDataListener;
-import com.fuyuanshen.modules.system.mapper.DeviceMapper;
-import com.fuyuanshen.modules.system.mapper.DeviceTypeMapper;
-import com.fuyuanshen.modules.system.mapper.UserMapper;
-import com.fuyuanshen.modules.system.service.DeviceService;
-import com.fuyuanshen.modules.system.service.UserService;
 import com.fuyuanshen.modules.system.service.app.APPDeviceService;
-import com.fuyuanshen.modules.system.service.impl.DeviceExportService;
 import com.fuyuanshen.modules.utils.ResponseVO;
-import com.fuyuanshen.modules.utils.excel.ImportResult;
-import com.fuyuanshen.utils.FileUtil;
 import com.fuyuanshen.utils.PageResult;
-import com.fuyuanshen.utils.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Base64;
 import java.util.List;
 
 /**
diff --git a/fys-system/src/main/resources/config/application.yml b/fys-system/src/main/resources/config/application.yml
index 76c354c..3cfdcbb 100644
--- a/fys-system/src/main/resources/config/application.yml
+++ b/fys-system/src/main/resources/config/application.yml
@@ -43,8 +43,8 @@ spring:
     multipart:
       max-file-size: 5MB        # 设置单个上传文件的最大大小为10MB
       max-request-size: 5MB
-  jackson:
-    default-property-inclusion: non_null
+#  jackson:
+#    default-property-inclusion: non_null
 #  pid:
 #    file: /自行指定位置/eladmin.pid