add

增加泵数据

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/app/controller/vo/DoctorClinicRoomVO.java

@@ -41,14 +41,36 @@ public class DoctorClinicRoomVO implements Serializable {
     @ApiModelProperty(value = "患者性别", position = 8)
     private String patientGender;
 
-    @ApiModelProperty(value = "泵信息", position = 9)
-    private WxDoctorPumpInfoVO pumpInfo;
-
     @ApiModelProperty(value = "术后随访次数", position = 10)
     private Integer followUpCount = 0;
 
     @ApiModelProperty(value = "术后镇痛评价次数", position = 11)
     private Integer assessCount = 0;
 
+    @ApiModelProperty("泵类型")
+    private String deviceType;
+
+    @ApiModelProperty("泵Id")
+    private String deviceId;
+
+    @ApiModelProperty(value = "剩余电量")
+    private Integer electricQuantity;
+
+    @ApiModelProperty(value = "泵运行状态")
+    private String deviceRunState;
+
+    @ApiModelProperty(value = "报警信息")
+    private String deviceAlarm;
+
+    @ApiModelProperty(value = "电量偏低提醒")
+    private Boolean warnLowBattery;
+
+    @ApiModelProperty(value = "输注即将结束提醒")
+    private Boolean warnWillFinished;
+
+    @ApiModelProperty(value = "镇痛不足提醒")
+    private Boolean warnAnalgesicPoor;
 
+    @ApiModelProperty(value = "加减档提示")
+    private String warnFlow;
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/app/controller/vo/WxDoctorPumpInfoVO.java

@@ -1,19 +0,0 @@
-package cn.tr.module.smart.app.controller.vo;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author wangzl
- * @description: TODO
- * @date 2025/7/14 9:18
- */
-@Data
-@ApiModel("医生端输注泵信息")
-public class WxDoctorPumpInfoVO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-
-}

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizDevicePO.java

@@ -1,6 +1,8 @@
 package cn.tr.module.smart.common.po;
 
 import cn.tr.plugin.mybatis.pojo.TenantPO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,6 +23,7 @@ public class BizDevicePO extends TenantPO {
 
     /** 设备唯一编码 */
     @ApiModelProperty(value = "设备唯一编码", position = 2)
+    @TableId
     private String deviceId;
 
     /** 设备类型 */

tr-test/src/main/resources/application.yml

@@ -8,7 +8,7 @@ server:
 mybatis-plus:
   mapper-locations: classpath*:com/gitee/sunchenbin/mybatis/actable/mapping/*/*.xml,classpath*:mapper/*/*.xml
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:
     db-config:
       logic-delete-value: 1