增加农户采集器耳标数据入库。

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/service/impl/EartagServiceImpl.java

@@ -161,7 +161,7 @@ public class EartagServiceImpl implements IEartagService {
 
     //--农户耳标注册
     private void updateEartagRegisterForFarmer(String earmark, String deviceCode, String bat, Timestamp nowTimestamp, java.sql.Date todayDate, String farmId, JSONObject eartagJo) {
-        System.out.println(" ============================ 更新耳标编码 ============================ ");
+        System.out.println(" ============================ 更新农户耳标数据 ============================ ");
         //# 判断耳标注册表是否存在；
         //      如果不存在就注册耳标；
         //      如果存在就更新活动状态（active_status）和活动状态更新时间（active_time）

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

@@ -3,6 +3,8 @@ package com.huimv.eartag2.manage2.mapper;
 import com.huimv.eartag2.manage2.pojo.BaseFarmer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -12,5 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2022-08-30
  */
 public interface BaseFarmerMapper extends BaseMapper<BaseFarmer> {
-    
+
+    List<BaseFarmer> getFarmer();
 }

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

@@ -4,6 +4,8 @@ import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -15,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
 public interface EartagDeviceRegisterMapper extends BaseMapper<EartagDeviceRegister> {
 
     String getDeviceIdByFarmerId(@Param("farmerId") String farmerId);
+
+    List<String> getDeviceIdListByFarmerId(@Param("farmerId") Integer farmerId);
 }

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

@@ -15,5 +15,8 @@
     <sql id="Base_Column_List">
         id, farmer, phone, address,farm_code
     </sql>
+    <select id="getFarmer" resultType="com.huimv.eartag2.manage2.pojo.BaseFarmer">
+        select * from base_farmer
+    </select>
 
 </mapper>

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

@@ -36,4 +36,8 @@
         SELECT device_code FROM eartag_device_register WHERE farmer_id=#{farmerId}
     </select>
 
+    <select id="getDeviceIdListByFarmerId" resultType="java.lang.String" parameterType="java.lang.String">
+        SELECT device_code FROM eartag_device_register WHERE farmer_id=#{farmerId}
+    </select>
+
 </mapper>

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

@@ -5,6 +5,11 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.eartag2.manage2.mapper.BaseFarmerMapper;
+import com.huimv.eartag2.manage2.mapper.EartagDeviceRegisterMapper;
+import com.huimv.eartag2.manage2.mapper.EartagEartagRegister2Mapper;
+import com.huimv.eartag2.manage2.mapper.EartagResetMapper;
+import com.huimv.eartag2.manage2.pojo.BaseFarmer;
 import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
 import com.huimv.eartag2.manage2.pojo.SysBaseConfig;
 import com.huimv.eartag2.manage2.service.EartagDeviceRegisterService;
@@ -19,6 +24,7 @@ import java.io.IOException;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.util.Date;
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -33,15 +39,20 @@ import java.util.concurrent.Executors;
 @Configuration      //1.主要用于标记配置类，兼备Component的效果。
 @EnableScheduling   // 2.开启定时任务
 public class EartagTask {
-
     @Autowired
     private IEartagService eartagService;
-
     @Autowired
     private SysBaseConfigService baseConfigService;
-
     @Autowired
     private EartagDeviceRegisterService deviceRegisterService;
+    @Autowired
+    private EartagResetMapper eartagResetMapper;
+    @Autowired
+    private EartagEartagRegister2Mapper eartagEartagRegister2Mapper;
+    @Autowired
+    private BaseFarmerMapper baseFarmerMapper;
+    @Autowired
+    private EartagDeviceRegisterMapper eartagDeviceRegisterMapper;
 
     /**
      * @Method      : countEartagOnlineTimes
@@ -108,4 +119,38 @@ public class EartagTask {
 
         System.out.println("测试数据");
     }
+
+    @Scheduled(cron = "0/5 * * * * ? ")
+    private void countAssetInEveryMonth()  {
+        com.huimv.eartag2.common.utils.DateUtil dateUtil = new com.huimv.eartag2.common.utils.DateUtil();
+        String month = dateUtil.getThisMonth();
+//        eartagResetMapper.
+//        eartagEartagRegister2Mapper.get
+        //--读取所有农户和采集器
+        List<BaseFarmer> baseFarmerList = baseFarmerMapper.getFarmer();
+
+        //--用采集器读取所有数据计算可售和不可售资源
+        for(BaseFarmer baseFarmer:baseFarmerList){
+            //--
+            _countAssetByFarmer(baseFarmer);
+        }
+
+        System.out.println("month="+month);
+    }
+
+    //--
+    private void _countAssetByFarmer(BaseFarmer baseFarmer) {
+        Integer farmerId = baseFarmer.getId();
+        System.out.println("farmerId="+farmerId);
+        //--读取采集器
+        String deviceCode = eartagDeviceRegisterMapper.getDeviceIdByFarmerId(String.valueOf(farmerId));
+        System.out.println("deviceCode="+deviceCode);
+        //--读取注册耳标
+
+//        System.out.println("deviceCodeList.size="+deviceCodeList.size());
+//        for(int a=0;a<deviceCodeList.size();a++)
+//        {
+//            System.out.println(""+deviceCodeList.get(a)+"");
+//        }
+    }
 }