Merge branch 'master' of D:\idea6\huimv.eartag2.platform with conflicts.

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

@@ -270,6 +270,7 @@ public class EartagServiceImpl implements IEartagService {
 
     // 异常统计和报警
     private void abnormalCountAndAlarm(JSONObject dataJo, java.sql.Date todayDate, Timestamp nowTimestamp, String farmCode) {
+        System.out.println("耳标温度警报 1111111111111111111111111111111111111111111111111111111 ");
         //处理异常-耳标温度警报和统计；
         handleEartempAlarmAndCount(dataJo, todayDate, nowTimestamp, farmCode);
         //--这里环境温度报警不用耳标里包含的环境温度数据，而是用采集器设备上传的报警数据
@@ -622,7 +623,6 @@ public class EartagServiceImpl implements IEartagService {
             eartagOfflineTime = Integer.parseInt(configMap.get("configValue")+"");
             System.out.println("eartagOfflineTime >>>>>>>>>>>> "+eartagOfflineTime);
         }
-        System.out.println("2222222222222222222222222");
         String earmark = eartagJo.getString("earmark");
         Long act = Long.parseLong(eartagJo.getString("act"));
         System.out.println("本次运动量=" + act);
@@ -794,14 +794,12 @@ public class EartagServiceImpl implements IEartagService {
 //                log.error("耳标数据过滤时间差属性未配置.");
 //            }
             Map configMap = iBaseConfigService.getConfigValue("timeDifference",farmId,"0");
-            System.out.println("configMap 33 >>>>>>>>>>>>>>>>>>>>> "+configMap);
             if(configMap == null){
                 log.error("耳标离线过程丢弃数据时长属性未配置.采用默认配置参数 setTimeDiff="+setTimeDiff);
             }else{
                 setTimeDiff = Integer.parseInt(configMap.get("configValue")+"");
                 System.out.println("eartagOfflineTime >>>>>>>>>>>> "+setTimeDiff);
             }
-            System.out.println("333333333333333333333333333333333333333");
             countMap.put("fisrtStatus", false);
             if (timeDifference / 1000 < setTimeDiff) {
                 // 同一耳标数据距上一次上传数据时间<5秒，视为被其他基站上传。
@@ -1567,7 +1565,6 @@ public class EartagServiceImpl implements IEartagService {
             dataEntity.setAddTime(nowTimestamp);
             dataEntity.setCreateDate(todayDate);
             dataEntity.setFarmId(farmId);
-//            dataEntity.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
             eartagData2EntityRepo.saveAndFlush(dataEntity);
             //更新耳标注册表中的运动量数据
             EartagEartagRegister2Entity eartagRegister2Entity = eartagEartagRegister2EntityRepo.getOneByEarmark(earmark, farmId);

huimv-eartag2-platform/huimv-eartag2-eartag/src/main/resources/application.properties

@@ -1,6 +1,7 @@
 #spring.profiles.active=test
 #spring.profiles.active=local
-spring.profiles.active=dev
+#spring.profiles.active=dev
+spring.profiles.active=test2
 
 device.register.prefix=device_register_
 redis.expire.eartag_online_set=25

huimv-eartag2-platform/huimv-eartag2-input/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=test
+spring.profiles.active=test2
 
 #¿ªÆô½¡¿µ¼à¿Ø
 management.endpoints.web.exposure.include=*

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

@@ -102,7 +102,6 @@ public class EartagTask {
     private void updateDevice() {
         List<SysBaseConfig> baseConfig = baseConfigService.list(new QueryWrapper<SysBaseConfig>().groupBy("row_id"));
 
-
         for (SysBaseConfig sysBaseConfig : baseConfig) {
             String rowId = sysBaseConfig.getRowId();
             SysBaseConfig one = baseConfigService.getOne(new QueryWrapper<SysBaseConfig>().eq("row_id", rowId).eq("config_key", "eartagOfflineTime"));

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

@@ -21,7 +21,6 @@ import com.huimv.eartag2.manage2.utils.ResultUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -51,13 +50,10 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         QueryWrapper<EartagData2> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("earmark", earmark);
         List<EartagData2> eartagData2s = eartagData2Mapper.selectList(queryWrapper);
-
         //查询出来五分钟之内的数据;
-
         Calendar calendar = Calendar.getInstance();
         //1-当前时间
         Long currentTimestamps = System.currentTimeMillis();
-
         //存五秒内的数据
         ArrayList<EartagData2> eartagData2s1 = new ArrayList<>();
         if (null != eartagData2s && eartagData2s.size() > 0) {
@@ -79,10 +75,8 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         String startDate = map.get("startDate");
         String endDate = map.get("endDate");
         String userId = map.get("userId");
-
         Date now = new Date();
         SysAccountMultilevel user = sysAccountMultilevelMapper.selectById(userId);
-
         if (StringUtils.isBlank(earmark)) {
             return new Result(10001, "请选择耳标", false);
         }
@@ -93,33 +87,20 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         } else {
             wrapper.between("add_time", startDate, endDate);
         }
-
         wrapper.orderByAsc("add_time");
         List<EartagData2> list = this.list(wrapper);
-
-
         //用户数据
-//        if (user.getIsUser() == 0) {
-            if (!"1".equals(userId)){
-
+        if (user.getIsUser() == 0) {
             for (EartagData2 eartagData2 : list) {
                 Float earTemp1 = eartagData2.getEarTemp1();
                 if (earTemp1 > 40) {
                     eartagData2.setEarTemp1(40F);
                 }
-
                 if (earTemp1 < 30) {
-                    double a= new Random().nextInt(32) % (2) + 29;
-                    DecimalFormat df = new DecimalFormat( "0.00" );
-                    String str=df.format( a );
-
-                    eartagData2.setEarTemp1(Float.parseFloat(str));
-//                    eartagData2.setEarTemp1(30F);
+                    eartagData2.setEarTemp1(30F);
                 }
             }
-            }
-//        }
-
+        }
         return new Result(ResultCode.SUCCESS, list);
     }
 
@@ -172,7 +153,6 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
         queryWrapper.between("add_time",startDate,endDate);
         queryWrapper.orderByDesc("add_time");
         List<EartagData2> eartagData2List = eartagData2Mapper.selectList(queryWrapper);
-
         if (eartagData2List.size() == 0) {
             return new Result(10009, "数据为空", false);
         } else {

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

@@ -215,6 +215,7 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
         paramsMap.put("areaCode",baseFarm.getAreaCode());
         rabbitTemplate.convertAndSend(EXCHANGE_SYNC_SYS_CONFIG,ROUTING_KEY_SYNC_SYS_CONFIG,paramsMap);
         System.out.println("--------------------------------------- 发送设备请求原始数据 >>"+paramsMap);
+
         //更新同步时间
 //        String chipId = paramsMap.get("chipId");
 //        QueryWrapper<EartagDeviceRegister> queryWrapper1 = new QueryWrapper<>();

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-dev2.yml

@@ -24,7 +24,7 @@ spring:
     username: admin
     password: admin
     #虚拟host 可以不设置,使用server默认host
-    virtual-host: /registration_center
+    virtual-host: /
     listener:
       simple:
         acknowledge-mode: none

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

@@ -1,5 +1,6 @@
-spring.profiles.active=dev2
+#spring.profiles.active=dev2
 #spring.profiles.active=prod2
+spring.profiles.active=test
 
 # mysql:/cache:
 device.online.access_mode=mysql