用料

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

@@ -33,4 +33,9 @@ public class EnergyFeedController {
     public Result listPigpen(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return energyFeedService.listPigpen(httpServletRequest, paramsMap);
     }
+
+    @RequestMapping("/listData")
+    public Result listData(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return energyFeedService.listData(httpServletRequest, paramsMap);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/entity/vo/EnergyFeedDataVo.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 EnergyFeedDataVo {
+    private String feedValue;
+
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
+    private Date createDate;
+}

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

@@ -1,7 +1,15 @@
 package com.huimv.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.admin.entity.EnergyFeed;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.EnergyGas;
+import com.huimv.admin.entity.vo.EnergyDataVo;
+import com.huimv.admin.entity.vo.EnergyFeedDataVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +20,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2023-02-14
  */
 public interface EnergyFeedMapper extends BaseMapper<EnergyFeed> {
-
+    List<EnergyFeedDataVo> listYear(@Param(Constants.WRAPPER) QueryWrapper<EnergyFeed> queryWrapper);
 }

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

@@ -18,4 +18,6 @@ import java.util.Map;
 public interface IEnergyFeedService extends IService<EnergyFeed> {
 
     Result listPigpen(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+
+    Result listData(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 }

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

@@ -1,14 +1,19 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 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.BasePigpen;
 import com.huimv.admin.entity.EnergyFeed;
 import com.huimv.admin.entity.EnergyGas;
+import com.huimv.admin.entity.vo.EnergyDataVo;
+import com.huimv.admin.entity.vo.EnergyFeedDataVo;
 import com.huimv.admin.mapper.BasePigpenMapper;
 import com.huimv.admin.mapper.EnergyFeedMapper;
 import com.huimv.admin.service.IEnergyFeedService;
@@ -17,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -94,4 +100,52 @@ public class EnergyFeedServiceImpl extends ServiceImpl<EnergyFeedMapper, EnergyF
         }
         return new Result(ResultCode.SUCCESS,jsonArray);
     }
+
+    @Override
+    public Result listData(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        String id = paramsMap.get("id");//楼层id
+        String startTime = paramsMap.get("startTime");
+        String endTime = paramsMap.get("endTime");
+
+        List<EnergyFeed> energyGasList=null;
+        //默认显示本年
+        if (type == null || type == "") {
+            type = "3";
+        }
+        QueryWrapper<EnergyFeed> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("unit_id",id);
+        //自定义查询
+        if ("4".equals(type)) {
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
+            queryWrapper.between("create_date", startTime, endTime).orderByAsc("create_date");
+            List<EnergyFeed> energyGases = energyFeedMapper.selectList(queryWrapper);
+            energyGasList = energyGases;
+        }
+        //全年
+        else if ("3".equals(type)) {
+            DateTime dateTime = DateUtil.beginOfYear(new Date());
+            queryWrapper.ge("create_date",dateTime);
+            List<EnergyFeedDataVo> energyDataVos = energyFeedMapper.listYear(queryWrapper);
+            return new Result(ResultCode.SUCCESS, energyDataVos);
+        }
+        //本月
+        else if ("2".equals(type)) {
+            Date timesMonthmorning = DataUill.getTimesMonthmorning();
+            queryWrapper.ge("create_date", timesMonthmorning).orderByAsc("create_date");
+            List<EnergyFeed> energyGases = energyFeedMapper.selectList(queryWrapper);
+            energyGasList = energyGases;
+        }
+        //本周
+        else if ("1".equals(type)) {
+            DateTime dateTime = DateUtil.beginOfWeek(new Date());
+            queryWrapper.ge("create_date", dateTime).orderByAsc("create_date");
+            List<EnergyFeed> energyGases = energyFeedMapper.selectList(queryWrapper);
+            energyGasList = energyGases;
+        }
+        return new Result(ResultCode.SUCCESS,energyGasList);
+
+    }
 }

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

@@ -15,5 +15,10 @@
         <result column="other3" property="other3" />
         <result column="create_date" property="createDate"/>
     </resultMap>
-
+    <select id="listYear" resultType="com.huimv.admin.entity.vo.EnergyFeedDataVo">
+        SELECT sum(feed_value) 'feedValue',create_date 'createDate' FROM `energy_feed`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(create_date,'%Y-%m')
+        ORDER BY create_date ASC
+    </select>
 </mapper>