修改环境温度（高温低温）报警。

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/entity/EartagDeviceRegisterEntity.java

@@ -79,6 +79,21 @@ public class EartagDeviceRegisterEntity implements Serializable {
     @Column(name = "sync_Time")
     private Timestamp syncTime;
 
+    @Column(name = "device_type")
+    public Integer deviceType;
+
+    @Column(name = "imei")
+    public String imei;
+
+    @Column(name = "upgrade")
+    public Integer upgrade;
+
+    @Column(name = "farmer_id")
+    public Integer farmerId;
+
+    @Column(name = "farmer_name")
+    public String farmerName;
+
     public void setId(Integer id) {
         this.id = id;
     }
@@ -255,31 +270,76 @@ public class EartagDeviceRegisterEntity implements Serializable {
         return syncTime;
     }
 
+    public Integer getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(Integer deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public String getImei() {
+        return imei;
+    }
+
+    public void setImei(String imei) {
+        this.imei = imei;
+    }
+
+    public Integer getUpgrade() {
+        return upgrade;
+    }
+
+    public void setUpgrade(Integer upgrade) {
+        this.upgrade = upgrade;
+    }
+
+    public Integer getFarmerId() {
+        return farmerId;
+    }
+
+    public void setFarmerId(Integer farmerId) {
+        this.farmerId = farmerId;
+    }
+
+    public String getFarmerName() {
+        return farmerName;
+    }
+
+    public void setFarmerName(String farmerName) {
+        this.farmerName = farmerName;
+    }
+
     @Override
     public String toString() {
         return "EartagDeviceRegisterEntity{" +
-                "id=" + id + '\'' +
-                "deviceCode=" + deviceCode + '\'' +
-                "chipId=" + chipId + '\'' +
-                "countyCode=" + countyCode + '\'' +
-                "countyName=" + countyName + '\'' +
-                "farmId=" + farmId + '\'' +
-                "farmName=" + farmName + '\'' +
-                "typeF=" + typeF + '\'' +
-                "stage=" + stage + '\'' +
-                "pigpenId=" + pigpenId + '\'' +
-                "unitId=" + unitId + '\'' +
-                "registerTime=" + registerTime + '\'' +
-                "lastTime=" + lastTime + '\'' +
-                "activeStatus=" + activeStatus + '\'' +
-                "activeTime=" + activeTime + '\'' +
-                "deviceStatus=" + deviceStatus + '\'' +
-                "deviceAlias=" + deviceAlias + '\'' +
-                "location=" + location + '\'' +
-                "remark=" + remark + '\'' +
-                "createDate=" + createDate + '\'' +
-                "updateType=" + updateType + '\'' +
-                "syncTime=" + syncTime + '\'' +
+                "id=" + id +
+                ", deviceCode='" + deviceCode + '\'' +
+                ", chipId='" + chipId + '\'' +
+                ", countyCode='" + countyCode + '\'' +
+                ", countyName='" + countyName + '\'' +
+                ", farmId='" + farmId + '\'' +
+                ", farmName='" + farmName + '\'' +
+                ", typeF=" + typeF +
+                ", stage=" + stage +
+                ", pigpenId=" + pigpenId +
+                ", unitId=" + unitId +
+                ", registerTime=" + registerTime +
+                ", lastTime=" + lastTime +
+                ", activeStatus=" + activeStatus +
+                ", activeTime=" + activeTime +
+                ", deviceStatus=" + deviceStatus +
+                ", deviceAlias='" + deviceAlias + '\'' +
+                ", location='" + location + '\'' +
+                ", remark='" + remark + '\'' +
+                ", createDate=" + createDate +
+                ", updateType='" + updateType + '\'' +
+                ", syncTime=" + syncTime +
+                ", deviceType=" + deviceType +
+                ", imei='" + imei + '\'' +
+                ", upgrade=" + upgrade +
+                ", farmerId=" + farmerId +
+                ", farmerName='" + farmerName + '\'' +
                 '}';
     }
 }

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/repo/EartagDeviceRegisterRepo.java

@@ -38,4 +38,6 @@ public interface EartagDeviceRegisterRepo extends JpaRepository<EartagDeviceRegi
     @Query(value = "update eartag_device_register set sync_time=?1 where chip_id=?2" ,nativeQuery = true)
     @Modifying
     public void updateDeviceRegister(Timestamp sysnTime,String chipId);
+
+
 }

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/utils/MathUtil.java

