From 8c026aa23062b0aab4738fdc19dadbe0e949dcbb Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:02:28 +0800
Subject: [PATCH] 最新版本541200007最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index c30157f..5627748 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -217,12 +217,6 @@
if (pageWrap.getModel().getName() != null) {
queryWrapper.lambda().like(Device::getName, pageWrap.getModel().getName());
}
- if (pageWrap.getModel().getDoorNo() != null) {
- queryWrapper.lambda().like(Device::getDoorNo, pageWrap.getModel().getDoorNo());
- }
- if (pageWrap.getModel().getNo() != null) {
- queryWrapper.lambda().like(Device::getNo, pageWrap.getModel().getNo());
- }
if (pageWrap.getModel().getDoorName() != null) {
queryWrapper.lambda().like(Device::getDoorName, pageWrap.getModel().getDoorName());
}
@@ -402,7 +396,7 @@
}
MqttClientCache.clientMapCache.put("device"+param.getId(),mqttClient);
String curremak = "銆�"+param.getLoginUserInfo().getRealname()
- +"銆戜簬"+ DateUtil.getPlusTime2(new Date()) +"杩涜浜�"+(Constants.equalsInteger(param.getStatus(),Constants.ONE)?"銆愬悎闂搞��":"銆愬垎闂搞��")+"鎿嶄綔,寮�鍏炽��"+param.getChannelNo()+"銆戯紱";
+ +"銆戜簬"+ DateUtil.getPlusTime2(new Date()) +"杩涜浜�"+(Constants.equalsInteger(param.getStatus(),Constants.ONE)?"銆愬紑闂搞��":"銆愬叧闂搞��")+"鎿嶄綔,寮�鍏炽��"+param.getChannelNo()+"銆戯紱";
deviceMapper.update(null,new UpdateWrapper<Device>().lambda()
// .setSql("remark = concat(ifnull(remark,''),'"+curremak+"','\n')")
.set(Device::getRemark,curremak)
@@ -420,7 +414,7 @@
data.setVal1("杩滅▼鎺у埗");
data.setVal2(curremak);
data.setHappenTime(DateUtil.getPlusTime2(data.getCreateDate()));
- data.setVal3((Constants.equalsInteger(param.getStatus(),Constants.ONE)?"銆愬悎闂搞��":"銆愬垎闂搞��"));
+ data.setVal3((Constants.equalsInteger(param.getStatus(),Constants.ONE)?"銆愬紑闂搞��":"銆愬叧闂搞��"));
data.setVal4(param.getLoginUserInfo().getRealname());
data.setVal5(param.getChannelNo());
deviceDataMapper.insert(data);
--
Gitblit v1.9.3