能耗用料天然气修改

huimv-admin/src/main/java/com/huimv/admin/mapper/ProtDataMapper.java

@@ -26,4 +26,6 @@ public interface ProtDataMapper extends BaseMapper<ProtData> {
     List<ProCountVo> listTp(@Param(Constants.WRAPPER) QueryWrapper<ProtData> queryWrapper);
     List<ProCountVo> listTn(@Param(Constants.WRAPPER) QueryWrapper<ProtData> queryWrapper);
     List<ProCountVo> listFlow(@Param(Constants.WRAPPER) QueryWrapper<ProtData> queryWrapper);
+
+    ProtData flowCount(@Param(Constants.WRAPPER) QueryWrapper<ProtData> queryWrapper);
 }

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

@@ -289,33 +289,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                         value = 0.00f;
                     }
                 }
-               /* for (BasePigpen basePigpen : basePigpens) {
-                    QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("farm_id", farmId).eq("parent_id", basePigpen.getId()).eq("f_type", 2);
-                    List<BasePigpen> pigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
-                    Float value = 0.00f;
-                    for (BasePigpen pigpen : pigpens) {
-                        JSONObject jsonObject = new JSONObject();
-                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                        queryWrapper1.eq("farm_id", farmId).eq("parent_id", pigpen.getId());
-                        List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//得到所有的单元
 
-                        for (BasePigpen basePigpen1 : basePigpens1) {
-                            QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                            dataQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpen1.getId())
-                                    .between("create_date", startTime, endTime);
-                            dataQueryWrapper.select(
-                                    "IFNULL(SUM(water_value),0) waterValue  "
-                            );
-                            EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                            value = value + Float.parseFloat(energyData.getWaterValue()); //把所有单元的值相加
-                        }
-                        jsonObject.put("value", value);
-                        jsonObject.put("buildName", pigpen.getBuildName());
-                        jsonArray.add(jsonObject);
-                        value = 0.00f;
-                    }
-                }*/
                 JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
                 return new Result(ResultCode.SUCCESS, arraySort);
             }
@@ -699,15 +673,20 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                                 "IFNULL(SUM(feed_value),0) feedValue  "
                         );
                         EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-                        if (Float.parseFloat(energyData.getFeedValue())!=0.0f) {
+
+                        QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                        queryWrapper1.eq("id", pigpen.getParentId()).eq("farm_id", farmId);
+                        BasePigpen basePigpen1 = basePigpenMapper.selectOne(queryWrapper1);
+                        if (Float.parseFloat(energyData.getFeedValue()) != 0.0f) {
                             value = value + Float.parseFloat(energyData.getFeedValue());
-                            QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-                            queryWrapper1.eq("id", pigpen.getParentId()).eq("farm_id", farmId);
-                            BasePigpen basePigpen1 = basePigpenMapper.selectOne(queryWrapper1);
                             jsonObject.put("value", value);
                             jsonObject.put("buildName", basePigpen1.getBuildName());
                             jsonArray.add(jsonObject);
                             value = 0.00f;
+                        } else {
+                            jsonObject.put("value", 0);
+                            jsonObject.put("buildName", basePigpen1.getBuildName());
+                            jsonArray.add(jsonObject);
                         }
                     }
                 }

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

@@ -22,14 +22,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author author
@@ -44,6 +41,7 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
     private BasePigpenMapper basePigpenMapper;
     @Autowired
     private EnergyDataMapper dataMapper;
+
     @Override
     public Result listPigpen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
