大屏控制展示修改1

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

@@ -141,6 +141,6 @@ public class EnvDeviceEquipmentController {
 
     @PostMapping("/listScreen")
     public Result listScreen(HttpServletRequest httpServletRequest,@RequestBody Map<String, String> paramsMap){
-        return new Result(ResultCode.SUCCESS,equipmentService.listScreen(httpServletRequest, paramsMap));
+        return equipmentService.listScreen(httpServletRequest, paramsMap);
     }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/EnvDeviceEquipment.java

@@ -70,4 +70,6 @@ public class EnvDeviceEquipment implements Serializable {
     /*响应时间*/
     private Date updateTime;
 
+    private Integer farmId;
+
 }

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

@@ -1,5 +1,6 @@
 package com.huimv.guowei.admin.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -194,7 +195,7 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
         queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(duckId), "duck_id", duckId)
-               /* .ge("call_date", calendar.getTime())*/;
+        /* .ge("call_date", calendar.getTime())*/;
         QueryWrapper<EnvRegularCallEgg> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("farm_id", farmId).eq(StringUtils.isNotBlank(duckId), "duck_id", duckId);
         queryWrapper1.select(" IFNULL(SUM(duck_weight),'0') duckWeight, IFNULL(SUM(egg_num),'0') eggNum");
@@ -223,24 +224,36 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
             queryWrapper.eq("farm_id", farmId).eq("unit_id", baseBuildingId).like(StringUtils.isNotBlank(duckNum), "duck_num", duckNum);
             BaseDuckInfo baseDuckInfo = infoMapper.selectOne(queryWrapper);//笼子里的鸭只信息
 
-            QueryWrapper<EnvRegularCallEgg> queryWrapper1 = new QueryWrapper<>();
-            queryWrapper1.eq("farm_id", farmId).eq("duck_num", baseDuckInfo.getDuckNum());
-            queryWrapper1.select("SUM(egg_num) eggNum,duck_num duckNum");
-            queryWrapper1.groupBy("duck_num");
-            EnvRegularCallEgg egg = eggMapper.selectOne(queryWrapper1);//鸡蛋个数
-
-            QueryWrapper<EnvRegularCallFeeding> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("farm_id", farmId).eq("duck_num", baseDuckInfo.getDuckNum());
-            queryWrapper2.select("SUM(duck_weight) duckWeight,duck_num duckNum");
-            queryWrapper2.groupBy("duck_num");
-            EnvRegularCallFeeding envRegularCallFeeding = feedingMapper.selectOne(queryWrapper2);//采食量
-
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("duckNum", baseDuckInfo.getDuckNum());
-            jsonObject.put("feed", envRegularCallFeeding.getDuckWeight());
-            jsonObject.put("egg", egg.getEggNum());
-            jsonObject.put("location", baseDuckInfo.getUnitName());
-            jsonArray.add(jsonObject);
+            if (ObjectUtil.isNotEmpty(baseDuckInfo)) {
+                QueryWrapper<EnvRegularCallEgg> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.eq("farm_id", farmId).eq("duck_num", baseDuckInfo.getDuckNum());
+                queryWrapper1.select("SUM(egg_num) eggNum,duck_num duckNum");
+                queryWrapper1.groupBy("duck_num");
+                EnvRegularCallEgg egg = eggMapper.selectOne(queryWrapper1);//鸡蛋个数
+
+                QueryWrapper<EnvRegularCallFeeding> queryWrapper2 = new QueryWrapper<>();
+                queryWrapper2.eq("farm_id", farmId).eq("duck_num", baseDuckInfo.getDuckNum());
+                queryWrapper2.select("SUM(duck_weight) duckWeight,duck_num duckNum");
+                queryWrapper2.groupBy("duck_num");
+                EnvRegularCallFeeding envRegularCallFeeding = feedingMapper.selectOne(queryWrapper2);//采食量
+
+
+                JSONObject jsonObject = new JSONObject();
+                if (ObjectUtil.isEmpty(egg)) {
+                    jsonObject.put("egg", 0);
+                } else {
+                    jsonObject.put("egg", egg.getEggNum());
+                }
+                if (ObjectUtil.isEmpty(envRegularCallFeeding)) {
+                    jsonObject.put("feed", 0);
+                } else {
+                    jsonObject.put("feed", envRegularCallFeeding.getDuckWeight());
+                }
+                jsonObject.put("duckNum", baseDuckInfo.getDuckNum());
+                jsonObject.put("location", baseDuckInfo.getUnitName());
+                jsonArray.add(jsonObject);
+            }
+
         }
 
 
@@ -260,14 +273,27 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         EnergyWater water = waterMapper.selectOne(queryWrapper1);//水表
 
         QueryWrapper<EnvData> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("farm_id", farmId).eq("unit_id", unitId).orderByDesc("create_date").last(" limit 1");
+        queryWrapper2.eq("farm_id", farmId).eq("unit_id", unitId).orderByDesc("create_time").last(" limit 1");
         EnvData envData = dataMapper.selectOne(queryWrapper2);//温湿度
 
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("electricity", energyElectricity.getElectricityValue());
-        jsonObject.put("water", water.getWaterValue());
-        jsonObject.put("hum", envData.getEnvHum());
-        jsonObject.put("temp", envData.getEnvTemp());
+        if (ObjectUtil.isEmpty(energyElectricity)) {
+            jsonObject.put("electricity", 0);
+        } else {
+            jsonObject.put("electricity", energyElectricity.getElectricityValue());
+        }
+        if (ObjectUtil.isEmpty(water)) {
+            jsonObject.put("water", 0);
+        } else {
+            jsonObject.put("water", water.getWaterValue());
+        }
+        if (ObjectUtil.isEmpty(envData)) {
+            jsonObject.put("hum", 0);
+            jsonObject.put("temp", 0);
+        } else {
+            jsonObject.put("hum", envData.getEnvHum());
+            jsonObject.put("temp", envData.getEnvTemp());
+        }
 
         return new Result(ResultCode.SUCCESS, jsonObject);
     }