浏览代码

大屏近7天全场用料

wwh 1 年之前
父节点
当前提交
d44d7918ef

+ 13 - 0
snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/controller/FeedingFatController.java

@@ -123,4 +123,17 @@ public class FeedingFatController {
     public CommonResult<FeedingFatMoveVo2> listFatByUnitId(@RequestBody @Valid FeedingFatMove2Param fatMove2Param) {
         return CommonResult.data(feedingFatService.listFatByUnitId(fatMove2Param));
     }
+
+    /**
+     * 采食曲线
+     *
+     * @author wang
+     * @date  2023/12/27 15:34
+     */
+    @ApiOperationSupport(order = 6)
+    @ApiOperation("大屏全场近7天用料")
+    @PostMapping("/feed/feedinglist/listFatSeven")
+    public CommonResult<List<FeedingFatVo2>> listFatSeven(@RequestBody @Valid FeedingFatMoveParam fatMoveParam) {
+        return CommonResult.data(feedingFatService.feedingDay(fatMoveParam));
+    }
 }

+ 3 - 0
snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/service/FeedingFatService.java

@@ -44,4 +44,7 @@ public interface FeedingFatService extends IService<FeedingFat> {
 
     /*移动端栋舍监测*/
     FeedingFatMoveVo2 listFatByUnitId(FeedingFatMove2Param fatMove2Param);
+
+    /*全场近7天采食曲线*/
+    List<FeedingFatVo2> feedingDay(FeedingFatMoveParam fatMoveParam);
 }

+ 11 - 4
snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/service/impl/FeedingFatServiceImpl.java

@@ -52,10 +52,7 @@ import vip.xiaonuo.modular.feed.feedinglist.vo.FeedingListVo2;
 
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 精准饲喂母猪采食Service接口实现类
@@ -309,5 +306,15 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
         return vo2;
     }
 
+    @Override
+    public List<FeedingFatVo2> feedingDay(FeedingFatMoveParam fatMoveParam) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+        QueryWrapper<FeedingFat> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", fatMoveParam.getOrgId());
+        List<FeedingFatVo2> list = fatMapper.listMonthFeeding(queryWrapper);
+        return list;
+    }
+
 
 }