水电

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

@@ -1,10 +1,12 @@
 package com.huimv.guowei.admin.controller;
 
 
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.service.IEnergyElectricityService;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Map;
 
 /**
  * <p>
@@ -18,5 +20,16 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/energy-electricity")
 @CrossOrigin
 public class EnergyElectricityController {
+    @Resource
+    private IEnergyElectricityService energyElectricityService;
 
+    @PostMapping("/getElectricity")
+    public Result getElectricity(@RequestBody Map<String ,String> paramsMap){
+        return energyElectricityService.getElectricity(paramsMap);
+    }
+
+    @PostMapping("/listElectricity")
+    public Result listElectricity(@RequestBody Map<String ,String> paramsMap){
+        return energyElectricityService.listElectricity(paramsMap);
+    }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnergyWarningInfoController.java

@@ -1,10 +1,7 @@
 package com.huimv.guowei.admin.controller;
 
 
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>

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

@@ -1,10 +1,12 @@
 package com.huimv.guowei.admin.controller;
 
 
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.service.IEnergyWaterService;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Map;
 
 /**
  * <p>
@@ -18,5 +20,17 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/energy-water")
 @CrossOrigin
 public class EnergyWaterController {
+    @Resource
+    private IEnergyWaterService energyWaterService;
+
+    @PostMapping("/getWater")
+    public Result getWater(@RequestBody Map<String ,String> paramsMap){
+        return energyWaterService.getWater(paramsMap);
+    }
+
+    @PostMapping("/listWater")
+    public Result listWater(@RequestBody Map<String ,String> paramsMap){
+        return energyWaterService.listWater(paramsMap);
+    }
 
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnergyElectricityMapper.java

@@ -3,6 +3,9 @@ package com.huimv.guowei.admin.mapper;
 import com.huimv.guowei.admin.entity.EnergyElectricity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +16,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EnergyElectricityMapper extends BaseMapper<EnergyElectricity> {
 
+    List<EnergyElectricity> listDayDetail(String farmId);
+
+    List<EnergyElectricity> listWeekDetail(String farmId);
+
+    List<EnergyElectricity> listMonthDetail(String farmId);
+
+    List<EnergyElectricity> listCustomDetail(String farmId, String startDate, String endDate);
+
+    BigDecimal getDayElectricity(String farmId);
+
+    BigDecimal getMonthElectricity(String farmId);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnergyWaterMapper.java

@@ -3,6 +3,9 @@ package com.huimv.guowei.admin.mapper;
 import com.huimv.guowei.admin.entity.EnergyWater;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +16,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EnergyWaterMapper extends BaseMapper<EnergyWater> {
 
+    List<EnergyWater> listDayDetail(String farmId);
+
+    List<EnergyWater> listWeekDetail(String farmId);
+
+    List<EnergyWater> listMonthDetail(String farmId);
+
+    List<EnergyWater> listCustomDetail(String id, String startDate, String farmId);
+
+    BigDecimal getDayWater(String farmId);
+
+    BigDecimal getMonthWater(String farmId);
 }

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

@@ -1,8 +1,11 @@
 package com.huimv.guowei.admin.service;
 
+import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.entity.EnergyElectricity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IEnergyElectricityService extends IService<EnergyElectricity> {
 
+    Result getElectricity(Map<String, String> paramsMap);
+
+    Result listElectricity(Map<String, String> paramsMap);
 }

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

@@ -1,8 +1,11 @@
 package com.huimv.guowei.admin.service;
 
+import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.entity.EnergyWater;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IEnergyWaterService extends IService<EnergyWater> {
 
+    Result listWater(Map<String, String> paramsMap);
+
+    Result getWater(Map<String, String> paramsMap);
 }

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

@@ -1,11 +1,20 @@
 package com.huimv.guowei.admin.service.impl;
 
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.EnergyElectricity;
+import com.huimv.guowei.admin.entity.EnergyWater;
 import com.huimv.guowei.admin.mapper.EnergyElectricityMapper;
 import com.huimv.guowei.admin.service.IEnergyElectricityService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +25,46 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityMapper, EnergyElectricity> implements IEnergyElectricityService {
+    @Resource
+    private EnergyElectricityMapper energyElectricityMapper;
+
+    @Override
+    public Result getElectricity(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        Map resultMap = new HashMap();
+        BigDecimal dayElectricity = energyElectricityMapper.getDayElectricity(farmId);
+        if (dayElectricity == null){
+            dayElectricity = BigDecimal.ZERO;
+        }
+        BigDecimal monthElectricity = energyElectricityMapper.getMonthElectricity(farmId);
+        if (monthElectricity == null){
+            monthElectricity = BigDecimal.ZERO;
+        }
+        resultMap.put("dayElectricity",dayElectricity);
+        resultMap.put("MonthElectricity",monthElectricity);
+        return new Result(ResultCode.SUCCESS,resultMap);
+    }
+
+    @Override
+    public Result listElectricity(Map<String, String> paramsMap) {
+        String type = paramsMap.get("type");
+        String farmId = paramsMap.get("farmId");
+        String startDate = paramsMap.get("startDate");
+        String endDate = paramsMap.get("endDate")+" 23:59:59";
 
+        List<EnergyElectricity> energyElectricityList = null;
+        if ("1".equals(type)){
+            energyElectricityList = energyElectricityMapper.listDayDetail(farmId);
+        }
+        if ("2".equals(type)){
+            energyElectricityList = energyElectricityMapper.listWeekDetail(farmId);
+        }
+        if ("3".equals(type)){
+            energyElectricityList = energyElectricityMapper.listMonthDetail(farmId);
+        }
+        if ("4".equals(type)){
+            energyElectricityList = energyElectricityMapper.listCustomDetail(farmId,startDate,endDate);
+        }
+        return new Result(ResultCode.SUCCESS,energyElectricityList);
+    }
 }

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

@@ -1,11 +1,20 @@
 package com.huimv.guowei.admin.service.impl;
 
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.EnergyWater;
 import com.huimv.guowei.admin.mapper.EnergyWaterMapper;
 import com.huimv.guowei.admin.service.IEnergyWaterService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +25,46 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, EnergyWater> implements IEnergyWaterService {
+    @Resource
+    private EnergyWaterMapper energyWaterMapper;
+
+    @Override
+    public Result listWater(Map<String, String> paramsMap) {
+        String type = paramsMap.get("type");
+        String farmId = paramsMap.get("farmId");
+        String startDate = paramsMap.get("startDate");
+        String endDate = paramsMap.get("endDate")+" 23:59:59";
+
+        List<EnergyWater> energyWaterList = null;
+        if ("1".equals(type)){
+            energyWaterList = energyWaterMapper.listDayDetail(farmId);
+        }
+        if ("2".equals(type)){
+            energyWaterList = energyWaterMapper.listWeekDetail(farmId);
+        }
+        if ("3".equals(type)){
+            energyWaterList = energyWaterMapper.listMonthDetail(farmId);
+        }
+        if ("4".equals(type)){
+            energyWaterList = energyWaterMapper.listCustomDetail(farmId,startDate,endDate);
+        }
+        return new Result(ResultCode.SUCCESS,energyWaterList);
+    }
 
+    @Override
+    public Result getWater(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        Map resultMap = new HashMap();
+        BigDecimal dayWater = energyWaterMapper.getDayWater(farmId);
+        if (dayWater == null){
+            dayWater = BigDecimal.ZERO;
+        }
+        BigDecimal monthWater = energyWaterMapper.getMonthWater(farmId);
+        if (monthWater == null){
+            monthWater = BigDecimal.ZERO;
+        }
+        resultMap.put("dayWater",dayWater);
+        resultMap.put("MonthWater",monthWater);
+        return new Result(ResultCode.SUCCESS,resultMap);
+    }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvDataServiceImpl.java

@@ -62,19 +62,19 @@ public class EnvDataServiceImpl extends ServiceImpl<EnvDataMapper, EnvData> impl
         }
 
         //今日查询
-        if ("0".equals(type)){
+        if ("1".equals(type)){
             envDataList = envDataMapper.listDayDetail(farmId,unitId);
         }
         //本周查询
-        if ("1".equals(type)){
+        if ("2".equals(type)){
             envDataList = envDataMapper.listWeekDetail(farmId,unitId);
         }
         //本月查询
-        if ("2".equals(type)){
+        if ("3".equals(type)){
             envDataList = envDataMapper.listMonthDetail(farmId,unitId);
         }
         //自定义查询
-        if ("3".equals(type)){
+        if ("4".equals(type)){
             envDataList = envDataMapper.listCustomDetail(farmId,unitId,startDate,endDate);
         }
         return new Result(ResultCode.SUCCESS,envDataList);

huimv-admin/src/main/resources/mapper/EnergyElectricityMapper.xml

@@ -16,4 +16,42 @@
         <result column="create_date" property="createDate" />
     </resultMap>
 
+    <select id="listDayDetail" resultType="com.huimv.guowei.admin.entity.EnergyElectricity">
+        SELECT ROUND(electricity_value,2) 'electricityValue', create_date FROM `energy_electricity`
+        WHERE farm_id = #{farmId}
+        AND TO_DAYS(create_date) = TO_DAYS(NOW()) ORDER BY create_date ASC
+    </select>
+
+    <select id="listWeekDetail" resultType="com.huimv.guowei.admin.entity.EnergyElectricity">
+        SELECT ROUND(SUM(electricity_value),2) 'electricityValue', create_date FROM `energy_electricity`
+        WHERE farm_id = #{farmId}
+        AND create_date BETWEEN (SELECT DATE_SUB(CURDATE(),INTERVAL WEEKDAY(CURDATE()) DAY)) AND NOW()
+        GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
+    </select>
+
+    <select id="listMonthDetail" resultType="com.huimv.guowei.admin.entity.EnergyElectricity">
+        SELECT ROUND(SUM(electricity_value),2) 'electricityValue', create_date FROM `energy_electricity`
+        WHERE farm_id = #{farmId}
+        AND create_date BETWEEN (SELECT DATE_ADD(CURDATE(),INTERVAL -DAY(CURDATE())+1 DAY)) AND NOW()
+        GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
+    </select>
+
+    <select id="listCustomDetail" resultType="com.huimv.guowei.admin.entity.EnergyElectricity">
+        SELECT ROUND(SUM(electricity_value),2) 'electricityValue', create_date FROM `energy_electricity`
+        WHERE farm_id = #{farmId}
+        AND create_date BETWEEN '${startDate}' AND '${endDate}'
+        GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
+    </select>
+
+    <select id="getDayElectricity" resultType="java.math.BigDecimal">
+        SELECT ROUND(SUM(electricity_value),2) 'electricityValue' FROM `energy_electricity`
+        WHERE farm_id = #{farmId}
+        AND TO_DAYS(create_date) = TO_DAYS(NOW())
+    </select>
+
+    <select id="getMonthElectricity" resultType="java.math.BigDecimal">
+        SELECT ROUND(SUM(electricity_value),2) 'electricityValue' FROM `energy_electricity`
+        WHERE farm_id = #{farmId}
+        AND create_date BETWEEN (SELECT DATE_SUB(CURDATE(),INTERVAL WEEKDAY(CURDATE()) DAY)) AND NOW()
+    </select>
 </mapper>

huimv-admin/src/main/resources/mapper/EnergyWaterMapper.xml

@@ -16,4 +16,43 @@
         <result column="create_date" property="createDate" />
     </resultMap>
 
+    <select id="listDayDetail" resultType="com.huimv.guowei.admin.entity.EnergyWater">
+        SELECT ROUND(water_value,2) 'waterValue', create_date FROM `energy_water`
+        WHERE farm_id = #{farmId}
+        AND TO_DAYS(create_date) = TO_DAYS(NOW()) ORDER BY create_date ASC
+    </select>
+
+    <select id="listWeekDetail" resultType="com.huimv.guowei.admin.entity.EnergyWater">
+        SELECT ROUND(SUM(water_value),2) 'waterValue', create_date FROM `energy_water`
+        WHERE farm_id = #{farmId}
+        AND create_date BETWEEN (SELECT DATE_SUB(CURDATE(),INTERVAL WEEKDAY(CURDATE()) DAY)) AND NOW()
+        GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
+    </select>
+
+    <select id="listMonthDetail" resultType="com.huimv.guowei.admin.entity.EnergyWater">
+        SELECT ROUND(SUM(water_value),2) 'waterValue', create_date FROM `energy_water`
+        WHERE farm_id = #{farmId}
+        AND create_date BETWEEN (SELECT DATE_ADD(CURDATE(),INTERVAL -DAY(CURDATE())+1 DAY)) AND NOW()
+        GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
+    </select>
+
+    <select id="listCustomDetail" resultType="com.huimv.guowei.admin.entity.EnergyWater">
+        SELECT ROUND(SUM(water_value),2) 'waterValue', create_date FROM `energy_water`
+        WHERE farm_id = #{farmId}
+        AND create_date BETWEEN '${startDate}' AND '${endDate}'
+        GROUP BY DATE_FORMAT(create_date,"%Y-%m-%d")
+    </select>
+
+    <select id="getDayWater" resultType="java.math.BigDecimal">
+        SELECT ROUND(SUM(water_value),2) 'waterValue' FROM `energy_water`
+        WHERE farm_id = #{farmId}
+        AND TO_DAYS(create_date) = TO_DAYS(NOW())
+    </select>
+
+    <select id="getMonthWater" resultType="java.math.BigDecimal">
+        SELECT ROUND(SUM(water_value),2) 'waterValue' FROM `energy_water`
+        WHERE farm_id = #{farmId}
+        AND create_date BETWEEN (SELECT DATE_SUB(CURDATE(),INTERVAL WEEKDAY(CURDATE()) DAY)) AND NOW()
+    </select>
+
 </mapper>