配置

src/main/java/com/huimv/admin/entity/vo/EnvDeviceVo.java

@@ -0,0 +1,9 @@
+package com.huimv.admin.entity.vo;
+
+import com.huimv.admin.entity.EnvDevice;
+import lombok.Data;
+
+@Data
+public class EnvDeviceVo extends EnvDevice {
+    private String deployName;
+}

src/main/java/com/huimv/admin/mapper/EnvDeviceMapper.java

@@ -1,8 +1,12 @@
 package com.huimv.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.admin.entity.EnvDevice;
 import com.huimv.admin.entity.dto.DeviceDto;
+import com.huimv.admin.entity.vo.EnvDeviceVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -21,4 +25,6 @@ public interface EnvDeviceMapper extends BaseMapper<EnvDevice> {
     DeviceDto getCount(@Param("farmId") String farmId);
 
     List<String>  selectDeviceCodeByfarmId(@Param("farmId") Integer farmId);
+
+    IPage<EnvDeviceVo> list(IPage<EnvDeviceVo> page,@Param(Constants.WRAPPER) QueryWrapper<EnvDevice> queryWrapper);
 }

src/main/java/com/huimv/admin/service/impl/EnvDeviceServiceImpl.java

@@ -8,12 +8,15 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.*;
+import com.huimv.admin.entity.vo.EnvDeviceVo;
+import com.huimv.admin.entity.vo.PublicDeployVo;
 import com.huimv.admin.mapper.*;
 import com.huimv.admin.service.IEnvDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -567,8 +570,9 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             queryWrapper.eq("farm_id", farmId);
             queryWrapper.like("device_code", name).or().like("device_name", name);
         }
-        Page<EnvDevice> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        return new Result(ResultCode.SUCCESS, envDeviceMapper.selectPage(page, queryWrapper));
+        Page<EnvDeviceVo> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<EnvDeviceVo> list = envDeviceMapper.list(page,queryWrapper);
+        return new Result(ResultCode.SUCCESS, list);
     }
 
 //    @Override

src/main/java/com/huimv/admin/service/impl/EnvFengPeizhiServiceImpl.java

@@ -50,7 +50,8 @@ public class EnvFengPeizhiServiceImpl extends ServiceImpl<EnvFengPeizhiMapper, E
             int j = 1;
             for (int i = fans.length()-1; i >= 0; i--) {
                 Map detailMap = new HashMap();
-                detailMap.put("风机"+j,fans.charAt(i));
+                detailMap.put("name","风机"+j);
+                detailMap.put("status",fans.charAt(i));
                 detailMap.put("constantSpeed",envDayFengPeizhi.getFanEnable());
                 detailMap.put("timeControl",envDayFengPeizhi.getCycleMode());
                 detailMap.put("changeSpeed",envDayFengPeizhi.getVarFanEnable());

src/main/resources/mapper/EnvDeviceMapper.xml

@@ -29,4 +29,12 @@
          from env_device
          where farm_id=#{farmId}
     </select>
+
+    <select id="list" resultType="com.huimv.admin.entity.vo.EnvDeviceVo">
+          select d.device_code,d.device_sort_code,d.device_name,d.build_location,d.device_status,d.feng_ji_num,d.xiao_chuang_num,d.dispose_time,dp.deploy_name
+          from `env_device` d left join `env_dayage_peizhi` dp
+          on d.dispose_time  = dp.time_dayage
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>