From 43dadecc141a2738d1c52eac014c6df0ba618cf7 Mon Sep 17 00:00:00 2001 From: yangzongjia Date: Tue, 22 Aug 2023 11:01:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B4=A8=E7=89=A9=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E7=9A=84=E6=97=B6=E5=80=99=E8=81=94=E6=9F=A5=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/api/entity/DeviceImage.java | 17 ++++++++++++++ .../biz/deviceImage/YDeviceImageMapper.java | 5 ++++- .../biz/deviceImage/YDeviceImageMapper.xml | 15 +++++++++++++ .../biz/deviceImage/YDeviceImageService.java | 22 +++++++++++++------ 4 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageMapper.xml diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java index 8c2d3c9..1367bce 100644 --- a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java +++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java @@ -1,5 +1,6 @@ package com.yxt.supervise.monitor.api.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.EntityWithId; @@ -76,4 +77,20 @@ public class DeviceImage extends EntityWithId { @ApiModelProperty("仓库ID") private String ckId; + + @ApiModelProperty("仓库名称") + @TableField(exist = false) + private String wareHouseName; + + @ApiModelProperty("仓库地址") + @TableField(exist = false) + private String wareHouseAddress; + + @ApiModelProperty("仓库联系人") + @TableField(exist = false) + private String linkerName; + + @ApiModelProperty("仓库联系人电话") + @TableField(exist = false) + private String linkerPhone; } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageMapper.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageMapper.java index 00f0c18..a584ea0 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageMapper.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageMapper.java @@ -1,12 +1,15 @@ package com.yxt.supervise.monitor.biz.deviceImage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.supervise.monitor.api.entity.Device; import com.yxt.supervise.monitor.api.entity.DeviceImage; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper public interface YDeviceImageMapper extends BaseMapper { - IPage getDevicePage(); + + IPage getDeviceImagePage(@Param("page") IPage page, @Param("ew") QueryWrapper ew); } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageMapper.xml b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageMapper.xml new file mode 100644 index 0000000..a9189c6 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageMapper.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java index 2e00211..b2fefc9 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java @@ -11,11 +11,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.monitor.api.entity.Device; import com.yxt.supervise.monitor.api.entity.DeviceImage; +import com.yxt.supervise.monitor.api.entity.WareHouse; import com.yxt.supervise.monitor.api.vo.PageVo; import com.yxt.supervise.monitor.biz.scheduled.SyncService; import com.yxt.supervise.monitor.biz.util.HttpUtils; import com.yxt.supervise.monitor.biz.util.ImageCompareUtil; import com.yxt.supervise.monitor.biz.util.ImageDownloadUtil; +import com.yxt.supervise.monitor.biz.wareHouse.YWareHouseMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -36,6 +38,12 @@ public class YDeviceImageService extends ServiceImpl getDeviceImagePage(Map searchVo, PageVo pageVo) { IPage page = new Page<>(); page.setSize(pageVo.getSize()); @@ -44,21 +52,21 @@ public class YDeviceImageService extends ServiceImpl queryWrapper = new QueryWrapper<>(); if (StrUtil.isNotBlank(searchVo.get("name"))) { - queryWrapper.like("name", searchVo.get("name")); + queryWrapper.like("t.name", searchVo.get("name")); } if (StrUtil.isNotBlank(searchVo.get("type"))) { - queryWrapper.eq("type", searchVo.get("type")); + queryWrapper.eq("t.type", searchVo.get("type")); } if (StrUtil.isNotBlank(searchVo.get("ckId"))) { - queryWrapper.eq("ckId", searchVo.get("ckId")); + queryWrapper.eq("t.ckId", searchVo.get("ckId")); } - queryWrapper.eq("isDelete", 0); - queryWrapper.eq("isShow", 1); - queryWrapper.orderByAsc("channelNo"); + queryWrapper.eq("t.isDelete", 0); + queryWrapper.eq("t.isShow", 1); + queryWrapper.orderByAsc("t.channelNo"); IPage athleteBOIPage = null; try { - athleteBOIPage = baseMapper.selectPage(page, queryWrapper); + athleteBOIPage = yDeviceImageMapper.getDeviceImagePage(page, queryWrapper); athleteBOIPage.getRecords().forEach(oo -> { String replaceBeforePath = oo.getImgBefore(); replaceBeforePath = replaceBeforePath.replaceAll("\\\\", "\\\\\\\\");