From 4aba5c05fd1c525f2daaa004fbfec45d997b2e29 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 05 十二月 2023 18:27:49 +0800 Subject: [PATCH] 海康接口对接开发 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 21 +++++++++++++++++++-- 1 files changed, 19 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..f2e9eb6 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,7 +1,16 @@ package com.doumee.service.business.impl; +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.Device; @@ -10,10 +19,14 @@ 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; /** @@ -26,6 +39,9 @@ @Autowired private DeviceMapper deviceMapper; + + @Autowired + private HKService hkService; @Override public Integer create(Device device) { @@ -112,8 +128,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 +201,5 @@ QueryWrapper<Device> wrapper = new QueryWrapper<>(device); return deviceMapper.selectCount(wrapper); } + } -- Gitblit v1.9.3