@@ -53,15 +51,49 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
         if (id == null || id == "") {
             QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq("parent_id", 0);
-            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
+            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);//所有栋
             for (int i = 0; i < basePigpens.size(); i++) {
+
                 QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
                 basePigpenQueryWrapper.eq("parent_id", basePigpens.get(i).getId()).eq("farm_id", farmId);
-                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);
+                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);//所有层
                 for (BasePigpen basePigpen : basePigpens1) {
+
+                    QueryWrapper<BasePigpen> basePigpenQueryWrapper1 = new QueryWrapper<>();
+                    basePigpenQueryWrapper1.like("other2", basePigpen.getId()).eq("farm_id", farmId);
+                    List<BasePigpen> basePigpens2 = basePigpenMapper.selectList(basePigpenQueryWrapper1);//得到所有的单元
+                    for (BasePigpen pigpen : basePigpens2) {
+                        JSONObject jsonObject = new JSONObject();
+                        QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
+                        queryWrapper1.eq("unit_id", pigpen.getId()).eq("farm_id", farmId)
+                                .orderByDesc("create_date").last(" limit 1");
+                        EnergyData energyFeed = dataMapper.selectOne(queryWrapper1);
+                        if (ObjectUtil.isEmpty(energyFeed)) {
+                            jsonObject.put("buildName", basePigpen.getBuildName());
+                            jsonObject.put("value", 0);
+                            jsonObject.put("id", basePigpen.getId());
+                        } else {
+                            jsonObject.put("buildName", basePigpen.getBuildName());
+                            jsonObject.put("value", energyFeed.getFeedValue());
+                            jsonObject.put("id", basePigpen.getId());
+                        }
+                        jsonArray.add(jsonObject);
+                    }
+
+                }
+            }
+        } else {
+            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("parent_id", id);
+            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);//所有层
+            for (BasePigpen basePigpen : basePigpens) {
+                QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
+                basePigpenQueryWrapper.like("other2", basePigpen.getId()).eq("farm_id", farmId);
+                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的单元
+                for (BasePigpen pigpen : basePigpens1) {
                     JSONObject jsonObject = new JSONObject();
                     QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
-                    queryWrapper1.eq("unit_id", basePigpen.getId()).eq("farm_id", farmId)
+                    queryWrapper1.eq("unit_id", pigpen.getId()).eq("farm_id", farmId)
                             .orderByDesc("create_date").last(" limit 1");
                     EnergyData energyFeed = dataMapper.selectOne(queryWrapper1);
                     if (ObjectUtil.isEmpty(energyFeed)) {
@@ -73,33 +105,13 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
                         jsonObject.put("value", energyFeed.getFeedValue());
                         jsonObject.put("id", basePigpen.getId());
                     }
+
                     jsonArray.add(jsonObject);
                 }
-            }
-        } else {
-            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId).eq("parent_id", id);
-            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
-            for (BasePigpen basePigpen : basePigpens) {
-                JSONObject jsonObject = new JSONObject();
-                QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.eq("unit_id", basePigpen.getId()).eq("farm_id", farmId)
-                        .orderByDesc("create_date").last(" limit 1");
-                EnergyData energyFeed = dataMapper.selectOne(queryWrapper1);
-                if (ObjectUtil.isEmpty(energyFeed)) {
-                    jsonObject.put("buildName", basePigpen.getBuildName());
-                    jsonObject.put("value", 0);
-                    jsonObject.put("id", basePigpen.getId());
-                } else {
-                    jsonObject.put("buildName", basePigpen.getBuildName());
-                    jsonObject.put("value", energyFeed.getFeedValue());
-                    jsonObject.put("id", basePigpen.getId());
-                }
 
-                jsonArray.add(jsonObject);
             }
         }
-        return new Result(ResultCode.SUCCESS,jsonArray);
+        return new Result(ResultCode.SUCCESS, jsonArray);
     }
 
     @Override
@@ -110,24 +122,34 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
         String startTime = paramsMap.get("startTime");
         String endTime = paramsMap.get("endTime");
 
-        List<EnergyFeedDataVo> energyGasList=null;
+        List<EnergyFeedDataVo> energyGasList = null;
         //默认显示本年
         if (type == null || type == "") {
             type = "3";
         }
+
+        QueryWrapper<BasePigpen> pigpenQueryWrapper = new QueryWrapper<>();
+        pigpenQueryWrapper.eq("farm_id", farmId).like("other2", id);
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(pigpenQueryWrapper);//单元的集合
+        List<Integer> unitIds = new ArrayList<>();
+        basePigpens.forEach(item -> {
+            unitIds.add(item.getId());
+        });
+
         QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("unit_id",id);
+        queryWrapper.eq("farm_id", farmId).in("unit_id", unitIds);
         //自定义查询
         if ("4".equals(type)) {
             startTime = startTime + " 00:00:00";
             endTime = endTime + " 23:59:59";
             queryWrapper.between("create_date", startTime, endTime);
-            energyGasList = dataMapper.listDay2(queryWrapper);;
+            energyGasList = dataMapper.listDay2(queryWrapper);
+            ;
         }
         //全年
         else if ("3".equals(type)) {
             DateTime dateTime = DateUtil.beginOfYear(new Date());
-            queryWrapper.ge("create_date",dateTime);
+            queryWrapper.ge("create_date", dateTime);
             List<EnergyFeedDataVo> energyFeedDataVos = dataMapper.listYear2(queryWrapper);
             for (EnergyFeedDataVo energyFeedDataVo : energyFeedDataVos) {
                 if (energyFeedDataVo.getFeedValue() == null || energyFeedDataVo.getFeedValue() == "") {
@@ -140,7 +162,7 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
         else if ("2".equals(type)) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
             queryWrapper.ge("create_date", timesMonthmorning);
-            energyGasList =dataMapper.listDay2(queryWrapper);
+            energyGasList = dataMapper.listDay2(queryWrapper);
         }
         //本周
         else if ("1".equals(type)) {
@@ -155,7 +177,8 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
             }
             energyGasList = energyFeedDataVos;
         }
-        return new Result(ResultCode.SUCCESS,energyGasList);
+
+        return new Result(ResultCode.SUCCESS, energyGasList);
 
     }
 }

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

