饲料设备

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

@@ -3,6 +3,7 @@ package com.huimv.env.admin.controller;
 
 
 import com.huimv.env.common.service.IEnergyDataService;
+import com.huimv.env.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,30 +28,30 @@ public class EnergyDataController {
 
     @Autowired
     private IEnergyDataService iEnergyDataService;
-//
-//    @RequestMapping("/listCount")
-//    public Result listCount(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
-//        return iEnergyDataService.listCount(httpServletRequest, paramsMap);
-//    }
-//
-//    @RequestMapping("/listData")
-//    public Result listData(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
-//        return iEnergyDataService.listData(httpServletRequest, paramsMap);
-//    }
-//
-//    @RequestMapping("/listRank")
-//    public Result listRank(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
-//        return iEnergyDataService.listRank(httpServletRequest, paramsMap);
-//    }
-//
-//    //大屏
-//    @RequestMapping("/listDataScreen")
-//    public Result listDataScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
-//        return iEnergyDataService.listDataScreen(httpServletRequest, paramsMap);
-//    }
-//
-//    @RequestMapping("/listRankScreen")
-//    public Result listRankScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
-//        return iEnergyDataService.listRankScreen(httpServletRequest, paramsMap);
-//    }
+
+    @RequestMapping("/listCount")
+    public Result listCount(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return iEnergyDataService.listCount(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/listData")
+    public Result listData(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return iEnergyDataService.listData(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/listRank")
+    public Result listRank(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return iEnergyDataService.listRank(httpServletRequest, paramsMap);
+    }
+
+    //大屏
+    @RequestMapping("/listDataScreen")
+    public Result listDataScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return iEnergyDataService.listDataScreen(httpServletRequest, paramsMap);
+    }
+
+    @RequestMapping("/listRankScreen")
+    public Result listRankScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return iEnergyDataService.listRankScreen(httpServletRequest, paramsMap);
+    }
 }

huimv-env-admin/src/main/java/com/huimv/env/admin/controller/EnergyEnvDeviceController.java

@@ -0,0 +1,69 @@
+package com.huimv.env.admin.controller;
+
+
+
+import com.huimv.env.common.entity.EnergyEnvDevice;
+import com.huimv.env.common.service.IEnergyEnvDeviceService;
+import com.huimv.env.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/admin/energyEnvDevice")
+public class EnergyEnvDeviceController {
+    @Autowired
+    private IEnergyEnvDeviceService energyEnvDeviceService;
+
+    @RequestMapping("/DeviceList")
+    public Result getDeviceList(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return energyEnvDeviceService.list(httpServletRequest,paramsMap);
+    }
+
+    @RequestMapping("/DeviceAdd")
+    public Result getDeviceAdd(HttpServletRequest httpServletRequest, @RequestBody EnergyEnvDevice energyEnvDevice) {
+        return energyEnvDeviceService.add(httpServletRequest,energyEnvDevice);
+    }
+
+    @RequestMapping("/DeviceEdit")
+    public Result getDeviceEdit(HttpServletRequest httpServletRequest, @RequestBody EnergyEnvDevice energyEnvDevice) {
+        return energyEnvDeviceService.edit(httpServletRequest,energyEnvDevice);
+    }
+
+    @RequestMapping("/DeviceDelete")
+    public Result getDeviceDelete(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return energyEnvDeviceService.delete(httpServletRequest,paramsMap);
+    }
+    @RequestMapping("/deviceCount")
+    public Result  deviceCount(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return energyEnvDeviceService.deviceCount(httpServletRequest,paramsMap);
+    }
+
+
+    @RequestMapping("/bandingUnitId")
+    public Result bandingUnitId(HttpServletRequest httpServletRequest, @RequestBody EnergyEnvDevice envDevice) {
+        return energyEnvDeviceService.bandingUnitId(httpServletRequest,envDevice);
+    }
+    @RequestMapping("/unBandingUnitId")
+    public Result unBandingUnitId(HttpServletRequest httpServletRequest, @RequestBody EnergyEnvDevice envDevice) {
+        envDevice.setUnitId(0);
+        envDevice.setUnitName("");
+        energyEnvDeviceService.updateById(envDevice);
+        return new Result(10000,"解绑成功",true);
+    }
+
+}

huimv-env-common/src/main/java/com/huimv/env/common/entity/EnergyEnvDevice.java

@@ -0,0 +1,83 @@
+package com.huimv.env.common.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("energy_env_device")
+public class EnergyEnvDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 位置
+     */
+    private String buildLocation;
+
+    /**
+     * 单元名字
+     */
+    private String unitName;
+
+    /**
+     * 单元id
+     */
+    private Integer unitId;
+
+    /**
+     * 品牌
+     */
+    private String deviceBrand;
+
+    /**
+     * 0不在线  1在线
+     */
+    private Integer deviceStatus;
+
+    private Integer farmId;
+
+    /**
+     * 温度计id
+     */
+    private String ohter1;
+
+    /**
+     * 湿度计id
+     */
+    private String ohter2;
+
+    private String ohter3;
+
+    private String remark;
+
+
+}

huimv-env-common/src/main/java/com/huimv/env/common/entity/vo/EnergyAllDataVo.java

@@ -0,0 +1,14 @@
+package com.huimv.env.common.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class EnergyAllDataVo {
+    private String value;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createDate;
+}

huimv-env-common/src/main/java/com/huimv/env/common/entity/vo/EnergyDataVo.java

@@ -0,0 +1,20 @@
+package com.huimv.env.common.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+@Data
+public class EnergyDataVo {
+    private String feedValue;
+
+    private String gasValue;
+
+    private String electricityValue;
+
+    private String waterValue;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private String nowTime;
+
+    private Integer count;
+}

huimv-env-common/src/main/java/com/huimv/env/common/entity/vo/EnergyElectricityDataVo.java

@@ -0,0 +1,14 @@
+package com.huimv.env.common.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class EnergyElectricityDataVo {
+    private String electricityValue;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createDate;
+}

huimv-env-common/src/main/java/com/huimv/env/common/entity/vo/EnergyWaterDataVo.java

@@ -0,0 +1,14 @@
+package com.huimv.env.common.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class EnergyWaterDataVo {
+    private String waterValue;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createDate;
+}

huimv-env-common/src/main/java/com/huimv/env/common/mapper/EnergyDataMapper.java

@@ -5,6 +5,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 
 import com.huimv.env.common.entity.EnergyData;
+import com.huimv.env.common.entity.vo.EnergyAllDataVo;
+import com.huimv.env.common.entity.vo.EnergyDataVo;
+import com.huimv.env.common.entity.vo.EnergyElectricityDataVo;
+import com.huimv.env.common.entity.vo.EnergyWaterDataVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -21,17 +25,17 @@ import java.util.List;
 @Repository
 public interface EnergyDataMapper extends BaseMapper<EnergyData> {
 
-/*    List<EnergyGasDataVo> listYear(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
-
-    List<EnergyFeedDataVo> listYear2(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+//    List<EnergyGasDataVo> listYear(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+//
+//    List<EnergyFeedDataVo> listYear2(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
     List<EnergyWaterDataVo> listYear3(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
     List<EnergyElectricityDataVo> listYear4(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
-    List<EnergyGasDataVo> listDay(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
-
-    List<EnergyFeedDataVo> listDay2(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+//    List<EnergyGasDataVo> listDay(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+//
+//    List<EnergyFeedDataVo> listDay2(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
     List<EnergyWaterDataVo> listDay3(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
@@ -39,23 +43,23 @@ public interface EnergyDataMapper extends BaseMapper<EnergyData> {
 
     EnergyDataVo listCount(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
-    *//*11111*//*
-    List<EnergyAllDataVo> listYearGas(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+//    11111
+//    List<EnergyAllDataVo> listYearGas(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
     List<EnergyAllDataVo> listYearWater(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
-    List<EnergyAllDataVo> listYearFeed(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+//    List<EnergyAllDataVo> listYearFeed(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
     List<EnergyAllDataVo> listYearElectricity(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
-    List<EnergyAllDataVo> listDayGas(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+//    List<EnergyAllDataVo> listDayGas(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
     List<EnergyAllDataVo> listDayWater(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
-    List<EnergyAllDataVo> listDayFeed(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
+//    List<EnergyAllDataVo> listDayFeed(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
     List<EnergyAllDataVo> listDayElectricity(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
     //能耗使用
-    EnergyData listDataCount(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);*/
+    EnergyData listDataCount(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 }

huimv-env-common/src/main/java/com/huimv/env/common/mapper/EnergyEnvDeviceMapper.java

@@ -0,0 +1,17 @@
+package com.huimv.env.common.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.env.common.entity.EnergyEnvDevice;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+public interface EnergyEnvDeviceMapper extends BaseMapper<EnergyEnvDevice> {
+
+}

huimv-env-common/src/main/java/com/huimv/env/common/service/IEnergyDataService.java

@@ -16,7 +16,7 @@ import java.util.Map;
  * @since 2023-02-14
  */
 public interface IEnergyDataService extends IService<EnergyData> {
-/*    Result listCount(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+    Result listCount(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
     Result listData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
@@ -25,6 +25,6 @@ public interface IEnergyDataService extends IService<EnergyData> {
     //大屏
     Result listDataScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
-    Result listRankScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);*/
+    Result listRankScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
 }

huimv-env-common/src/main/java/com/huimv/env/common/service/IEnergyEnvDeviceService.java

@@ -0,0 +1,32 @@
+package com.huimv.env.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.env.common.entity.EnergyEnvDevice;
+import com.huimv.env.common.utils.Result;
+
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+public interface IEnergyEnvDeviceService extends IService<EnergyEnvDevice> {
+
+    Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result add(HttpServletRequest httpServletRequest, EnergyEnvDevice energyEnvDevice);
+
+    Result edit(HttpServletRequest httpServletRequest, EnergyEnvDevice energyEnvDevice);
+
+    Result delete(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result bandingUnitId(HttpServletRequest httpServletRequest, EnergyEnvDevice envDevice);
+
+    Result deviceCount(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+}

huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnergyDataServiceImpl.java

@@ -11,9 +11,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.DataUill;
 import com.huimv.env.common.entity.BasePigpen;
 import com.huimv.env.common.entity.EnergyData;
+import com.huimv.env.common.entity.vo.EnergyAllDataVo;
+import com.huimv.env.common.entity.vo.EnergyDataVo;
 import com.huimv.env.common.mapper.BasePigpenMapper;
 import com.huimv.env.common.mapper.EnergyDataMapper;
 import com.huimv.env.common.service.IEnergyDataService;
+import com.huimv.env.common.utils.Result;
+import com.huimv.env.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,17 +37,17 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
 
     @Autowired
     private EnergyDataMapper dataMapper;
-//    @Autowired
-//    private BasePigpenMapper basePigpenMapper;
+    @Autowired
+    private BasePigpenMapper basePigpenMapper;
 //    @Autowired
 //    private EnergyWarningInfoMapper warningInfoMapper;
 
-//    @Override
-//    public Result listCount(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-//        String farmId = paramsMap.get("farmId");
-//        QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.eq("farm_id", farmId);
-//        EnergyDataVo energyDataVo = dataMapper.listCount(queryWrapper);
+    @Override
+    public Result listCount(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        EnergyDataVo energyDataVo = dataMapper.listCount(queryWrapper);
 //        QueryWrapper<EnergyWarningInfo> queryWrapper1 = new QueryWrapper<>();
 //        queryWrapper1.eq("farm_id", farmId);
 //        Integer count = warningInfoMapper.selectCount(queryWrapper1);
@@ -53,88 +57,88 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
 ////                Float.parseFloat(energyDataVo.getGasValue()) + Float.parseFloat(energyDataVo.getWaterValue()));
 ////        DecimalFormat df1 = new DecimalFormat("#.00");
 //        energyDataVo.setCount(count);
-//        return new Result(ResultCode.SUCCESS, energyDataVo);
-//    }
-//
-//    @Override
-//    public Result listData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-//        String farmId = paramsMap.get("farmId");
-//        String dataType = paramsMap.get("dataType");
-//        String timeType = paramsMap.get("timeType");
-//        String startTime = paramsMap.get("startTime");
-//        String endTime = paramsMap.get("endTime");
-//
-//        if (dataType == null || dataType == "") {
-//            dataType = "1";
-//        }
-//        if (timeType == null || timeType == "") {
-//            timeType = "3";
-//        }
-//
-//        QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-//        dataQueryWrapper.eq("farm_id", farmId);
-//        //用水
-//        if ("1".equals(dataType)) {
-//            //自定义
-//            if ("4".equals(timeType)) {
-//                startTime = startTime + " 00:00:00";
-//                endTime = endTime + " 23:59:59";
-//                dataQueryWrapper.between("create_date", startTime, endTime);
-//                return new Result(ResultCode.SUCCESS, dataMapper.listDayWater(dataQueryWrapper));
-//            }
-//            //全年
-//            if ("3".equals(timeType)) {
-//                DateTime dateTime = DateUtil.beginOfYear(new Date());
-//                dataQueryWrapper.ge("create_date", dateTime);
-//                List<EnergyAllDataVo> energyWaterDataVos = dataMapper.listYearWater(dataQueryWrapper);
-//                return new Result(ResultCode.SUCCESS, energyWaterDataVos);
-//            }
-//            //本月
-//            if ("2".equals(timeType)) {
-//                Date timesMonthmorning = DataUill.getTimesMonthmorning();
-//                dataQueryWrapper.ge("create_date", timesMonthmorning);
-//                return new Result(ResultCode.SUCCESS, dataMapper.listDayWater(dataQueryWrapper));
-//            }
-//            //本周
-//            if ("1".equals(timeType)) {
-//                Calendar calendar = Calendar.getInstance();
-//                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-//                dataQueryWrapper.ge("create_date", calendar.getTime());
-//                List<EnergyAllDataVo> energyWaterDataVos = dataMapper.listDayWater(dataQueryWrapper);
-//                return new Result(ResultCode.SUCCESS, energyWaterDataVos);
-//            }
-//        }
-//        //用电
-//        else if ("2".equals(dataType)) {
-//            //自定义
-//            if ("4".equals(timeType)) {
-//                startTime = startTime + " 00:00:00";
-//                endTime = endTime + " 23:59:59";
-//                dataQueryWrapper.between("create_date", startTime, endTime);
-//                return new Result(ResultCode.SUCCESS, dataMapper.listDayElectricity(dataQueryWrapper));
-//            }
-//            //全年
-//            if ("3".equals(timeType)) {
-//                DateTime dateTime = DateUtil.beginOfYear(new Date());
-//                dataQueryWrapper.ge("create_date", dateTime);
-//                List<EnergyAllDataVo> energyElectricityDataVos = dataMapper.listYearElectricity(dataQueryWrapper);
-//                return new Result(ResultCode.SUCCESS, energyElectricityDataVos);
-//            }
-//            //本月
-//            if ("2".equals(timeType)) {
-//                Date timesMonthmorning = DataUill.getTimesMonthmorning();
-//                dataQueryWrapper.ge("create_date", timesMonthmorning);
-//                return new Result(ResultCode.SUCCESS, dataMapper.listDayElectricity(dataQueryWrapper));
-//            }
-//            //本周
-//            if ("1".equals(timeType)) {
-//                Calendar calendar = Calendar.getInstance();
-//                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-//                dataQueryWrapper.ge("create_date", calendar.getTime());
-//                List<EnergyAllDataVo> energyElectricityDataVos = dataMapper.listDayElectricity(dataQueryWrapper);
-//                return new Result(ResultCode.SUCCESS, energyElectricityDataVos);
-//            }
-//        }
+        return new Result(ResultCode.SUCCESS, energyDataVo);
+    }
+
+    @Override
+    public Result listData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String dataType = paramsMap.get("dataType");
+        String timeType = paramsMap.get("timeType");
+        String startTime = paramsMap.get("startTime");
+        String endTime = paramsMap.get("endTime");
+
+        if (dataType == null || dataType == "") {
+            dataType = "1";
+        }
+        if (timeType == null || timeType == "") {
+            timeType = "3";
+        }
+
+        QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
+        dataQueryWrapper.eq("farm_id", farmId);
+        //用水
+        if ("1".equals(dataType)) {
+            //自定义
+            if ("4".equals(timeType)) {
+                startTime = startTime + " 00:00:00";
+                endTime = endTime + " 23:59:59";
+                dataQueryWrapper.between("create_date", startTime, endTime);
+                return new Result(ResultCode.SUCCESS, dataMapper.listDayWater(dataQueryWrapper));
+            }
+            //全年
+            if ("3".equals(timeType)) {
+                DateTime dateTime = DateUtil.beginOfYear(new Date());
+                dataQueryWrapper.ge("create_date", dateTime);
+                List<EnergyAllDataVo> energyWaterDataVos = dataMapper.listYearWater(dataQueryWrapper);
+                return new Result(ResultCode.SUCCESS, energyWaterDataVos);
+            }
+            //本月
+            if ("2".equals(timeType)) {
+                Date timesMonthmorning = DataUill.getTimesMonthmorning();
+                dataQueryWrapper.ge("create_date", timesMonthmorning);
+                return new Result(ResultCode.SUCCESS, dataMapper.listDayWater(dataQueryWrapper));
+            }
+            //本周
+            if ("1".equals(timeType)) {
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                dataQueryWrapper.ge("create_date", calendar.getTime());
+                List<EnergyAllDataVo> energyWaterDataVos = dataMapper.listDayWater(dataQueryWrapper);
+                return new Result(ResultCode.SUCCESS, energyWaterDataVos);
+            }
+        }
+        //用电
+        else if ("2".equals(dataType)) {
+            //自定义
+            if ("4".equals(timeType)) {
+                startTime = startTime + " 00:00:00";
+                endTime = endTime + " 23:59:59";
+                dataQueryWrapper.between("create_date", startTime, endTime);
+                return new Result(ResultCode.SUCCESS, dataMapper.listDayElectricity(dataQueryWrapper));
+            }
+            //全年
+            if ("3".equals(timeType)) {
+                DateTime dateTime = DateUtil.beginOfYear(new Date());
+                dataQueryWrapper.ge("create_date", dateTime);
+                List<EnergyAllDataVo> energyElectricityDataVos = dataMapper.listYearElectricity(dataQueryWrapper);
+                return new Result(ResultCode.SUCCESS, energyElectricityDataVos);
+            }
+            //本月
+            if ("2".equals(timeType)) {
+                Date timesMonthmorning = DataUill.getTimesMonthmorning();
+                dataQueryWrapper.ge("create_date", timesMonthmorning);
+                return new Result(ResultCode.SUCCESS, dataMapper.listDayElectricity(dataQueryWrapper));
+            }
+            //本周
+            if ("1".equals(timeType)) {
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                dataQueryWrapper.ge("create_date", calendar.getTime());
+                List<EnergyAllDataVo> energyElectricityDataVos = dataMapper.listDayElectricity(dataQueryWrapper);
+                return new Result(ResultCode.SUCCESS, energyElectricityDataVos);
+            }
+        }
 //        //饲料
 //        else if ("3".equals(dataType)) {
 //            //自定义
@@ -197,361 +201,361 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
 //                return new Result(ResultCode.SUCCESS, energyGasDataVos);
 //            }
 //        }
-//        return new Result(ResultCode.SUCCESS);
-//    }
-//
-//    @Override
-//    public Result listRank(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-//        String farmId = paramsMap.get("farmId");
-//        String dataType = paramsMap.get("dataType");
-//        String timeType = paramsMap.get("timeType");
-//        String startTime = paramsMap.get("startTime");
-//        String endTime = paramsMap.get("endTime");
-//        if (dataType == null || dataType == "") {
-//            dataType = "1";
-//        }
-//        if (timeType == null || timeType == "") {
-//            timeType = "3";
-//        }
-//        QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
-//        basePigpenQueryWrapper.eq("farm_id", farmId);
-//        JSONArray jsonArray = new JSONArray();
-//        basePigpenQueryWrapper.eq("parent_id", 0);
-//        List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
-//        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) {
-//                QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-//                queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
-//                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);
-//                List<Integer> idList = new ArrayList<>();
-//                basePigpens1.forEach(item -> {
-//                    idList.add(item.getId());
-//                });//某一层所有单元的id
-//                QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-//                if (ObjectUtil.isNotEmpty(idList)) {
-//                    dataQueryWrapper.eq("farm_id", farmId).in("unit_id", idList);
-//                } else {
-//                    dataQueryWrapper.eq("farm_id", farmId);
-//                }
-//
-//
-//                if ("4".equals(timeType)) {
-//                    //自定义
-//                    startTime = startTime + " 00:00:00";
-//                    endTime = endTime + " 23:59:59";
-//                    dataQueryWrapper.between("create_date", startTime, endTime);
-//                } else if ("3".equals(timeType)) {
-//                    //本年
-//                    DateTime dateTime = DateUtil.beginOfYear(new Date());
-//                    dataQueryWrapper.ge("create_date", dateTime);
-//                } else if ("2".equals(timeType)) {
-//                    //本月
-//                    Date timesMonthmorning = DataUill.getTimesMonthmorning();
-//                    dataQueryWrapper.ge("create_date", timesMonthmorning);
-//                } else if ("1".equals(timeType)) {
-//                    //本周
-//                    Calendar calendar = Calendar.getInstance();
-//                    calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-//                    dataQueryWrapper.ge("create_date", calendar.getTime());
-//                }
-//
-//
-//                dataQueryWrapper.select(
-//                        "IFNULL(SUM(water_value),0) waterValue,IFNULL(SUM(gas_value),0) gasValue" +
-//                                ",IFNULL(SUM(electricity_value),0) electricityValue" +
-//                                ",IFNULL(SUM(feed_value),0) feedValue  "
-//                );
-//                EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-//                JSONObject jsonObject = new JSONObject();
-//
-//
-//                if ("1".equals(dataType)) {
-//                    if (Float.parseFloat(energyData.getWaterValue()) != 0.0f) {
-//                        value = value + Float.parseFloat(energyData.getWaterValue());
-//                        jsonObject.put("value", value);
-//                    } else {
-//                        jsonObject.put("value", 0);
-//                    }
-//                }
-//                if ("2".equals(dataType)) {
-//                    if (Float.parseFloat(energyData.getElectricityValue()) != 0.0f) {
-//                        value = value + Float.parseFloat(energyData.getElectricityValue());
-//                        jsonObject.put("value", value);
-//                    } else {
-//                        jsonObject.put("value", 0);
-//                    }
-//                }
-//                if ("3".equals(dataType)) {
-//                    if (Float.parseFloat(energyData.getFeedValue()) != 0.0f) {
-//                        value = value + Float.parseFloat(energyData.getFeedValue());
-//                        jsonObject.put("value", value);
-//                    } else {
-//                        jsonObject.put("value", 0);
-//                    }
-//                }
-//                if ("4".equals(dataType)) {
-//                    if (Float.parseFloat(energyData.getGasValue()) != 0.0f) {
-//                        value = value + Float.parseFloat(energyData.getGasValue());
-//                        jsonObject.put("value", value);
-//                    } else {
-//                        jsonObject.put("value", 0);
-//                    }
-//                }
-//                jsonObject.put("buildName", pigpen.getBuildName());
-//                jsonArray.add(jsonObject);
-//                value = 0.00f;
-//            }
-//        }
-//
-//        JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
-//        return new Result(ResultCode.SUCCESS, arraySort);
-//    }
-//
-//    @Override
-//    public Result listDataScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-//        String farmId = paramsMap.get("farmId");
-//        QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.eq("farm_id", farmId);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @Override
+    public Result listRank(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String dataType = paramsMap.get("dataType");
+        String timeType = paramsMap.get("timeType");
+        String startTime = paramsMap.get("startTime");
+        String endTime = paramsMap.get("endTime");
+        if (dataType == null || dataType == "") {
+            dataType = "1";
+        }
+        if (timeType == null || timeType == "") {
+            timeType = "3";
+        }
+        QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
+        basePigpenQueryWrapper.eq("farm_id", farmId);
+        JSONArray jsonArray = new JSONArray();
+        basePigpenQueryWrapper.eq("parent_id", 0);
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
+        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) {
+                QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
+                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);
+                List<Integer> idList = new ArrayList<>();
+                basePigpens1.forEach(item -> {
+                    idList.add(item.getId());
+                });//某一层所有单元的id
+                QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
+                if (ObjectUtil.isNotEmpty(idList)) {
+                    dataQueryWrapper.eq("farm_id", farmId).in("unit_id", idList);
+                } else {
+                    dataQueryWrapper.eq("farm_id", farmId);
+                }
+
+
+                if ("4".equals(timeType)) {
+                    //自定义
+                    startTime = startTime + " 00:00:00";
+                    endTime = endTime + " 23:59:59";
+                    dataQueryWrapper.between("create_date", startTime, endTime);
+                } else if ("3".equals(timeType)) {
+                    //本年
+                    DateTime dateTime = DateUtil.beginOfYear(new Date());
+                    dataQueryWrapper.ge("create_date", dateTime);
+                } else if ("2".equals(timeType)) {
+                    //本月
+                    Date timesMonthmorning = DataUill.getTimesMonthmorning();
+                    dataQueryWrapper.ge("create_date", timesMonthmorning);
+                } else if ("1".equals(timeType)) {
+                    //本周
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                    dataQueryWrapper.ge("create_date", calendar.getTime());
+                }
+
+
+                dataQueryWrapper.select(
+                        "IFNULL(SUM(water_value),0) waterValue,IFNULL(SUM(gas_value),0) gasValue" +
+                                ",IFNULL(SUM(electricity_value),0) electricityValue" +
+                                ",IFNULL(SUM(feed_value),0) feedValue  "
+                );
+                EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
+                JSONObject jsonObject = new JSONObject();
+
+
+                if ("1".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getWaterValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getWaterValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
+                    }
+                }
+                if ("2".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getElectricityValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getElectricityValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
+                    }
+                }
+                if ("3".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getFeedValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getFeedValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
+                    }
+                }
+                if ("4".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getGasValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getGasValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
+                    }
+                }
+                jsonObject.put("buildName", pigpen.getBuildName());
+                jsonArray.add(jsonObject);
+                value = 0.00f;
+            }
+        }
+
+        JSONArray arraySort = jsonArraySort(jsonArray, "value", true);
+        return new Result(ResultCode.SUCCESS, arraySort);
+    }
+
+    @Override
+    public Result listDataScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
 //        List<EnergyAllDataVo> energyGasDataVos = dataMapper.listDayGas(queryWrapper);
 //        List<EnergyAllDataVo> energyFeedDataVos = dataMapper.listDayFeed(queryWrapper);
