料塔余量修改

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedinglist/service/impl/FeedingListServiceImpl.java

@@ -28,6 +28,8 @@ import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.modular.bi.utils.DataUill;
+import vip.xiaonuo.modular.feed.feedingenv.entity.FeedingEnv;
+import vip.xiaonuo.modular.feed.feedingenv.mapper.FeedingEnvMapper;
 import vip.xiaonuo.modular.feed.feedinglist.entity.FeedingList;
 import vip.xiaonuo.modular.feed.feedinglist.mapper.FeedingListMapper;
 import vip.xiaonuo.modular.feed.feedinglist.param.FeedingListAddParam;
@@ -48,20 +50,23 @@ import java.util.Map;
  * 料塔Service接口实现类
  *
  * @author wang
- * @date  2023/12/27 15:34
+ * @date 2023/12/27 15:34
  **/
 @Service
 public class FeedingListServiceImpl extends ServiceImpl<FeedingListMapper, FeedingList> implements FeedingListService {
 
     @Autowired
     private FeedingListMapper feedingListMapper;
+    @Autowired
+    private FeedingEnvMapper envMapper;
+
     @Override
     public Page<FeedingList> page(FeedingListPageParam feedingListPageParam) {
         QueryWrapper<FeedingList> queryWrapper = new QueryWrapper<>();
-        if(ObjectUtil.isNotEmpty(feedingListPageParam.getUnitId())) {
+        if (ObjectUtil.isNotEmpty(feedingListPageParam.getUnitId())) {
             queryWrapper.lambda().notLike(FeedingList::getUnitId, feedingListPageParam.getUnitId());
         }
-        if(ObjectUtil.isAllNotEmpty(feedingListPageParam.getSortField(), feedingListPageParam.getSortOrder())) {
+        if (ObjectUtil.isAllNotEmpty(feedingListPageParam.getSortField(), feedingListPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(feedingListPageParam.getSortOrder());
             queryWrapper.orderBy(true, feedingListPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(feedingListPageParam.getSortField()));
@@ -81,14 +86,30 @@ public class FeedingListServiceImpl extends ServiceImpl<FeedingListMapper, Feedi
 
     @Override
     public List<FeedingListVo> listFeed(String orgId) {
-        QueryWrapper<FeedingList> queryWrapper = new QueryWrapper<>();
+        List<FeedingListVo> feedingListVos = new ArrayList<>();
+        QueryWrapper<FeedingEnv> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", orgId);
-        List<FeedingListVo> feedingListVos = feedingListMapper.listFeed(queryWrapper);
+        List<FeedingEnv> feedingEnvs = envMapper.selectList(queryWrapper);
+        for (FeedingEnv feedingEnv : feedingEnvs) {
+            QueryWrapper<FeedingList> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("org_id", orgId).eq("unit_id",feedingEnv.getUnitId())
+                    .orderByDesc("upload_time").last(" limit 1");
+            FeedingList one = feedingListMapper.selectOne(queryWrapper1);
+            FeedingListVo vo = new FeedingListVo();
+            vo.setUnitId(feedingEnv.getUnitId());
+            vo.setUnitName(feedingEnv.getUnitName());
+            if (ObjectUtil.isNotEmpty(one)) {
+                vo.setValue(one.getMarginValue());
+            } else {
+                vo.setValue("0");
+            }
+            feedingListVos.add(vo);
+        }
         return feedingListVos;
     }
 
     @Override
-    public List<FeedingListVo2> feedingList(Map<String,String> paramsMap) {
+    public List<FeedingListVo2> feedingList(Map<String, String> paramsMap) {
         String type = paramsMap.get("type");
         if ("".equals(type) || null == type) {
             type = "1";
@@ -98,7 +119,7 @@ public class FeedingListServiceImpl extends ServiceImpl<FeedingListMapper, Feedi
         queryWrapper.eq("unit_id", paramsMap.get("unitId"));
         if ("1".equals(type)) {
             Date timesmorning = DataUill.getTimesmorning();
-            queryWrapper.ge("create_time",timesmorning).orderByAsc("create_time");
+            queryWrapper.ge("create_time", timesmorning).orderByAsc("create_time");
             List<FeedingList> feedingLists = feedingListMapper.selectList(queryWrapper);
             for (FeedingList feedingList : feedingLists) {
                 FeedingListVo2 listVo2 = new FeedingListVo2();
@@ -112,16 +133,16 @@ public class FeedingListServiceImpl extends ServiceImpl<FeedingListMapper, Feedi
         } else if ("2".equals(type)) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
             queryWrapper.ge("create_time", dateTime);
-             list = feedingListMapper.feedList(queryWrapper);
-        }else if ("3".equals(type)) {
+            list = feedingListMapper.feedList(queryWrapper);
+        } else if ("3".equals(type)) {
             Date monthmorning = DataUill.getTimesMonthmorning();
             queryWrapper.ge("create_time", monthmorning);
-             list = feedingListMapper.feedList(queryWrapper);
-        }else if ("4".equals(type)) {
+            list = feedingListMapper.feedList(queryWrapper);
+        } else if ("4".equals(type)) {
             String startTime = paramsMap.get("startTime") + " 00:00:00";
             String endTime = paramsMap.get("endTime") + " 23:59:59";
-            queryWrapper.between("create_time", startTime,endTime);
-             list = feedingListMapper.feedList(queryWrapper);
+            queryWrapper.between("create_time", startTime, endTime);
+            list = feedingListMapper.feedList(queryWrapper);
         }
         return list;
     }