From 8d2f5011aee911f31cba0e65a37dd700d6d39e0d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 10 十月 2025 18:21:03 +0800
Subject: [PATCH] 钥匙柜开发
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 5 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java | 49 ++++++++++++++++++++++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkCabinetCloudController.java | 18 +++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetConfigDataVO.java | 30 +++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java | 5 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetService.java | 5 ++
7 files changed, 110 insertions(+), 3 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 6635af7..f54ec05 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -59,6 +59,11 @@
public static final String REQUEST_URL ="REQUEST_URL" ;
public static final String LOCATION ="LOCATION" ;
public static final String API_KEY ="API_KEY" ;
+ public static final String CABINET_CONFIG ="CABINET_CONFIG" ;
+ public static final String BLOW_TIME ="BLOW_TIME" ;
+ public static final String PRESSURE ="PRESSURE" ;
+ public static final String CONCENTRATION ="CONCENTRATION" ;
+ public static final String THRESHOLD ="THRESHOLD" ;
//琚嫓璁夸汉淇℃伅鏍￠獙鏂瑰紡锛�0鎵嬫満鍙峰崟鐙牎楠� 1鎵嬫満鍙峰拰濮撳悕缁勫悎鏍￠獙锛�
public static final String BEVISITED_USER_VALID = "BEVISITED_USER_VALID";
public static final String LW_BEVISITED_USER_VALID = "LW_BEVISITED_USER_VALID";
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkCabinetCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkCabinetCloudController.java
index cf0044a..a51a381 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkCabinetCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkCabinetCloudController.java
@@ -6,6 +6,7 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.JkCabinet;
+import com.doumee.dao.business.vo.CabinetConfigDataVO;
import com.doumee.service.business.JkCabinetService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
@@ -95,4 +96,21 @@
public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(jkCabinetService.getDetail(id));
}
+
+ @ApiOperation("鏇存柊閰掔簿妫�娴嬮厤缃�")
+ @PostMapping("/updateCabinetConfig")
+ @CloudRequiredPermission("business:jkcabinet:update")
+ public ApiResponse updateCabinetConfig(@RequestBody CabinetConfigDataVO cabinetConfigDataVO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jkCabinetService.updCabinetConfig(cabinetConfigDataVO);
+ return ApiResponse.success(null);
+ }
+
+
+ @ApiOperation("鑾峰彇閰掔簿妫�娴嬮厤缃�")
+ @GetMapping("/getCabinetConfig")
+ @CloudRequiredPermission("business:jkcabinet:query")
+ public ApiResponse<CabinetConfigDataVO> getCabinetConfig( @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(jkCabinetService.getCabinetConfigDataVO());
+ }
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetConfigDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetConfigDataVO.java
new file mode 100644
index 0000000..03624f1
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/CabinetConfigDataVO.java
@@ -0,0 +1,30 @@
+package com.doumee.dao.business.vo;
+
+import com.doumee.dao.business.model.Approve;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/5/23 14:56
+ */
+@Data
+public class CabinetConfigDataVO {
+
+ @ApiModelProperty(value = "娴撳害闃堝�煎崟浣� (1=mg/100ml;2=mg/L;3=%BAC)")
+ private String threshold;
+
+ @ApiModelProperty(value = "鍚规皵鏃堕暱锛堢锛�")
+ private String blowTime;
+
+ @ApiModelProperty(value = "鍘嬪姏鍊�")
+ private String pressure;
+
+ @ApiModelProperty(value = "娴撳害闃堝��")
+ private String concentration;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetService.java
index c9f2469..c11b9c5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetService.java
@@ -1,5 +1,6 @@
package com.doumee.service.business;
+import com.doumee.dao.business.vo.CabinetConfigDataVO;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.JkCabinet;
@@ -97,4 +98,8 @@
* @return long
*/
long count(JkCabinet jkCabinet);
+
+ CabinetConfigDataVO getCabinetConfigDataVO();
+
+ void updCabinetConfig(CabinetConfigDataVO cabinetConfigDataVO);
}
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 36b38ff..6f1c80b 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
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
@@ -8,6 +9,8 @@
import com.doumee.dao.business.JkKeysMapper;
import com.doumee.dao.business.model.JkCabinetGrid;
import com.doumee.dao.business.model.JkKeys;
+import com.doumee.dao.business.vo.CabinetConfigDataVO;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -45,6 +48,9 @@
@Autowired
private JkKeysMapper jkKeysMapper;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -292,8 +298,51 @@
+ @Override
+ public CabinetConfigDataVO getCabinetConfigDataVO(){
+ CabinetConfigDataVO cabinetConfigDataVO = new CabinetConfigDataVO();
+ cabinetConfigDataVO.setConcentration(systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.CONCENTRATION).getCode());
+ cabinetConfigDataVO.setPressure(systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.PRESSURE).getCode());
+ cabinetConfigDataVO.setBlowTime(systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.BLOW_TIME).getCode());
+ cabinetConfigDataVO.setThreshold(systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.THRESHOLD).getCode());
+ return cabinetConfigDataVO;
+
+ }
+ @Override
+ public void updCabinetConfig(CabinetConfigDataVO cabinetConfigDataVO){
+ if(Objects.isNull(cabinetConfigDataVO)
+ || (StringUtils.isBlank(cabinetConfigDataVO.getBlowTime())
+ && StringUtils.isBlank(cabinetConfigDataVO.getConcentration())
+ && StringUtils.isBlank(cabinetConfigDataVO.getPressure())
+ && StringUtils.isBlank(cabinetConfigDataVO.getThreshold())
+ )){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(StringUtils.isNotBlank(cabinetConfigDataVO.getConcentration())){
+ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.CONCENTRATION);
+ systemDictData.setCode(cabinetConfigDataVO.getConcentration());
+ systemDictDataBiz.updateByIdNew(systemDictData);
+ }
+ if(StringUtils.isNotBlank(cabinetConfigDataVO.getPressure())){
+ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.PRESSURE);
+ systemDictData.setCode(cabinetConfigDataVO.getPressure());
+ systemDictDataBiz.updateByIdNew(systemDictData);
+ }
+ if(StringUtils.isNotBlank(cabinetConfigDataVO.getBlowTime())){
+ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.BLOW_TIME);
+ systemDictData.setCode(cabinetConfigDataVO.getBlowTime());
+ systemDictDataBiz.updateByIdNew(systemDictData);
+ }
+ if(StringUtils.isNotBlank(cabinetConfigDataVO.getThreshold())){
+ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.CABINET_CONFIG,Constants.THRESHOLD);
+ systemDictData.setCode(cabinetConfigDataVO.getThreshold());
+ systemDictDataBiz.updateByIdNew(systemDictData);
+ }
+
+
+ }
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java
index fee5ff9..fcb86bc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkIccardServiceImpl.java
@@ -72,6 +72,7 @@
if(Constants.equalsInteger(jkIccard.getStatus(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚敤鏁版嵁鏃犳硶杩涜鍒犻櫎锛�");
}
+ jkIccardMapper.update(null,new UpdateWrapper<JkIccard>().lambda().set(JkIccard::getIsdeleted,Constants.ONE).eq(JkIccard::getId,jkIccard.getId()));
}
@Override
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java
index 7bc2a7c..0f49383 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkVersionServiceImpl.java
@@ -48,7 +48,6 @@
@Override
public Integer create(JkVersion jkVersion) {
if(Objects.isNull(jkVersion)
- || Objects.isNull(jkVersion.getType())
|| Objects.isNull(jkVersion.getIsForce())
|| StringUtils.isBlank(jkVersion.getVersionInfo())
|| StringUtils.isBlank(jkVersion.getFileUrl())
@@ -56,7 +55,7 @@
|| StringUtils.isBlank(jkVersion.getName())
|| StringUtils.isBlank(jkVersion.getContent())
){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
LoginUserInfo loginUserInfo = jkVersion.getLoginUserInfo();
jkVersion.setCreateDate(new Date());
@@ -64,6 +63,7 @@
jkVersion.setEditDate(jkVersion.getCreateDate());
jkVersion.setEditor(jkVersion.getCreator());
jkVersion.setIsdeleted(Constants.ZERO);
+ jkVersion.setType(Constants.ZERO);
jkVersionMapper.insert(jkVersion);
return jkVersion.getId();
}
@@ -94,7 +94,6 @@
public void updateById(JkVersion jkVersion) {
if(Objects.isNull(jkVersion)
|| Objects.isNull(jkVersion.getId())
- || Objects.isNull(jkVersion.getType())
|| Objects.isNull(jkVersion.getIsForce())
|| StringUtils.isBlank(jkVersion.getVersionInfo())
|| StringUtils.isBlank(jkVersion.getFileUrl())
--
Gitblit v1.9.3