From f9bf6830debbe4f7486add9d99ecbbc0d67c13cd Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 23 四月 2024 10:10:13 +0800
Subject: [PATCH] 最新版本
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index 6d46aff..285a0d1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -1,20 +1,37 @@
package com.doumee.service.business.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.haikang.model.HKConstants;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
+import com.doumee.core.haikang.model.param.respose.AcsDeviceInfoResponse;
+import com.doumee.core.haikang.model.param.respose.AcsDeviceListResponse;
+import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.DeviceMapper;
+import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Device;
+import com.doumee.dao.business.model.Retention;
import com.doumee.service.business.DeviceService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 璁惧淇℃伅琛⊿ervice瀹炵幇
@@ -26,6 +43,7 @@
@Autowired
private DeviceMapper deviceMapper;
+
@Override
public Integer create(Device device) {
@@ -75,12 +93,26 @@
@Override
public Device findOne(Device device) {
QueryWrapper<Device> wrapper = new QueryWrapper<>(device);
- return deviceMapper.selectOne(wrapper);
+ return deviceMapper.selectOne(wrapper.last("limit 1"));
}
@Override
public List<Device> findList(Device device) {
+ device.setIsdeleted(Constants.ZERO);
QueryWrapper<Device> wrapper = new QueryWrapper<>(device);
+ return deviceMapper.selectList(wrapper);
+ }
+
+ @Override
+ public List<Device> findIdAndNameList(Device param) {
+ LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>(param);
+ param.setIsdeleted(Constants.ZERO);
+ wrapper.select(Device::getId, Device::getName, Device::getDoorName,Device::getRegionPathName, Device::getRegionName);
+ if(null != param.getType() && null != param.getIsdeleted() && null != param.getHkStatus()) {
+ wrapper.eq(Device::getType,param.getType())
+ .eq(Device::getIsdeleted,param.getIsdeleted())
+ .eq(Device::getHkStatus,param.getHkStatus());
+ }
return deviceMapper.selectList(wrapper);
}
@@ -89,6 +121,7 @@
IPage<Device> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(Device::getId, pageWrap.getModel().getId());
}
@@ -112,8 +145,20 @@
if (pageWrap.getModel().getRemark() != null) {
queryWrapper.lambda().eq(Device::getRemark, pageWrap.getModel().getRemark());
}
- if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().eq(Device::getTitle, pageWrap.getModel().getTitle());
+ if (pageWrap.getModel().getIsEntrance() != null) {
+ queryWrapper.lambda().eq(Device::getIsEntrance, pageWrap.getModel().getIsEntrance());
+ }
+ if (pageWrap.getModel().getName() != null) {
+ queryWrapper.lambda().like(Device::getName, pageWrap.getModel().getName());
+ }
+ if (pageWrap.getModel().getDoorName() != null) {
+ queryWrapper.lambda().like(Device::getDoorName, pageWrap.getModel().getDoorName());
+ }
+ if (pageWrap.getModel().getRegionPathName() != null) {
+ queryWrapper.lambda().like(Device::getRegionPathName, pageWrap.getModel().getRegionPathName());
+ }
+ if (pageWrap.getModel().getRegionName() != null) {
+ queryWrapper.lambda().like(Device::getRegionName, pageWrap.getModel().getRegionName());
}
if (pageWrap.getModel().getHkId() != null) {
queryWrapper.lambda().eq(Device::getHkId, pageWrap.getModel().getHkId());
@@ -185,4 +230,5 @@
QueryWrapper<Device> wrapper = new QueryWrapper<>(device);
return deviceMapper.selectCount(wrapper);
}
+
}
--
Gitblit v1.9.3