查询质物检测的时候联查仓库信息

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;
 }

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<DeviceImage> {
-    IPage<DeviceImage> getDevicePage();
+
+    IPage<DeviceImage> getDeviceImagePage(@Param("page") IPage<DeviceImage> page, @Param("ew") QueryWrapper<DeviceImage> ew);
 }

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yxt.supervise.monitor.biz.deviceImage.YDeviceImageMapper">
+    <select id="getDeviceImagePage" resultType="com.yxt.supervise.monitor.api.entity.DeviceImage">
+        SELECT
+               t.*,
+               w.name as wareHouseName,
+               w.address as wareHouseAddress,
+               w.linkerName,
+               w.linkerPhone
+        FROM y_device_image t
+                 LEFT JOIN y_warehouse w ON t.ckId = w.sid
+            ${ew.customSqlSegment}
+    </select>
+</mapper>

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<YDeviceImageMapper, DeviceI
     @Value("${scheduleTime.folder}")
     private String filePath;
 
+    @Resource
+    private YWareHouseMapper yWareHouseMapper;
+
+    @Resource
+    private YDeviceImageMapper yDeviceImageMapper;
+
     public IPage<DeviceImage> getDeviceImagePage(Map<String, String> searchVo, PageVo pageVo) {
         IPage<DeviceImage> page = new Page<>();
         page.setSize(pageVo.getSize());
@@ -44,21 +52,21 @@ public class YDeviceImageService extends ServiceImpl<YDeviceImageMapper, DeviceI
         QueryWrapper<DeviceImage> 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("t.isDelete", 0);
-        queryWrapper.eq("isShow", 1);
+        queryWrapper.eq("t.isShow", 1);
-        queryWrapper.orderByAsc("channelNo");
+        queryWrapper.orderByAsc("t.channelNo");
 
         IPage<DeviceImage> athleteBOIPage = null;
         try {
-            athleteBOIPage = baseMapper.selectPage(page, queryWrapper);
+            athleteBOIPage = yDeviceImageMapper.getDeviceImagePage(page, queryWrapper);
             athleteBOIPage.getRecords().forEach(oo -> {
                 String replaceBeforePath = oo.getImgBefore();
                 replaceBeforePath = replaceBeforePath.replaceAll("\\\\", "\\\\\\\\");