From 98661dae111965b72b758a14d687b3218c2e2089 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 15:38:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 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..cdf4578 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) {
@@ -83,6 +101,18 @@
QueryWrapper<Device> wrapper = new QueryWrapper<>(device);
return deviceMapper.selectList(wrapper);
}
+
+ @Override
+ public List<Device> findIdAndNameList(Device param) {
+ LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>(param);
+ wrapper.select(Device::getId, Device::getName);
+ 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);
+ }
@Override
public PageData<Device> findPage(PageWrap<Device> pageWrap) {
@@ -112,8 +142,8 @@
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().getName() != null) {
+ queryWrapper.lambda().eq(Device::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getHkId() != null) {
queryWrapper.lambda().eq(Device::getHkId, pageWrap.getModel().getHkId());
@@ -185,4 +215,5 @@
QueryWrapper<Device> wrapper = new QueryWrapper<>(device);
return deviceMapper.selectCount(wrapper);
}
+
}
--
Gitblit v1.9.3