app增加接口

huimv-admin/src/main/java/com/huimv/admin/controller/EnergyElectricityController.java

@@ -37,4 +37,9 @@ public class EnergyElectricityController {
     public Result listData(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return energyElectricityService.listData(httpServletRequest, paramsMap);
     }
+    //app
+    @RequestMapping("/listPigpenApp")
+    public Result listPigpenApp(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return energyElectricityService.listPigpenApp(httpServletRequest, paramsMap);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/controller/EnergyFeedController.java

@@ -38,4 +38,9 @@ public class EnergyFeedController {
     public Result listData(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return energyFeedService.listData(httpServletRequest, paramsMap);
     }
+    //app
+    @RequestMapping("/listPigpenApp")
+    public Result listPigpenApp(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return energyFeedService.listPigpenApp(httpServletRequest, paramsMap);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/controller/EnergyWaterController.java

@@ -38,4 +38,10 @@ public class EnergyWaterController {
     public Result listData(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return energyWaterService.listData(httpServletRequest, paramsMap);
     }
+
+    //app
+    @RequestMapping("/listPigpenApp")
+    public Result listPigpenApp(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return energyWaterService.listPigpenApp(httpServletRequest, paramsMap);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/service/IEnergyElectricityService.java

@@ -19,4 +19,7 @@ public interface IEnergyElectricityService extends IService<EnergyElectricity> {
     Result listPigpen(HttpServletRequest httpServletRequest,Map<String,String> paramsMap );
 
     Result listData(HttpServletRequest httpServletRequest,Map<String,String> paramsMap );
+
+    //app
+    Result listPigpenApp(HttpServletRequest httpServletRequest,Map<String,String> paramsMap );
 }

huimv-admin/src/main/java/com/huimv/admin/service/IEnergyFeedService.java

@@ -20,4 +20,7 @@ public interface IEnergyFeedService extends IService<EnergyFeed> {
     Result listPigpen(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
     Result listData(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+
+    //app
+    Result listPigpenApp(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/admin/service/IEnergyWaterService.java

@@ -19,4 +19,7 @@ public interface IEnergyWaterService extends IService<EnergyWater> {
     Result listPigpen(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
     Result listData(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+
+    //app
+    Result listPigpenApp(HttpServletRequest httpServletRequest,Map<String,String> paramsMap );
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnergyElectricityServiceImpl.java

@@ -126,4 +126,36 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
         }
         return new Result(ResultCode.SUCCESS, electricityList);
     }
+
+    @Override
+    public Result listPigpenApp(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        JSONArray jsonArray = new JSONArray();
+
+        QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
+        basePigpenQueryWrapper.eq("farm_id", farmId).eq("f_type", 3);
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//所有的单元
+        for (BasePigpen basePigpen : basePigpens) {
+            JSONObject jsonObject = new JSONObject();
+            QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen.getId());
+            queryWrapper.select(" IFNULL(SUM(electricity_value),'0') electricityValue");
+            DateTime dateTime = DateUtil.beginOfDay(new Date());
+            queryWrapper.ge("create_date", dateTime);
+
+            EnergyData energyElectricity = dataMapper.selectOne(queryWrapper);
+            if (ObjectUtil.isEmpty(energyElectricity)) {
+                jsonObject.put("buildName", basePigpen.getBuildName());
+                jsonObject.put("value", 0);
+                jsonObject.put("id", basePigpen.getId());
+            } else {
+                DecimalFormat df = new DecimalFormat("0.00");
+                jsonObject.put("buildName", basePigpen.getBuildName());
+                jsonObject.put("value", df.format(Float.parseFloat(energyElectricity.getElectricityValue())));
+                jsonObject.put("id", basePigpen.getId());
+            }
+            jsonArray.add(jsonObject);
+        }
+        return new Result(ResultCode.SUCCESS, jsonArray);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnergyFeedServiceImpl.java

@@ -142,4 +142,46 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
         return new Result(ResultCode.SUCCESS, energyGasList);
 
     }
+
+    @Override
+    public Result listPigpenApp(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+
+        JSONArray jsonArray = new JSONArray();
+
+        QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("f_type", 1);
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);//所有层
+        for (BasePigpen basePigpen : basePigpens) {
+            Float count = 0.00f;
+            QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
+            basePigpenQueryWrapper.like("other2", basePigpen.getId()).eq("farm_id", farmId).eq("f_type", 3);
+            List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的单元
+            List<Integer> idList = new ArrayList<>();
+            basePigpens1.forEach(item->{
+                idList.add(item.getId());
+            });
+            JSONObject jsonObject = new JSONObject();
+            QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.in("unit_id", idList).eq("farm_id", farmId);
+            DateTime dateTime = DateUtil.beginOfDay(new Date());
+            queryWrapper1.ge("create_date", dateTime);
+            queryWrapper1.select(" IFNULL(SUM(feed_value),'0') feedValue");
+            EnergyData energyGas = dataMapper.selectOne(queryWrapper1);
+
+            if (ObjectUtil.isNotEmpty(energyGas)) {
+                count = count + Float.parseFloat(energyGas.getFeedValue());
+            } else {
+                count = count + 0.00f;
+            }
+            DecimalFormat df = new DecimalFormat("0.00");
+            jsonObject.put("value", df.format(count));
+            jsonObject.put("buildName", basePigpen.getBuildName());
+            jsonObject.put("id", basePigpen.getId());
+            jsonArray.add(jsonObject);
+
+        }
+
+        return new Result(ResultCode.SUCCESS, jsonArray);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnergyWaterServiceImpl.java

@@ -126,4 +126,35 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
         }
         return new Result(ResultCode.SUCCESS, energyWaterList);
     }
+
+    @Override
+    public Result listPigpenApp(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        JSONArray jsonArray = new JSONArray();
+        QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
+        basePigpenQueryWrapper.eq("farm_id", farmId).eq("f_type", 3);
+        List<BasePigpen> basePigpenList = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的单元
+        for (BasePigpen basePigpen : basePigpenList) {
+            JSONObject jsonObject = new JSONObject();
+            QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen.getId());
+            queryWrapper.select(" IFNULL(SUM(water_value),'0') waterValue");
+            DateTime dateTime = DateUtil.beginOfDay(new Date());
+            queryWrapper.ge("create_date", dateTime);
+
+            EnergyData energyWater = dataMapper.selectOne(queryWrapper);
+            if (ObjectUtil.isEmpty(energyWater)) {
+                jsonObject.put("buildName", basePigpen.getBuildName());
+                jsonObject.put("value", 0);
+                jsonObject.put("id", basePigpen.getId());
+            } else {
+                DecimalFormat df = new DecimalFormat("0.00");
+                jsonObject.put("buildName", basePigpen.getBuildName());
+                jsonObject.put("value",df.format(Float.parseFloat(energyWater.getWaterValue())));
+                jsonObject.put("id", basePigpen.getId());
+            }
+            jsonArray.add(jsonObject);
+        }
+        return new Result(ResultCode.SUCCESS, jsonArray);
+    }
 }