大屏接口

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BaseBuildingController.java

@@ -107,7 +107,7 @@ public class BaseBuildingController {
     }
 
     @PostMapping("/listScreenFeed")
-    public Result listScreenFeed(){
-        return baseBuildingService.listScreenFeed();
+    public Result listScreenFeed(@RequestBody Map<String, String> map){
+        return baseBuildingService.listScreenFeed(map);
     }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvRegularCallEggMapper.java

@@ -25,4 +25,6 @@ public interface EnvRegularCallEggMapper extends BaseMapper<EnvRegularCallEgg> {
     IPage<EnvRegularCallEgg> listPage(Page<EnvRegularCallEgg> page, @Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallEgg> queryWrapper);
 
     List<EnvRegularCallEgg> printEggList(@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallEgg> queryWrapper);
+
+    String getTotalEgg (String farmId);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IBaseBuildingService.java

@@ -36,5 +36,5 @@ public interface IBaseBuildingService extends IService<BaseBuilding> {
 
     Result listScreenEnergy();
 
-    Result listScreenFeed();
+    Result listScreenFeed(Map<String, String> map);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnvRegularCallEggService.java

@@ -35,4 +35,5 @@ public interface IEnvRegularCallEggService extends IService<EnvRegularCallEgg> {
     Result listSelect(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
     Result listSeven(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
+
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseBuildingServiceImpl.java

@@ -51,6 +51,8 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
     private EnvDeviceEquipmentMapper envDeviceEquipmentMapper;
     @Resource
     private BaseDuckInfoMapper baseDuckInfoMapper;
+    @Resource
+    private EnvRegularCallEggMapper envRegularCallEggMapper;
 
     @Override
     @Transactional
@@ -233,9 +235,14 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
     }
 
     @Override
-    public Result listScreenFeed() {
+    public Result listScreenFeed(Map<String, String> map) {
+        String farmId = map.get("farmId");
+        Map resultMap = new HashMap();
         List<ScreenFeedVo> screenEnergyVos = baseBuildingMapper.listScreenFeed();
-        return new Result(ResultCode.SUCCESS,screenEnergyVos);
+        resultMap.put("list",screenEnergyVos);
+        String totalEgg = envRegularCallEggMapper.getTotalEgg(farmId);
+        resultMap.put("totalEgg",totalEgg);
+        return new Result(ResultCode.SUCCESS,resultMap);
     }
 
 

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallEggServiceImpl.java

@@ -185,4 +185,7 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         return new Result(ResultCode.SUCCESS, jsonObject);
     }
 
+
+
+
 }

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallEggMapper.xml

@@ -35,4 +35,7 @@
         GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
         ORDER BY call_date ASC
     </select>
+    <select id="getTotalEgg" resultType="java.lang.String">
+        SELECT SUM(egg_num) FROM `env_regular_call_egg` WHERE farm_id = #{farmId} AND YEAR(call_date) = YEAR(CURDATE());
+    </select>
 </mapper>

huimv-admin/src/main/resources/mapper/DuckBodySizeInfoMapper.xml

@@ -24,12 +24,12 @@
     </resultMap>
 
     <select id="listLimitInfo" resultType="com.huimv.guowei.admin.entity.vo.DuckBodySizeInfoVo">
-        SELECT s.*,b.day_age FROM `duck_body_size_info` s LEFT JOIN `base_duck_info` b ON s.duck_id = b.id
+        SELECT s.*,b.day_age FROM `duck_body_size_info` s LEFT JOIN `base_duck_info` b ON s.duck_num = b.duck_num
         WHERE s.farm_id = #{farmId} ORDER BY s.measure_date DESC LIMIT ${num}
     </select>
 
     <select id="listPageInfo" resultType="com.huimv.guowei.admin.entity.vo.DuckBodySizeInfoVo">
-        SELECT s.*,b.day_age FROM `duck_body_size_info` s LEFT JOIN `base_duck_info` b ON s.duck_id = b.id
+        SELECT s.*,b.day_age FROM `duck_body_size_info` s LEFT JOIN `base_duck_info` b ON s.duck_num = b.duck_num
         WHERE s.farm_id = #{farmId} AND s.unit_name Like '%${unitName}%' ORDER BY s.measure_date DESC
     </select>