耳标平台

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

@@ -50,7 +50,7 @@ public class EartarFarmAllStatusEntity implements Serializable {
     private String farmId;
 
     @Column(name = "update_time")
-    private java.util.Date updateTime;
+    private Date updateTime;
 
     @Column(name = "create_date")
     private Date createDate;

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

@@ -124,32 +124,31 @@ public class CacheServiceImpl implements ICacheService {
 
     @Override
     public Boolean isExistTodayFarmAllStatus(String deviceCode) throws ParseException {
-        System.out.println("isExistTodayFarmAllStatus 2.deviceCode>>"+deviceCode);
+//        System.out.println("isExistTodayFarmAllStatus 2.deviceCode>>"+deviceCode);
 
         //(1)从注册表缓存中（device_register_牧场id）取出牧场id,(2)如果缓存没有则从注册表（eartag_device_register）中查询00
         //(1)
         Object farmIdObj = redisTemplate.opsForHash().get(BizConst.DEVICE_REGISTER_PREFIX + deviceCode,"farmId");
-        System.out.println("2.farmIdObj>>"+farmIdObj);
+//        System.out.println("2.farmIdObj>>"+farmIdObj);
         String farmId = "";
         if(farmIdObj != null){
             farmId = farmIdObj.toString();
         }else{
             //(2)
             EartagDeviceRegisterEntity eartagDeviceRegisterEntity = eartagDeviceRegisterRepo.getDeviceRegister(deviceCode);
-            System.out.println("2.eartagDeviceRegisterEntity>>"+eartagDeviceRegisterEntity.toString());
+//            System.out.println("2.eartagDeviceRegisterEntity>>"+eartagDeviceRegisterEntity.toString());
             if(eartagDeviceRegisterEntity == null){
                 log.error("设备编号:"+deviceCode+",不存在.");
                 return null;
             }
             farmId = eartagDeviceRegisterEntity.getFarmId();
         }
-        System.out.println("2.farmId>>"+farmId);
+//        System.out.println("2.farmId>>"+farmId);
         //从牧场总状态缓存中获取最近一次日期
         Object createDateObj = redisTemplate.opsForHash().get(BizConst.FARM_ALL_STATUS_PREFIX + farmId,"createDate");
-        System.out.println("2.createDateObj>>"+createDateObj);
+//        System.out.println("2.createDateObj>>"+createDateObj);
         if(createDateObj == null){
             //--总状态记录记录不存在
-            System.out.println("A.");
             return false;
         }else{
             //
@@ -157,11 +156,9 @@ public class CacheServiceImpl implements ICacheService {
             System.out.println("缓存中上次操作日期 createDate>>"+createDate);
             if(new DateUtil().getTodayDateText().trim().equalsIgnoreCase(createDate)){
                 //--当天记录存在，就返回true；
-                System.out.println("B.");
                 return true;
             }else{
                 //--当天记录不存在，就返回false；
-                System.out.println("C.");
                 return false;
             }
         }
@@ -246,7 +243,6 @@ public class CacheServiceImpl implements ICacheService {
      */
     @Override
     public void putDeviceToOnline(String farmId, String deviceCode, String todayDateText) {
-        System.out.println("## 心跳 2.4");
         String setKey = BizConst.SET_FARM_DEVICE_ONLINE_PREFIX + farmId+":"+todayDateText;
         redisTemplate.opsForSet().add(setKey, deviceCode);
         redisTemplate.expire(setKey,eartagOnlineSetExpire , TimeUnit.HOURS);

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

@@ -102,12 +102,12 @@ public class DeviceServiceImpl implements IDeviceService {
     public String getFarmIdByDeviceCode(String deviceCode) {
         //
         String farmId = (String)cacheService.getFarmIdByDeviceCode(deviceCode);
-        System.out.println("####### farmId=" + farmId);
+//        System.out.println("####### farmId=" + farmId);
         if(farmId != null && farmId.trim().length()>0){
             return farmId;
         }else{
             EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.getDeviceRegister(deviceCode);
-            System.out.println("####### deviceRegisterEntity=" + deviceRegisterEntity);
+//            System.out.println("####### deviceRegisterEntity=" + deviceRegisterEntity);
             //{将设备注册信息保存到缓存中}
             cacheService.putDeviceRegister(deviceCode,deviceRegisterEntity);
             return deviceRegisterEntity.getFarmId();

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

@@ -124,7 +124,7 @@ public class EartagServiceImpl implements IEartagService {
         //--设备和耳标总状态表
         //获取牧场id
         String farmId = deviceService.getFarmIdByDeviceCode(deviceCode);
-        System.out.println("####### farmId=" + farmId);
+//        System.out.println("####### farmId=" + farmId);
         if (farmId != null) {
             //{计算小时运动量}
 //            countHourAct(dataJo);
@@ -669,7 +669,7 @@ public class EartagServiceImpl implements IEartagService {
         String earmark = eartagJo.getString("earmark");
         Long act = Long.parseLong(eartagJo.getString("act"));
         Long act1 = Long.parseLong(eartagJo.getString("act1"));
-        System.out.println("本次运动量=" + act);
+//        System.out.println("本次运动量=" + act);
         System.out.println("earmark=" + earmark);
         System.out.println("farmId=" + farmId);
         //
@@ -1037,7 +1037,7 @@ public class EartagServiceImpl implements IEartagService {
 
         System.out.println("deviceCode>>" + deviceCode);
         EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.getDeviceRegister(deviceCode);
-        System.out.println("deviceRegisterEntity>>" + deviceRegisterEntity);
+//        System.out.println("deviceRegisterEntity>>" + deviceRegisterEntity);
         if (deviceRegisterEntity == null) {
             log.error("(updateDeviceRegister).deviceRegisterEntity=null <-- deviceCode>>" + deviceCode);
             return;
@@ -1388,7 +1388,7 @@ public class EartagServiceImpl implements IEartagService {
             eartagRegister2Entity.setStageName(stageName);
             eartagRegister2Entity.setEarTemp2(dataJo.getFloat("earTemp2"));
             eartagRegister2Entity.setEarTemp1(dataJo.getFloat("earTemp1"));
-//            eartagRegisterEntity.setEnvTemp1(eartagJo.getFloat("envTemp1"));
+            eartagRegister2Entity.setEnvTemp1(dataJo.getFloat("envTemp1"));
             //相对运动量
             eartagRegister2Entity.setAct(Long.parseLong(dataJo.getString("act1")));
             eartagRegister2Entity.setSignal1(Integer.parseInt(dataJo.getString("signal")));
@@ -1401,9 +1401,10 @@ public class EartagServiceImpl implements IEartagService {
             System.out.println("开始更新--> " + eartagRegisterEntity);
             eartagEartagRegister2EntityRepo.saveAndFlush(eartagRegister2Entity);
             //更新耳标注册消息缓存
+            cacheService.putEartagRegister(earmark, eartagRegisterEntity);
 
         }
-        cacheService.putEartagRegister(earmark, eartagRegisterEntity);
+
     }
 
     /**
@@ -1568,6 +1569,7 @@ public class EartagServiceImpl implements IEartagService {
         //{更新耳标注册消息缓存}
         cacheService.putEartagRegister(earmark, newEartagRegisterEntity);
         //{更新耳标数量}
+
         cacheService.putEartagTotal(getEartagSum(farmId, liveStatus), farmId);
     }
 

huimv-eartag2-input/src/main/java/com/huimv/eartag2/service/impl/DataServiceImpl.java

@@ -293,7 +293,7 @@ public class DataServiceImpl implements IDataService {
 
     @Override
     public   void sendEartagMQ(Map map,String eartag) throws IOException, ParseException {
-        int i = Math.abs(eartag.hashCode()) % queues;
+
 
 
         String askText = map.get("askText").toString();
@@ -319,7 +319,11 @@ public class DataServiceImpl implements IDataService {
             }
             dataJo.put("farmId", farmId);
 
+            int i = Math.abs(eartag.hashCode()) % queues;
             rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_EARTAG, Const.ROUTING_KEY_ASK_EARTAG+i, dataJo);
+
+
+
             rabbitTemplate.convertAndSend(Const.EXCHANGE_COUNT_ACT_HOUR, Const.ROUTING_KEY_COUNT_ACT_HOUR+i, dataJo);
             rabbitTemplate.convertAndSend(Const.EXCHANGE_DEVICE_REGIST, Const.ROUTING_KEY_DEVICE_REGIST+i, dataJo);
             rabbitTemplate.convertAndSend(Const.EXCHANGE_EARTAG_REGIST, Const.ROUTING_KEY_EARTAG_REGIST+i, dataJo);

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/HuimvManageApplication.java

@@ -27,7 +27,7 @@ import org.springframework.web.client.RestTemplate;
 @MapperScan("com.huimv.eartag2.manage2.mapper")
 @EntityScan(value = "com.huimv.eartag2.common.dao.entity")
 @EnableJpaRepositories(basePackages = "com.huimv.eartag2.common.dao.repo")
-@Import(InterceptorConfig.class)
+//@Import(InterceptorConfig.class)
 public class HuimvManageApplication {
     public static void main(String[] args) throws InterruptedException {
 

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartarFarmAllStatus.java

@@ -52,7 +52,7 @@ public class EartarFarmAllStatus implements Serializable {
 
     private Date updateTime;
 
-    private LocalDate createDate;
+    private Date createDate;
 
     @TableLogic
     private Integer isDeleted;

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

@@ -79,7 +79,7 @@ public class EartagTask {
      */
 
     // 10分钟
-    @Scheduled(cron = "0 0/3 * * * ? ")
+    @Scheduled(cron = "1 0/5 * * * ? ")
 //    @Scheduled(cron = "0 * * * * ? ")
     private void countEartagOnlineTimes() throws IOException, ParseException {
         //更新耳标在线状态

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

@@ -207,7 +207,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
     @Override
     public Result add(Map<String, String> mapList) {
         String deviceType = mapList.get("deviceType");
-        String farmName = baseFarmMapper.selectById(mapList.get("farmId")).getFarmName();
+//        String farmName = baseFarmMapper.selectById(mapList.get("farmId")).getFarmName();
         if ("1".equals(deviceType)){
             //采集器
             String farmId = mapList.get("farmId");
@@ -221,7 +221,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             System.out.println(deviceCode);
             EartagDeviceRegister eartagDeviceRegister = new EartagDeviceRegister();
             eartagDeviceRegister.setChipId(chipId);
-            eartagDeviceRegister.setFarmerName(farmName);
+//            eartagDeviceRegister.setFarmerName(farmName);
             eartagDeviceRegister.setDeviceAlias(deviceAlias);
             eartagDeviceRegister.setDeviceCode(deviceCode);
             eartagDeviceRegister.setActiveStatus(Integer.valueOf(activeStatus));
@@ -263,7 +263,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
             String deviceCode = (String)getDeviceCode(farmId).getData();
             EartagDeviceRegister eartagDeviceRegister = new EartagDeviceRegister();
             eartagDeviceRegister.setFarmId(farmId);
-            eartagDeviceRegister.setFarmName(farmName);
+//            eartagDeviceRegister.setFarmName(farmName);
             eartagDeviceRegister.setDeviceCode(deviceCode);
             eartagDeviceRegister.setDeviceType(Integer.parseInt(deviceType));
             eartagDeviceRegister.setRemark(remark);

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

@@ -110,7 +110,7 @@ public class EartagServiceImpl implements IEartagService {
             }
 
 
-            EartarFarmAllStatus eartarFarmAllStatus = eartarFarmAllStatusMapper.selectOne(new QueryWrapper<EartarFarmAllStatus>().eq("create_date", now).eq("farm_id", farmCode));
+            EartarFarmAllStatus eartarFarmAllStatus = eartarFarmAllStatusMapper.selectOne(new QueryWrapper<EartarFarmAllStatus>().ge("update_time", DateUtil.beginOfDay(now)).eq("farm_id", farmCode));
             QueryWrapper<EartagDeviceRegister> deviceWapper = new QueryWrapper<>();
             QueryWrapper<EartagEartagRegister2> eartagWapper = new QueryWrapper<>();
 
@@ -133,6 +133,7 @@ public class EartagServiceImpl implements IEartagService {
                 eartarFarmAllStatus.setDeviceCancel(0);
                 eartarFarmAllStatus.setEartagTotal(allEartag.intValue());
                 eartarFarmAllStatus.setFarmId(farmCode);
+                eartarFarmAllStatus.setCreateDate(now);
                 eartarFarmAllStatus.setEartagOnline(onEartag.intValue());
                 eartarFarmAllStatus.setEartagRate(calculatePercentage(onDevice,allDevice));
                 eartarFarmAllStatus.setUpdateTime(now);

huimv-eartag2-manage2/src/main/resources/application.properties

@@ -1,7 +1,7 @@
 #spring.profiles.active=dev2
 #spring.profiles.active=prod3
-spring.profiles.active=prod
-#spring.profiles.active=prod2
+#spring.profiles.active=prod
+spring.profiles.active=prod2
 
 # mysql:/cache:
 device.online.access_mode=mysql