@@ -23,10 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -55,17 +52,50 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
         if (id == null || id == "") {
             QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("farm_id", farmId).eq("parent_id", 0);
-            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
+            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的栋
             for (int i = 0; i < basePigpens.size(); i++) {
 
 
                 QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
                 basePigpenQueryWrapper.eq("parent_id", basePigpens.get(i).getId()).eq("farm_id", farmId);
-                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);
+                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的层
                 for (BasePigpen basePigpen : basePigpens1) {
+
+                    QueryWrapper<BasePigpen> basePigpenQueryWrapper1 = new QueryWrapper<>();
+                    basePigpenQueryWrapper1.like("other2", basePigpen.getId()).eq("farm_id", farmId);
+                    List<BasePigpen> basePigpens2 = basePigpenMapper.selectList(basePigpenQueryWrapper1);//得到所有的单元
+                    for (BasePigpen pigpen : basePigpens2) {
+                        JSONObject jsonObject = new JSONObject();
+                        QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
+                        queryWrapper1.eq("unit_id", pigpen.getId()).eq("farm_id", farmId)
+                                .orderByDesc("create_date").last(" limit 1");
+                        EnergyData energyGas = dataMapper.selectOne(queryWrapper1);
+                        if (ObjectUtil.isEmpty(energyGas)) {
+                            jsonObject.put("buildName", basePigpen.getBuildName());
+                            jsonObject.put("value", 0);
+                            jsonObject.put("id", basePigpen.getId());
+                        } else {
+                            jsonObject.put("buildName", basePigpen.getBuildName());
+                            jsonObject.put("value", energyGas.getGasValue());
+                            jsonObject.put("id", basePigpen.getId());
+                        }
+                        jsonArray.add(jsonObject);
+                    }
+
+                }
+            }
+        } else {
+            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("farm_id", farmId).eq("parent_id", id);
+            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的楼层
+            for (BasePigpen basePigpen : basePigpens) {
+                QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
+                basePigpenQueryWrapper.like("other2", basePigpen.getId()).eq("farm_id", farmId);
+                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的单元
+                for (BasePigpen pigpen : basePigpens1) {
                     JSONObject jsonObject = new JSONObject();
                     QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
-                    queryWrapper1.eq("unit_id", basePigpen.getId()).eq("farm_id", farmId)
+                    queryWrapper1.eq("unit_id", pigpen.getId()).eq("farm_id", farmId)
                             .orderByDesc("create_date").last(" limit 1");
                     EnergyData energyGas = dataMapper.selectOne(queryWrapper1);
                     if (ObjectUtil.isEmpty(energyGas)) {
@@ -77,30 +107,10 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
                         jsonObject.put("value", energyGas.getGasValue());
                         jsonObject.put("id", basePigpen.getId());
                     }
+
                     jsonArray.add(jsonObject);
                 }
-            }
-        } else {
-            QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId).eq("parent_id", id);
-            List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
-            for (BasePigpen basePigpen : basePigpens) {
-                JSONObject jsonObject = new JSONObject();
-                QueryWrapper<EnergyData> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.eq("unit_id", basePigpen.getId()).eq("farm_id", farmId)
-                        .orderByDesc("create_date").last(" limit 1");
-                EnergyData energyGas = dataMapper.selectOne(queryWrapper1);
-                if (ObjectUtil.isEmpty(energyGas)) {
-                    jsonObject.put("buildName", basePigpen.getBuildName());
-                    jsonObject.put("value", 0);
-                    jsonObject.put("id", basePigpen.getId());
-                } else {
-                    jsonObject.put("buildName", basePigpen.getBuildName());
-                    jsonObject.put("value", energyGas.getGasValue());
-                    jsonObject.put("id", basePigpen.getId());
-                }
 
-                jsonArray.add(jsonObject);
             }
         }
 
@@ -120,8 +130,16 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
         if (type == null || type == "") {
             type = "3";
         }
+        QueryWrapper<BasePigpen> pigpenQueryWrapper = new QueryWrapper<>();
+        pigpenQueryWrapper.eq("farm_id", farmId).like("other2", id);
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(pigpenQueryWrapper);//单元的集合
+        List<Integer> unitIds = new ArrayList<>();
+        basePigpens.forEach(item -> {
+            unitIds.add(item.getId());
+        });
+
         QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("unit_id", id);
