+ 510测试，打入平均速度、拔出平均速度计算

bd-park/park-backend/park-collect/src/main/java/com/huashe/park/collect/handle/RootMsgHandler.java

@@ -109,8 +109,15 @@ public class RootMsgHandler extends TopicMsgEngine {
             machineProcess.setRecordTime(DateTimeUtil.getDateFromMills(machineProcess.getDataTime()));
             machineProcess.setDt(
                 DateTimeUtil.getDateFromMills(machineProcess.getDataTime(), DateTimeUtil.DateFormatter.yyyyMMdd));
+            // 结合下行深度effectiveDown 以及 开始和结束时间 sendStartTime sendEndTime，计算平均下行速度
+            machineProcess.setAvgSpeed(machineProcess.getEffectiveDown()
+                / (machineProcess.getEndTime() - machineProcess.getStartTime()) * 1000);
+            // 结合下行深度effectiveDown 以及 开始和结束时间 pullingStartTime pullingEndTime， 计算平均拔管速度。并且保留两位小数
+            machineProcess.setAvgUpSpeed(machineProcess.getEffectiveDown()
+                / (machineProcess.getPullingEndTime() - machineProcess.getPullingStartTime()) * 1000);
             machineProcessResultService.insertMachineProcessResult(machineProcess);
             machineRealtimeEventListener.handleConsResult(machineProcess);
+            return;
         }
         if (topic.endsWith(topicDataCfg.getProcessTopic().getName())) {
             JSONObject jsonObject = json.getJSONObject(TOPIC_PAYLOAD);

bd-park/park-backend/park-collect/src/main/resources/application.yml

@@ -3,7 +3,7 @@ spring:
   application:
     name: ems-collect
   profiles:
-    active: pre
+    active: local
     include:
       - topic
       - schedule

bd-park/park-backend/park-collect/src/test/java/com/huashe/park/collect/controller/TopicControllerTest.java

@@ -108,13 +108,29 @@ class TopicControllerTest {
         // 启动线程
         processThread.start();
         resultThread.start();
+
         // 等待线程执行完成
         try {
             processThread.join();
             resultThread.join();
+
         }
         catch (InterruptedException e) {
             e.printStackTrace();
         }
+        // 模拟施工结束，再次施工之前推送回带量数据
+        machineProcessResults.forEach(result -> {
+            byte[] bytes;
+            try {
+                System.out.println(">>>>>>>>>>>>>>>>>" + result.getId());
+                result.setSprayVolume(0.37f);
+                bytes = ByteArrayUtil.serializeObject(result);
+                mqttTemplate.sendByte("110DS98412300212/TEST002", "110DS98412300212/TEST002/machine/piling/result",
+                    bytes, 0, false);
+            }
+            catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
     }
 }

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendGroup.java

@@ -1,10 +1,11 @@
 package com.huashe.park.domain.entity;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import com.alibaba.fastjson2.JSONArray;
 import com.huashe.common.annotation.Excel;
 import com.huashe.common.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 考勤组对象 park_attend_group
@@ -38,11 +39,6 @@ public class ParkAttendGroup extends BaseEntity {
     @Excel(name = "考勤时间")
     private JSONArray timeRange;
 
-    /**
-     * 租户id
-     */
-    private String tenantId;
-
     public void setId(Long id) {
         this.id = id;
     }
@@ -75,27 +71,12 @@ public class ParkAttendGroup extends BaseEntity {
         this.timeRange = timeRange;
     }
 
-    public void setTenantId(String tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public String getTenantId() {
-        return tenantId;
-    }
-
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("name", getName())
-                .append("remark", getRemark())
-                .append("poly", getPoly())
-                .append("timeRange", getTimeRange())
-                .append("updateTime", getUpdateTime())
-                .append("createTime", getCreateTime())
-                .append("createBy", getCreateBy())
-                .append("updateBy", getUpdateBy())
-                .append("tenantId", getTenantId())
-                .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("name", getName())
+            .append("remark", getRemark()).append("poly", getPoly()).append("timeRange", getTimeRange())
+            .append("updateTime", getUpdateTime()).append("createTime", getCreateTime())
+            .append("createBy", getCreateBy()).append("updateBy", getUpdateBy()).append("tenantId", getTenantId())
+            .toString();
     }
 }

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendGroupUsr.java

@@ -48,10 +48,6 @@ public class ParkAttendGroupUsr extends BaseEntity {
     @Excel(name = "部门名称")
     private String usrDept;
 
-    /**
-     * 租户id
-     */
-    private String tenantId;
 
     public String getGroupName() {
         return groupName;
@@ -109,14 +105,6 @@ public class ParkAttendGroupUsr extends BaseEntity {
         return usrDept;
     }
 
-    public void setTenantId(String tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public String getTenantId() {
-        return tenantId;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendUsrDetail.java

@@ -61,11 +61,6 @@ public class ParkAttendUsrDetail extends BaseEntity {
     @Excel(name = "考勤组主键")
     private Long attendGroupId;
 
-    /**
-     * 租户id
-     */
-    @Excel(name = "租户id")
-    private String tenantId;
 
     public void setId(Long id) {
         this.id = id;
@@ -139,14 +134,6 @@ public class ParkAttendUsrDetail extends BaseEntity {
         return attendGroupId;
     }
 
-    public void setTenantId(String tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public String getTenantId() {
-        return tenantId;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkInspectProj.java

@@ -50,10 +50,7 @@ public class ParkInspectProj extends BaseEntity {
     @Excel(name = "巡检项目类型")
     private String projType;
 
-    /**
-     * 租户id
-     */
-    private String tenantId;
+
 
     public void setId(Long id) {
         this.id = id;
@@ -103,13 +100,6 @@ public class ParkInspectProj extends BaseEntity {
         this.projContent = projContent;
     }
 
-    public void setTenantId(String tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public String getTenantId() {
-        return tenantId;
-    }
 
     @Override
     public String toString() {

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkInspectTask.java

@@ -26,9 +26,6 @@ public class ParkInspectTask extends BaseEntity
     @Excel(name = "巡检计划")
     private String schedule;
 
-    /** 租户id */
-    private String tenantId;
-
     public void setId(Long id) 
     {
         this.id = id;
@@ -56,15 +53,6 @@ public class ParkInspectTask extends BaseEntity
     {
         return schedule;
     }
-    public void setTenantId(String tenantId) 
-    {
-        this.tenantId = tenantId;
-    }
-
-    public String getTenantId() 
-    {
-        return tenantId;
-    }
 
     @Override
     public String toString() {

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkInspectTaskUsrTrail.java

@@ -35,8 +35,6 @@ public class ParkInspectTaskUsrTrail extends BaseEntity
     @Excel(name = "巡检轨迹")
     private String trail;
 
-    /** 租户id */
-    private String tenantId;
 
     public void setId(Long id) 
     {
@@ -92,15 +90,7 @@ public class ParkInspectTaskUsrTrail extends BaseEntity
     {
         return trail;
     }
-    public void setTenantId(String tenantId) 
-    {
-        this.tenantId = tenantId;
-    }
 
-    public String getTenantId() 
-    {
-        return tenantId;
-    }
 
     @Override
     public String toString() {