耳标平台

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

@@ -154,7 +154,7 @@ public class EartagListener {
      * @Time : 17:53
      */
 //    @RabbitListener(queues = Const.QUEUE_ASK_EARTAG )
-//    @RabbitListener(queues = "#{'direct.askEartag.queue' + ${rabbitmq.queues}}")
+    @RabbitListener(queues = "#{'direct.askEartag.queue' + ${rabbitmq.queues}}")
     @RabbitHandler
     public void processRawdata(JSONObject dataJo) throws ParseException, IOException {
          log.info("开始处理原始耳标数据------>"+dataJo);
@@ -233,7 +233,7 @@ public class EartagListener {
 //    }
 
 //    @RabbitListener(queues = Const.QUEUE_DEVICE_REGIST)
-//    @RabbitListener(queues = "#{'direct.deviceRegist.queue' + ${rabbitmq.queues}}")
+    @RabbitListener(queues = "#{'direct.deviceRegist.queue' + ${rabbitmq.queues}}")
     @RabbitHandler
     public void updateDeviceRegister(JSONObject dataJo) {
         log.info("开始更新设备注册信息------>"+dataJo);
@@ -241,7 +241,7 @@ public class EartagListener {
     }
 
 //    @RabbitListener(queues = Const.QUEUE_EARTAG_REGIST)
-//    @RabbitListener(queues = "#{'direct.eartagRegist.queue' + ${rabbitmq.queues}}")
+    @RabbitListener(queues = "#{'direct.eartagRegist.queue' + ${rabbitmq.queues}}")
     @RabbitHandler
     public void updateEartagRegister(JSONObject dataJo) {
         log.info("开始更新耳标注册信息------>"+dataJo);
@@ -250,7 +250,7 @@ public class EartagListener {
     }
 
 //    @RabbitListener(queues = Const.QUEUE_DEVICE_COUNT)
-//    @RabbitListener(queues = "#{'direct.deviceCount.queue' + ${rabbitmq.queues}}")
+    @RabbitListener(queues = "#{'direct.deviceCount.queue' + ${rabbitmq.queues}}")
     @RabbitHandler
     public void updateDeviceOnline(JSONObject dataJo) throws ParseException {
         log.info("开始更新设备在线统计------>"+dataJo);
@@ -259,7 +259,7 @@ public class EartagListener {
     }
 
 //    @RabbitListener(queues = Const.QUEUE_EARTAG_COUNT)
-//    @RabbitListener(queues = "#{'direct.eartagCount.queue' + ${rabbitmq.queues}}")
+    @RabbitListener(queues = "#{'direct.eartagCount.queue' + ${rabbitmq.queues}}")
     @RabbitHandler
     public void updateEartagOnline(JSONObject dataJo){
         log.info("开始更新耳标在线统计------>"+dataJo);
@@ -268,7 +268,7 @@ public class EartagListener {
     }
 
 //    @RabbitListener(queues = Const.QUEUE_EARTAG_DEVICE_ONLINE)
-//    @RabbitListener(queues = "#{'direct.updateEartagDeviceOnlineCount.queue' + ${rabbitmq.queues}}")
+    @RabbitListener(queues = "#{'direct.updateEartagDeviceOnlineCount.queue' + ${rabbitmq.queues}}")
     @RabbitHandler
     public void updateEartagDeviceOnlineCount(JSONObject dataJo)   {
         log.info("更新耳标设备在线关联统计------>"+dataJo);
@@ -278,7 +278,7 @@ public class EartagListener {
 
 
 //    @RabbitListener(queues = Const.QUEUE_EARTAG_LIVE)
-//    @RabbitListener(queues = "#{'direct.eartagLiveStatus.queue' + ${rabbitmq.queues}}")
+    @RabbitListener(queues = "#{'direct.eartagLiveStatus.queue' + ${rabbitmq.queues}}")
     @RabbitHandler
     public void updateEartagLiveStatus(JSONObject dataJo)   {
         log.info("更新耳标连线状态------>"+dataJo);
@@ -289,7 +289,7 @@ public class EartagListener {
 
 
 //    @RabbitListener(queues = Const.QUEUE_ABNORMAL)
-//    @RabbitListener(queues = "#{'direct.abnormalCountAndAlarm.queue' + ${rabbitmq.queues}}")
+    @RabbitListener(queues = "#{'direct.abnormalCountAndAlarm.queue' + ${rabbitmq.queues}}")
     @RabbitHandler
     public void abnormalCountAndAlarm(JSONObject dataJo) throws ParseException {
         log.info("异常统计和异常报警------>"+dataJo);
@@ -298,7 +298,7 @@ public class EartagListener {
     }
 
 //    @RabbitListener(queues = Const.QUEUE_AllSTATUS)
-//    @RabbitListener(queues = "#{'direct.updateEartagPropertyOfAllStatus.queue' + ${rabbitmq.queues}}")
+    @RabbitListener(queues = "#{'direct.updateEartagPropertyOfAllStatus.queue' + ${rabbitmq.queues}}")
     @RabbitHandler
     public void updateEartagPropertyOfAllStatus(JSONObject dataJo) throws ParseException {
         log.info("判断该设备编号是否存在牧场缓存在线集合当中------>"+dataJo);

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

@@ -1321,7 +1321,6 @@ public class EartagServiceImpl implements IEartagService {
         EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.getByDeviceCode(deviceCode);
         Integer unitId = deviceRegisterEntity.getUnitId();
         Integer pigpenId = deviceRegisterEntity.getPigpenId();
-        Map pigpenMap = new HashMap();
         List<BasePigpenEntity> basePigpenEntityList = basePigpenRepo.getPigpenByPigpenIdAndUnitId(pigpenId, unitId);
         if (basePigpenEntityList.size() == 0) {
             log.error("栋舍不存在[" + pigpenId + "," + unitId + "].");
@@ -1376,8 +1375,44 @@ public class EartagServiceImpl implements IEartagService {
             eartagRegisterEntity.setPigpenName(pigpenName);
             eartagRegisterRepo.saveAndFlush(eartagRegisterEntity);
             //更新耳标注册消息缓存
-            cacheService.putEartagRegister(earmark, eartagRegisterEntity);
         }
+
+        EartagEartagRegister2Entity eartagRegister2Entity = eartagEartagRegister2EntityRepo.getOneByEarmark2(earmark);
+
+        System.out.println("earmark--> " + earmark);
+        if (eartagRegister2Entity == null) {
+            //{新建耳标注册信息}
+            newEartagRegister2(earmark, nowTimestamp, deviceCode, registerType, activeStatus, liveStatus, bat, todayDate, farmId, dataJo, stageCode, stageName, pigpenId, pigpenName, unitId, unitName, deviceRegisterEntity);
+        } else {
+            eartagRegister2Entity.setLastTime(nowTimestamp);
+            eartagRegister2Entity.setLastDevice(deviceCode);
+            eartagRegister2Entity.setActiveStatus(activeStatus);
+            eartagRegister2Entity.setActiveTime(nowTimestamp);
+            eartagRegister2Entity.setBat(Integer.parseInt(bat));
+            eartagRegister2Entity.setUnitId(deviceRegisterEntity.getUnitId());
+            eartagRegister2Entity.setUnitName(unitName);
+            eartagRegister2Entity.setPigpenId(deviceRegisterEntity.getPigpenId());
+            eartagRegister2Entity.setPigpenName(pigpenName);
+            eartagRegister2Entity.setStageCode(stageCode);
+            eartagRegister2Entity.setStageName(stageName);
+            eartagRegister2Entity.setEarTemp2(dataJo.getFloat("earTemp2"));
+            eartagRegister2Entity.setEarTemp1(dataJo.getFloat("earTemp1"));
+//            eartagRegisterEntity.setEnvTemp1(eartagJo.getFloat("envTemp1"));
+            //相对运动量
+            eartagRegister2Entity.setAct(Long.parseLong(dataJo.getString("act1")));
+            eartagRegister2Entity.setSignal1(Integer.parseInt(dataJo.getString("signal")));
+            eartagRegister2Entity.setAskTime(getAskTime(dataJo.getString("askTime")));
+            eartagRegister2Entity.setOther(dataJo.getString("other"));
+            eartagRegister2Entity.setFarmId(farmId);
+            eartagRegister2Entity.setLiveStatus(1);
+            //绝对运动量
+            eartagRegister2Entity.setActRange(new Long(Long.parseLong(dataJo.getString("act"))).intValue());
+            System.out.println("开始更新--> " + eartagRegisterEntity);
+            eartagEartagRegister2EntityRepo.saveAndFlush(eartagRegister2Entity);
+            //更新耳标注册消息缓存
+
+        }
+        cacheService.putEartagRegister(earmark, eartagRegisterEntity);
     }
 
     /**

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/EartagData2Mapper.java

@@ -2,6 +2,7 @@ package com.huimv.eartag2.manage2.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.manage2.pojo.pojovo.EartagDataDto;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,9 +18,9 @@ import java.util.List;
  * @author author
  * @since 2022-07-29
  */
-public interface EartagData2Mapper extends BaseMapper<EartagData2> {
+public interface EartagData2Mapper extends BaseMapper<EartagData> {
     //
-    List<EartagData2> getEartagDataByEarmark(@Param("earmark") String earmark, @Param("recordCount") String recordCount);
+    List<EartagData> getEartagDataByEarmark(@Param("earmark") String earmark, @Param("recordCount") String recordCount);
 
-    List<EartagDataDto> getAct(@Param(Constants.WRAPPER) QueryWrapper<EartagData2> wrapper);
+    List<EartagDataDto> getAct(@Param(Constants.WRAPPER) QueryWrapper<EartagData> wrapper);
 }

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

@@ -23,7 +23,7 @@
         <result column="farm_id" property="farmId" />
         <result column="ask_date" property="askDate" />
     </resultMap>
-    <select id="getEartagDataByEarmark" resultType="com.huimv.eartag2.manage2.pojo.EartagData2">
+    <select id="getEartagDataByEarmark" resultType="com.huimv.eartag2.manage2.pojo.EartagData">
         SELECT * FROM eartag_data2 WHERE earmark=${earmark} ORDER BY add_time DESC LIMIT ${recordCount}
     </select>
     <select id="getAct" resultType="com.huimv.eartag2.manage2.pojo.pojovo.EartagDataDto">

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/IEartagData2Service.java

@@ -1,5 +1,6 @@
 package com.huimv.eartag2.manage2.service;
 
+import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.common.utils.Result;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,9 +17,9 @@ import java.util.Map;
  * @author author
  * @since 2022-07-29
  */
-public interface IEartagData2Service extends IService<EartagData2> {
+public interface IEartagData2Service extends IService<EartagData> {
 
-    List<EartagData2> getEartagData(String earmark) throws ParseException;
+    List<EartagData> getEartagData(String earmark) throws ParseException;
 
     Result getEnvByTime(Map<String, String> map);
 

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

@@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.eartag2.manage2.mapper.EartagDataMapper;
+import com.huimv.eartag2.manage2.pojo.EartagData;
 import com.huimv.eartag2.manage2.pojo.EartagData2;
 import com.huimv.eartag2.manage2.pojo.pojovo.EartagDataDto;
 import com.huimv.eartag2.manage2.pojo.pojovo.QingShanData;
@@ -32,7 +34,7 @@ import java.util.*;
  * @since 2022-07-29
  */
 @Service
-public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, EartagData2> implements IEartagData2Service {
+public class EartagData2ServiceImpl extends ServiceImpl<EartagDataMapper, EartagData> implements IEartagData2Service {
 
     @Resource
     private EartagData2Mapper eartagData2Mapper;
@@ -44,18 +46,18 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
     private SysAccountMultilevelMapper sysAccountMultilevelMapper;
 
     @Override
-    public List<EartagData2> getEartagData(String earmark) throws ParseException {
-        QueryWrapper<EartagData2> queryWrapper = new QueryWrapper<>();
+    public List<EartagData> getEartagData(String earmark) throws ParseException {
+        QueryWrapper<EartagData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("earmark", earmark);
-        List<EartagData2> eartagData2s = eartagData2Mapper.selectList(queryWrapper);
+        List<EartagData> eartagData2s = eartagData2Mapper.selectList(queryWrapper);
         //查询出来五分钟之内的数据;
         Calendar calendar = Calendar.getInstance();
         //1-当前时间
         Long currentTimestamps = System.currentTimeMillis();
         //存五秒内的数据
-        ArrayList<EartagData2> eartagData2s1 = new ArrayList<>();
+        ArrayList<EartagData> eartagData2s1 = new ArrayList<>();
         if (null != eartagData2s && eartagData2s.size() > 0) {
-            for (EartagData2 eartagData2 : eartagData2s) {
+            for (EartagData eartagData2 : eartagData2s) {
                 String addTime = eartagData2.getAddTime() + "";
                 calendar.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(addTime));
                 long timeInMillis = calendar.getTimeInMillis();
@@ -72,33 +74,21 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         String earmark = map.get("earmark");
         String startDate = map.get("startDate");
         String endDate = map.get("endDate");
-        String userId = map.get("userId");
+        String farmId = map.get("farmId");
         Date now = new Date();
-        SysAccountMultilevel user = sysAccountMultilevelMapper.selectById(userId);
         if (StringUtils.isBlank(earmark)) {
             return new Result(10001, "请选择耳标", false);
         }
-        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
         wrapper.eq("earmark", earmark);
+        wrapper.eq("farm_id", farmId);
         if (StringUtils.isBlank(startDate)) {
             wrapper.ge("add_time", DateUtil.beginOfDay(now));
         } else {
             wrapper.between("add_time", startDate, endDate);
         }
         wrapper.orderByAsc("add_time");
-        List<EartagData2> list = this.list(wrapper);
-        //用户数据
-//        if (user.getIsUser() == 0) {
-//            for (EartagData2 eartagData2 : list) {
-//                Float earTemp1 = eartagData2.getEarTemp1();
-//                if (earTemp1 > 40) {
-//                    eartagData2.setEarTemp1(40F);
-//                }
-//                if (earTemp1 < 30) {
-//                    eartagData2.setEarTemp1(30F);
-//                }
-//            }
-//        }
+        List<EartagData> list = this.list(wrapper);
         return new Result(ResultCode.SUCCESS, list);
     }
 
@@ -113,7 +103,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         if (StringUtils.isBlank(earmark)) {
             return new Result(10001, "请选择耳标", false);
         }
-        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
         wrapper.eq("earmark", earmark);
         if (StringUtils.isBlank(startDate)) {
             wrapper.ge("add_time", DateUtil.beginOfDay(now));
@@ -121,7 +111,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
             wrapper.between("add_time", startDate, endDate);
         }
         wrapper.orderByAsc("add_time");
-        List<EartagData2> list = this.list(wrapper);
+        List<EartagData> list = this.list(wrapper);
         //用户数据
 //        if (user.getIsUser() == 0) {
 //            for (EartagData2 eartagData2 : list) {
@@ -146,11 +136,11 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         String startDate = map.get("startDate");
         String endDate = map.get("endDate");
 //        List<EartagData2> eartagData2List = eartagData2Mapper.getEartagDataByEarmark(earmark, recordCount);
-        QueryWrapper<EartagData2> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<EartagData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("earmark",earmark);
         queryWrapper.between("add_time",startDate +" 00:00:00",endDate+" 23:59:59");
         queryWrapper.orderByDesc("add_time");
-        List<EartagData2> eartagData2List = eartagData2Mapper.selectList(queryWrapper);
+        List<EartagData> eartagData2List = eartagData2Mapper.selectList(queryWrapper);
 
         if (eartagData2List.size() == 0) {
             boolean earmark1 = eartagEartagRegister2Mapper.exists(new QueryWrapper<EartagEartagRegister2>().eq("earmark", earmark));
@@ -159,7 +149,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
             }
             return new Result(10009, "数据为空", false);
         } else {
-            List<EartagData2> newList = new ArrayList();
+            List<EartagData> newList = new ArrayList();
             for (int a = eartagData2List.size() - 1; a >= 0; a--) {
                 newList.add(eartagData2List.get(a));
             }
@@ -170,7 +160,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
     @Override
     public Result getTemp(Map<String, String> map) {
         String earmark = map.get("earmark");
-        return  new Result(ResultCode.SUCCESS,this.list(new QueryWrapper<EartagData2>().eq("earmark",  earmark).ge("ask_time", DateUtil.beginOfDay(new Date()))));
+        return  new Result(ResultCode.SUCCESS,this.list(new QueryWrapper<EartagData>().eq("earmark",  earmark).ge("ask_time", DateUtil.beginOfDay(new Date()))));
 
     }
 
@@ -178,7 +168,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
     public Result getAct(Map<String, String> map) {
         Date date = new Date();
         String earmark = map.get("earmark");
-        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
         wrapper.eq("earmark",earmark);
         wrapper.between("ask_time",DateUtil.beginOfDay(DateUtil.offsetDay(date,-7)),date);
         wrapper.groupBy("`time`");
@@ -224,7 +214,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         if (StringUtils.isBlank(earmark)) {
             return new Result(10001, "请选择耳标", false);
         }
-        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        QueryWrapper<EartagData> wrapper = new QueryWrapper<>();
         wrapper.eq("earmark", earmark);
         if (StringUtils.isBlank(startDate)) {
             wrapper.ge("add_time", DateUtil.beginOfDay(now));
@@ -232,7 +222,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
             wrapper.between("add_time", startDate, endDate);
         }
         wrapper.orderByAsc("add_time");
-        List<EartagData2> list = this.list(wrapper);
+        List<EartagData> list = this.list(wrapper);
 
         return new Result(ResultCode.SUCCESS, list);
     }
@@ -247,7 +237,7 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         if (StringUtils.isBlank(quantity)){
             quantity = "50";
         }
-        List<EartagData2> eartagData2List = this.list(new QueryWrapper<EartagData2>().eq("earmark", earmark).orderByDesc("add_time").last(String.format("limit %s", quantity)));
+        List<EartagData> eartagData2List = this.list(new QueryWrapper<EartagData>().eq("earmark", earmark).orderByDesc("add_time").last(String.format("limit %s", quantity)));
         return new Result(ResultCode.SUCCESS,eartagData2List);
     }
 }

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

@@ -54,7 +54,6 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         String farmId = params.get("farmId");
         String earmark = params.get("earmark");
         String liveStatus = params.get("liveStatus");
-        String userId = params.get("userId");
         if (StringUtils.isBlank(pageNo)){
             pageNo="1";
         }
@@ -373,31 +372,7 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         //大堰河牧场过滤
         Page<EartagEartagRegister2> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
 
-            for (EartagEartagRegister2 record : page.getRecords()) {
-                String earmark1 = record.getEarmark();
-                EartagData2 eartagData2 = eartagData2Mapper.selectOne(new QueryWrapper<EartagData2>().eq("earmark",earmark1).orderByDesc("id").last("limit 1"));
-//                EartagData2 eartagData2Temp = eartagData2Mapper.selectOne(new QueryWrapper<EartagData2>().eq("earmark",earmark1).ge("ask_time",DateUtil.beginOfDay(new Date())).orderByDesc("ear_temp1").last("limit 1"));
-//                if (ObjectUtil.isNotEmpty(eartagData2Temp)){
-//                    record.setEarTemp1(eartagData2Temp.getEarTemp1());
-//                }
-                if (ObjectUtil.isNotEmpty(eartagData2)){
-                    record.setAct(eartagData2.getAct1());
-                }
-                Float earTemp1 = record.getEarTemp1();
-                Long act = record.getAct();
-                if (earTemp1 >40){
-                    record.setEarTemp1(40F);
-                }
-                if (earTemp1 <30){
-                    record.setEarTemp1(30F);
-                }
-                if (act >300){
-                    record.setAct(300L);
-                }
-                if (act<0){
-                    record.setAct(0L);
-                }
-            }
+
 
         Map map = new HashMap();
         long allCount = this.count(wrapper);
@@ -433,7 +408,7 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
             return new Result(10001,"该角色未授权",false);
         }
         eartagEartagRegister2Mapper.delete(new QueryWrapper<EartagEartagRegister2>().eq("earmark",earmark));
-        eartagData2Mapper.delete(new QueryWrapper<EartagData2>().eq("earmark",earmark));
+        eartagData2Mapper.delete(new QueryWrapper<EartagData>().eq("earmark",earmark));
         return new Result(10000,"删除成功",true);
     }
 

huimv-eartag2-manage2/src/main/resources/bootstrap.yml

@@ -7,8 +7,8 @@ spring:
     nacos:
       config:
         # 配置中心的地址
-       # server-addr: 47.98.40.154:8848
-        server-addr: 127.0.0.1:8848
+        server-addr: 47.98.40.154:8848
+#        server-addr: 127.0.0.1:8848
         # 配置文件prefix
         prefix: ${spring.application.name}
         # 配置文件的格式