用气

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

@@ -134,4 +134,10 @@ public class EnergyDataController {
             iEnergyDataService.save(energyData);
         }
     }
+
+    @RequestMapping("/addGas")
+    public Result addGas(@RequestBody EnergyData energyData) {
+        iEnergyDataService.save(energyData);
+        return Result.SUCCESS();
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/entity/EnergyData.java

@@ -82,7 +82,7 @@ public class EnergyData implements Serializable {
 
     private Integer farmId;
 
-    private String other1;
+    private Integer displayType;
 
     private String other2;
 

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

@@ -56,7 +56,11 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
     @Override
     public Result listCount(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
+        String displayType = paramsMap.get("displayType");
         QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
+        if ("0".equals(displayType)){
+            queryWrapper.eq("display_type",displayType);
+        }
         Date monthmorning = DataUill.getTimesMonthmorning();
         queryWrapper.eq("farm_id", farmId).ge("create_date", monthmorning);
         EnergyDataVo energyDataVo = dataMapper.listCount(queryWrapper);
@@ -76,6 +80,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
     public Result listData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String dataType = paramsMap.get("dataType");
+        String displayType = paramsMap.get("displayType");
         String timeType = paramsMap.get("timeType");
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
@@ -184,6 +189,9 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
         }
         //天然气
         else if ("4".equals(dataType)) {
+            if (ObjectUtil.isNotEmpty(displayType)){
+                dataQueryWrapper.eq("display_type",displayType);
+            }
             //自定义
             if ("4".equals(timeType)) {
                 startTime = startTime + " 00:00:00";
@@ -219,6 +227,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
     @Override
     public Result listRank(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
+        String displayType = paramsMap.get("displayType");
         String dataType = paramsMap.get("dataType");
         String timeType = paramsMap.get("timeType");
         String startTime = paramsMap.get("startTime");
@@ -245,6 +254,9 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 idList.add(item.getId());
             });//某一层所有单元的id
             QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
+            if ("0".equals(displayType)){
+                dataQueryWrapper.eq("display_type",displayType);
+            }
             if (idList.size() != 0) {
                 dataQueryWrapper.eq("farm_id", farmId).in("unit_id", idList);
                 if ("4".equals(timeType)) {
@@ -305,9 +317,15 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
     @Override
     public Result listDataScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
+        String displayType = paramsMap.get("displayType");
         QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
-        List<EnergyAllDataVo> energyGasDataVos = dataMapper.listDayGas(queryWrapper);
+        QueryWrapper<EnergyData> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("farm_id", farmId);
+        if (ObjectUtil.isNotEmpty(displayType)){
+            queryWrapper2.eq("display_type",displayType);
+        }
+        List<EnergyAllDataVo> energyGasDataVos = dataMapper.listDayGas(queryWrapper2);
         List<EnergyAllDataVo> energyFeedDataVos = dataMapper.listDayFeed(queryWrapper);
         List<EnergyAllDataVo> energyWaterDataVos = dataMapper.listDayWater(queryWrapper);
         List<EnergyAllDataVo> energyElectricityDataVos = dataMapper.listDayElectricity(queryWrapper);
@@ -323,6 +341,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
     public Result listRankScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String dataType = paramsMap.get("dataType");
+        String displayType = paramsMap.get("displayType");
         if (dataType == null || dataType == "") {
             dataType = "1";
         }
@@ -342,6 +361,9 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
             });//某一层所有单元的id
 
             QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
+            if ("0".equals(displayType)){
+                dataQueryWrapper.eq("display_type",displayType);
+            }
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
             JSONObject jsonObject = new JSONObject();
             if (idList.size() != 0) {

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

@@ -47,6 +47,7 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
     @Override
     public Result listPigpen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
+        String displayType = paramsMap.get("displayType");
         String id = paramsMap.get("id");
 
         JSONArray jsonArray = new JSONArray();
@@ -62,8 +63,14 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
             basePigpens1.forEach(item->{
                 idList.add(item.getId());
             });
+            if (ObjectUtil.isEmpty(idList)){
+                return  new Result(ResultCode.SUCCESS, jsonArray);
+            }
             JSONObject jsonObject = new JSONObject();
             QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
+            if (ObjectUtil.isNotEmpty(displayType)){
+                queryWrapper1.eq("display_type",displayType);
+            }
             queryWrapper1.in("unit_id", idList).eq("farm_id", farmId);
             DateTime dateTime = DateUtil.beginOfDay(new Date());
             queryWrapper1.ge("create_date", dateTime);
@@ -87,6 +94,7 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
     @Override
     public Result listData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
+        String displayType = paramsMap.get("displayType");
         String type = paramsMap.get("type");
         String id = paramsMap.get("id");//楼层id
         String startTime = paramsMap.get("startTime");
@@ -106,6 +114,9 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
         });
 
         QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(displayType)){
+            queryWrapper.eq("display_type",displayType);
+        }
         queryWrapper.eq("farm_id", farmId).in("unit_id", unitIds);
         //自定义查询
         if ("4".equals(type)) {