栋舍名

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/FeedUsageController.java

@@ -40,6 +40,14 @@ public class FeedUsageController {
         String date = map.get("date");
         Page<FeedUsage> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         Page<FeedUsage> feedUsagePage = feedUsageService.page(page,new QueryWrapper<FeedUsage>().lambda().eq(StringUtils.isNotBlank(date),FeedUsage::getUsedDate,date).orderByDesc(FeedUsage::getUsedDate).orderByAsc(FeedUsage::getUnitName));
+        for (FeedUsage record : feedUsagePage.getRecords()) {
+            String[] buildNum = record.getUnitName().split("舍");
+            if (Integer.valueOf(buildNum[0]) < 3){
+                record.setUnitName("育雏"+ record.getUnitName());
+            }else {
+                record.setUnitName("产蛋"+ (Integer.valueOf(buildNum[0])-2) +"舍");
+            }
+        }
         return new Result(ResultCode.SUCCESS,feedUsagePage);
     }
 

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/FeedConsumeServiceImpl.java

@@ -158,7 +158,11 @@ public class FeedConsumeServiceImpl extends ServiceImpl<FeedConsumeMapper, FeedC
         buildName.add(allBuild);
         for (BuildVo datum : data) {
             AllBuildVo allBuildVo = new AllBuildVo();
-            allBuildVo.setName(datum.getI()+"舍");
+            if (Integer.valueOf(datum.getI()) < 3){
+                allBuildVo.setName("育雏"+ datum.getI()+"舍");
+            }else {
+                allBuildVo.setName("产蛋"+ (Integer.valueOf(datum.getI())-2) +"舍");
+            }
             allBuildVo.setValue(datum.getI()+"舍");
             buildName.add(allBuildVo);
         }
@@ -244,6 +248,15 @@ public class FeedConsumeServiceImpl extends ServiceImpl<FeedConsumeMapper, FeedC
         }else {
             feedAnalysisVo.setList(new ArrayList<>());
         }
+        List<BuildFeedVo> list = feedAnalysisVo.getList();
+        for (BuildFeedVo buildFeedVo : list) {
+            String[] buildNum = buildFeedVo.getUnitName().split("舍");
+            if (Integer.valueOf(buildNum[0]) < 3){
+                buildFeedVo.setUnitName("育雏"+ buildFeedVo.getUnitName());
+            }else {
+                buildFeedVo.setUnitName("产蛋"+ (Integer.valueOf(buildNum[0])-2) +"舍");
+            }
+        }
         return new Result(ResultCode.SUCCESS,feedAnalysisVo);
     }
 

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/FeedUsageServiceImpl.java

@@ -48,6 +48,16 @@ public class FeedUsageServiceImpl extends ServiceImpl<FeedUsageMapper, FeedUsage
                     .orderByAsc(FeedUsage::getUnitName));
             usedVo.setList(feedUsages);
         }
+        for (FeedUsedVo usedVo : feedUsedVo) {
+            for (FeedUsage feedUsage : usedVo.getList()) {
+                String[] buildNum = feedUsage.getUnitName().split("舍");
+                if (Integer.valueOf(buildNum[0]) < 3){
+                    feedUsage.setUnitName("育雏"+ feedUsage.getUnitName());
+                }else {
+                    feedUsage.setUnitName("产蛋"+ (Integer.valueOf(buildNum[0])-2) +"舍");
+                }
+            }
+        }
         return new Result(ResultCode.SUCCESS,feedUsedVo);
     }
 
@@ -87,6 +97,14 @@ public class FeedUsageServiceImpl extends ServiceImpl<FeedUsageMapper, FeedUsage
     public Result listScreenUse(Map<String, String> map) {
         String startDate = map.get("startDate");
         List<FeedUsage> feedUsages = feedUsageMapper.listScreenUse(startDate);
+        for (FeedUsage feedUsage : feedUsages) {
+            String[] buildNum = feedUsage.getUnitName().split("舍");
+            if (Integer.valueOf(buildNum[0]) < 3){
+                feedUsage.setUnitName("育雏"+ feedUsage.getUnitName());
+            }else {
+                feedUsage.setUnitName("产蛋"+ (Integer.valueOf(buildNum[0])-2) +"舍");
+            }
+        }
         return new Result(ResultCode.SUCCESS,feedUsages);
     }
 }