From 1bff330017b9fd91ee4a0b93b7484b82cb92ccf4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 十二月 2025 13:48:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java | 3 +++
admin/src/components/business/OperaJkCabinetWindow.vue | 15 ++++++++++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java | 2 ++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java | 2 ++
admin/.env.development | 10 ++++------
5 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 5916de9..651ff40 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -3,13 +3,11 @@
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
+# VUE_APP_API_URL = 'http://192.168.1.45:10010'
+
+VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
+
VUE_APP_API_URL = 'http://localhost:10010'
-
-#VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
-
-# VUE_APP_API_URL = 'http://localhost:10010'
-
-# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
#key锛�045542fc5f436b75e6c911c5c84ff8cd
#瀵嗛挜锛�8bd38497f9aee2b75e7a888a4dfd1e6c
diff --git a/admin/src/components/business/OperaJkCabinetWindow.vue b/admin/src/components/business/OperaJkCabinetWindow.vue
index e6a415d..5372648 100644
--- a/admin/src/components/business/OperaJkCabinetWindow.vue
+++ b/admin/src/components/business/OperaJkCabinetWindow.vue
@@ -42,6 +42,18 @@
<span style="margin-left: 20px;">鍗曚綅锛氬垎閽�</span>
</div>
</el-form-item>
+ <el-form-item label="閰掔簿妫�娴�" prop="doubleAuth">
+ <div style="width: 100%; display: flex; align-items: center;">
+ <el-switch
+ v-model="form.alcoholStatus"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ :active-value="0"
+ :inactive-value="1">
+ </el-switch>
+ <span style="margin-left: 20px; color: #999999;">寮�鍚悗锛岄渶瑕侀厭绮炬娴嬮�氳繃鍚庯紝鎵嶈兘寮�闂�</span>
+ </div>
+ </el-form-item>
<el-form-item label="鍙岄噸楠岃瘉" prop="doubleAuth">
<div style="width: 100%; display: flex; align-items: center;">
<el-switch
@@ -177,7 +189,8 @@
noLength: '',
noIndex: '',
sortType: 0,
- activateFile: null
+ activateFile: null,
+ alcoholStatus: 0
},
// 楠岃瘉瑙勫垯
rules: {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
index aad438a..f8d889a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java
@@ -148,6 +148,9 @@
@ExcelColumn(name="璧峰缂栫爜")
private Integer noIndex;
+ @ApiModelProperty(value = "閰掔簿妫�娴嬪紑鍚細0=寮�鍚紱1=鍏抽棴", example = "1")
+ private Integer alcoholStatus;
+
@ApiModelProperty(value = "缁忕含搴︿俊鎭� 鍙傛暟鍊硷細缁忓害,绾害")
@TableField(exist = false)
private String jwd;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java
index 591b025..dca9101 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetInfoVO.java
@@ -64,6 +64,8 @@
@ApiModelProperty(value = "婵�娲绘枃浠跺湴鍧�")
private String activateFileUrl;
+ @ApiModelProperty(value = "閰掔簿妫�娴嬪紑鍚細0=寮�鍚紱1=鍏抽棴", example = "1")
+ private Integer alcoholStatus;
@ApiModelProperty(value = "杞挱鍥惧湴鍧�", example = "1")
private List<String> bannerList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
index 2b4ff0f..bf05a2f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
@@ -81,6 +81,7 @@
|| CollectionUtils.isEmpty(jkCabinet.getManagerIdList())
|| CollectionUtils.isEmpty(jkCabinet.getAuthMemberIdList())
|| Objects.isNull(jkCabinet.getDoubleAuth())
+ || Objects.isNull(jkCabinet.getAlcoholStatus())
|| Objects.isNull(jkCabinet.getRowNum())
|| jkCabinet.getRowNum() <= Constants.ZERO
@@ -214,6 +215,7 @@
|| CollectionUtils.isEmpty(jkCabinet.getAuthMemberIdList())
|| Objects.isNull(jkCabinet.getPort())
|| Objects.isNull(jkCabinet.getDoubleAuth())
+ || Objects.isNull(jkCabinet.getAlcoholStatus())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
--
Gitblit v1.9.3