init

pump-admin/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 spring:
   profiles:
     # 使用生产环境
-    active: prod
+    active: dev
   main:
     allow-bean-definition-overriding: true
 mybatis-plus:

pump-admin/src/main/test/com/tuoren/web/Test.java

@@ -0,0 +1,27 @@
+package com.tuoren.web;
+
+import com.tuoren.TuorenApplication;
+import com.tuoren.web.rabbit.RabbitHandle;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+/**
+ * @ClassName : Test
+ * @Description :
+ * @Author : LF
+ * @Date: 2025年03月12日
+ */
+@Slf4j
+@SpringBootTest(classes = TuorenApplication.class)
+public class Test {
+
+    @Autowired
+    private RabbitHandle rabbitHandle;
+    @org.junit.Test
+    public void test() throws Exception {
+        String str="{\\\"pumpCode\\\":\\\"3332343205340147\\\",\\\"patientCode\\\":\\\"999999999\\\",\\\"lastUploadTime\\\":1741744469,\\\"remainQuantity\\\":997.3,\\\"continueQuantity\\\":27.0,\\\"selfControlQuantity\\\":0.0,\\\"lockTime\\\":0,\\\"inputQuantity\\\":1.7,\\\"validTime\\\":0,\\\"invalidTime\\\":0,\\\"maxQuantity\\\":90,\\\"firstQuantity\\\":1,\\\"singleQuantity\\\":0.0,\\\"totalQuantity\\\":999,\\\"totalCount\\\":0,\\\"pulseQuantity\\\":null,\\\"pulseLockTime\\\":null,\\\"firsLockTime\\\":null,\\\"upperLimit\\\":null,\\\"lowerLimit\\\":null,\\\"customScate\\\":null,\\\"addValidTime\\\":null,\\\"addCycle\\\":null,\\\"reduceCycle\\\":null,\\\"runState\\\":4,\\\"bufState1\\\":3,\\\"bufState2\\\":0,\\\"bufState3\\\":0,\\\"bufState4\\\":0,\\\"bufState5\\\":0,\\\"bufState6\\\":53,\\\"bufState7\\\":0,\\\"bufState8\\\":0,\\\"bufState9\\\":0,\\\"score\\\":0,\\\"startTime\\\":1741742073,\\\"isRemove\\\":true,\\\"viewState\\\":\\\"未装药盒\\\",\\\"stateFlag\\\":4,\\\"callFlag\\\":0,\\\"noSignal\\\":null,\\\"remark\\\":\\\"1\\\",\\\"number1\\\":null,\\\"number2\\\":null,\\\"hospitalCode\\\":\\\"b5df38b8cba447afb02f29af8bc71b08\\\",\\\"productCode\\\":\\\"1\\\"}\\n\",\"stream\":\"stdout\",\"time\":\"2025-03-12T01:54:32.539934079Z\"}";
+        rabbitHandle.pumpHandle(str.getBytes());
+
+    }
+}

pump-web/src/main/java/com/tuoren/web/layer/controller/BusReceiveRecordController.java

@@ -1,6 +1,7 @@
 package com.tuoren.web.layer.controller;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.tuoren.common.api.CommonResult;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +17,7 @@ import com.tuoren.web.layer.service.IBusPatientService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -59,10 +61,14 @@ public class BusReceiveRecordController{
      */
     @ApiOperation("分页查询所有数据")
     @GetMapping
-    public CommonResult selectAll(Integer pageNo, Integer pageSize,BusReceiveRecordEntity busReceiveRecordEntity) {
+    public CommonResult selectAll(@RequestParam("pageNo") Integer pageNo,@RequestParam("pageSize") Integer pageSize,
+                                  @RequestParam("viewState") String viewState,
+                                  BusReceiveRecordEntity busReceiveRecordEntity) {
         IPage<BusReceiveRecordEntity> page = new Page<>(pageNo,pageSize);
-        QueryWrapper<BusReceiveRecordEntity> wrapper = new QueryWrapper<>(busReceiveRecordEntity);
-        wrapper.orderByDesc("last_upload_time");
+        LambdaQueryWrapper<BusReceiveRecordEntity> wrapper =
+                new LambdaQueryWrapper<BusReceiveRecordEntity>(busReceiveRecordEntity)
+                        .like(StrUtil.isNotBlank(viewState),BusReceiveRecordEntity::getViewState,viewState)
+                        .orderByDesc(BusReceiveRecordEntity::getLastUploadTime);
         return CommonResult.success(this.iBusReceiveRecordEntityService.page(page, wrapper));
     }
 

pump-web/src/main/java/com/tuoren/web/layer/entity/BusReceiveRecordCopyEntity.java

@@ -172,28 +172,28 @@ public class BusReceiveRecordCopyEntity implements Serializable {
     @ApiModelProperty(value = "更新时间",hidden = true)
     private LocalDateTime gmtModified;
 
-    @ApiModelProperty("电机运行时采集的压力数据")
-    private String number1;
-
-    @ApiModelProperty("电机非运行时采集的压力数据")
-    private String number2;
-
-    @ApiModelProperty("电机状态")
-    private String numberStatus;
-
-    private String number3;
-
-    private String number4;
-
-    private String number5;
-
-    private String number6;
-
-    private String number7;
-
-    private String number8;
-
-    private String MotorCode;
+//    @ApiModelProperty("电机运行时采集的压力数据")
+//    private String number1;
+//
+//    @ApiModelProperty("电机非运行时采集的压力数据")
+//    private String number2;
+//
+//    @ApiModelProperty("电机状态")
+//    private String numberStatus;
+//
+//    private String number3;
+//
+//    private String number4;
+//
+//    private String number5;
+//
+//    private String number6;
+//
+//    private String number7;
+//
+//    private String number8;
+//
+//    private String MotorCode;
 
     private String dataVersion;