From 75c4327733349693e6ac67de9b49d6f98a6009d7 Mon Sep 17 00:00:00 2001
From: jiyufei <67400194@qq.com>
Date: Tue, 9 Jul 2024 17:42:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(bucket):=E6=96=B0=E5=A2=9E=E5=9B=9E?=
 =?UTF-8?q?=E6=94=B6=E6=A1=B6=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=80?=
 =?UTF-8?q?=E5=B1=82=E5=88=A4=E6=96=AD;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/RecycleDeviceConfigService.java   |  7 +++++
 .../impl/RecycleDeviceConfigServiceImpl.java  |  9 +++++++
 .../RecycleDeviceConfigController.java        |  6 +++++
 .../jnpf-web/src/views/recyclebucket/form.vue | 27 ++++++++++++++++++-
 .../src/views/recyclebucket/index.vue         | 12 +++++++++
 5 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceConfigService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceConfigService.java
index 154feb4..22a58f2 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceConfigService.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceConfigService.java
@@ -43,4 +43,11 @@ public interface RecycleDeviceConfigService extends IService<RecycleDeviceConfig
      * @return map
      */
     Map<String, RecycleDeviceConfigEntity> getConfigs(List<String> companyIds);
+
+    /**
+     * 获取统一配置
+     *
+     * @return entity
+     */
+    RecycleDeviceConfigEntity getConfig();
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java
index 0a1bbe6..379e765 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java
@@ -430,4 +430,13 @@ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceCon
         }
         return list.stream().collect(Collectors.toMap(RecycleDeviceConfigEntity::getCompanyId, Function.identity()));
     }
+
+    @Override
+    public RecycleDeviceConfigEntity getConfig() {
+        //根据当前登陆人获取统一配置
+        LambdaQueryWrapper<RecycleDeviceConfigEntity> wrapper = new LambdaQueryWrapper<>(RecycleDeviceConfigEntity.class)
+                .eq(RecycleDeviceConfigEntity::getCompanyId, userProvider.get().getOrganizeId())
+                .isNull(RecycleDeviceConfigEntity::getDeleteMark);
+        return this.getOne(wrapper);
+    }
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceConfigController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceConfigController.java
index 834fff8..dc29e53 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceConfigController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceConfigController.java
@@ -197,4 +197,10 @@ public class RecycleDeviceConfigController {
         return ActionResult.success(recycleDeviceConfigMap);
     }
 
+    @Operation(summary = "获取统一配置")
+    @GetMapping()
+    public ActionResult getConfig() {
+        return ActionResult.success(recycleDeviceConfigService.getConfig());
+    }
+
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue b/jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue
index d110086..9230475 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue
@@ -1072,7 +1072,32 @@ export default {
       this.$store.commit("generator/UPDATE_RELATION_DATA", {});
     },
     //初始化默认数据
-    initDefaultData() {},
+    initDefaultData() {
+      request({
+            url: `/api/scm/RecycleDeviceConfig`,
+            method: "GET"
+          }).then(res => {
+              this.priceDesc = res.data.deliveryPrice;
+              this.useUnifiedConfig = true;
+              if (res.data.fullSet == 0) {
+                this.fullSetDesc = "关闭";
+              } else {
+                this.fullSetDesc = "开启";
+              }
+              this.usefullSetConfig = true;
+              if (res.data.smogSet == 0) {
+                this.smogSetDesc = "关闭";
+              } else {
+                this.smogSetDesc = "开启";
+              }
+              this.useSmogSetConfig = true;
+              this.closeDelayDesc = res.data.closeDelay;
+              this.closeDelayConfig = true;
+              res.data.closeDelay = null;     
+              this.warningWeightDesc = res.data.warningWeight;
+              this.warningWeightConfig = true; 
+          });
+    },
     // 表单提交
     dataFormSubmit(type) {
       if (this.dataForm.price == null && !this.useUnifiedConfig) {
diff --git a/jnpf-java-boot/jnpf-web/src/views/recyclebucket/index.vue b/jnpf-java-boot/jnpf-web/src/views/recyclebucket/index.vue
index 83da002..70570bb 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recyclebucket/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recyclebucket/index.vue
@@ -664,6 +664,18 @@ export default {
       this.initData();
     },
     addOrUpdateHandle(row, isDetail) {
+      if (row == undefined) {
+        request({
+            url: `/api/scm/RecycleDeviceConfig`,
+            method: "GET"
+          }).then(res => {
+            if (res.data === null || res.data == undefined) {
+              this.$message.error('当前组织下，无设备柜配置，请先配置！');
+              this.formVisible = false;
+              return;
+            }
+          });
+      }
       let id = row ? row.id : "";
       this.formVisible = true;
       this.$nextTick(() => {