|
@@ -82,7 +82,7 @@ public class ReceivePackageSerivce {
|
|
|
// eartagDataEntity.setFrameSerialNo(Integer.parseInt(frame_serial_no)); //耳标帧序号
|
|
|
eartagDataEntity.setBat(Integer.parseInt(bat)); //电池 电量
|
|
|
DecimalFormat df = new DecimalFormat("####0.00");
|
|
|
-
|
|
|
+ double setEarTemp11 = Double.parseDouble(df.format(ln(Integer.parseInt(split[2]))));
|
|
|
eartagDataEntity.setEarTemp(Double.parseDouble( df.format( ln(Integer.parseInt(split[2]))))) ; //ntc转环境温度
|
|
|
eartagDataEntity.setEnvTemp( Double.parseDouble(new DecimalFormat("#,##0.00").format(( Double.parseDouble(env_temp)/100)))); //环境温度--转doubbo
|
|
|
//System.out.println( ln(Integer.parseInt(prepare_field)));//----25.001
|
|
@@ -113,6 +113,13 @@ public class ReceivePackageSerivce {
|
|
|
// String deviceCode = eartagRegisterEntity.getDeviceCode();//---获取这个基站的编码
|
|
|
// System.out.println(deviceCode);
|
|
|
|
|
|
+ //wendu cha dayu 8
|
|
|
+ if(Double.parseDouble(env_temp)/100-setEarTemp11>8|| Double.parseDouble(env_temp)/100-setEarTemp11<-8){
|
|
|
+ //与注册表不同,,不存
|
|
|
+ System.out.println("丢弃");
|
|
|
+ return "hm+6+0+6+end";
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
if(!eartagRegisterEntity.getDeviceCode().equals(device_code) ){
|
|
|
//与注册表不同,,不存
|