耳标流水：增加运动量和电量显示(input和manage业务模块)

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

@@ -52,6 +52,12 @@ public class EartagEartagOnlineEntity implements Serializable {
     @Column(name = "unit_name")
     private String unitName;
 
+    @Column(name = "act")
+    private String act;
+
+    @Column(name = "bat")
+    private Integer bat;
+
     public void setId(Integer id) {
         this.id = id;
     }
@@ -127,15 +133,70 @@ public class EartagEartagOnlineEntity implements Serializable {
     @Override
     public String toString() {
         return "EartagEartagOnlineEntity{" +
-                "id=" + id + '\'' +
-                "earmark=" + earmark + '\'' +
-                "total=" + total + '\'' +
-                "firstTime=" + firstTime + '\'' +
-                "lastTime=" + lastTime + '\'' +
-                "envTemp=" + envTemp + '\'' +
-                "eartagTemp=" + eartagTemp + '\'' +
-                "addDate=" + addDate + '\'' +
-                "farmId=" + farmId + '\'' +
+                "id=" + id +
+                ", earmark='" + earmark + '\'' +
+                ", total=" + total +
+                ", firstTime=" + firstTime +
+                ", lastTime=" + lastTime +
+                ", envTemp='" + envTemp + '\'' +
+                ", eartagTemp='" + eartagTemp + '\'' +
+                ", addDate=" + addDate +
+                ", farmId='" + farmId + '\'' +
+                ", pigpenId=" + pigpenId +
+                ", pigpenName='" + pigpenName + '\'' +
+                ", unitId=" + unitId +
+                ", unitName='" + unitName + '\'' +
+                ", act='" + act + '\'' +
+                ", bat=" + bat +
                 '}';
     }
+
+    public Integer getBat() {
+        return bat;
+    }
+
+    public void setBat(Integer bat) {
+        this.bat = bat;
+    }
+
+    public Integer getPigpenId() {
+        return pigpenId;
+    }
+
+    public void setPigpenId(Integer pigpenId) {
+        this.pigpenId = pigpenId;
+    }
+
+    public String getPigpenName() {
+        return pigpenName;
+    }
+
+    public void setPigpenName(String pigpenName) {
+        this.pigpenName = pigpenName;
+    }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public String getAct() {
+        return act;
+    }
+
+    public void setAct(String act) {
+        this.act = act;
+    }
+
 }

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

@@ -1065,17 +1065,21 @@ public class EartagServiceImpl implements IEartagService {
         //      不存在，则创建耳标在线记录，并更新到缓存数据中；
         String envTemp = eartagJo.getString("envTemp1");
         String earTemp = eartagJo.getString("earTemp1");
+        String act = eartagJo.getString("act");
+        Integer bat = eartagJo.getInteger("bat");
         EartagEartagOnlineEntity eartagOnlineEntity = eartagOnlineRepo.getOneByEarmarkAndFarmId(earmark, todayDateText, farmId);
         if (eartagOnlineEntity == null) {
             int total = 1;
             //{新建耳标在线记录}
-            newEartagOnline(earmark, total, nowTimestamp, earTemp, envTemp, todayDate, farmId);
+            newEartagOnline(earmark, total, nowTimestamp, earTemp, envTemp, todayDate, farmId,act,bat);
         } else {
             int total = eartagOnlineEntity.getTotal();
             eartagOnlineEntity.setTotal(++total);
             eartagOnlineEntity.setLastTime(nowTimestamp);
             eartagOnlineEntity.setEnvTemp(envTemp);
             eartagOnlineEntity.setEartagTemp(earTemp);
+            eartagOnlineEntity.setAct(act);
+            eartagOnlineEntity.setBat(bat);
             eartagOnlineRepo.saveAndFlush(eartagOnlineEntity);
             //更新耳标在线统计
             cacheService.putEartagOnlineCount(earmark, eartagOnlineEntity);
@@ -1083,7 +1087,7 @@ public class EartagServiceImpl implements IEartagService {
     }
 
     //新建耳标在线记录
-    private void newEartagOnline(String earmark, int total, Timestamp nowTimestamp, String earTemp, String envTemp, java.sql.Date todayDate, String farmId) {
+    private void newEartagOnline(String earmark, int total, Timestamp nowTimestamp, String earTemp, String envTemp, java.sql.Date todayDate, String farmId, String act, Integer bat) {
         EartagEartagOnlineEntity newEartagOnlineEntity = new EartagEartagOnlineEntity();
         newEartagOnlineEntity.setEarmark(earmark);
         newEartagOnlineEntity.setTotal(total);
@@ -1093,6 +1097,8 @@ public class EartagServiceImpl implements IEartagService {
         newEartagOnlineEntity.setEartagTemp(earTemp);
         newEartagOnlineEntity.setAddDate(todayDate);
         newEartagOnlineEntity.setFarmId(farmId);
+        newEartagOnlineEntity.setAct(act);
+        newEartagOnlineEntity.setBat(bat);
         eartagOnlineRepo.saveAndFlush(newEartagOnlineEntity);
         //更新耳标在线统计
         cacheService.putEartagOnlineCount(earmark, newEartagOnlineEntity);

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

@@ -453,7 +453,7 @@ public class EartagServiceImpl implements IEartagService {
             criteriaQuery.where(and);
             //
             List<Order> orders = new ArrayList<>();
-            orders.add(criteriaBuilder.desc(root.get("id")));
+            orders.add(criteriaBuilder.desc(root.get("lastTime")));
             return criteriaQuery.orderBy(orders).getRestriction();
         };
         Pageable pageable = PageRequest.of(pageNo - 1, pageSize);
@@ -485,13 +485,13 @@ public class EartagServiceImpl implements IEartagService {
             outJo.put("envTemp", eartagOnlineEntity.getEnvTemp());
             outJo.put("eartagTemp", eartagOnlineEntity.getEartagTemp());
             outJo.put("addDate", eartagOnlineEntity.getAddDate());
+            outJo.put("act",eartagOnlineEntity.getAct());
+            outJo.put("bat",eartagOnlineEntity.getBat());
             outJo.put("farmId", eartagOnlineEntity.getFarmId());
         }
-
         return new Result(ResultCode.SUCCESS, outDataJo);
     }
 
-
     /**
      * @Method : listEartagOnlineAllStatus
      * @Description :

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagData2Controller.java

@@ -26,7 +26,7 @@ public class EartagData2Controller {
     @Autowired
     private IEartagData2Service eartagDataService;
 
-    @PostMapping("getEnvByTime")
+    @PostMapping("/getEnvByTime")
     public Result getEnvByTime(@RequestBody Map<String,String> map){
         return eartagDataService.getEnvByTime(map);
     }