【feat】 getway部署

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/controller/DeviceController.java

@@ -22,7 +22,7 @@ import java.text.ParseException;
  * @Author : ZhuoNing
  * @Create : 2020-12-25
  **/
-@CrossOrigin
+//@CrossOrigin
 @RestController
 @RequestMapping(value = "/device")
 @Slf4j

huimv-eartag2-platform/huimv-eartag2-manage/src/main/java/com/huimv/eartag2/manage/controller/EartagController.java

@@ -17,7 +17,7 @@ import java.text.ParseException;
  * @Author : ZhuoNing
  * @Create : 2020-12-25
  **/
-@CrossOrigin
+//@CrossOrigin
 @RestController
 @RequestMapping(value = "/eartag")
 @Slf4j

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

@@ -890,8 +890,17 @@ public class DeviceServiceImpl implements IDeviceService {
                 int deviceOnlineTotal = cacheService.getDeviceOnlineTotal(farmId, todayDateText);
                 int eartagOnlineTotal = cacheService.getEartagOnlineTotal(farmId, todayDateText);
                 int deviceOffline = deviceTotal - deviceOnlineTotal;
-                BigDecimal deviceRateBd = new BigDecimal(deviceOnlineTotal).divide(new BigDecimal(deviceTotal), 1, BigDecimal.ROUND_HALF_UP);
-                BigDecimal eartagRateBd = new BigDecimal(eartagOnlineTotal).divide(new BigDecimal(eartagTotal), 1, BigDecimal.ROUND_HALF_UP);
+                BigDecimal deviceRateBd = new BigDecimal(0);
+                BigDecimal eartagRateBd = new BigDecimal(0);
+                if (deviceTotal != 0){
+                    new BigDecimal(deviceOnlineTotal).divide(new BigDecimal(deviceTotal), 1, BigDecimal.ROUND_HALF_UP);
+
+                }
+                if (eartagTotal != 0){
+                    new BigDecimal(eartagOnlineTotal).divide(new BigDecimal(eartagTotal), 1, BigDecimal.ROUND_HALF_UP);
+                }
+
+
 
                 EartarFarmAllStatusEntity newFarmAllStatusEntity = new EartarFarmAllStatusEntity();
                 newFarmAllStatusEntity.setDeviceTotal(deviceTotal);

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/netty/EartagServerHandler2.java

@@ -188,7 +188,7 @@ private IEartagEartagRegister2Service eartagRegisterService;
                     String[] location = locations.split(",");
 
                     lat = location[1];
-                    lon = location[1];
+                    lon = location[0];
 
                     StationLib stationLib1 = new StationLib();
                     stationLib1.setAddress(address);

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

@@ -1,6 +1,7 @@
 package com.huimv.eartag2.manage2.service.impl;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.StopWatch;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -129,8 +130,8 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
 
     @Override
     public Result countAll(Map<String, Object> paramsMap) {
-        String farmCode = (String)paramsMap.get("farmCode");
-        Map endMap = new HashMap();
+        String farmCode = (String)paramsMap.get("farmId");
+        HashMap<String,Long> endMap = new HashMap();
         Long countFarmer = baseFarmerMapper.selectCount(new QueryWrapper<BaseFarmer>().eq("farm_code", farmCode));;
         Long countPig = eartagEartagRegister2Mapper.selectCount(new QueryWrapper<EartagEartagRegister2>().eq("farm_id", farmCode));
         Long countDevice = eartagDeviceRegisterMapper.selectCount(new QueryWrapper<EartagDeviceRegister>().eq("farm_id", farmCode));
@@ -147,14 +148,11 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
 
     @Override
     public Result pigMonitor(Map<String, Object> paramsMap) {
-        String farmCode = (String)paramsMap.get("farmCode");
-
-        List<EartagEartagRegister2> eartagEartagRegister2s = eartagEartagRegister2Mapper.selectList(new QueryWrapper<EartagEartagRegister2>().eq("farm_id", farmCode).orderByDesc("last_time").last("limit 10"));
-
-
-
+        String farmCode = (String)paramsMap.get("farmId");
+        List<EartagEartagRegister2> eartagEartagRegister2s = eartagEartagRegister2Mapper.selectList(new QueryWrapper<EartagEartagRegister2>().eq("farm_id", farmCode).orderByDesc("last_time").last("limit 5"));
         return new Result(ResultCode.SUCCESS,eartagEartagRegister2s);
     }
 
 
+
 }

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

@@ -49,9 +49,14 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         if (StringUtils.isBlank(pageSize)){
             pageSize="20";
         }
+
+
         Float maxEarTemp = 0F;
         Float minEarTemp = 100F;
         QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
+
+        //大堰河牧场过滤
+
         //设备
         wrapper.like(StringUtils.isNotBlank(deviceCode),"last_device",deviceCode);
         wrapper.eq("farm_id",farmId);
@@ -59,6 +64,13 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         wrapper.like(StringUtils.isNotBlank(earmark),"earmark",earmark);
         wrapper.eq(StringUtils.isNotBlank(liveStatus),"live_status",liveStatus);
         wrapper.orderByDesc("ask_time");
+        if ("330112004".equals(farmId)){
+            wrapper.eq("live_status", 1).and( i->i.likeRight("earmark","1332022109003").or().likeRight("earmark","1332022109004"));
+//            wrapper.likeRight("earmark","1332022109003").or();
+//            wrapper.likeRight("earmark","1332022109004");
+        }
+
+
         //吴老师要求，屏蔽耳标
 //        wrapper.le("ear_temp1",41);