创建项目

musk/src/main/java/com/huimv/farm/musk/controller/DevEnergyController.java

@@ -79,4 +79,9 @@ public class DevEnergyController {
         return energyService.listHistory(paramsMap);
     }
 
+    @RequestMapping("/listScreen")
+    public Result listScreen(@RequestBody Map<String, String> paramsMap) {
+        return energyService.listScreen(paramsMap);
+    }
+
 }

musk/src/main/java/com/huimv/farm/musk/controller/DevEnvController.java

@@ -80,10 +80,10 @@ public class DevEnvController {
     }
 
 //    //大屏环境监测
-//    @RequestMapping("/listScreen")
-//    public Result listScreen(@RequestBody Map<String, String> paramsMap) {
-//        return envService.listScreen(paramsMap);
-//    }
+    @RequestMapping("/listScreen")
+    public Result listScreen(@RequestBody Map<String, String> paramsMap) {
+        return envService.listScreen(paramsMap);
+    }
 
 
 }

musk/src/main/java/com/huimv/farm/musk/service/IDevEnergyService.java

@@ -21,4 +21,6 @@ public interface IDevEnergyService extends IService<DevEnergy> {
     Result listEnergy(Map<String, String> map);
 
     Result listHistory(Map<String, String> paramsMap);
+
+    Result listScreen(Map<String, String> paramsMap);
 }

musk/src/main/java/com/huimv/farm/musk/service/IDevEnvService.java

@@ -22,5 +22,5 @@ public interface IDevEnvService extends IService<DevEnv> {
 
     Result listHistory(Map<String, String> paramsMap);
 
-//    Result listScreen(Map<String, String> paramsMap);
+    Result listScreen(Map<String, String> paramsMap);
 }

musk/src/main/java/com/huimv/farm/musk/service/impl/DevEnergyServiceImpl.java

@@ -2,6 +2,9 @@ package com.huimv.farm.musk.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+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.core.toolkit.StringUtils;
@@ -9,9 +12,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.farm.musk.common.utils.DataUill;
 import com.huimv.farm.musk.common.utils.Result;
 import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.BaseBuilding;
 import com.huimv.farm.musk.entity.DevEnergy;
 import com.huimv.farm.musk.entity.DevEnv;
 import com.huimv.farm.musk.entity.SysCameraArea;
+import com.huimv.farm.musk.mapper.BaseBuildingMapper;
 import com.huimv.farm.musk.mapper.DevEnergyMapper;
 import com.huimv.farm.musk.mapper.DevEnvMapper;
 import com.huimv.farm.musk.service.IDevEnergyService;
@@ -37,6 +42,9 @@ public class DevEnergyServiceImpl extends ServiceImpl<DevEnergyMapper, DevEnergy
     @Autowired
     private DevEnergyMapper energyMapper;
 
+    @Autowired
+    private BaseBuildingMapper baseBuildingMapper;
+
     @Override
     public Result pageEnergy(Map<String, Object> map) {
 
@@ -99,4 +107,32 @@ public class DevEnergyServiceImpl extends ServiceImpl<DevEnergyMapper, DevEnergy
         }
         return new Result(ResultCode.SUCCESS, protEnvData);
     }
+
+    @Override
+    public Result listScreen(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<BaseBuilding> buildingQueryWrapper = new QueryWrapper<>();
+        buildingQueryWrapper.eq("farm_id", farmId).eq("f_type", 1);
+        List<BaseBuilding> buildings = baseBuildingMapper.selectList(buildingQueryWrapper);
+        JSONArray jsonArray = new JSONArray();
+        if (buildings.size() != 0) {
+            for (BaseBuilding building : buildings) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("unitName", building.getBuildName());
+                jsonObject.put("unitId", building.getId());
+                QueryWrapper<DevEnergy> devEnvQueryWrapper = new QueryWrapper<>();
+                devEnvQueryWrapper.eq("farm_id", farmId).orderByDesc("id").last(" limit 1").eq("unit_id", building.getId());
+                DevEnergy devEnv = energyMapper.selectOne(devEnvQueryWrapper);
+                if (ObjectUtil.isNotEmpty(devEnv)) {
+                    jsonObject.put("water", devEnv.getWater());
+                    jsonObject.put("elec", devEnv.getElec());
+                } else {
+                    jsonObject.put("water", "--");
+                    jsonObject.put("elec", "--");
+                }
+                jsonArray.add(jsonObject);
+            }
+        }
+        return new Result(ResultCode.SUCCESS, jsonArray);
+    }
 }

