大屏控制展示修改

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvDeviceEquipmentController.java

@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -136,4 +137,10 @@ public class EnvDeviceEquipmentController {
         Page<EnvDeviceEquipment> page = new Page(Integer.valueOf(pageNum),Integer.valueOf(pageSize));
         return new Result(ResultCode.SUCCESS,equipmentService.page(page,new QueryWrapper<EnvDeviceEquipment>().orderByAsc("unit_id").orderByAsc("equipment_type")));
     }
+
+
+    @PostMapping("/listScreen")
+    public Result listScreen(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
+        return new Result(ResultCode.SUCCESS,equipmentService.listScreen(httpServletRequest, paramsMap));
+    }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnvDeviceEquipmentService.java

@@ -1,8 +1,12 @@
 package com.huimv.guowei.admin.service;
 
+import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.entity.EnvDeviceEquipment;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 环控绑定设备 服务类
@@ -12,5 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2023-06-01
  */
 public interface IEnvDeviceEquipmentService extends IService<EnvDeviceEquipment> {
-
+    Result listScreen(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvDeviceEquipmentServiceImpl.java

@@ -1,11 +1,19 @@
 package com.huimv.guowei.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.EnvDeviceEquipment;
 import com.huimv.guowei.admin.mapper.EnvDeviceEquipmentMapper;
 import com.huimv.guowei.admin.service.IEnvDeviceEquipmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
  * 环控绑定设备 服务实现类
@@ -17,4 +25,28 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnvDeviceEquipmentServiceImpl extends ServiceImpl<EnvDeviceEquipmentMapper, EnvDeviceEquipment> implements IEnvDeviceEquipmentService {
 
+    @Autowired
+    private EnvDeviceEquipmentMapper equipmentMapper ;
+    @Override
+    public Result listScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String unitId = paramsMap.get("unitId");
+        String type = paramsMap.get("type");//显示设备类型
+        if ("".equals(type) || null == type) {
+            type = "1";
+        }
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNum) || null == pageNum) {
+            pageNum = "1";
+        }
+        if ("".equals(pageSize) || null == pageSize) {
+            pageSize = "4";
+        }
+        Page<EnvDeviceEquipment> page = new Page(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        QueryWrapper<EnvDeviceEquipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("unit_id", unitId).eq("equipment_type", type)
+                .orderByAsc("equipment_port");
+        return new Result(ResultCode.SUCCESS, equipmentMapper.selectPage(page, queryWrapper));
+    }
 }