+ csv 导出数据补充

+ 测试数据推送完整逻辑单元测试

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/cons/ConsUnitInfoController.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.annotation.Anonymous;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,20 +16,23 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.huashe.common.domain.AjaxResult;
 import com.huashe.common.exception.ServiceException;
 import com.huashe.park.common.i18n.MessageUtils;
 import com.huashe.park.core.service.IConsUnitInfoService;
+import com.huashe.park.core.service.IPileHoleIndexRealtimeService;
 import com.huashe.park.domain.dto.cons.ConsUnitMachine;
 import com.huashe.park.domain.entity.ConsUnitInfo;
+import com.huashe.park.domain.entity.PileHoleIndexRealtime;
+import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringMatchUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 施工单元Controller
@@ -44,6 +46,9 @@ public class ConsUnitInfoController extends BaseController {
     @Autowired
     private IConsUnitInfoService consUnitInfoService;
 
+    @Autowired
+    private IPileHoleIndexRealtimeService pileHoleIndexRealtimeService;
+
     /**
      * 查询施工单元列表
      */
@@ -142,6 +147,4 @@ public class ConsUnitInfoController extends BaseController {
         return toAjax(consUnitInfoService.deleteConsUnitInfoById(id));
     }
 
-
-
 }

bd-park/park-backend/park-collect/src/main/java/com/huashe/park/collect/controller/TopicController.java

@@ -1,5 +1,8 @@
 package com.huashe.park.collect.controller;
 
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,7 +16,11 @@ import com.huashe.park.collect.core.MqttTemplate;
 import com.huashe.park.collect.model.TopicVO;
 import com.huashe.park.common.ByteArrayUtil;
 import com.huashe.park.common.SpringBeanUtils;
+import com.huashe.park.core.service.IMachineProcessResultService;
+import com.huashe.park.core.service.IMachineProcessService;
 import com.huashe.park.domain.dto.cons.MqttRequest;
+import com.huashe.park.domain.entity.MachineProcess;
+import com.huashe.park.domain.entity.MachineProcessResult;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
 