musk/src/main/java/com/huimv/farm/musk/service/impl/DevEnvServiceImpl.java

@@ -2,6 +2,9 @@ package com.huimv.farm.musk.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+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.core.toolkit.StringUtils;
@@ -12,6 +15,7 @@ import com.huimv.farm.musk.common.utils.ResultCode;
 import com.huimv.farm.musk.entity.BaseBuilding;
 import com.huimv.farm.musk.entity.DevEnergy;
 import com.huimv.farm.musk.entity.DevEnv;
+import com.huimv.farm.musk.mapper.BaseBuildingMapper;
 import com.huimv.farm.musk.mapper.DevEnvMapper;
 import com.huimv.farm.musk.service.IDevEnvService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -36,6 +40,9 @@ public class DevEnvServiceImpl extends ServiceImpl<DevEnvMapper, DevEnv> impleme
 
     @Autowired
     private DevEnvMapper devEnvMapper;
+    @Autowired
+    private BaseBuildingMapper baseBuildingMapper;
+
 
     @Override
     public Result pageDevEnv(Map<String, Object> map) {
@@ -100,12 +107,35 @@ public class DevEnvServiceImpl extends ServiceImpl<DevEnvMapper, DevEnv> impleme
         return new Result(ResultCode.SUCCESS, protEnvData);
     }
 
-//    @Override
-//    public Result listScreen(Map<String, String> paramsMap) {
-//        String farmId = paramsMap.get("farmId");
-//        QueryWrapper<BaseBuilding> buildingQueryWrapper = new QueryWrapper<>();
-//        buildingQueryWrapper.eq("farm_id", farmId).eq("f_type", 1);
-//        List<BaseBuilding> buildings = buildingMapper.selectList(buildingQueryWrapper);
-//        return null;
-//    }
+    @Override
+    public Result listScreen(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<BaseBuilding> buildingQueryWrapper = new QueryWrapper<>();
+        buildingQueryWrapper.eq("farm_id", farmId).eq("f_type", 1);
+        List<BaseBuilding> buildings = baseBuildingMapper.selectList(buildingQueryWrapper);
+        JSONArray jsonArray = new JSONArray();
+        if (buildings.size() != 0) {
+            for (BaseBuilding building : buildings) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("unitName", building.getBuildName());
+                jsonObject.put("unitId", building.getId());
+                QueryWrapper<DevEnv> devEnvQueryWrapper = new QueryWrapper<>();
+                devEnvQueryWrapper.eq("farm_id", farmId).orderByDesc("id").last(" limit 1").eq("unit_id", building.getId());
+                DevEnv devEnv = devEnvMapper.selectOne(devEnvQueryWrapper);
+                if (ObjectUtil.isNotEmpty(devEnv)) {
+                    jsonObject.put("humi", devEnv.getHumi());
+                    jsonObject.put("tem", devEnv.getTem());
+                    jsonObject.put("gas", devEnv.getGas());
+
+                } else {
+                    jsonObject.put("humi", "--");
+                    jsonObject.put("tem", "--");
+                    jsonObject.put("gas", "--");
+
+                }
+                jsonArray.add(jsonObject);
+            }
+        }
+        return new Result(ResultCode.SUCCESS, jsonArray);
+    }
 }