Merge remote-tracking branch 'origin/master'

zxkf-api/src/main/java/api/controller/call/RecordController.java

@@ -1,9 +1,5 @@
 package api.controller.call;
-
-import api.entity.database.system.Config;
-import api.entity.database.system.Customer;
 import api.service.system.IConfigService;
-import api.util.annotation.Anonymous;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,7 +13,6 @@ import api.util.enums.BusinessType;
 import api.util.helper.StringHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.Arrays;
@@ -36,7 +31,7 @@ public class RecordController extends BaseController {
     @Log(title = "查询通话记录表列表",businessType = BusinessType.QUERY)
     @GetMapping
     public AjaxResult getList(Record input, PageInput pageInput) {
-        LambdaQueryWrapper<Record> qw = new LambdaQueryWrapper();
+        LambdaQueryWrapper<Record> qw = new LambdaQueryWrapper<>();
         qw.eq(input.getRecordId() != null && input.getRecordId() > 0, Record::getRecordId, input.getRecordId());
         qw.like(!StringHelper.isEmpty(input.getUuid()), Record::getUuid, input.getUuid());
         qw.like(!StringHelper.isEmpty(input.getBaseNumber()), Record::getBaseNumber, input.getBaseNumber());
@@ -81,11 +76,9 @@ public class RecordController extends BaseController {
         //添加录音路径
         if (Records!=null && Records.size()>0)
         {
-            for (int i=0;i<Records.size();i++)
-            {
-                if (!StringHelper.isEmpty(Records.get(i ).getFilePath()))
-                {
-                    Records.get(i ).setFilePath(captchaEnabled+ Records.get(i ).getFilePath());
+            for (Record record : Records) {
+                if (!StringHelper.isEmpty(record.getFilePath())) {
+                    record.setFilePath(captchaEnabled + record.getFilePath());
                 }
             }
         }

zxkf-api/src/main/java/api/controller/system/CustomerController.java

@@ -79,6 +79,7 @@ public class CustomerController extends BaseController {
         {
             return Success("成功", customer);
         }
+
         else
         {
             return Error("该客户不存在");

zxkf-api/src/main/java/api/controller/system/SysAccessoriesController.java

@@ -48,18 +48,16 @@ public class SysAccessoriesController extends BaseController {
 
         //全部文件名，若多个，则逗号分隔
         StringBuilder allFileNames = new StringBuilder();
-
-        //上传路径
-       // String fileSavePath = "files";
-
-
         String fileSavePath = "files/order/" + DateHelper.getDate();
         //若文件夹不存在，则创建文件夹
         File pFile = new File(fileSavePath);
         if (!pFile.exists()) {
             pFile.mkdirs();
         }
-
+        long size = file.getSize();
+        if (size > 20 * 1024 * 1024) {
+            return Error("文件大小不能超过20mb");
+        }
             //得到原始文件名
             newFileName = new StringBuilder(file.getOriginalFilename());
             //查询文件名中点号所处位置

zxkf-util/src/main/java/api/util/helper/FileUploadHelper.java

@@ -90,8 +90,8 @@ public class FileUploadHelper {
                 throw new IOException("文件名不能超过50");
             }
             long size = file.getSize();
-            if (size > 50 * 1024 * 1024) {
-                throw new IOException("文件大小不能超过50mb");
+            if (size > 20 * 1024 * 1024) {
+                throw new IOException("文件大小不能超过20mb");
             }
             List<String> exts = Arrays.asList("bmp", "gif", "jpg", "jpeg", "png");
             String fileName = file.getOriginalFilename();