修改获取资产接口bug

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/FarmerAssetMapper.java

@@ -21,5 +21,5 @@ public interface FarmerAssetMapper extends BaseMapper<FarmerAsset> {
 
     BigDecimal getPigWeightByDayage(@Param("days") long days);
 
-    List<FarmerAsset> getAssetByMonth(@Param("months") int months);
+    List<FarmerAsset> getAssetByMonth(@Param("months") int months,@Param("farm_code") String farmerId);
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/xml/FarmerAssetMapper.xml

@@ -23,7 +23,7 @@
         SELECT weight FROM farmer_dayage_weight WHERE start_dayage <= #{days} AND #{days} <= end_dayage
     </select>
     <select id="getAssetByMonth" resultType="com.huimv.eartag2.manage2.pojo.FarmerAsset" parameterType="int">
-        SELECT * FROM farmer_asset ORDER BY YEAR DESC,MONTH DESC LIMIT #{months}
+        SELECT * FROM farmer_asset WHERE farm_code=${farm_code} ORDER BY YEAR DESC,MONTH DESC LIMIT ${months}
     </select>
 
 </mapper>

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/schedule/EartagTask.java

@@ -140,6 +140,12 @@ public class EartagTask {
 
     //--
     private void _countAssetByFarmer(BaseFarmer baseFarmer) {
+        //------------------------------------------------------------------------
+        // 读取采集器
+        // 根据采集器读取所有耳标
+        // 对读取耳标进行计算可售和非可售，并归到当月
+        //------------------------------------------------------------------------
+
         Integer farmerId = baseFarmer.getId();
         System.out.println("farmerId="+farmerId);
         //--读取采集器
@@ -147,6 +153,7 @@ public class EartagTask {
         System.out.println("deviceCode="+deviceCode);
         //--读取注册耳标
 
+
 //        System.out.println("deviceCodeList.size="+deviceCodeList.size());
 //        for(int a=0;a<deviceCodeList.size();a++)
 //        {

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/FarmerAssetServiceImpl.java

@@ -67,8 +67,9 @@ public class FarmerAssetServiceImpl extends ServiceImpl<FarmerAssetMapper, Farme
         //{读取最后一批猪信息}
         JSONObject lastBatchJo = _getlastBatchAdoptPig(deviceCode);
         System.out.println("lastBatchJo="+lastBatchJo);
+        System.out.println(">>>>>>>>>>>>>>>>>>>>>>> farmerId="+farmerId);
         //读取资产信息
-        List<FarmerAsset> farmerAssetList = farmerAssetMapper.getAssetByMonth(6);
+        List<FarmerAsset> farmerAssetList = farmerAssetMapper.getAssetByMonth(6,farmerId);
         System.out.println("farmerAssetList.size="+farmerAssetList.size());
         List reverseList = new ArrayList();
         //--反转排序
@@ -79,7 +80,13 @@ public class FarmerAssetServiceImpl extends ServiceImpl<FarmerAssetMapper, Farme
             lastBatchJo.put("estimated",reverseList);
             return new Result(ResultCode.SUCCESS,lastBatchJo);
         }else{
-            return new Result(ResultCode.SUCCESS,lastBatchJo);
+            JSONObject nullLastBatchJo = new JSONObject();
+            nullLastBatchJo.put("adoptTime","");
+            nullLastBatchJo.put("husbandryTime","");
+            nullLastBatchJo.put("currentPrices",0);
+            nullLastBatchJo.put("expectedEarning",0);
+            nullLastBatchJo.put("estimated",reverseList);
+            return new Result(ResultCode.SUCCESS,nullLastBatchJo);
         }
 
     }