-//        List<EnergyAllDataVo> energyWaterDataVos = dataMapper.listDayWater(queryWrapper);
-//        List<EnergyAllDataVo> energyElectricityDataVos = dataMapper.listDayElectricity(queryWrapper);
-//        JSONObject jsonObject = new JSONObject();
+        List<EnergyAllDataVo> energyWaterDataVos = dataMapper.listDayWater(queryWrapper);
+        List<EnergyAllDataVo> energyElectricityDataVos = dataMapper.listDayElectricity(queryWrapper);
+        JSONObject jsonObject = new JSONObject();
 //        jsonObject.put("gas", energyGasDataVos);
-//        jsonObject.put("water", energyWaterDataVos);
-//        jsonObject.put("energyElectricity", energyElectricityDataVos);
+        jsonObject.put("water", energyWaterDataVos);
+        jsonObject.put("energyElectricity", energyElectricityDataVos);
 //        jsonObject.put("feed", energyFeedDataVos);
-//        return new Result(ResultCode.SUCCESS, jsonObject);
-//    }
-//
-//    @Override
-//    public Result listRankScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-//        String farmId = paramsMap.get("farmId");
-//        String dataType = paramsMap.get("dataType");
-//        if (dataType == null || dataType == "") {
-//            dataType = "1";
-//        }
-//        QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
-//        basePigpenQueryWrapper.eq("farm_id", farmId);
-//        JSONArray jsonArray = new JSONArray();
-//        basePigpenQueryWrapper.eq("parent_id", 0);
-//        List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
-//        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) {
-//                QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
-//                queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
-//                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);
-//                List<Integer> idList = new ArrayList<>();
-//                basePigpens1.forEach(item -> {
-//                    idList.add(item.getId());
-//                });//某一层所有单元的id
-//                QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-//                if (ObjectUtil.isNotEmpty(idList)) {
-//                    dataQueryWrapper.eq("farm_id", farmId).in(("unit_id"), idList);
-//                } else {
-//                    dataQueryWrapper.eq("farm_id", farmId);
-//                }
-//
-//
-//                dataQueryWrapper.select(
-//                        "IFNULL(SUM(water_value),0) waterValue,IFNULL(SUM(gas_value),0) gasValue" +
-//                                ",IFNULL(SUM(electricity_value),0) electricityValue" +
-//                                ",IFNULL(SUM(feed_value),0) feedValue  "
-//                );
-//                EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
-//                JSONObject jsonObject = new JSONObject();
-//                if ("1".equals(dataType)) {
-//                    if (Float.parseFloat(energyData.getWaterValue()) != 0.0f) {
-//                        value = value + Float.parseFloat(energyData.getWaterValue());
-//                        jsonObject.put("value", value);
-//                    } else {
-//                        jsonObject.put("value", 0);
-//                    }
-//                }
-//                if ("2".equals(dataType)) {
-//                    if (Float.parseFloat(energyData.getElectricityValue()) != 0.0f) {
-//                        value = value + Float.parseFloat(energyData.getElectricityValue());
-//                        jsonObject.put("value", value);
-//                    } else {
-//                        jsonObject.put("value", 0);
-//                    }
-//                }
-//                if ("3".equals(dataType)) {
-//                    if (Float.parseFloat(energyData.getFeedValue()) != 0.0f) {
-//                        value = value + Float.parseFloat(energyData.getFeedValue());
-//                        jsonObject.put("value", value);
-//                    } else {
-//                        jsonObject.put("value", 0);
-//                    }
-//                }
-//                if ("4".equals(dataType)) {
-//                    if (Float.parseFloat(energyData.getGasValue()) != 0.0f) {
-//                        value = value + Float.parseFloat(energyData.getGasValue());
-//                        jsonObject.put("value", value);
-//                    } else {
-//                        jsonObject.put("value", 0);
-//                    }
-//                }
-//                jsonObject.put("buildName", pigpen.getBuildName());
-//                jsonArray.add(jsonObject);
-//                value = 0.00f;
-//            }
-//        }
-//        JSONArray arraySort = jsonArraySort1(jsonArray, "value", true);
-//        JSONArray array = new JSONArray();
-//        if (arraySort.size() < 5) {
-//            return new Result(ResultCode.SUCCESS, arraySort);
-//        } else {
-//            for (int i = 0; i < 5; i++) {
-//                array.add(arraySort.get(i));
-//            }
-//            return new Result(ResultCode.SUCCESS, array);
-//        }
-//    }
-//
-//
-//    /*数组排序*/
-//    public static JSONArray jsonArraySort(JSONArray jsonArr, String sortKey, boolean is_desc) {
-//        //存放排序结果json数组
-//        JSONArray sortedJsonArray = new JSONArray();
-//        //用于排序的list
-//        List<JSONObject> jsonValues = new ArrayList<JSONObject>();
-//        //将参数json数组每一项取出，放入list
-//        if (jsonArr.size() < 8) {
-//            for (int i = 0; i < jsonArr.size(); i++) {
-//                jsonValues.add(jsonArr.getJSONObject(i));
-//            }
-//            //快速排序，重写compare方法，完成按指定字段比较，完成排序
-//            Collections.sort(jsonValues, new Comparator<JSONObject>() {
-//                //排序字段
-//                private final String KEY_NAME = sortKey;
-//
-//                //重写compare方法
-//                @Override
-//                public int compare(JSONObject a, JSONObject b) {
-//                    //如果用String接会导致一位数和两位数混合比对的时候不能准确比出来，要用int类型接
-//                    //String valA = new String();
-//                    //String valB = new String();
-//                    Float valA = 0.00f;
-//                    Float valB = 0.00f;
-//                    try {
-//                        valA = Float.parseFloat(a.getString(KEY_NAME));
-//                        valB = Float.parseFloat(b.getString(KEY_NAME));
-//                    } catch (JSONException e) {
-//                        e.printStackTrace();
-//                    }
-//                    //是升序还是降序
-//                    if (is_desc) {
-//                        return -valA.compareTo(valB);
-//                    } else {
-//                        return -valB.compareTo(valA);
-//                    }
-//
-//                }
-//            });
-//            //将排序后结果放入结果jsonArray
-//            for (int i = 0; i < jsonArr.size(); i++) {
-//                sortedJsonArray.add(jsonValues.get(i));
-//            }
-//        } else {
-//            for (int i = 0; i < 8; i++) {
-//                jsonValues.add(jsonArr.getJSONObject(i));
-//            }
-//            //快速排序，重写compare方法，完成按指定字段比较，完成排序
-//            Collections.sort(jsonValues, new Comparator<JSONObject>() {
-//                //排序字段
-//                private final String KEY_NAME = sortKey;
-//
-//                //重写compare方法
-//                @Override
-//                public int compare(JSONObject a, JSONObject b) {
-//                    //如果用String接会导致一位数和两位数混合比对的时候不能准确比出来，要用int类型接
-//                    //String valA = new String();
-//                    //String valB = new String();
-//                    Float valA = 0.00f;
-//                    Float valB = 0.00f;
-//                    try {
-//                        valA = Float.parseFloat(a.getString(KEY_NAME));
-//                        valB = Float.parseFloat(b.getString(KEY_NAME));
-//                    } catch (JSONException e) {
-//                        e.printStackTrace();
-//                    }
-//                    //是升序还是降序
-//                    if (is_desc) {
-//                        return -valA.compareTo(valB);
-//                    } else {
-//                        return -valB.compareTo(valA);
-//                    }
-//
-//                }
-//            });
-//            //将排序后结果放入结果jsonArray
-//            for (int i = 0; i < 8; i++) {
-//                sortedJsonArray.add(jsonValues.get(i));
-//            }
-//        }
-//
-//        return sortedJsonArray;
-//    }
-//
-//    /*数组排序*/
-//    public static JSONArray jsonArraySort1(JSONArray jsonArr, String sortKey, boolean is_desc) {
-//        //存放排序结果json数组
-//        JSONArray sortedJsonArray = new JSONArray();
-//        //用于排序的list
-//        List<JSONObject> jsonValues = new ArrayList<JSONObject>();
-//        //将参数json数组每一项取出，放入list
-//
-//        for (int i = 0; i < jsonArr.size(); i++) {
-//            jsonValues.add(jsonArr.getJSONObject(i));
-//        }
-//        //快速排序，重写compare方法，完成按指定字段比较，完成排序
-//        Collections.sort(jsonValues, new Comparator<JSONObject>() {
-//            //排序字段
-//            private final String KEY_NAME = sortKey;
-//
-//            //重写compare方法
-//            @Override
-//            public int compare(JSONObject a, JSONObject b) {
-//                //如果用String接会导致一位数和两位数混合比对的时候不能准确比出来，要用int类型接
-//                //String valA = new String();
-//                //String valB = new String();
-//                Float valA = 0.00f;
-//                Float valB = 0.00f;
-//                try {
-//                    valA = Float.parseFloat(a.getString(KEY_NAME));
-//                    valB = Float.parseFloat(b.getString(KEY_NAME));
-//                } catch (JSONException e) {
-//                    e.printStackTrace();
-//                }
-//                //是升序还是降序
-//                if (is_desc) {
-//                    return -valA.compareTo(valB);
-//                } else {
-//                    return -valB.compareTo(valA);
-//                }
-//
-//            }
-//        });
-//        //将排序后结果放入结果jsonArray
-//        if (jsonArr.size() < 5) {
-//            for (int i = 0; i < jsonArr.size(); i++) {
-//                sortedJsonArray.add(jsonValues.get(i));
-//            }
-//        } else {
-//            for (int i = 0; i < 5; i++) {
-//                sortedJsonArray.add(jsonValues.get(i));
-//            }
-//        }
-//        return sortedJsonArray;
-//    }
+        return new Result(ResultCode.SUCCESS, jsonObject);
+    }
+
+    @Override
+    public Result listRankScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String dataType = paramsMap.get("dataType");
+        if (dataType == null || dataType == "") {
+            dataType = "1";
+        }
+        QueryWrapper<BasePigpen> basePigpenQueryWrapper = new QueryWrapper<>();
+        basePigpenQueryWrapper.eq("farm_id", farmId);
+        JSONArray jsonArray = new JSONArray();
+        basePigpenQueryWrapper.eq("parent_id", 0);
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(basePigpenQueryWrapper);//得到所有的栋舍
+        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) {
+                QueryWrapper<BasePigpen> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.like("other2", pigpen.getId()).eq("farm_id", farmId);
+                List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(queryWrapper1);
+                List<Integer> idList = new ArrayList<>();
+                basePigpens1.forEach(item -> {
+                    idList.add(item.getId());
+                });//某一层所有单元的id
+                QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
+                if (ObjectUtil.isNotEmpty(idList)) {
+                    dataQueryWrapper.eq("farm_id", farmId).in(("unit_id"), idList);
+                } else {
+                    dataQueryWrapper.eq("farm_id", farmId);
+                }
+
+
+                dataQueryWrapper.select(
+                        "IFNULL(SUM(water_value),0) waterValue,IFNULL(SUM(gas_value),0) gasValue" +
+                                ",IFNULL(SUM(electricity_value),0) electricityValue" +
+                                ",IFNULL(SUM(feed_value),0) feedValue  "
+                );
+                EnergyData energyData = dataMapper.selectOne(dataQueryWrapper);
+                JSONObject jsonObject = new JSONObject();
+                if ("1".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getWaterValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getWaterValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
+                    }
+                }
+                if ("2".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getElectricityValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getElectricityValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
+                    }
+                }
+                if ("3".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getFeedValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getFeedValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
+                    }
+                }
+                if ("4".equals(dataType)) {
+                    if (Float.parseFloat(energyData.getGasValue()) != 0.0f) {
+                        value = value + Float.parseFloat(energyData.getGasValue());
+                        jsonObject.put("value", value);
+                    } else {
+                        jsonObject.put("value", 0);
+                    }
+                }
+                jsonObject.put("buildName", pigpen.getBuildName());
+                jsonArray.add(jsonObject);
+                value = 0.00f;
+            }
+        }
+        JSONArray arraySort = jsonArraySort1(jsonArray, "value", true);
+        JSONArray array = new JSONArray();
+        if (arraySort.size() < 5) {
+            return new Result(ResultCode.SUCCESS, arraySort);
+        } else {
+            for (int i = 0; i < 5; i++) {
+                array.add(arraySort.get(i));
+            }
+            return new Result(ResultCode.SUCCESS, array);
+        }
+    }
+
+
+    /*数组排序*/
+    public static JSONArray jsonArraySort(JSONArray jsonArr, String sortKey, boolean is_desc) {
+        //存放排序结果json数组
+        JSONArray sortedJsonArray = new JSONArray();
+        //用于排序的list
+        List<JSONObject> jsonValues = new ArrayList<JSONObject>();
+        //将参数json数组每一项取出，放入list
+        if (jsonArr.size() < 8) {
+            for (int i = 0; i < jsonArr.size(); i++) {
+                jsonValues.add(jsonArr.getJSONObject(i));
+            }
+            //快速排序，重写compare方法，完成按指定字段比较，完成排序
+            Collections.sort(jsonValues, new Comparator<JSONObject>() {
+                //排序字段
+                private final String KEY_NAME = sortKey;
+
+                //重写compare方法
+                @Override
+                public int compare(JSONObject a, JSONObject b) {
+                    //如果用String接会导致一位数和两位数混合比对的时候不能准确比出来，要用int类型接
+                    //String valA = new String();
+                    //String valB = new String();
+                    Float valA = 0.00f;
+                    Float valB = 0.00f;
+                    try {
+                        valA = Float.parseFloat(a.getString(KEY_NAME));
+                        valB = Float.parseFloat(b.getString(KEY_NAME));
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                    //是升序还是降序
+                    if (is_desc) {
+                        return -valA.compareTo(valB);
+                    } else {
+                        return -valB.compareTo(valA);
+                    }
+
+                }
+            });
+            //将排序后结果放入结果jsonArray
+            for (int i = 0; i < jsonArr.size(); i++) {
+                sortedJsonArray.add(jsonValues.get(i));
+            }
+        } else {
+            for (int i = 0; i < 8; i++) {
+                jsonValues.add(jsonArr.getJSONObject(i));
+            }
+            //快速排序，重写compare方法，完成按指定字段比较，完成排序
+            Collections.sort(jsonValues, new Comparator<JSONObject>() {
+                //排序字段
+                private final String KEY_NAME = sortKey;
+
+                //重写compare方法
+                @Override
+                public int compare(JSONObject a, JSONObject b) {
+                    //如果用String接会导致一位数和两位数混合比对的时候不能准确比出来，要用int类型接
+                    //String valA = new String();
+                    //String valB = new String();
+                    Float valA = 0.00f;
+                    Float valB = 0.00f;
+                    try {
+                        valA = Float.parseFloat(a.getString(KEY_NAME));
+                        valB = Float.parseFloat(b.getString(KEY_NAME));
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                    //是升序还是降序
+                    if (is_desc) {
+                        return -valA.compareTo(valB);
+                    } else {
+                        return -valB.compareTo(valA);
+                    }
+
+                }
+            });
+            //将排序后结果放入结果jsonArray
+            for (int i = 0; i < 8; i++) {
+                sortedJsonArray.add(jsonValues.get(i));
+            }
+        }
+
+        return sortedJsonArray;
+    }
+
+    /*数组排序*/
+    public static JSONArray jsonArraySort1(JSONArray jsonArr, String sortKey, boolean is_desc) {
+        //存放排序结果json数组
+        JSONArray sortedJsonArray = new JSONArray();
+        //用于排序的list
+        List<JSONObject> jsonValues = new ArrayList<JSONObject>();
+        //将参数json数组每一项取出，放入list
+
+        for (int i = 0; i < jsonArr.size(); i++) {
+            jsonValues.add(jsonArr.getJSONObject(i));
+        }
+        //快速排序，重写compare方法，完成按指定字段比较，完成排序
+        Collections.sort(jsonValues, new Comparator<JSONObject>() {
+            //排序字段
+            private final String KEY_NAME = sortKey;
+
+            //重写compare方法
+            @Override
+            public int compare(JSONObject a, JSONObject b) {
+                //如果用String接会导致一位数和两位数混合比对的时候不能准确比出来，要用int类型接
+                //String valA = new String();
+                //String valB = new String();
+                Float valA = 0.00f;
+                Float valB = 0.00f;
+                try {
+                    valA = Float.parseFloat(a.getString(KEY_NAME));
+                    valB = Float.parseFloat(b.getString(KEY_NAME));
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+                //是升序还是降序
+                if (is_desc) {
+                    return -valA.compareTo(valB);
+                } else {
+                    return -valB.compareTo(valA);
+                }
+
+            }
+        });
+        //将排序后结果放入结果jsonArray
+        if (jsonArr.size() < 5) {
+            for (int i = 0; i < jsonArr.size(); i++) {
+                sortedJsonArray.add(jsonValues.get(i));
+            }
+        } else {
+            for (int i = 0; i < 5; i++) {
+                sortedJsonArray.add(jsonValues.get(i));
+            }
+        }
+        return sortedJsonArray;
+    }
 
 }

huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnergyEnvDeviceServiceImpl.java

@@ -0,0 +1,151 @@
+package com.huimv.env.common.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.huimv.env.common.entity.EnergyEnvDevice;
+import com.huimv.env.common.mapper.EnergyEnvDeviceMapper;
+import com.huimv.env.common.service.IEnergyEnvDeviceService;
+import com.huimv.env.common.utils.Result;
+import com.huimv.env.common.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.NumberFormat;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-21
+ */
+@Service
+public class EnergyEnvDeviceServiceImpl extends ServiceImpl<EnergyEnvDeviceMapper, EnergyEnvDevice> implements IEnergyEnvDeviceService {
+    @Autowired
+    private EnergyEnvDeviceMapper energyEnvDeviceMapper;
+
+    @Override
+    public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String pageSize = paramsMap.get("pageSize");
+        String pageNo = paramsMap.get("pageNo");
+        if (pageSize==null||pageSize=="") {
+            pageSize = "10";
+        }
+        if (pageNo==null||pageNo=="") {
+            pageNo = "1";
+        }
+        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        Page<EnergyEnvDevice> page = new Page(Integer.parseInt(pageNo),Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS,energyEnvDeviceMapper.selectPage(page, queryWrapper));
+    }
+
+    @Override
+    public Result add(HttpServletRequest httpServletRequest, EnergyEnvDevice energyEnvDevice) {
+        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("device_name", energyEnvDevice.getDeviceName()).eq("farm_id",energyEnvDevice.getFarmId());
+        Integer count = energyEnvDeviceMapper.selectCount(queryWrapper);
+        if (count>0) {
+            return new Result(10001,"设备名称已存在",false);
+        }
+        queryWrapper.clear();
+        queryWrapper.eq("device_code", energyEnvDevice.getDeviceCode()).eq("farm_id",energyEnvDevice.getFarmId());
+        Integer count1= energyEnvDeviceMapper.selectCount(queryWrapper);
+        if (count1>0) {
+            return new Result(10001,"设备id已存在",false);
+        }
+        queryWrapper.clear();
+        queryWrapper.eq("unit_id", energyEnvDevice.getUnitId()).eq("farm_id",energyEnvDevice.getFarmId());
+        Integer count2= energyEnvDeviceMapper.selectCount(queryWrapper);
+        if (count2>0) {
+            return new Result(10001,"该单元已绑定设备",false);
+        }
+        energyEnvDeviceMapper.insert(energyEnvDevice);
+        return new Result(ResultCode.SUCCESS,"添加成功");
+    }
+
+    @Override
+    public Result edit(HttpServletRequest httpServletRequest,  EnergyEnvDevice energyEnvDevice) {
+        String deviceName = energyEnvDevice.getDeviceName();
+
+        QueryWrapper<EnergyEnvDevice> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq(StringUtils.isNotBlank(deviceName),"device_name", deviceName).ne("id",energyEnvDevice.getId());
+
+        Integer count = energyEnvDeviceMapper.selectCount(queryWrapper1);
+        if (count>0) {
+            return new Result(10001,"设备名称已存在",false);
+        }
+        queryWrapper1.clear();
+        queryWrapper1.eq("device_code", energyEnvDevice.getDeviceCode()).eq("farm_id",energyEnvDevice.getFarmId()).ne("id",energyEnvDevice.getId());
+        Integer count1= energyEnvDeviceMapper.selectCount(queryWrapper1);
+        if (count1>0) {
+            return new Result(10001,"设备id已存在",false);
+        }
+        queryWrapper1.clear();
+        queryWrapper1.eq("unit_id", energyEnvDevice.getUnitId()).eq("farm_id",energyEnvDevice.getFarmId()).ne("id",energyEnvDevice.getId());
+        Integer count2= energyEnvDeviceMapper.selectCount(queryWrapper1);
+        if (count2>0) {
+            return new Result(10001,"该单元已绑定设备",false);
+        }
+         energyEnvDeviceMapper.updateById(energyEnvDevice);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @Override
+    public Result delete(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String id = paramsMap.get("id");
+        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", id).eq("farm_id", farmId);
+        energyEnvDeviceMapper.delete(queryWrapper);
+        return new Result(ResultCode.SUCCESS,"删除成功");
+    }
+
+    @Override
+    public Result bandingUnitId(HttpServletRequest httpServletRequest, EnergyEnvDevice envDevice) {
+        Integer unitId = envDevice.getUnitId();
+        int count = this.count(new QueryWrapper<EnergyEnvDevice>().eq("unit_id", unitId));
+        if (count>0){
+            return new Result(10001,"绑定失败，该栋舍已有设备",false);
+        }
+        return new Result(10000,"绑定成功",true);
+    }
+
+    @Override
+    public Result deviceCount(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<EnergyEnvDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        Integer count = energyEnvDeviceMapper.selectCount(queryWrapper);
+        JSONObject jsonObject = new JSONObject();
+        if (count == 0) {
+            jsonObject.put("DeviceCount", 0);
+            jsonObject.put("OnDeviceCount", 0);
+            jsonObject.put("OffDeviceCount", 0);
+            jsonObject.put("OnDeviceRate", 0);
+        } else {
+            QueryWrapper<EnergyEnvDevice> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("device_status", 1).eq("farm_id",farmId);
+            Integer count1 = energyEnvDeviceMapper.selectCount(queryWrapper1);
+            Integer OffDeviceCount = count- count1;
+            //创建一个数值格式化对象
+            NumberFormat numberFormat = NumberFormat.getInstance();
+            //设置精确到小数点后两位
+            numberFormat.setMaximumFractionDigits(2);
+            String onDeviceRate = numberFormat.format((float)count1 / (float) count* 100) + "%";
+            jsonObject.put("DeviceCount", count);
+            jsonObject.put("OnDeviceCount", count1);
+            jsonObject.put("OffDeviceCount", OffDeviceCount);
+            jsonObject.put("OnDeviceRate", onDeviceRate);
+        }
+        return new Result(ResultCode.SUCCESS, jsonObject);
+    }
+}

huimv-env-common/src/main/java/resources/com/huimv/env/admin/mapper/EnergyDataMapper.xml

@@ -46,39 +46,37 @@
 <!--        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')-->
 <!--        ORDER BY create_date ASC-->
 <!--    </select>-->
-<!--    <select id="listYear3" resultType="com.huimv.admin.entity.vo.EnergyWaterDataVo">-->
-<!--        SELECT Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'waterValue',create_date 'createDate' FROM `energy_data`-->
-<!--         ${ew.customSqlSegment}-->
-<!--        GROUP BY DATE_FORMAT(create_date,'%Y-%m')-->
-<!--        ORDER BY create_date ASC-->
-<!--    </select>-->
-<!--    <select id="listDay3" resultType="com.huimv.admin.entity.vo.EnergyWaterDataVo">-->
-<!--        SELECT Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'waterValue',create_date 'createDate' FROM `energy_data`-->
-<!--         ${ew.customSqlSegment}-->
-<!--        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')-->
-<!--        ORDER BY create_date ASC-->
-<!--    </select>-->
-<!--    <select id="listYear4" resultType="com.huimv.admin.entity.vo.EnergyElectricityDataVo">-->
-<!--        SELECT Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'electricityValue',create_date 'createDate' FROM `energy_data`-->
-<!--         ${ew.customSqlSegment}-->
-<!--        GROUP BY DATE_FORMAT(create_date,'%Y-%m')-->
-<!--        ORDER BY create_date ASC-->
-<!--    </select>-->
-<!--    <select id="listDay4" resultType="com.huimv.admin.entity.vo.EnergyElectricityDataVo">-->
-<!--        SELECT Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'electricityValue',create_date 'createDate' FROM `energy_data`-->
-<!--         ${ew.customSqlSegment}-->
-<!--        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')-->
-<!--        ORDER BY create_date ASC-->
-<!--    </select>-->
-<!--    <select id="listCount" resultType="com.huimv.admin.entity.vo.EnergyDataVo">-->
-<!--        select Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'waterValue',-->
-<!--        Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'electricityValue',-->
-<!--        Convert((IFNUll(sum(feed_value),'0')),DECIMAL(10,2)) 'feedValue',-->
-<!--        Convert((IFNUll(sum(gas_value),'0')),DECIMAL(10,2)) 'gasValue',-->
-<!--        now() 'nowTime'-->
-<!--         from energy_data-->
-<!--        ${ew.customSqlSegment}-->
-<!--    </select>-->
+    <select id="listYear3" resultType="com.huimv.env.common.entity.vo.EnergyWaterDataVo">
+        SELECT Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'waterValue',create_date 'createDate' FROM `energy_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m')
+        ORDER BY create_date ASC
+    </select>
+    <select id="listDay3" resultType="com.huimv.env.common.entity.vo.EnergyWaterDataVo">
+        SELECT Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'waterValue',create_date 'createDate' FROM `energy_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
+        ORDER BY create_date ASC
+    </select>
+    <select id="listYear4" resultType="com.huimv.env.common.entity.vo.EnergyElectricityDataVo">
+        SELECT Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'electricityValue',create_date 'createDate' FROM `energy_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m')
+        ORDER BY create_date ASC
+    </select>
+    <select id="listDay4" resultType="com.huimv.env.common.entity.vo.EnergyElectricityDataVo">
+        SELECT Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'electricityValue',create_date 'createDate' FROM `energy_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
+        ORDER BY create_date ASC
+    </select>
+    <select id="listCount" resultType="com.huimv.env.common.entity.vo.EnergyDataVo">
+        select Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'waterValue',
+        Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'electricityValue'
+        now() 'nowTime'
+         from energy_data
+        ${ew.customSqlSegment}
+    </select>
 
 
 
@@ -108,34 +106,34 @@
 <!--        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')-->
 <!--        ORDER BY create_date ASC-->
 <!--    </select>-->
-<!--    <select id="listYearWater" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">-->
-<!--        SELECT Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`-->
-<!--         ${ew.customSqlSegment}-->
-<!--        GROUP BY DATE_FORMAT(create_date,'%Y-%m')-->
-<!--        ORDER BY create_date ASC-->
-<!--    </select>-->
-<!--    <select id="listDayWater" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">-->
-<!--        SELECT Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`-->
-<!--         ${ew.customSqlSegment}-->
-<!--        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')-->
-<!--        ORDER BY create_date ASC-->
-<!--    </select>-->
-<!--    <select id="listYearElectricity" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">-->
-<!--        SELECT Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`-->
-<!--         ${ew.customSqlSegment}-->
-<!--        GROUP BY DATE_FORMAT(create_date,'%Y-%m')-->
-<!--        ORDER BY create_date ASC-->
-<!--    </select>-->
-<!--    <select id="listDayElectricity" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">-->
-<!--        SELECT Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`-->
-<!--         ${ew.customSqlSegment}-->
-<!--        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')-->
-<!--        ORDER BY create_date ASC-->
-<!--    </select>-->
+    <select id="listYearWater" resultType="com.huimv.env.common.entity.vo.EnergyAllDataVo">
+        SELECT Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m')
+        ORDER BY create_date ASC
+    </select>
+    <select id="listDayWater" resultType="com.huimv.env.common.entity.vo.EnergyAllDataVo">
+        SELECT Convert((IFNUll(sum(water_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
+        ORDER BY create_date ASC
+    </select>
+    <select id="listYearElectricity" resultType="com.huimv.env.common.entity.vo.EnergyAllDataVo">
+        SELECT Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m')
+        ORDER BY create_date ASC
+    </select>
+    <select id="listDayElectricity" resultType="com.huimv.env.common.entity.vo.EnergyAllDataVo">
+        SELECT Convert((IFNUll(sum(electricity_value),'0')),DECIMAL(10,2)) 'value',create_date 'createDate' FROM `energy_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
+        ORDER BY create_date ASC
+    </select>
 
-<!--    <select id="listDataCount" resultType="com.huimv.admin.entity.EnergyData">-->
-<!--        select Convert(IFNULL(SUM(water_value),0),DECIMAL(10,2)) 'waterValue',Convert(IFNULL(SUM(electricity_value),0),DECIMAL(10,2)) 'electricityValue',-->
-<!--Convert(IFNULL(SUM(feed_value),0),DECIMAL(10,2)) 'feedValue',Convert(IFNULL(SUM(gas_value),0),DECIMAL(10,2)) 'gasValue' FROM energy_data-->
-<!-- ${ew.customSqlSegment}-->
-<!--    </select>-->
+    <select id="listDataCount" resultType="com.huimv.env.common.entity.EnergyData">
+        select Convert(IFNULL(SUM(water_value),0),DECIMAL(10,2)) 'waterValue',Convert(IFNULL(SUM(electricity_value),0),DECIMAL(10,2)) 'electricityValue',
+Convert(IFNULL(SUM(feed_value),0),DECIMAL(10,2)) 'feedValue',Convert(IFNULL(SUM(gas_value),0),DECIMAL(10,2)) 'gasValue' FROM energy_data
+ ${ew.customSqlSegment}
+    </select>
 </mapper>