料塔余量修改3

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/service/impl/FeedingEnvServiceImpl.java

@@ -130,19 +130,19 @@ public class FeedingEnvServiceImpl extends ServiceImpl<FeedingEnvMapper, Feeding
     @Override
     public JSONObject listEnv(String orgId) {
         JSONObject jsonObject = new JSONObject();
-        long deviceNum = this.count(new QueryWrapper<FeedingEnv>().lambda().eq(FeedingEnv::getOrgId, orgId));
-        if (deviceNum > 0){
-            jsonObject.put("envCount",deviceNum);
-            long onDeviceNum = this.count(new QueryWrapper<FeedingEnv>().lambda().eq(FeedingEnv::getDeviceStatus,"1").eq(FeedingEnv::getOrgId, orgId));
-            jsonObject.put("onliveCount", onDeviceNum);
-
-            long offDeviceNum = this.count(new QueryWrapper<FeedingEnv>().lambda().eq(FeedingEnv::getDeviceStatus,"0").eq(FeedingEnv::getOrgId, orgId));
-            jsonObject.put("offliveCount", offDeviceNum);
+        List<FeedingEnv> envs = envMapper.selectList(new QueryWrapper<FeedingEnv>().eq("org_id", orgId));
+        if (envs.size() > 0){
+            jsonObject.put("envCount",envs.size());
+            List<FeedingEnv> onenvs = envMapper.selectList(new QueryWrapper<FeedingEnv>().eq("org_id", orgId).eq("device_status",1));
+            jsonObject.put("onliveCount", onenvs.size());
+
+            List<FeedingEnv> offenvs = envMapper.selectList(new QueryWrapper<FeedingEnv>().eq("org_id", orgId).eq("device_status",0));
+            jsonObject.put("offliveCount", offenvs.size());
             //创建一个数值格式化对象
             NumberFormat numberFormat = NumberFormat.getInstance();
             //设置精确到小数点后两位
             numberFormat.setMaximumFractionDigits(2);
-            String onlineRate = numberFormat.format((float)onDeviceNum / (float) deviceNum* 100) + "%";
+            String onlineRate = numberFormat.format((float)onenvs.size() / (float) envs.size()* 100) + "%";
             jsonObject.put("rank", onlineRate);
         }else {
             jsonObject.put("envCount", 0);