@@ -39,6 +39,14 @@ public class MathUtil {
         return deviceRateBd;
     }
 
+    public static BigDecimal countEnvtemp2(String val1,Integer scale){
+        if(scale == null){
+            scale = 2;
+        }
+        BigDecimal deviceRateBd= new BigDecimal(val1).divide(new BigDecimal(10),scale,BigDecimal.ROUND_HALF_UP);
+        return deviceRateBd;
+    }
+
     public static BigDecimal countRate(String val1,Integer scale){
         if(scale == null){
             scale = 2;

huimv-eartag2-platform/huimv-eartag2-device/src/main/java/com/huimv/eartag2/device/HuimvEartag2DeviceApplication.java

@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.ComponentScans;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -16,6 +17,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @Create : 2020-12-25
  **/
 //@ComponentScan(basePackages = {"com.huimv.eartag2.common.utils"})
+@ComponentScans({@ComponentScan("com.huimv.eartag2.common.service")})
 @EntityScan(value = "com.huimv.eartag2.common.dao.entity")
 @EnableJpaRepositories(basePackages = "com.huimv.eartag2.common.dao.repo")
 //@ComponentScan(value="com.huimv.eartag2.common.service")

huimv-eartag2-platform/huimv-eartag2-device/src/main/java/com/huimv/eartag2/device/listener/DeviceListener.java

@@ -104,6 +104,7 @@ public class DeviceListener {
                 //环境温度-设备、数值、上传时间
                 dataJo.put("device", dataArray[1]);
                 dataJo.put("temp", dataArray[4]);
+                dataJo.put("temp1", MathUtil.countEnvtemp2(dataArray[4], 1));
                 dataJo.put("askTime", dataArray[5]);
                 type = "device-temp";
             } else {

huimv-eartag2-platform/huimv-eartag2-device/src/main/java/com/huimv/eartag2/device/service/impl/DeviceServiceImpl.java

@@ -6,6 +6,7 @@ import com.huimv.eartag2.common.dao.repo.*;
 //import com.huimv.eartag2.process.service.IDeviceService;
 //import com.huimv.eartag2.process.utils.DateUtil;
 //import com.huimv.eartag2.process.utils.MathUtil;
+import com.huimv.eartag2.common.service.IBaseConfigService;
 import com.huimv.eartag2.common.utils.BizConst;
 import com.huimv.eartag2.common.vo.FarmAllStatusVo;
 import com.huimv.eartag2.device.service.ICacheService;
@@ -16,16 +17,14 @@ import com.huimv.eartag2.device.utils.MathUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Project : huimv.shiwan
@@ -74,6 +73,16 @@ public class DeviceServiceImpl implements IDeviceService {
     private String serviceFarmAllStatusIp;
     @Value("${service.farmAllStatus.url}")
     private String serviceFarmAllStatusUrl;
+    @Autowired
+    private IBaseConfigService iBaseConfigService;
+    @Autowired
+    private BasePigpenEntityRepo basePigpenRepo;
+    @Autowired
+    private EartagAbnormalAlarmEntityRepo eartagAbnormalAlarmEntityRepo;
+    @Autowired
+    private EartagAbnormalCountEntityRepo eartagAbnormalCountEntityRepo;
+    @Autowired
+    private EartagDeviceRegisterRepo eartagDeviceRegisterRepo;
 
     /**
      * @Method      : handleDeviceHeartbeat
@@ -376,7 +385,9 @@ public class DeviceServiceImpl implements IDeviceService {
             updateDeviceOnlineWithEnvtemp(farmId, deviceCode,envtemp,todayDate,nowTimestamp);
 
             //{检查异常温度}
-            checkAbnormalEnvTemp(farmId,envtemp);
+//            checkAbnormalEnvTemp(farmId,envtemp);
+            //--处理异常环境温度报警
+            handleEnvtempAlarmAndCount(dataJo,todayDate,nowTimestamp,farmId);
 
             //判断该设备编号是否存在牧场缓存在线集合当中；
             Boolean isExist = cacheService.isExistDeviceOnlineSet(farmId, deviceCode,todayDateText);
@@ -394,6 +405,156 @@ public class DeviceServiceImpl implements IDeviceService {
         System.out.println("## END 环境数据。"+new com.huimv.eartag2.common.utils.DateUtil().getTodayMissionText());
     }
 
+    //{处理环境温度报警}
+    private void handleEnvtempAlarmAndCount(JSONObject dataJo, java.sql.Date todayDate, Timestamp nowTimestamp, String farmId) {
+        String device = dataJo.getString("device");
+        System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+dataJo);
+        Map maxAndMinMap = getMaxAndMin2(farmId, "envMaxTem", "envMinTem");
+        BigDecimal configMaxTempBd = new BigDecimal(maxAndMinMap.get("envMaxTem").toString());
+        BigDecimal configMinTempBd = new BigDecimal(maxAndMinMap.get("envMinTem").toString());
+        BigDecimal envTemp1Bd = new BigDecimal(dataJo.getString("temp1"));
+        if (envTemp1Bd.compareTo(configMaxTempBd) >= 0) {
+            //{}
+            String warningObject = getWarningObject(device);
+            if(warningObject == null){
+                return;
+            }
+            // 保存耳标高温报警
+            EartagAbnormalAlarmEntity eartagAbnormalAlarmEntity = new EartagAbnormalAlarmEntity();
+            eartagAbnormalAlarmEntity.setFarmCode(farmId);
+            eartagAbnormalAlarmEntity.setContent("高温警报：["+warningObject+"]的环境温度为" + envTemp1Bd.toString() + "°，高于等于高温阈值" + configMaxTempBd.toString() + "°");
+            //数据:2
+            eartagAbnormalAlarmEntity.setAlarmType(2);
+            //采集器:1
+            eartagAbnormalAlarmEntity.setAlarmFrom(1);
+            eartagAbnormalAlarmEntity.setAddTime(nowTimestamp);
+            eartagAbnormalAlarmEntity.setAddDate(todayDate);
+            //环境高温:3
+            eartagAbnormalAlarmEntity.setAlarmSort(3);
+            eartagAbnormalAlarmEntityRepo.saveAndFlush(eartagAbnormalAlarmEntity);
+            // 高温次数记录
+            saveEartagTempDataCount(todayDate, nowTimestamp, farmId);
+        } else if (configMinTempBd.compareTo(envTemp1Bd) >= 0) {
+            //{}
+            String warningObject = getWarningObject(device);
+            if(warningObject == null){
+                return;
+            }
+            // 保存耳标高温报警
+            EartagAbnormalAlarmEntity eartagAbnormalAlarmEntity = new EartagAbnormalAlarmEntity();
+            eartagAbnormalAlarmEntity.setFarmCode(farmId);
+            eartagAbnormalAlarmEntity.setContent("低温警报：["+warningObject+"]的环境温度为" + envTemp1Bd.toString() + "°，低于等于低温阈值" + configMinTempBd.toString() + "°");
+            //数据:2
+            eartagAbnormalAlarmEntity.setAlarmType(2);
+            //采集器:1
+            eartagAbnormalAlarmEntity.setAlarmFrom(1);
+            eartagAbnormalAlarmEntity.setAddTime(nowTimestamp);
+            eartagAbnormalAlarmEntity.setAddDate(todayDate);
+            //环境低温:4
+            eartagAbnormalAlarmEntity.setAlarmSort(4);
+            eartagAbnormalAlarmEntityRepo.saveAndFlush(eartagAbnormalAlarmEntity);
+            //低温次数记录
+            saveEartagTempDataCount(todayDate, nowTimestamp, farmId);
+        }
+    }
+
+    //--读取报警对象
+    public String getWarningObject(String device){
+        EartagDeviceRegisterEntity queryEartagDeviceRegisterEntity = eartagDeviceRegisterRepo.getByDeviceCode(device);
+        if(queryEartagDeviceRegisterEntity == null){
+            log.error("该采集器设备["+device+"]不存在.");
+            return null;
+        }
+        String warningObject = "";
+        if(queryEartagDeviceRegisterEntity.getPigpenId()!=null){
+            //{读取栋舍}
+            warningObject = getPigpenByDevice(device);
+        }else{
+            warningObject = queryEartagDeviceRegisterEntity.getFarmerName();
+        }
+        return warningObject;
+    }
+
+    // 保存异常耳标温度计数
+    public void saveEartagTempDataCount(java.sql.Date todayDate, Timestamp nowTimestamp, String farmCode) {
+        EartagAbnormalCountEntity eartagAbnormalCountEntity = new EartagAbnormalCountEntity();
+        eartagAbnormalCountEntity.setFarmCode(farmCode);
+        eartagAbnormalCountEntity.setAddDate(todayDate);
+        Example<EartagAbnormalCountEntity> example = Example.of(eartagAbnormalCountEntity);
+        Optional<EartagAbnormalCountEntity> optional = eartagAbnormalCountEntityRepo.findOne(example);
+        if (!optional.isPresent()) {
+            eartagAbnormalCountEntity.setEartagDataCount(1);
+            eartagAbnormalCountEntity.setEartagDataUpateTime(nowTimestamp);
+            eartagAbnormalCountEntityRepo.saveAndFlush(eartagAbnormalCountEntity);
+        } else {
+            EartagAbnormalCountEntity existEartagAbnormalCountEntity = optional.get();
+            Integer count = existEartagAbnormalCountEntity.getEartagDataCount();
+            if(count == null){
+                count = 0;
+            }
+            existEartagAbnormalCountEntity.setEartagDataCount(count + 1);
+            existEartagAbnormalCountEntity.setEartagDataUpateTime(nowTimestamp);
+            eartagAbnormalCountEntityRepo.saveAndFlush(existEartagAbnormalCountEntity);
+        }
+    }
+    //--通过设备获取栋舍
+    private String getPigpenByDevice(String device) {
+        //根据设备读取栋舍
+        List<Object[]> pigpenList = basePigpenRepo.getPigpenByDevice(device);
+        if(pigpenList.size()==0){
+            return "";
+        }else{
+            StringBuilder sb = new StringBuilder();
+            for(int a=0;a<pigpenList.size();a++){
+                Object[] objArray = pigpenList.get(0);
+                if(sb.length()>0){
+                    sb.append(",");
+                }
+                sb.append(objArray[0]).append(",").append(objArray[1]);
+            }
+            return sb.toString();
+        }
+    }
+
+    // 获取最大最小数值
+    private Map getMaxAndMin2(String farmCode, String maxKeyName, String minKeyName) {
+        Map configMap = new HashMap();
+        String hashKey = BizConst.HASH_EARTEMP_TH_PREFIX + farmCode;
+        // 从属性配置表取值
+        String confMaxTem = getConfigValue(farmCode, maxKeyName);
+        if (confMaxTem == null) {
+            log.error("属性配置:"+maxKeyName+"未配置,请联系管理员进行配置.");
+        }
+        configMap.put(maxKeyName, confMaxTem);
+        //获取耳标温度阈值：最小值
+        // 从属性配置表取值
+        String configMinTem = getConfigValue(farmCode, minKeyName);
+        if (configMinTem == null) {
+            log.error("属性配置:"+minKeyName+"未配置,请联系管理员进行配置.");
+        }
+        configMap.put(minKeyName, configMinTem);
+        return configMap;
+    }
+
+    // 从属性配置表取值
+    public String getConfigValue(String farmCode, String configKey) {
+        //从数据库读取温度阈值属性
+//        List<SysBaseConfigEntity> configList = sysBaseConfigEntityRepo.getConfigValue(configKey, farmCode);
+//        if (configList.size() > 0) {
+//            SysBaseConfigEntity sysBaseConfigEntity = configList.get(0);
+//            return sysBaseConfigEntity.getConfigValue();
+//        } else {
+//            return null;
+//        }
+        Map configMap = iBaseConfigService.getConfigValue(configKey,farmCode,"0");
+        if(configMap == null){
+            log.error("采用默认配置参数 configKey="+configKey);
+            return null;
+        }else{
+            return configMap.get("configValue")+"";
+        }
+    }
+
     /**
      * @Method      : checkAbnormalEnvTemp
      * @Description : 检查异常环境温度
@@ -777,7 +938,7 @@ public class DeviceServiceImpl implements IDeviceService {
     public String getFarmIdByDeviceCode(String deviceCode) {
         EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.getDeviceRegister(deviceCode);
         if(deviceRegisterEntity == null){
-            log.error("该设备编码["+deviceCode+"]的设备已经不存在。");
+            log.error("该采集器设备["+deviceCode+"]的已经不存在。");
             return null;
         }
         return deviceRegisterEntity.getFarmId();
@@ -788,7 +949,6 @@ public class DeviceServiceImpl implements IDeviceService {
         String farmId = deviceRegisterJo.getString("farmId");
         //{}
         Integer effectiveDeviceTotal = getEffectiveDeviceSum(farmId);
-        System.out.println("## effectiveDeviceTotal >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+effectiveDeviceTotal);
         //{设置设备总数}
         cacheService.putDeviceTotal(effectiveDeviceTotal,farmId);
     }

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/listener/EartagListener.java

@@ -51,7 +51,6 @@ public class EartagListener {
     @RabbitHandler
     public void processRawdata(Map RawMap) throws ParseException, IOException {
         System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 处理耳标 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
-        System.out.println("<<<<<<<<<<<<<<< RawMap>>" + RawMap.toString());
         String askText = RawMap.get("askText").toString();
 
         //本模块主要执行保存以下4类数据：（其他注册数据，在线数据，状态数据等都是由其他模块工程执行处理-process2模块工程）

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

@@ -144,7 +144,7 @@ public class EartagServiceImpl implements IEartagService {
             updateEartagDeviceOnlineCount(earmark, deviceCode, todayDateText, todayDate, nowTimestamp, farmId);
 
             //{异常统计和异常报警}
-            abnormalCountAndAlarm(dataJo, todayDate, nowTimestamp, farmId);
+//            abnormalCountAndAlarm(dataJo, todayDate, nowTimestamp, farmId);
 
             //判断该设备编号是否存在牧场缓存在线集合当中；
             if (!cacheService.isExistEartagOnlineSet(farmId, earmark, todayDateText)) {
@@ -231,8 +231,9 @@ public class EartagServiceImpl implements IEartagService {
     private void abnormalCountAndAlarm(JSONObject dataJo, java.sql.Date todayDate, Timestamp nowTimestamp, String farmCode) {
         //处理异常-耳标温度警报和统计；
         handleEartempAlarmAndCount(dataJo, todayDate, nowTimestamp, farmCode);
+        //--这里环境温度报警不用耳标里包含的环境温度数据，而是用采集器设备上传的报警数据
         //处理异常-环境温度警报和统计；
-        handleEnvtempAlarmAndCount(dataJo, todayDate, nowTimestamp, farmCode);
+//        handleEnvtempAlarmAndCount(dataJo, todayDate, nowTimestamp, farmCode);
     }
 
     //处理异常环境温度警报和统计；
@@ -254,8 +255,8 @@ public class EartagServiceImpl implements IEartagService {
             eartagAbnormalAlarmEntity.setContent("高温警报：["+pigpenName+"]的环境温度为" + envTemp1Bd.toString() + "°，高于高温阈值" + configMaxTempBd.toString() + "°");
             //数据:2
             eartagAbnormalAlarmEntity.setAlarmType(2);
-            //耳标:2
-            eartagAbnormalAlarmEntity.setAlarmFrom(2);
+            //采集器:1
+            eartagAbnormalAlarmEntity.setAlarmFrom(1);
             eartagAbnormalAlarmEntity.setAddTime(nowTimestamp);
             eartagAbnormalAlarmEntity.setAddDate(todayDate);
             //环境高温:3
@@ -270,8 +271,8 @@ public class EartagServiceImpl implements IEartagService {
             eartagAbnormalAlarmEntity.setContent("低温警报：["+pigpenName+"]的环境温度为" + envTemp1Bd.toString() + "°，低于低温阈值" + configMinTempBd.toString() + "°");
             //数据:2
             eartagAbnormalAlarmEntity.setAlarmType(2);
-            //耳标:2
-            eartagAbnormalAlarmEntity.setAlarmFrom(2);
+            //采集器:1
+            eartagAbnormalAlarmEntity.setAlarmFrom(1);
             eartagAbnormalAlarmEntity.setAddTime(nowTimestamp);
             eartagAbnormalAlarmEntity.setAddDate(todayDate);
             //环境低温:4

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

@@ -20,4 +20,6 @@ public interface EartagEartagRegister2Mapper extends BaseMapper<EartagEartagRegi
     Date getLastBatchCreateDate(@Param("deviceCode") String deviceCode);
 
     List<EartagEartagRegister2> getLastBatchPig(@Param("deviceCode") String deviceCode, @Param("createDate") Date createDate);
+
+    List<EartagEartagRegister2> getEartagByDeviceCode(@Param("deviceCode") String deviceCode);
 }

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

@@ -48,5 +48,9 @@
     <select id="getLastBatchPig" resultType="com.huimv.eartag2.manage2.pojo.EartagEartagRegister2">
         SELECT * FROM eartag_eartag_register2 WHERE last_device=#{deviceCode} AND create_date=#{createDate} ORDER BY register_time DESC
     </select>
+    <select id="getEartagByDeviceCode" resultType="com.huimv.eartag2.manage2.pojo.EartagEartagRegister2"
+            parameterType="java.lang.String">
+        SELECT * FROM eartag_eartag_register2 WHERE last_device=${deviceCode}  ORDER BY register_time DESC
+    </select>
 
 </mapper>

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

@@ -11,6 +11,7 @@ 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.EartagEartagRegister2;
 import com.huimv.eartag2.manage2.pojo.SysBaseConfig;
 import com.huimv.eartag2.manage2.service.EartagDeviceRegisterService;
 import com.huimv.eartag2.manage2.service.IEartagService;
@@ -152,6 +153,11 @@ public class EartagTask {
         String deviceCode = eartagDeviceRegisterMapper.getDeviceIdByFarmerId(String.valueOf(farmerId));
         System.out.println("deviceCode="+deviceCode);
         //--读取注册耳标
+        List<EartagEartagRegister2> eartagEartagRegister2List = eartagEartagRegister2Mapper.getEartagByDeviceCode(deviceCode);
+        System.out.println("eartagEartagRegister2List.size=============="+eartagEartagRegister2List.size());
+        for(EartagEartagRegister2 eartagEartagRegister2:eartagEartagRegister2List){
+            System.out.println(""+eartagEartagRegister2.getCreateDate());
+        }
 
 
 //        System.out.println("deviceCodeList.size="+deviceCodeList.size());

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

@@ -63,14 +63,10 @@ public class FarmerAssetServiceImpl extends ServiceImpl<FarmerAssetMapper, Farme
 
         //{根据农户读取采集器}
         String deviceCode = eartagDeviceRegisterMapper.getDeviceIdByFarmerId(farmerId);
-        System.out.println("deviceCode="+deviceCode);
         //{读取最后一批猪信息}
         JSONObject lastBatchJo = _getlastBatchAdoptPig(deviceCode);
-        System.out.println("lastBatchJo="+lastBatchJo);
-        System.out.println(">>>>>>>>>>>>>>>>>>>>>>> farmerId="+farmerId);
         //读取资产信息
         List<FarmerAsset> farmerAssetList = farmerAssetMapper.getAssetByMonth(6,farmerId);
-        System.out.println("farmerAssetList.size="+farmerAssetList.size());
         List reverseList = new ArrayList();
         //--反转排序
         for(int a=farmerAssetList.size()-1;a>=0;a--){