修复manage模块部分bug 2022.3.31。

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

@@ -378,6 +378,7 @@ public class DeviceServiceImpl implements IDeviceService {
             if (!isExist) {
                 //4.{更新总状态表}
                 updateEnvtempOfDeviceAllStatus(farmId, todayDateText,todayDate,nowTimestamp);
+
                 //{将新设备编号加入在线缓存}
                 cacheService.putDeviceToOnlineSet(farmId, deviceCode, todayDateText);
             }
@@ -399,7 +400,9 @@ public class DeviceServiceImpl implements IDeviceService {
         }
         //设备在线数量
         Integer deviceOnlineSum = cacheService.getDeviceOnlineSum(farmId,todayDateText);
+//        System.out.println("# 设备当前在线数量(deviceOnlineSum)="+deviceOnlineSum);
         deviceOnlineSum++;
+//        System.out.println("# 设备当前在线数量(deviceOnlineSum) 2="+deviceOnlineSum);
         //设备离线数量
         Integer deviceOfflineSum = 0;
         if(deviceTotal > deviceOnlineSum){

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

@@ -73,6 +73,9 @@ public class DeviceRegisterServiceImpl implements IDeviceRegisterService {
 
     @Override
     public Result editDevice(String chipId, String deviceCode, Integer lastDeviceStatus, Integer deviceStatus, Integer activeStatus, String deviceAlias, String location, String remark, Integer id) throws ParseException {
+        if(deviceStatus == 2){
+            activeStatus = 2;
+        }
         //
 //        EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.getById(id);
         EartagDeviceRegisterEntity deviceRegisterEntity = deviceRegisterRepo.getDeviceRegister(deviceCode);
@@ -211,7 +214,7 @@ public class DeviceRegisterServiceImpl implements IDeviceRegisterService {
         //{将芯片ID和设备编码加入缓存}
         cacheService.putChipIdToCache(chipId,deviceCode);
         //{将该设备编码加入到在线设备集合当中}
-        cacheService.putOnlineDeviceSet(farmId,deviceCode,dateUtil.getTodayDateText());
+//        cacheService.putOnlineDeviceSet(farmId,deviceCode,dateUtil.getTodayDateText());
 
         //{将最新设备数量加入到缓存}--MQ异步处理
 //        Integer deviceStatus = 1;

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

@@ -838,11 +838,11 @@ public class DeviceServiceImpl implements IDeviceService {
         resultJo.put("deviceRate",mathUtil.countRate(resultJo.getFloat("deviceRate"),1)+"%");
         resultJo.put("eartagRate",mathUtil.countRate(resultJo.getIntValue("eartagOnline"),resultJo.getIntValue("eartagTotal"),1)+"%");
         resultJo.put("updateTime", dateUtil.formatDatetimeText(resultJo.getDate("updateTime")));
-        resultJo.put("deviceTotal",resultJo.getString("deviceTotal")+"个");
-        resultJo.put("deviceOnline",resultJo.getString("deviceOnline")+"个");
-        resultJo.put("deviceOffline",resultJo.getString("deviceOffline")+"个");
-        resultJo.put("eartagTotal",resultJo.getString("eartagTotal")+"枚");
-        resultJo.put("eartagOnline",resultJo.getString("eartagOnline")+"枚");
+//        resultJo.put("deviceTotal",resultJo.getString("deviceTotal")+"个");
+//        resultJo.put("deviceOnline",resultJo.getString("deviceOnline")+"个");
+//        resultJo.put("deviceOffline",resultJo.getString("deviceOffline")+"个");
+//        resultJo.put("eartagTotal",resultJo.getString("eartagTotal")+"枚");
+//        resultJo.put("eartagOnline",resultJo.getString("eartagOnline")+"枚");
     }
 
     @Override

huimv-eartag2-platform/huimv-eartag2-manage/src/test/java/com/huimv/eartag2/manage/utils/CacheTest.java

@@ -74,7 +74,7 @@ public class CacheTest {
     @Test
     public void testGetDeviceOnlineSum(){
         String farmId = "101";
-        String todayDateText = "2022-03-25";
+        String todayDateText = "2022-03-31";
         String setKey = BizConst.SET_FARM_DEVICE_ONLINE_PREFIX + farmId+":"+todayDateText;
         Set<String> resultSet = redisTemplate.opsForSet().members(setKey);
         System.out.println("resultSet="+resultSet.toString());