+        queryWrapper.eq("farm_id", farmId).in("unit_id", unitIds);
         //自定义查询
         if ("4".equals(type)) {
             startTime = startTime + " 00:00:00";
@@ -136,10 +154,10 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
             List<EnergyGasDataVo> energyGasDataVos = dataMapper.listYear(queryWrapper);
             for (EnergyGasDataVo energyGasDataVo : energyGasDataVos) {
                 if (energyGasDataVo.getGasValue() == null || energyGasDataVo.getGasValue() == "") {
-                   energyGasDataVo.setGasValue("0");
+                    energyGasDataVo.setGasValue("0");
                 }
             }
-            energyGasList = dataMapper.listYear(queryWrapper);
+            energyGasList = energyGasDataVos;
         }
         //本月
         else if ("2".equals(type)) {
@@ -158,8 +176,9 @@ public class EnergyGasServiceImpl extends ServiceImpl<EnergyGasMapper, EnergyGas
                     energyGasDataVo.setGasValue("0");
                 }
             }
-            energyGasList =energyGasDataVos;
+            energyGasList = energyGasDataVos;
         }
+
         return new Result(ResultCode.SUCCESS, energyGasList);
     }
 }

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

@@ -273,7 +273,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         else if ("1".equals(type)) {
             Date timesmorning = DataUill.getTimesmorning();
             queryWrapper.ge("create_time", timesmorning);
-            List<EnvData> envData = dataMapper.selectList(queryWrapper);
+            List<EnvData> envData = dataMapper.listDay(queryWrapper);
             map.put("location", basePigpen.getBuildName());
             map.put("data", envData);
         }
@@ -287,15 +287,15 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         Integer onCount = 0;
         QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).eq("parent_id", 0);
-        List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);//得到所有的栋
         JSONArray jsonArray = new JSONArray();
         for (int i = 0; i < basePigpens.size(); i++) {
             QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.like("other2", basePigpens.get(i).getId());
-            List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);
+            List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);//得到所有的楼层
             for (int j = 0; j < basePigpens1.size(); j++) {
                 QueryWrapper<EnvDevice> deviceQueryWrapper = new QueryWrapper<>();
-                deviceQueryWrapper.eq("build_location",basePigpens1.get(j).getId());
+                deviceQueryWrapper.eq("unit_id",basePigpens1.get(j).getId());
                 EnvDevice envDevice = envDeviceMapper.selectOne(deviceQueryWrapper);
                 if (ObjectUtil.isNotEmpty(envDevice)) {
                     if (envDevice.getDeviceStatus() == 0) {
@@ -311,6 +311,8 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             jsonObject.put("onDevice", onCount);
             jsonObject.put("offDevice", offCount);
             jsonArray.add(jsonObject);
+            offCount = 0;
+            onCount = 0;
         }
         return new Result(ResultCode.SUCCESS,jsonArray);
     }

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

@@ -768,11 +768,17 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             return new Result(ResultCode.SUCCESS, "");
         }
 
+        DateTime dateTime = DateUtil.beginOfYear(new Date());
+        QueryWrapper<ProtData> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("farm_id", farmId).ge("create_date", dateTime);
+        ProtData protData = protDataMapper.flowCount(queryWrapper2);
+
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("locCount", 27);
         jsonObject.put("ProtCount", count);
         jsonObject.put("WarningCount", count1);
         jsonObject.put("day", day);
+        jsonObject.put("flowCount", protData.getFlow());
         return new Result(ResultCode.SUCCESS,jsonObject);
     }
 

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnvDataMapper.xml

@@ -18,7 +18,7 @@
         <result column="receive_date" property="receiveDate"/>
     </resultMap>
     <select id="listDay" resultType="com.huimv.admin.entity.EnvData">
-    SELECT Convert((IFNULL(AVG(env_temp),0)),DECIMAL(10,2)) 'envTemp',Convert((IFNULL(AVG(env_hum),0)),DECIMAL(10,2)) 'envHum',create_time FROM env_data
+    SELECT Convert((IFNULL(AVG(env_temp),'0')),DECIMAL(10,2)) 'envTemp',Convert((IFNULL(AVG(env_hum),'0')),DECIMAL(10,2)) 'envHum',create_time FROM env_data
     ${ew.customSqlSegment}
     group BY DATE_FORMAT(create_time,'%Y-%m-%d')
     ORDER BY create_time ASC

huimv-admin/src/main/resources/com/huimv/admin/mapper/ProtDataMapper.xml

@@ -55,4 +55,11 @@
         group BY DATE_FORMAT(create_date,'%Y-%m-%d')
         ORDER BY create_date ASC
     </select>
+
+    <!--大屏-->
+    <select id="flowCount" resultType="com.huimv.admin.entity.ProtData">
+        select Convert((IFNULL(sum(FLOW),0)),DECIMAL(10,2)) 'flow',create_date,loction_type from prot_data
+        ${ew.customSqlSegment}
+        group BY DATE_FORMAT(create_date,'%Y')
+    </select>
 </mapper>