From 03941ed4fa0fcf582e4aa8d118366231bee1870a Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 12 十二月 2023 11:13:33 +0800
Subject: [PATCH] api文档

---
 consum-base/src/main/java/com/consum/base/controller/FinFileController.java            |    2 +
 consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java   |    2 
 consum-base/src/main/java/com/consum/base/controller/LWhProcureModelController.java    |   14 ++++--
 consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java      |    2 +
 consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java       |    4 +
 consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java     |    2 +
 consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java |    2 +
 consum-base/src/main/java/com/consum/base/controller/LOrgSupplierController.java       |    2 +
 consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java       |   19 +++++----
 consum-base/src/main/java/com/consum/base/controller/LWhGoodsStatisticsController.java |    2 +
 consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java  |    4 +
 consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java    |    2 
 consum-base/src/main/java/com/consum/base/controller/FinDepartLedgerController.java    |    2 +
 consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java    |    2 +
 14 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
index bf69c9e..3fecfb9 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsModelsController.java
@@ -8,6 +8,7 @@
 import com.walker.db.page.GenericPager;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.web.ResponseValue;
+import io.swagger.annotations.Api;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -21,6 +22,7 @@
  * @Author 鍗㈠簡闃�
  * @Date 2023/10/25
  */
+@Api(value = "瑙勬牸鍨嬪彿", tags = "瑙勬牸鍨嬪彿")
 @RestController
 @RequestMapping("/pc/base/goods/models")
 public class BaseGoodsModelsController extends BaseController {
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
index 7a5e781..991539d 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -45,6 +45,7 @@
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.web.ResponseValue;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -54,6 +55,7 @@
  * @Author 鍗㈠簡闃�
  * @Date 2023/10/24
  */
+@Api(value = "鐗╁搧妯℃澘", tags = "鐗╁搧妯℃澘")
 @RestController
 @RequestMapping("/pc/base/goods/template")
 public class BaseGoodsTemplateController extends BaseController {
@@ -361,6 +363,6 @@
                 }
             }).sheet(0).doRead();
 
-        return ResponseValue.success("瀵煎叆鎴愬姛!", 1);
+        return ResponseValue.success("瀵煎叆鎴愬姛!");
     }
 }
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
index 228d85a..059859c 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -1,5 +1,6 @@
 package com.consum.base.controller;
 
+import io.swagger.annotations.Api;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,6 +32,7 @@
  * @Author 鍗㈠簡闃�
  * @Date 2023/10/26
  */
+@Api(value = "浠撳簱绠＄悊", tags = "浠撳簱绠＄悊")
 @RestController
 @RequestMapping("/pc/base/warehouse")
 public class BaseWarehouseController extends BaseController {
diff --git a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
index 281c1ce..4c40b21 100644
--- a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
@@ -41,7 +41,7 @@
  * @Description
  * @Version 1.0
  **/
-@Api(value = "搴撶鍛�", tags = "搴撶鍛�")
+@Api(value = "閮ㄩ棬鎶ュ簾", tags = "閮ㄩ棬鎶ュ簾")
 @RestController
 @RequestMapping("/pc/l/wh/form/scrapped")
 public class DepFormScrappedController extends BaseController {
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinDepartLedgerController.java b/consum-base/src/main/java/com/consum/base/controller/FinDepartLedgerController.java
index daec1ca..69dbf3f 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinDepartLedgerController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinDepartLedgerController.java
@@ -10,6 +10,7 @@
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
 import com.walker.web.ResponseValue;
+import io.swagger.annotations.Api;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.core.io.ClassPathResource;
@@ -28,6 +29,7 @@
 /**
  * 閮ㄩ棬鍙拌处
  */
+@Api(value = "閮ㄩ棬鍙拌处", tags = "閮ㄩ棬鍙拌处")
 @RestController
 @RequestMapping("/pc/fin/warehouse/departLedger")
 public class FinDepartLedgerController extends BaseController {
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinFileController.java b/consum-base/src/main/java/com/consum/base/controller/FinFileController.java
index 293602a..d003b80 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinFileController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinFileController.java
@@ -7,6 +7,7 @@
 import com.walker.infrastructure.utils.DateUtils;
 import com.walker.infrastructure.utils.NumberGenerator;
 import com.walker.web.ResponseValue;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +20,7 @@
  * @Author wh
  * @Date 2023/8/1 10:33
  */
+@Api(value = "鏂囦欢涓婁紶", tags = "鏂囦欢涓婁紶")
 @RestController
 @RequestMapping("/pc/fin/file")
 public class FinFileController extends BaseController {
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
index 50b6caa..3de9388 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
@@ -1,5 +1,15 @@
 package com.consum.base.controller;
 
+import io.swagger.annotations.Api;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.consum.base.BaseController;
 import com.consum.base.core.utils.CommonUtil;
 import com.consum.base.pojo.FinSysServerSearchParam;
@@ -10,14 +20,7 @@
 import com.walker.infrastructure.utils.DateUtils;
 import com.walker.infrastructure.utils.NumberGenerator;
 import com.walker.web.ResponseValue;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
+@Api(value = "绯荤粺鏈嶅姟淇℃伅", tags = "绯荤粺鏈嶅姟淇℃伅")
 @RestController
 @RequestMapping("/pc/fin/sys/server")
 public class FinSysServerController extends BaseController {
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
index 88718da..ea9e566 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
@@ -46,15 +46,17 @@
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.web.ResponseValue;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
 /**
- * @Description 鍖哄垝
+ * @Description 鏈烘瀯
  * @Author wh
  * @Date 2023/7/13 19:51
  */
+@Api(value = "鏈烘瀯绠＄悊", tags = "鏈烘瀯绠＄悊")
 @RestController
 @RequestMapping("/pc/fin/sys/tenant")
 public class FinSysTenantController extends BaseController {
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index 2bb2d93..9329e4f 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -310,7 +310,7 @@
     public ResponseValue importUser(@RequestParam String tenantId, @RequestParam String tenantCode, MultipartFile file)
         throws IOException {
         String originalFilename = file.getOriginalFilename();
-        if (!"xls".equals(originalFilename.substring(originalFilename.lastIndexOf(".") + 1))) {
+        if (!originalFilename.endsWith("xls")) {
             return ResponseValue.error("鏂囦欢鏍煎紡鏈夎!");
         }
         S_user_core currentUser = this.getCurrentUser();
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java b/consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java
index 3221750..0c353bf 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinWarehouseLedgerController.java
@@ -10,6 +10,7 @@
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
 import com.walker.web.ResponseValue;
+import io.swagger.annotations.Api;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.core.io.ClassPathResource;
@@ -33,6 +34,7 @@
  * @Description 浠撳簱鍙拌处
  * @Version 1.0
  **/
+@Api(value = "浠撳簱鍙拌处", tags = "浠撳簱鍙拌处")
 @RestController
 @RequestMapping("/pc/fin/warehouse/ledger")
 public class FinWarehouseLedgerController extends BaseController {
diff --git a/consum-base/src/main/java/com/consum/base/controller/LOrgSupplierController.java b/consum-base/src/main/java/com/consum/base/controller/LOrgSupplierController.java
index 84783f0..4f2b81c 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LOrgSupplierController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LOrgSupplierController.java
@@ -4,6 +4,7 @@
 import com.consum.base.service.LOrgSupplierServiceImpl;
 import com.iplatform.model.po.S_user_core;
 import com.walker.web.ResponseValue;
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,6 +18,7 @@
  * @Description
  * @Version 1.0
  **/
+@Api(value = "渚涘簲鍟�", tags = "渚涘簲鍟�")
 @RestController
 @RequestMapping("/pc/orgSupplier")
 public class LOrgSupplierController extends BaseController {
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
index eef390c..ff8cd13 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
@@ -11,6 +11,7 @@
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
 import com.walker.web.ResponseValue;
+import io.swagger.annotations.Api;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +28,7 @@
  * @Description
  * @Version 1.0
  **/
+@Api(value = "浠撳簱娴佹按", tags = "浠撳簱娴佹按")
 @RestController
 @RequestMapping("/pc/warehouse/flow")
 public class LWarehouseFlowController extends BaseController {
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhGoodsStatisticsController.java b/consum-base/src/main/java/com/consum/base/controller/LWhGoodsStatisticsController.java
index 576c9e8..4422fa3 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhGoodsStatisticsController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhGoodsStatisticsController.java
@@ -7,6 +7,7 @@
 import com.consum.model.po.FinSysTenantUser;
 import com.iplatform.model.po.S_user_core;
 import com.walker.web.ResponseValue;
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,6 +21,7 @@
  * @Description 鐗╁搧缁熻
  * @Version 1.0
  **/
+@Api(value = "鐗╁搧缁熻", tags = "鐗╁搧缁熻")
 @RestController
 @RequestMapping("/pc/warehouse/goodsStatistics")
 public class LWhGoodsStatisticsController extends BaseController {
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhProcureModelController.java b/consum-base/src/main/java/com/consum/base/controller/LWhProcureModelController.java
index 58d2d9e..2fc80d8 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhProcureModelController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhProcureModelController.java
@@ -17,6 +17,9 @@
 import com.walker.infrastructure.utils.CollectionUtils;
 import com.walker.web.ResponseValue;
 
+import io.swagger.annotations.Api;
+
+@Api(value = "鐗╁搧鍨嬪彿", tags = "鐗╁搧鍨嬪彿")
 @RestController
 @RequestMapping("/pc/warehouse/procureModel")
 public class LWhProcureModelController extends BaseController {
@@ -32,7 +35,8 @@
         LWhProcureModelQry param2 = new LWhProcureModelQry();
         CommonUtil.copyProperties(param, param2);
         param = param2;
-        List<Map<String, Object>> ffOrderByGoodsIdAndDept = lWhProcureModelService.getFfOrderByGoodsIdAndDept(param.getBaseGoodsTemplateId(), param.getDepartmentId());
+        List<Map<String, Object>> ffOrderByGoodsIdAndDept =
+            lWhProcureModelService.getFfOrderByGoodsIdAndDept(param.getBaseGoodsTemplateId(), param.getDepartmentId());
         if (CollectionUtils.isEmpty(ffOrderByGoodsIdAndDept)) {
             return ResponseValue.success();
         }
@@ -48,14 +52,14 @@
         LWhProcureModelQry param2 = new LWhProcureModelQry();
         CommonUtil.copyProperties(param, param2);
         param = param2;
-        List<Map<String, Object>> ffOrderByGoodsIdAndDept = lWhProcureModelService.getGoodsUseInfoByFfOrderAndGoodId(param.getBaseGoodsTemplateId(), param.getTransBusinessId());
+        List<Map<String, Object>> ffOrderByGoodsIdAndDept = lWhProcureModelService
+            .getGoodsUseInfoByFfOrderAndGoodId(param.getBaseGoodsTemplateId(), param.getTransBusinessId());
         if (CollectionUtils.isEmpty(ffOrderByGoodsIdAndDept)) {
             return ResponseValue.success();
         }
         // 鎸夊瀷鍙峰垎缁勮繑鍥�
-        return ResponseValue.success(ffOrderByGoodsIdAndDept.stream()
-                .collect(Collectors.groupingBy(map -> map.get("baseGoodsModelsId"))));
+        return ResponseValue.success(
+            ffOrderByGoodsIdAndDept.stream().collect(Collectors.groupingBy(map -> map.get("baseGoodsModelsId"))));
     }
-
 
 }

--
Gitblit v1.9.1