bug修改

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

@@ -32,4 +32,9 @@ public class EnvDeviceMaintainController {
     public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return envDeviceMaintainService.list(httpServletRequest,paramsMap);
     }
+    @RequestMapping("/add")
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return envDeviceMaintainService.add(httpServletRequest,paramsMap);
+    }
+
 }

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

@@ -48,7 +48,7 @@ public class EnvDeviceMaintain implements Serializable {
 
     private Integer farmId;
 
-    private Integer deviceId;
+    private String deviceId;
 
     private String other1;
 

huimv-admin/src/main/java/com/huimv/admin/entity/vo/EnergyAllDataVo.java

@@ -0,0 +1,14 @@
+package com.huimv.admin.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-admin/src/main/java/com/huimv/admin/entity/vo/GasDataVo.java

@@ -0,0 +1,14 @@
+package com.huimv.admin.entity.vo;
+
+import com.huimv.admin.entity.GasData;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GasDataVo {
+    private List<GasData> pigpen;
+    private List<GasData> above;
+    private List<GasData> under;
+    private List<GasData> people;
+}

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

@@ -38,4 +38,21 @@ public interface EnergyDataMapper extends BaseMapper<EnergyData> {
     List<EnergyElectricityDataVo> listDay4(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 
     EnergyDataVo listCount(@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> listYearElectricity(@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> listDayElectricity(@Param(Constants.WRAPPER) QueryWrapper<EnergyData> queryWrapper);
 }

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

@@ -19,5 +19,6 @@ public interface IEnvDeviceMaintainService extends IService<EnvDeviceMaintain> {
 
     Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
+    Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
 }

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

@@ -71,16 +71,16 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
                 dataQueryWrapper.between("create_time", startTime, endTime);
-               return new Result(ResultCode.SUCCESS, dataMapper.listDay3(dataQueryWrapper));
+               return new Result(ResultCode.SUCCESS, dataMapper.listDayWater(dataQueryWrapper));
             }
             //全年
             if ("3".equals(timeType)) {
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 dataQueryWrapper.ge("create_date", dateTime);
-                List<EnergyWaterDataVo> energyWaterDataVos = dataMapper.listYear3(dataQueryWrapper);
-                for (EnergyWaterDataVo energyWaterDataVo : energyWaterDataVos) {
-                    if (energyWaterDataVo.getWaterValue() == null || energyWaterDataVo.getWaterValue() == "") {
-                        energyWaterDataVo.setWaterValue("0");
+                List<EnergyAllDataVo> energyWaterDataVos = dataMapper.listYearWater(dataQueryWrapper);
+                for (EnergyAllDataVo energyWaterDataVo : energyWaterDataVos) {
+                    if (energyWaterDataVo.getValue() == null || energyWaterDataVo.getValue() == "") {
+                        energyWaterDataVo.setValue("0");
                     }
                 }
                 return new Result(ResultCode.SUCCESS, energyWaterDataVos);
@@ -89,17 +89,17 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
             if ("2".equals(timeType)) {
                 Date timesMonthmorning = DataUill.getTimesMonthmorning();
                 dataQueryWrapper.ge("create_date", timesMonthmorning);
-                return new Result(ResultCode.SUCCESS, dataMapper.listDay3(dataQueryWrapper));
+                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<EnergyWaterDataVo> energyWaterDataVos = dataMapper.listDay3(dataQueryWrapper);
-                for (EnergyWaterDataVo energyWaterDataVo : energyWaterDataVos) {
-                    if (energyWaterDataVo.getWaterValue() == null || energyWaterDataVo.getWaterValue() == "") {
-                        energyWaterDataVo.setWaterValue("0");
+                List<EnergyAllDataVo> energyWaterDataVos = dataMapper.listDayWater(dataQueryWrapper);
+                for (EnergyAllDataVo energyWaterDataVo : energyWaterDataVos) {
+                    if (energyWaterDataVo.getValue() == null || energyWaterDataVo.getValue() == "") {
+                        energyWaterDataVo.setValue("0");
                     }
                 }
                 return new Result(ResultCode.SUCCESS, energyWaterDataVos);
@@ -112,16 +112,16 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
                 dataQueryWrapper.between("create_time", startTime, endTime);
-                return new Result(ResultCode.SUCCESS, dataMapper.listDay4(dataQueryWrapper));
+                return new Result(ResultCode.SUCCESS, dataMapper.listDayElectricity(dataQueryWrapper));
             }
             //全年
             if ("3".equals(timeType)) {
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 dataQueryWrapper.ge("create_date", dateTime);
-                List<EnergyElectricityDataVo> energyElectricityDataVos = dataMapper.listYear4(dataQueryWrapper);
-                for (EnergyElectricityDataVo energyElectricityDataVo : energyElectricityDataVos) {
-                    if (energyElectricityDataVo.getElectricityValue() == null || energyElectricityDataVo.getElectricityValue() == "") {
-                        energyElectricityDataVo.setElectricityValue("0");
+                List<EnergyAllDataVo> energyElectricityDataVos = dataMapper.listYearElectricity(dataQueryWrapper);
+                for (EnergyAllDataVo energyElectricityDataVo : energyElectricityDataVos) {
+                    if (energyElectricityDataVo.getValue() == null || energyElectricityDataVo.getValue() == "") {
+                        energyElectricityDataVo.setValue("0");
                     }
                 }
                 return new Result(ResultCode.SUCCESS, energyElectricityDataVos);
@@ -130,17 +130,17 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
             if ("2".equals(timeType)) {
                 Date timesMonthmorning = DataUill.getTimesMonthmorning();
                 dataQueryWrapper.ge("create_date", timesMonthmorning);
-                return new Result(ResultCode.SUCCESS, dataMapper.listDay4(dataQueryWrapper));
+                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<EnergyElectricityDataVo> energyElectricityDataVos = dataMapper.listDay4(dataQueryWrapper);
-                for (EnergyElectricityDataVo energyElectricityDataVo : energyElectricityDataVos) {
-                    if (energyElectricityDataVo.getElectricityValue() == null || energyElectricityDataVo.getElectricityValue() == "") {
-                        energyElectricityDataVo.setElectricityValue("0");
+                List<EnergyAllDataVo> energyElectricityDataVos = dataMapper.listDayElectricity(dataQueryWrapper);
+                for (EnergyAllDataVo energyElectricityDataVo : energyElectricityDataVos) {
+                    if (energyElectricityDataVo.getValue() == null || energyElectricityDataVo.getValue() == "") {
+                        energyElectricityDataVo.setValue("0");
                     }
                 }
                 return new Result(ResultCode.SUCCESS, energyElectricityDataVos);
@@ -153,16 +153,16 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
                 dataQueryWrapper.between("create_time", startTime, endTime);
-                return new Result(ResultCode.SUCCESS, dataMapper.listDay2(dataQueryWrapper));
+                return new Result(ResultCode.SUCCESS, dataMapper.listDayFeed(dataQueryWrapper));
             }
             //全年
             if ("3".equals(timeType)) {
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 dataQueryWrapper.ge("create_date", dateTime);
-                List<EnergyFeedDataVo> energyFeedDataVos = dataMapper.listYear2(dataQueryWrapper);
-                for (EnergyFeedDataVo energyFeedDataVo : energyFeedDataVos) {
-                    if (energyFeedDataVo.getFeedValue() == null || energyFeedDataVo.getFeedValue() == "") {
-                        energyFeedDataVo.setFeedValue("0");
+                List<EnergyAllDataVo> energyFeedDataVos = dataMapper.listYearFeed(dataQueryWrapper);
+                for (EnergyAllDataVo energyFeedDataVo : energyFeedDataVos) {
+                    if (energyFeedDataVo.getValue() == null || energyFeedDataVo.getValue() == "") {
+                        energyFeedDataVo.setValue("0");
                     }
                 }
                 return new Result(ResultCode.SUCCESS, energyFeedDataVos);
@@ -171,17 +171,17 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
             if ("2".equals(timeType)) {
                 Date timesMonthmorning = DataUill.getTimesMonthmorning();
                 dataQueryWrapper.ge("create_date", timesMonthmorning);
-                return new Result(ResultCode.SUCCESS, dataMapper.listDay2(dataQueryWrapper));
+                return new Result(ResultCode.SUCCESS, dataMapper.listDayFeed(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<EnergyFeedDataVo> energyFeedDataVos = dataMapper.listDay2(dataQueryWrapper);
-                for (EnergyFeedDataVo energyFeedDataVo : energyFeedDataVos) {
-                    if (energyFeedDataVo.getFeedValue() == null || energyFeedDataVo.getFeedValue() == "") {
-                        energyFeedDataVo.setFeedValue("0");
+                List<EnergyAllDataVo> energyFeedDataVos = dataMapper.listDayFeed(dataQueryWrapper);
+                for (EnergyAllDataVo energyFeedDataVo : energyFeedDataVos) {
+                    if (energyFeedDataVo.getValue() == null || energyFeedDataVo.getValue() == "") {
+                        energyFeedDataVo.setValue("0");
                     }
                 }
                 return new Result(ResultCode.SUCCESS, energyFeedDataVos);
@@ -194,16 +194,16 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                 startTime = startTime + " 00:00:00";
                 endTime = endTime + " 23:59:59";
                 dataQueryWrapper.between("create_time", startTime, endTime);
-                return new Result(ResultCode.SUCCESS, dataMapper.listDay(dataQueryWrapper));
+                return new Result(ResultCode.SUCCESS, dataMapper.listDayGas(dataQueryWrapper));
             }
             //全年
             if ("3".equals(timeType)) {
                 DateTime dateTime = DateUtil.beginOfYear(new Date());
                 dataQueryWrapper.ge("create_date", dateTime);
-                List<EnergyGasDataVo> energyGasDataVos = dataMapper.listYear(dataQueryWrapper);
-                for (EnergyGasDataVo energyGasDataVo : energyGasDataVos) {
-                    if (energyGasDataVo.getGasValue() == null || energyGasDataVo.getGasValue() == "") {
-                        energyGasDataVo.setGasValue("0");
+                List<EnergyAllDataVo> energyGasDataVos = dataMapper.listYearGas(dataQueryWrapper);
+                for (EnergyAllDataVo energyGasDataVo : energyGasDataVos) {
+                    if (energyGasDataVo.getValue() == null || energyGasDataVo.getValue() == "") {
+                        energyGasDataVo.setValue("0");
                     }
                 }
                 return new Result(ResultCode.SUCCESS, energyGasDataVos);
@@ -212,17 +212,17 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
             if ("2".equals(timeType)) {
                 Date timesMonthmorning = DataUill.getTimesMonthmorning();
                 dataQueryWrapper.ge("create_date", timesMonthmorning);
-                return new Result(ResultCode.SUCCESS, dataMapper.listDay(dataQueryWrapper));
+                return new Result(ResultCode.SUCCESS, dataMapper.listDayGas(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<EnergyGasDataVo> energyGasDataVos = dataMapper.listDay(dataQueryWrapper);
-                for (EnergyGasDataVo energyGasDataVo : energyGasDataVos) {
-                    if (energyGasDataVo.getGasValue() == null || energyGasDataVo.getGasValue() == "") {
-                        energyGasDataVo.setGasValue("0");
+                List<EnergyAllDataVo> energyGasDataVos = dataMapper.listDayGas(dataQueryWrapper);
+                for (EnergyAllDataVo energyGasDataVo : energyGasDataVos) {
+                    if (energyGasDataVo.getValue() == null || energyGasDataVo.getValue() == "") {
+                        energyGasDataVo.setValue("0");
                     }
                 }
                 return new Result(ResultCode.SUCCESS, energyGasDataVos);

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

@@ -1,16 +1,24 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.EnvDeviceMaintain;
 import com.huimv.admin.mapper.EnvDeviceMaintainMapper;
 import com.huimv.admin.service.IEnvDeviceMaintainService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -33,7 +41,35 @@ public class EnvDeviceMaintainServiceImpl extends ServiceImpl<EnvDeviceMaintainM
         String deviceId = paramsMap.get("deviceId");
         QueryWrapper<EnvDeviceMaintain> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("device_id", deviceId).eq("farm_id", farmId);
-        return new Result(ResultCode.SUCCESS,envDeviceMaintainMapper.selectOne(queryWrapper));
+        return new Result(ResultCode.SUCCESS,envDeviceMaintainMapper.selectList(queryWrapper));
+    }
+
+    @Override
+    public Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String deviceId = paramsMap.get("deviceId");
+        String maintainContent = paramsMap.get("maintainContent");
+        String remark = paramsMap.get("remark");
+
+        DateTime dateTime = DateUtil.beginOfDay(new Date());
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String format = simpleDateFormat.format(dateTime);
+        Date date = null;
+        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
+        try {
+            date = simpleDateFormat1.parse(format);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        EnvDeviceMaintain envDeviceMaintain = new EnvDeviceMaintain();
+        envDeviceMaintain.setMaintainContent(maintainContent);
+        envDeviceMaintain.setDeviceId(deviceId);
+        envDeviceMaintain.setFarmId(Integer.parseInt(farmId));
+        envDeviceMaintain.setRemark(remark);
+        envDeviceMaintain.setMaintainTime(date);
+
+        envDeviceMaintainMapper.insert(envDeviceMaintain);
+        return new Result(ResultCode.SUCCESS,"添加成功");
     }
 
 }

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

@@ -185,11 +185,14 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         String farmId = paramsMap.get("farmId");
         String id = paramsMap.get("id");//楼层id
 
+        JSONArray jsonArray = new JSONArray();
         QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
-        queryWrapper.like("other2", id);
-
-        JSONArray jsonArray = new JSONArray();
+        if (id == null || id == "") {
+            queryWrapper.eq("parent_id", 3);
+        } else {
+            queryWrapper.like("other2", id);
+        }
         List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);//得到栋舍单元
         for (int i = 0; i < basePigpens.size(); i++) {
            /* QueryWrapper<EnvDevice> queryWrapper1 = new QueryWrapper<>();
@@ -200,10 +203,17 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             queryWrapper2.eq("unit_id",basePigpens.get(i).getId()).orderByDesc("create_time").last(" limit 1");//通过设备id来拿取数据
             EnvData envData = dataMapper.selectOne(queryWrapper2);
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("temp", envData.getEnvTemp());//温度
-            jsonObject.put("hum", envData.getEnvHum());//湿度
-            jsonObject.put("location", basePigpens.get(i).getBuildName());
-            jsonObject.put("unit_id", envData.getUnitId());//单元id
+            if (ObjectUtil.isEmpty(envData)) {
+                jsonObject.put("temp", 0);//温度
+                jsonObject.put("hum", 0);//湿度
+                jsonObject.put("location", basePigpens.get(i).getBuildName());
+                jsonObject.put("unit_id", 0);//单元id
+            } else {
+                jsonObject.put("temp", envData.getEnvTemp());//温度
+                jsonObject.put("hum", envData.getEnvHum());//湿度
+                jsonObject.put("location", basePigpens.get(i).getBuildName());
+                jsonObject.put("unit_id", envData.getUnitId());//单元id
+            }
             jsonArray.add(jsonObject);
         }
         return new Result(ResultCode.SUCCESS,jsonArray);

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

@@ -9,6 +9,7 @@ import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.GasData;
+import com.huimv.admin.entity.vo.GasDataVo;
 import com.huimv.admin.mapper.GasDataMapper;
 import com.huimv.admin.service.IGasDataService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -50,23 +52,28 @@ public class GasDataServiceImpl extends ServiceImpl<GasDataMapper, GasData> impl
             String endTime = date + " 23:59:59";
             queryWrapper.between("create_time", startTime, endTime).orderByAsc("create_time");
         }
-
         List<GasData> gasData = dataMapper.selectList(queryWrapper);
-        JSONArray jsonArray = new JSONArray();
+        GasDataVo gasDataVo = new GasDataVo();
+        List<GasData> gasDataList = new LinkedList<>();
+        List<GasData> gasDataList1 = new LinkedList<>();
+        List<GasData> gasDataList2 = new LinkedList<>();
+        List<GasData> gasDataList3 = new LinkedList<>();
         for (GasData gasDatum : gasData) {
-            JSONObject jsonObject = new JSONObject();
             if (gasDatum.getLoctionType() == 1) {
-                jsonObject.put("pigpen", gasDatum);
+                gasDataList.add(gasDatum);
             } else if (gasDatum.getLoctionType() == 2) {
-                jsonObject.put("above", gasDatum);
+                gasDataList1.add(gasDatum);
             } else if (gasDatum.getLoctionType() == 3) {
-                jsonObject.put("under", gasDatum);
+                gasDataList2.add(gasDatum);
             } else if (gasDatum.getLoctionType() == 4) {
-                jsonObject.put("people", gasDatum);
+                gasDataList3.add(gasDatum);
             }
-            jsonArray.add(jsonObject);
         }
-        return new Result(ResultCode.SUCCESS, jsonArray);
+        gasDataVo.setPigpen(gasDataList);
+        gasDataVo.setAbove(gasDataList1);
+        gasDataVo.setUnder(gasDataList2);
+        gasDataVo.setPeople(gasDataList3);
+        return new Result(ResultCode.SUCCESS,gasDataVo);
     }
 
     @Override

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

@@ -120,7 +120,9 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             }
             //本周
             else if ("1".equals(type)) {
-                DateTime dateTime = DateUtil.beginOfWeek(new Date());
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                Date dateTime = calendar.getTime();
                 queryWrapper.ge("create_date", dateTime);
 
                 queryWrapper.eq("loction_type" ,1);
@@ -198,7 +200,9 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             }
             //本周
             else if ("1".equals(type)) {
-                DateTime dateTime = DateUtil.beginOfWeek(new Date());
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                Date dateTime = calendar.getTime();
                 queryWrapper.ge("create_date", dateTime);
                 queryWrapper.eq("loction_type" ,1);
                 List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
@@ -275,7 +279,9 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             }
             //本周
             else if ("1".equals(type)) {
-                DateTime dateTime = DateUtil.beginOfWeek(new Date());
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                Date dateTime = calendar.getTime();
                 queryWrapper.ge("create_date", dateTime);
                 queryWrapper.eq("loction_type" ,1);
                 List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
@@ -352,7 +358,9 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             }
             //本周
             else if ("1".equals(type)) {
-                DateTime dateTime = DateUtil.beginOfWeek(new Date());
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                Date dateTime = calendar.getTime();
                 queryWrapper.ge("create_date", dateTime);
                 queryWrapper.eq("loction_type" ,1);
                 List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
@@ -429,7 +437,9 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             }
             //本周
             else if ("1".equals(type)) {
-                DateTime dateTime = DateUtil.beginOfWeek(new Date());
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                Date dateTime = calendar.getTime();
                 queryWrapper.ge("create_date", dateTime);
                 queryWrapper.eq("loction_type" ,1);
                 List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);
@@ -506,7 +516,9 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             }
             //本周
             else if ("1".equals(type)) {
-                DateTime dateTime = DateUtil.beginOfWeek(new Date());
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+                Date dateTime = calendar.getTime();
                 queryWrapper.ge("create_date", dateTime);
                 queryWrapper.eq("loction_type" ,1);
                 List<ProtData> protData1 = protDataMapper.listPh(queryWrapper);

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

@@ -76,4 +76,56 @@
         ${ew.customSqlSegment}
     </select>
 
+
+
+    <!--为的是给前端不改变值的写法-->
+    <select id="listYearGas" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
+        SELECT sum(gas_value) '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="listDayGas" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
+        SELECT sum(gas_value) '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="listYearFeed" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
+        SELECT sum(feed_value) '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="listDayFeed" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
+        SELECT sum(feed_value) '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.admin.entity.vo.EnergyAllDataVo">
+        SELECT sum(water_value) '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 sum(water_value) '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 sum(electricity_value) '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 sum(electricity_value) 'value',create_date 'createDate' FROM `energy_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
+        ORDER BY create_date ASC
+    </select>
 </mapper>