From 6f67eee1325143911bd41403a8c8b769a0cdfe2a Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期五, 26 七月 2024 15:45:30 +0800
Subject: [PATCH] 方重复
---
project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 61 insertions(+), 20 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java b/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java
index 1866bf3..9c23927 100644
--- a/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/system/SysCompanyController.java
@@ -1,25 +1,28 @@
package com.project.admin.controller.system;
-import java.util.List;
-import java.util.Arrays;
-
+import com.project.common.annotation.Log;
import com.project.common.annotation.RepeatSubmit;
+import com.project.common.core.controller.BaseController;
+import com.project.common.core.domain.AjaxResult;
+import com.project.common.core.page.TableDataInfo;
+import com.project.common.enums.BusinessType;
+import com.project.common.utils.poi.ExcelUtil;
+import com.project.system.domain.bo.editBo.SysCompanyBo;
+import com.project.system.domain.bo.queryBo.SysCompanyQueryBo;
+import com.project.system.domain.vo.SysCompanyResultVo;
+import com.project.system.domain.vo.SysCompanyVo;
+import com.project.system.service.ISysCompanyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import com.project.common.annotation.Log;
-import com.project.common.core.controller.BaseController;
-import com.project.common.core.domain.AjaxResult;
-import com.project.common.enums.BusinessType;
-import com.project.system.domain.vo.SysCompanyVo;
-import com.project.system.domain.bo.editBo.SysCompanyBo;
-import com.project.system.domain.bo.queryBo.SysCompanyQueryBo;
-import com.project.system.service.ISysCompanyService;
-import com.project.common.utils.poi.ExcelUtil;
-import com.project.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
/**
* 浼佷笟淇℃伅Controller
@@ -53,7 +56,12 @@
@RepeatSubmit
public AjaxResult export(SysCompanyQueryBo bo)
{
- List<SysCompanyVo> list = iSysCompanyService.queryList(bo);
+ List<SysCompanyVo> list;
+ if (bo==null){
+ list = new ArrayList<>();
+ } else {
+ list = iSysCompanyService.queryList(bo);
+ }
ExcelUtil<SysCompanyVo> util = new ExcelUtil<>(SysCompanyVo.class);
return util.exportExcel(list, "浼佷笟淇℃伅");
}
@@ -89,6 +97,17 @@
}
+ @ApiOperation("浼佷笟淇℃伅鐘舵�佸紑鍏�")
+ //@PreAuthorize("@ss.hasPermi('system:company:edit')")
+ @Log(title = "浼佷笟淇℃伅鐘舵�佸紑鍏�", businessType = BusinessType.UPDATE)
+ @PostMapping("/updStatus")
+ @RepeatSubmit
+ public AjaxResult updStatus(@RequestBody SysCompanyBo bo)
+ {
+ return toAjax(iSysCompanyService.updStatus(bo) ? 1 : 0);
+ }
+
+
@ApiOperation("鍒犻櫎浼佷笟淇℃伅")
//@PreAuthorize("@ss.hasPermi('system:company:remove')")
@Log(title = "浼佷笟淇℃伅" , businessType = BusinessType.DELETE)
@@ -108,12 +127,34 @@
return util.exportExcel(null, "浼佷笟淇℃伅妯℃澘");
}
- @ApiOperation(value = "瀵煎叆娲诲姩鎸囨爣")
- @PostMapping("/import")
- public AjaxResult importList(@RequestParam MultipartFile file) throws Exception
+ @ApiOperation(value = "澶勭悊瀵煎叆淇℃伅")
+ @Log(title = "瀵煎叆浼佷笟淇℃伅澶勭悊" , businessType = BusinessType.OTHER)
+ @ApiImplicitParam(value = "浼佷笟淇℃伅", name = "file", dataType = "file", dataTypeClass = MultipartFile.class)
+ @PostMapping("/doImport")
+ public AjaxResult doImport(@RequestPart(value = "file") MultipartFile file) throws Exception
{
+
ExcelUtil<SysCompanyVo> util = new ExcelUtil<>(SysCompanyVo.class);
List<SysCompanyVo> list = util.importExcel(file.getInputStream());
- return toAjax(iSysCompanyService.importList(list) ? 1 : 0);
+ return AjaxResult.success(iSysCompanyService.doImport(list));
}
+
+ @ApiOperation(value = "鏍￠獙瀵煎叆淇℃伅")
+ @Log(title = "瀵煎叆浼佷笟淇℃伅鏍￠獙" , businessType = BusinessType.OTHER)
+ @PostMapping("/checkImport")
+ public AjaxResult checkImport(@RequestBody SysCompanyResultVo resultVo)
+ {
+ return AjaxResult.success(iSysCompanyService.checkImport(resultVo));
+ }
+
+ @ApiOperation(value = "淇濆瓨瀵煎叆淇℃伅")
+ @Log(title = "瀵煎叆浼佷笟淇℃伅淇濆瓨" , businessType = BusinessType.IMPORT)
+ @RepeatSubmit
+ @PostMapping("/saveImport")
+ public AjaxResult saveImport(@RequestBody SysCompanyResultVo resultVo)
+ {
+ return toAjax(iSysCompanyService.saveImport(resultVo) ? 1 : 0);
+ }
+
+
}
--
Gitblit v1.9.1