【feat】 添加对外服务 api

huimv-eartag2-platform/huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/controller/YourApplication.java

@@ -30,7 +30,7 @@ public class YourApplication {
             System.out.println(result);
             if (1==result){
 //
-                System.out.println("验证失败");
+//                System.out.println("验证失败");
                 AppEncrypted appEncrypted = new AppEncrypted();
                 appEncrypted.setId(1);
                 appEncrypted.setAppEncrypted(result);

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/entity/EartagData2Entity.java

@@ -38,6 +38,8 @@ public class EartagData2Entity implements Serializable {
 
     @Column(name = "ear_temp1")
     private Float earTemp1;
+    @Column(name = "ear_temp2")
+    private Float earTemp2;
 
     @Column(name = "env_temp")
     private Integer envTemp;

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/entity/EartagDataEntity.java

@@ -36,6 +36,9 @@ public class EartagDataEntity implements Serializable {
     @Column(name = "ear_temp1")
     private Float earTemp1;
 
+    @Column(name = "ear_temp2")
+    private Float earTemp2;
+
     @Column(name = "env_temp")
     private Integer envTemp;
 
@@ -71,6 +74,14 @@ public class EartagDataEntity implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date askDate;
 
+    public Float getEarTemp2() {
+        return earTemp2;
+    }
+
+    public void setEarTemp2(Float earTemp2) {
+        this.earTemp2 = earTemp2;
+    }
+
     public void setId(Integer id) {
         this.id = id;
     }

huimv-eartag2-platform/huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/dao/entity/EartagEartagRegister2Entity.java

@@ -99,6 +99,9 @@ public class EartagEartagRegister2Entity implements Serializable {
     @Column(name = "ear_temp1")
     private Float earTemp1;
 
+    @Column(name = "ear_temp2")
+    private Float earTemp2;
+
     @Column(name = "env_temp1")
     private Float envTemp1;
 

huimv-eartag2-platform/huimv-eartag2-device/src/main/java/com/huimv/eartag2/device/listener/DeviceListener.java

@@ -115,15 +115,22 @@ public class DeviceListener {
             //-- 耳标数据 --//
             //计算耳标温度
             Double earTemp = 0D;
+            Double earTemp2 = 0D;
             String other = dataArray[9];
             if (other != null && other.trim().length() > 0) {
                 String[] otherArray = other.split("#");
                 String resi = otherArray[2];
+                String resi2 = otherArray[3];
                 int resiInt = Integer.parseInt(resi);
                 if (resiInt != 0) {
                     Double temp = MathUtil.ln(resiInt);
                     earTemp = new BigDecimal(temp).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
                 }
+                if (null != resi2 && !"0".equals(resi2)){
+
+                    Double temp2 = MathUtil.ln( Integer.parseInt(resi2));
+                    earTemp2 = new BigDecimal(temp2).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
+                }
             }
             //计算运动量//
             Integer act1Int = eartagService.countAct(dataArray[1], dataArray[6]);
@@ -138,6 +145,7 @@ public class DeviceListener {
             //耳标温度
             dataJo.put("earTemp", dataArray[4]);
             dataJo.put("earTemp1", earTemp);
+            dataJo.put("earTemp2", earTemp2);
             //环境温度
             dataJo.put("envTemp", dataArray[5]);
             //运动量

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

@@ -150,15 +150,26 @@ public class EartagListener {
             //-- 耳标数据 --//
             //计算耳标温度
             Double earTemp = 0D;
+            Double earTemp2 = 0D;
             String other = dataArray[9];
             if (other != null && other.trim().length() > 0) {
                 String[] otherArray = other.split("#");
                 String resi = otherArray[2];
+                if (otherArray.length>3){
+                    String resi2 = otherArray[3];
+                    if (null != resi2 && !"0".equals(resi2)){
+
+                        Double temp2 = MathUtil.ln( Integer.parseInt(resi2));
+                        earTemp2 = new BigDecimal(temp2).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
+                    }
+                }
+
                 int resiInt = Integer.parseInt(resi);
                 if (resiInt != 0) {
                     Double temp = MathUtil.ln(resiInt);
                     earTemp = new BigDecimal(temp).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
                 }
+
             }
             //计算运动量//
             Integer act1Int = eartagService.countAct(dataArray[2], dataArray[6]);
@@ -173,6 +184,7 @@ public class EartagListener {
             //耳标温度
             dataJo.put("earTemp", dataArray[4]);
             dataJo.put("earTemp1", earTemp);
+            dataJo.put("earTemp2", earTemp2);
             //环境温度
             dataJo.put("envTemp", dataArray[5]);
             dataJo.put("envTemp1", MathUtil.countEnvtemp(dataArray[5], 2));

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

@@ -1384,6 +1384,7 @@ public class EartagServiceImpl implements IEartagService {
             eartagRegisterEntity.setPigpenName(pigpenName);
             eartagRegisterEntity.setStageCode(stageCode);
             eartagRegisterEntity.setStageName(stageName);
+            eartagRegisterEntity.setEarTemp2(eartagJo.getFloat("earTemp2"));
             eartagRegisterEntity.setEarTemp1(eartagJo.getFloat("earTemp1"));
 //            eartagRegisterEntity.setEnvTemp1(eartagJo.getFloat("envTemp1"));
             //相对运动量
@@ -1458,6 +1459,7 @@ public class EartagServiceImpl implements IEartagService {
         newEartagRegisterEntity.setStageCode(stageCode);
 
         newEartagRegisterEntity.setEarTemp1(eartagJo.getFloat("earTemp1"));
+        newEartagRegisterEntity.setEarTemp2(eartagJo.getFloat("earTemp2"));
         newEartagRegisterEntity.setEnvTemp1(eartagJo.getFloat("envTemp1"));
         newEartagRegisterEntity.setAct(Long.parseLong(eartagJo.getString("act1")));
         newEartagRegisterEntity.setSignal1(Integer.parseInt(eartagJo.getString("signal")));
@@ -1564,6 +1566,7 @@ public class EartagServiceImpl implements IEartagService {
         dataEntity.setBat(Integer.parseInt(eartagJo.getString("bat")));
         dataEntity.setEarTemp(Integer.parseInt(eartagJo.getString("earTemp")));
         dataEntity.setEarTemp1(eartagJo.getFloat("earTemp1"));
+        dataEntity.setEarTemp2(eartagJo.getFloat("earTemp2"));
         dataEntity.setEnvTemp(Integer.parseInt(eartagJo.getString("envTemp")));
         dataEntity.setEnvTemp1(eartagJo.getFloat("envTemp1"));
         dataEntity.setAct(Integer.parseInt(eartagJo.getString("act")));
@@ -1572,6 +1575,7 @@ public class EartagServiceImpl implements IEartagService {
         dataEntity.setAskTime(getAskTime(eartagJo.getString("askTime")));
         dataEntity.setOther(eartagJo.getString("other"));
         dataEntity.setAddTime(nowTimestamp);
+
         dataEntity.setCreateDate(todayDate);
         dataEntity.setFarmId(farmId);
 //        dataEntity.setAskDate(new java.sql.Date(dateUtil.parseDate(getAskDate(eartagJo.getString("askTime"))).getTime()));
@@ -1621,6 +1625,7 @@ public class EartagServiceImpl implements IEartagService {
             dataEntity.setBat(Integer.parseInt(eartagJo.getString("bat")));
             dataEntity.setEarTemp(Integer.parseInt(eartagJo.getString("earTemp")));
             dataEntity.setEarTemp1(eartagJo.getFloat("earTemp1"));
+            dataEntity.setEarTemp2(eartagJo.getFloat("earTemp2"));
             dataEntity.setEnvTemp(Integer.parseInt(eartagJo.getString("envTemp")));
             dataEntity.setEnvTemp1(eartagJo.getFloat("envTemp1"));
             dataEntity.setAct(Long.parseLong(act));

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

@@ -1,8 +1,8 @@
 #spring.profiles.active=test
 #spring.profiles.active=local
 #spring.profiles.active=dev
-#spring.profiles.active=prod2
-spring.profiles.active=prod3
+spring.profiles.active=prod2
+#spring.profiles.active=prod3
 #spring.profiles.active=test2
 
 device.register.prefix=device_register_

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagData2.java

@@ -43,6 +43,7 @@ public class EartagData2 implements Serializable {
     private Integer earTemp;
 
     private Float earTemp1;
+    private Float earTemp2;
 
     private Integer envTemp;
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagEartagRegister2.java

@@ -86,6 +86,7 @@ public class EartagEartagRegister2 implements Serializable {
     private Long actRange;
 
     private Float earTemp1;
+    private Float earTemp2;
 
     private Float envTemp1;
 

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

@@ -45,12 +45,19 @@ public class EartagHourActServiceImpl extends ServiceImpl<EartagHourActMapper, E
         List resultList = new ArrayList();
         DateUtil du = new DateUtil();
         for(EartagHourAct eartagHourAct:eartagHourActList){
+            Integer act = eartagHourAct.getAct();
+
             Map map = new HashMap<>();
             resultList.add(map);
             map.put("addDate",du.formatDateText(eartagHourAct.getAddDate()));
             map.put("hour",eartagHourAct.getHour());
-            map.put("act",eartagHourAct.getAct());
+            if (act >1000){
+                map.put("act",0);
+            }else {
+                map.put("act",act);
+            }
         }
         return new Result(ResultCode.SUCCESS,resultList);
     }
+
 }

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

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