@@ -35,6 +42,12 @@ public class TopicController extends BaseController {
     @Autowired
     private TopicDataCfg topicDataCfg;
 
+    @Autowired
+    private IMachineProcessResultService machineProcessResultService;
+
+    @Autowired
+    private IMachineProcessService machineProcessService;
+
     @PostMapping
     @Anonymous
     public void send(@RequestBody MqttRequest jsonObject) {

bd-park/park-backend/park-collect/src/main/java/com/huashe/park/collect/core/TopicMsgEngine.java

@@ -56,7 +56,7 @@ public abstract class TopicMsgEngine implements ITopicListener, MqttMessageHandl
                         JSONObject msg = queue.get(finalI).take();
                         messageBizHandle(msg);
                     }
-                    catch (InterruptedException e) {
+                    catch (Exception e) {
                         logger.error("{} error", this.engineName, e);
                     }
                 }

bd-park/park-backend/park-collect/src/main/java/com/huashe/park/collect/event/EventPublisherService.java

@@ -1,24 +0,0 @@
-package com.huashe.park.collect.event;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.stereotype.Service;
-
-import com.huashe.park.domain.entity.MachineProcess;
-import com.huashe.park.domain.entity.MachineProcessResult;
-
-@Service
-public class EventPublisherService {
-    @Autowired
-    private ApplicationEventPublisher applicationEventPublisher;
-
-    public void publishMachineProcessEvent(final MachineProcess message) {
-        PileMachineConsRealtimeEvent customEvent = new PileMachineConsRealtimeEvent(this, message);
-        applicationEventPublisher.publishEvent(customEvent);
-    }
-
-    public void publishMachineResultEvent(final MachineProcessResult message) {
-        PileMachineConsResultEvent customEvent = new PileMachineConsResultEvent(this, message);
-        applicationEventPublisher.publishEvent(customEvent);
-    }
-}

bd-park/park-backend/park-collect/src/main/java/com/huashe/park/collect/event/MachineRealtimeEventListener.java

@@ -181,28 +181,45 @@ public class MachineRealtimeEventListener {
     }
 
     private JSONObject depthPressMap(String pileId) {
-        Map allHash = redisProxy.getAllHash(String.format(PILE_MACHINE_MQTT.MQTT_TOPIC_PREFIX, pileId));
+        Map<String, Float> allHash = redisProxy.getAllHash(String.format(PILE_MACHINE_MQTT.MQTT_TOPIC_PREFIX, pileId));
         if (CollectionUtils.isEmpty(allHash)) {
             return null;
         }
         JSONObject result = new JSONObject(DEPTH_PRESS_TIPS.PILE_LENGTH_TIPS);
         Float press;
+        fillDepthZeroPressMap(allHash);
         for (int i = 0; i <= DEPTH_PRESS_TIPS.PILE_LENGTH_TIPS; i += 1) {
-            press = (Float) allHash.get(Integer.toString(i));
+            press = allHash.get(Integer.toString(i));
             result.put(String.format("%.2fm", i * 0.25), press);
         }
         return result;
     }
 
+    private void fillDepthZeroPressMap(Map<String, Float> allHash) {
+        int prevNonZeroIndex = -1;
+        Float press;
+        Float currentValue;
+        for (int i = 0; i <= DEPTH_PRESS_TIPS.PILE_LENGTH_TIPS; i++) {
+            press = allHash.get(Integer.toString(i));
+            if (press > 0F) {
+                currentValue = press;
+                for (int j = prevNonZeroIndex + 1; j < i; j++) {
+                    allHash.put(Integer.toString(j), currentValue);
+                }
+                prevNonZeroIndex = i;
+            }
+        }
+    }
+
     private Map<String, Object> generateMapTemplate() {
         Map<String, Object> result = new HashMap<String, Object>() {
             {
-                put(PILE_MACHINE_MQTT.MQTT_TOPIC_PROCESS_MAX_PRESS, 0);
-                put(PILE_MACHINE_MQTT.MQTT_TOPIC_PROCESS_MAX_DEPTH, 0);
+                put(PILE_MACHINE_MQTT.MQTT_TOPIC_PROCESS_MAX_PRESS, 0F);
+                put(PILE_MACHINE_MQTT.MQTT_TOPIC_PROCESS_MAX_DEPTH, 0F);
             }
         };
         for (int i = 0; i <= DEPTH_PRESS_TIPS.PILE_LENGTH_TIPS; i += 1) {
-            result.put(Integer.toString(i), 0);
+            result.put(Integer.toString(i), 0F);
         }
         return result;
     }

bd-park/park-backend/park-collect/src/main/java/com/huashe/park/collect/event/PileMachineConsRealtimeEvent.java

@@ -1,22 +0,0 @@
-package com.huashe.park.collect.event;
-
-import org.springframework.context.ApplicationEvent;
-
-import com.huashe.park.domain.entity.MachineProcess;
-
-public class PileMachineConsRealtimeEvent extends ApplicationEvent {
-    private MachineProcess message;
-
-    public PileMachineConsRealtimeEvent(Object source, MachineProcess message) {
-        super(source);
-        this.message = message;
-    }
-
-    public MachineProcess getMessage() {
-        return message;
-    }
-
-    public void setMessage(MachineProcess message) {
-        this.message = message;
-    }
-}

bd-park/park-backend/park-collect/src/main/java/com/huashe/park/collect/event/PileMachineConsResultEvent.java

@@ -1,22 +0,0 @@
-package com.huashe.park.collect.event;
-
-import org.springframework.context.ApplicationEvent;
-
-import com.huashe.park.domain.entity.MachineProcessResult;
-
-public class PileMachineConsResultEvent extends ApplicationEvent {
-    private MachineProcessResult message;
-
-    public PileMachineConsResultEvent(Object source, MachineProcessResult message) {
-        super(source);
-        this.message = message;
-    }
-
-    public MachineProcessResult getMessage() {
-        return message;
-    }
-
-    public void setMessage(MachineProcessResult message) {
-        this.message = message;
-    }
-}

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

@@ -26,7 +26,6 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.huashe.park.collect.config.TopicDataCfg;
 import com.huashe.park.collect.core.TopicMsgEngine;
-import com.huashe.park.collect.event.EventPublisherService;
 import com.huashe.park.collect.event.MachineRealtimeEventListener;
 import com.huashe.park.common.ByteArrayUtil;
 import com.huashe.park.common.DateTimeUtil;
@@ -65,9 +64,6 @@ public class RootMsgHandler extends TopicMsgEngine {
     private IMachineProcessResultService machineProcessResultService;
 
     @Autowired
-    private EventPublisherService eventPublisherService;
-
-    @Autowired
     private MachineRealtimeEventListener machineRealtimeEventListener;
 
     @Autowired

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

@@ -0,0 +1,120 @@
+package com.huashe.park.collect.controller;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import com.huashe.park.collect.SpingMqttApplication;
+import com.huashe.park.collect.core.MqttTemplate;
+import com.huashe.park.common.ByteArrayUtil;
+import com.huashe.park.core.service.IMachineProcessResultService;
+import com.huashe.park.core.service.IMachineProcessService;
+import com.huashe.park.domain.entity.MachineProcess;
+import com.huashe.park.domain.entity.MachineProcessResult;
+
+@SpringBootTest(classes = SpingMqttApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@ExtendWith(SpringExtension.class)
+class TopicControllerTest {
+
+    @Autowired
+    private MqttTemplate mqttTemplate;
+
+    @Autowired
+    private IMachineProcessResultService machineProcessResultService;
+
+    @Autowired
+    private IMachineProcessService machineProcessService;
+
+    @Test
+    void unitTest() {
+        List<MachineProcessResult> machineProcessResults = machineProcessResultService
+            .selectMachineProcessResultList(new MachineProcessResult() {
+                {
+                    setPileId("ilf171fk");
+                }
+            });
+        List<MachineProcess> machineProcesses = machineProcessService.selectMachineProcessList(new MachineProcess() {
+            {
+                setPileId("ilf171fk");
+            }
+        });
+
+        CountDownLatch latch = new CountDownLatch(1);
+        long l = System.currentTimeMillis();
+        // 过程线程：处理数据并发送信号
+        Thread processThread = new Thread(() -> {
+            System.out.println("[过程线程] 开始处理数据...");
+            machineProcesses.forEach(machineProcess -> {
+                byte[] bytes;
+                try {
+                    Thread.sleep(1000);
+                    machineProcess.setId(null);
+                    machineProcess.setPileId("talv1qmq");
+                    machineProcess.setMachineId("wi4mdee7");
+                    machineProcess.setDataTime(System.currentTimeMillis());
+                    machineProcess.setUuid(Long.toString(System.currentTimeMillis()));
+                    if (machineProcesses.indexOf(machineProcess) > machineProcesses.size() - 3) {
+                        latch.countDown(); // 发送信号（计数减1）
+                    }
+                    bytes = ByteArrayUtil.serializeObject(machineProcess);
+                    mqttTemplate.sendByte("/gl41DkJLD3N/123457", "/gl41DkJLD3N/123457/machine/piling/process", bytes, 0,
+                        false);
+
+                }
+                catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            });
+            System.out.println("[过程线程] 数据处理完成，发送启动信号");
+
+        });
+
+        // 结果线程：等待信号后处理结果
+        Thread resultThread = new Thread(() -> {
+            try {
+                System.out.println("[结果线程] 等待启动信号...");
+                latch.await(); // 阻塞直到门闩计数归零
+                machineProcessResults.forEach(result -> {
+                    byte[] bytes;
+                    try {
+                        result.setId(null);
+                        result.setPileId("talv1qmq");
+
+                        result.setMachineId("wi4mdee7");
+                        result.setDataTime(System.currentTimeMillis());
+                        result.setStartTime(l);
+                        result.setEndTime(System.currentTimeMillis());
+                        result.setUuid(Long.toString(System.currentTimeMillis()));
+                        bytes = ByteArrayUtil.serializeObject(result);
+                        mqttTemplate.sendByte("/gl41DkJLD3N/123457", "/gl41DkJLD3N/123457/machine/piling/result", bytes,
+                            0, false);
+                    }
+                    catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                });
+                System.out.println("[结果线程] 收到信号，开始处理结果数据");
+                // 此处添加具体的结果处理逻辑
+            }
+            catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        // 启动线程
+        processThread.start();
+        resultThread.start();
+        // 等待线程执行完成
+        try {
+            processThread.join();
+            resultThread.join();
+        }
+        catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+}

bd-park/park-backend/park-common/src/main/java/com/huashe/park/common/ByteArrayUtil.java

@@ -462,7 +462,6 @@ public class ByteArrayUtil {
 
             // 根据字段类型转换字节数组
             Object value = field.get(obj);
-            System.out.println(">>>>>>>>>>>" + field.getName());
             byte[] bytes = convertFieldToBytes(field.getType(), value, length, annotation.paddingByte());
 
             fieldBytesList.add(bytes);

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/MachineProcessResultServiceImpl.java

@@ -3,6 +3,7 @@ package com.huashe.park.core.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -116,14 +117,17 @@ public class MachineProcessResultServiceImpl implements IMachineProcessResultSer
                 DateTimeUtil.getDateFromMills(consUnitResult.getDataTime(), DateTimeUtil.DateFormatter.yyyy_MM_dd));
             resultCADCsv.setStartingTime(
                 DateTimeUtil.getDateFromMills(consUnitResult.getDataTime(), DateTimeUtil.DateFormatter.HHmmss));
-            resultCADCsv.setDuration(consUnitResult.getEndTime() - consUnitResult.getStartTime());
+            resultCADCsv.setDuration(calcSecond(consUnitResult.getEndTime(), consUnitResult.getStartTime()));
 
             // 评价结果转换
             consResult = ConsResult.getByCode(consUnitResult.getResultEvaluation());
             resultCADCsv.setEvaluation(consResult.getValue());
             resultCADCsv.setPullValue(consUnitResult.getSprayVolume());
             resultCADCsv.setActualDepth(consUnitResult.getPileLength() - consUnitResult.getSprayVolume());
-            resultCADCsv.setEndingPress(consUnitResult.getPressure());
+            resultCADCsv.setEndingPress(consUnitResult.getEndPress());
+            resultCADCsv.setAvgSprayPressure(consUnitResult.getEndPress());
+            resultCADCsv.setAvgSpeed(consUnitResult.getAvgSpeed());
+            resultCADCsv.setAvgUpSpeed(consUnitResult.getAvgUpSpeed());
             stringObjectMap = BeanUtil.beanToMap(resultCADCsv);
             depthPress = consUnitResult.getDepthPress();
             if (!CollectionUtils.isEmpty(depthPress)) {
@@ -135,4 +139,11 @@ public class MachineProcessResultServiceImpl implements IMachineProcessResultSer
         }
         return resultCADCsvs;
     }
+
+    private Long calcSecond(Long end, Long start) {
+        if (end == null || start == null) {
+            return 0L;
+        }
+        return TimeUnit.MILLISECONDS.toSeconds(end - start);
+    }
 }

bd-park/park-backend/park-core/src/main/resources/mapper/cons/MachineProcessResultMapper.xml

@@ -453,7 +453,7 @@
                cphir.hole_num,
                cphir.spray_pressure pressure,
                cphir.end_press,
-               cphir.depth_press
+               cphir.depth_press depth_press
         from cons_machine_process_result cmpr
                  inner join cons_pile_hole_index_realtime cphir on
             cmpr.pile_id = cphir.hole_byte_key

bd-park/park-backend/park-core/src/main/resources/mapper/cons/PileHoleIndexRealtimeMapper.xml

@@ -87,7 +87,7 @@
         </where>
     </select>
 
-    <select id="selectPileHoleIndexRealtimeById" parameterType="Long" resultMap="PileHoleIndexRealtimeResult">
+    <select id="selectPileHoleIndexRealtimeById" parameterType="Long" resultType="PileHoleIndexRealtime">
         <include refid="selectPileHoleIndexRealtimeVo"/>
         where id = #{id}
     </select>

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/dto/cons/ConsUnitResult.java

@@ -3,11 +3,6 @@ package com.huashe.park.domain.dto.cons;
 import com.alibaba.fastjson2.JSONObject;
 import com.huashe.park.domain.entity.MachineProcessResult;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
 public class ConsUnitResult extends MachineProcessResult {
     private Double forwardTiltAngle;
 
@@ -17,8 +12,55 @@ public class ConsUnitResult extends MachineProcessResult {
 
     private Double pressure;
 
-    private Float endPress;
+    private Double endPress;
 
     private JSONObject depthPress;
 
+    public Double getForwardTiltAngle() {
+        return forwardTiltAngle;
+    }
+
+    public void setForwardTiltAngle(Double forwardTiltAngle) {
+        this.forwardTiltAngle = forwardTiltAngle;
+    }
+
+    public Double getTiltAngle() {
+        return tiltAngle;
+    }
+
+    public void setTiltAngle(Double tiltAngle) {
+        this.tiltAngle = tiltAngle;
+    }
+
+    public String getHoleNum() {
+        return holeNum;
+    }
+
+    public void setHoleNum(String holeNum) {
+        this.holeNum = holeNum;
+    }
+
+    public Double getPressure() {
+        return pressure;
+    }
+
+    public void setPressure(Double pressure) {
+        this.pressure = pressure;
+    }
+
+    public Double getEndPress() {
+        return endPress;
+    }
+
+    public void setEndPress(Double endPress) {
+        this.endPress = endPress;
+    }
+
+    public JSONObject getDepthPress() {
+        return depthPress;
+    }
+
+    public void setDepthPress(JSONObject depthPress) {
+        this.depthPress = depthPress;
+    }
 }

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/dto/cons/ResultCADCsv.java

@@ -58,10 +58,10 @@ public class ResultCADCsv {
     private Double endingPress;
 
     @CsvAlias(alias = "Intrusion Vel.[m/s]")
-    private Double avgSpeed;
+    private Float avgSpeed;
 
     @CsvAlias(alias = "Pullout Vel.[m/s]")
-    private Double avgUpSpeed;
+    private Float avgUpSpeed;
 
     @CsvAlias(alias = "Result")
     private String evaluation;

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

@@ -2,12 +2,10 @@ package com.huashe.park.domain.entity;
 
 import java.util.Date;
 
-import com.alibaba.fastjson2.JSONObject;
-import com.huashe.park.common.animations.mybatis.FieldConvert;
-import com.huashe.park.common.animations.mybatis.service.JsonConverter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.huashe.common.annotation.Excel;
 import com.huashe.common.domain.BaseEntity;
@@ -102,10 +100,8 @@ public class PileHoleIndexRealtime extends BaseEntity {
 
     private Float endPress;
 
-    @FieldConvert(converter = JsonConverter.class)
     private JSONObject depthPress;
 
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId())