From db40d04b8b242c6853f9baa0a8a675d65ecc04f9 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期四, 26 十月 2023 17:23:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java |  124 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 124 insertions(+), 0 deletions(-)

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
new file mode 100644
index 0000000..f278db3
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -0,0 +1,124 @@
+package com.consum.base.controller;
+
+import com.consum.base.BaseController;
+import com.consum.base.pojo.BaseWarehouseParam;
+import com.consum.base.pojo.FinSysTenantDepartmentParam;
+import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantDepartment;
+import com.consum.model.po.FinSysTenantUser;
+import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.StringUtils;
+import com.walker.web.ResponseValue;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Description 浠撳簱绠$悊
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/26
+ */
+@RestController
+@RequestMapping("/pc/base/warehouse")
+public class BaseWarehouseController extends BaseController {
+
+    @Autowired
+    private BaseWarehouseServiceImpl baseWarehouseService;
+
+    /**
+     * @Description 鏂板
+     * @Author 鍗㈠簡闃�
+     * @Date 2023/10/26
+     */
+    @PostMapping("/add")
+    public ResponseValue add(@RequestBody BaseWarehouseParam param) {
+        if (StringUtils.isEmpty(param.getWarehouseName())) {
+            return ResponseValue.error("浠撳簱鍚嶇О涓虹┖");
+        }
+        //TODO 鍔犳潈闄� 鐪佺骇绠$悊鍛樺綍鍏ユ墍鏈変粨搴撲俊鎭�
+
+        int result = this.baseWarehouseService.add(param);
+        if (result > 0) return ResponseValue.success(1);
+        return ResponseValue.error("鏂板澶辫触锛�");
+    }
+
+    /**
+     * @Description 浠撳簱鍒楄〃鏌ヨ
+     * @Author 鍗㈠簡闃�
+     * @Date 2023/10/26
+     */
+    @GetMapping("/list")
+    public ResponseValue queryList(BaseWarehouseParam param) {
+        FinSysTenantUser sysInfo = this.getSysInfo();
+        if (sysInfo == null) {
+            return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+        }
+        GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param,sysInfo);
+        return ResponseValue.success(pager);
+    }
+
+    /**
+     * @Description 缂栬緫(淇敼鐘舵��)
+     * @Author 鍗㈠簡闃�
+     * @Date 2023/10/26
+     */
+    @PostMapping("/edit")
+    public ResponseValue edit(@RequestBody BaseWarehouse baseWarehouse) {
+        Long id = baseWarehouse.getId();
+        if (id == null || id <= 0) {
+            return ResponseValue.error("缂栬緫鐨勪粨搴撲笉瀛樺湪");
+        }
+        if (StringUtils.isEmpty(baseWarehouse.getWarehouseName())) {
+            return ResponseValue.error("浠撳簱鍚嶇О涓虹┖");
+        }
+
+        int num = this.baseWarehouseService.updateBaseWarehouse(baseWarehouse);
+        return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
+    }
+
+    /**
+     * 鏍规嵁id鏌ヨ浠撳簱璇︽儏
+     * @author 鍗㈠簡闃�
+     * @Date 2023/10/26
+     */
+    @GetMapping("/detail")
+    public ResponseValue getById(Long id) {
+        if (id == null) {
+            return ResponseValue.error("浠撳簱id涓虹┖");
+        }
+        BaseWarehouse baseWarehouse = this.baseWarehouseService.getById(id);
+        if (baseWarehouse == null) return ResponseValue.error("鏌ヨ澶辫触锛�");
+        return ResponseValue.success("鏌ヨ鎴愬姛!", baseWarehouse);
+    }
+
+    /**
+     * @Description 鏍规嵁id鍒犻櫎浠撳簱
+     * @Author 鍗㈠簡闃�
+     * @Date 2023/10/26
+     */
+    @DeleteMapping("/del")
+    public ResponseValue updateById(@RequestBody BaseWarehouse baseWarehouse) {
+        if (baseWarehouse.getId() == null) {
+            return ResponseValue.error("浠撳簱id涓虹┖");
+        }
+        int num = this.baseWarehouseService.updateById(baseWarehouse);
+
+        return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
+    }
+
+    /**
+     * @Description 鏍规嵁浠撳簱id鑾峰彇鏈烘瀯鐢ㄦ埛淇℃伅
+     * @Author 鍗㈠簡闃�
+     * @Date 2023/10/26
+     */
+    @GetMapping("/select/userList")
+    public ResponseValue queryList(Long baseWarehouseId) {
+        if (baseWarehouseId == null){
+            return ResponseValue.error("浠撳簱id涓虹┖");
+        }
+        this.baseWarehouseService.queryUserList(baseWarehouseId);
+        return ResponseValue.success();
+    }
+
+}
+

--
Gitblit v1.9.1