update 数据库时间类型变为 datetime

coffee-admin/src/main/test/java/com/coffee/admin/BusDeviceRegisterTest.java

@@ -1,5 +1,7 @@
 package com.coffee.admin;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.coffee.bus.controller.BusDeviceRunningController;
 import com.coffee.bus.entity.BusDeviceEntity;
 import com.coffee.bus.service.LocalBusDeviceService;
@@ -9,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.Date;
+
 /**
  * @author lifang
  * @version 1.0.0
@@ -26,11 +30,12 @@ public class BusDeviceRegisterTest {
     private BusDeviceRunningController netPumpController;
     @Test
     public void save(){
-        BusDeviceEntity registeredEntity = new BusDeviceEntity();
-        registeredEntity.setAlias("测试泵");
-        registeredEntity.setDeviceId("123");
-        registeredEntity.setEnable(true);
-        registeredService.save(registeredEntity);
+        BusDeviceEntity deviceEntity = new BusDeviceEntity();
+        deviceEntity.setAlias("测试泵");
+        deviceEntity.setDeviceId("123");
+        deviceEntity.setEnable(true);
+        registeredService.save(deviceEntity);
+
     }
 
     @Test

coffee-system/src/main/java/com/coffee/bus/entity/BusClinicEntity.java

@@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.coffee.bus.bean.HisInfo;
-import com.coffee.common.config.mybatis.DateToBigIntHandler;
 import com.coffee.common.entity.TenantGenericEntity;
 import com.coffee.common.enums.SexEnum;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -37,21 +35,14 @@ public class BusClinicEntity extends TenantGenericEntity<String,String> {
     @Length(max = 255,message = "临床手术名称长度不得超过255个字节")
     private String name;
 
-    @ApiModelProperty(value = "病人id")
-    private String patientId;
-
     @ApiModelProperty(value = "病号")
     @Length(max = 255,message = "病号长度不得超过255个字节")
     private String patientCode;
 
     @ApiModelProperty(value = "手术开始时间")
-    @TableField(typeHandler = DateToBigIntHandler.class)
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     @ApiModelProperty(value = "手术结束时间")
-    @TableField(typeHandler = DateToBigIntHandler.class)
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
     @ApiModelProperty(value = "患者姓名")

coffee-system/src/main/java/com/coffee/bus/entity/BusDeviceAlarmEntity.java

@@ -3,7 +3,6 @@ package com.coffee.bus.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.coffee.bus.enums.DeviceAlarmEnum;
-import com.coffee.common.config.mybatis.DateToBigIntHandler;
 import com.coffee.common.entity.TenantGenericEntity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
@@ -36,7 +35,6 @@ public class BusDeviceAlarmEntity extends TenantGenericEntity<String,String> {
     private DeviceAlarmEnum alarm;
 
     @ApiModelProperty(value = "报警时间")
-    @TableField(typeHandler = DateToBigIntHandler.class)
     private Date alarmTime;
 
 

coffee-system/src/main/java/com/coffee/bus/entity/BusDeviceEntity.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.coffee.bus.bean.AliIotConfig;
 import com.coffee.bus.enums.DeviceAlarmEnum;
 import com.coffee.bus.enums.DeviceStatusEnum;
+import com.coffee.common.config.mybatis.DateToBigIntHandler;
+import com.coffee.common.entity.RecordCreationEntity;
+import com.coffee.common.entity.RecordModifierEntity;
 import com.coffee.common.entity.TenantGenericEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,6 +17,8 @@ import lombok.ToString;
 import org.apache.ibatis.type.EnumTypeHandler;
 import org.hibernate.validator.constraints.Length;
 
+import java.util.Date;
+
 /**
  * @author lifang
  * @version 1.0.0
@@ -26,7 +31,7 @@ import org.hibernate.validator.constraints.Length;
 @TableName(value = "bus_device",autoResultMap = true)
 @ApiModel(value="设备经销商管理", description="设备与医院关系管理")
 @ToString
-public class BusDeviceEntity extends TenantGenericEntity<String,String> {
+public class BusDeviceEntity extends TenantGenericEntity<String,String> implements RecordCreationEntity, RecordModifierEntity {
 
 
     @ApiModelProperty(value = "设备唯一id")
@@ -54,4 +59,16 @@ public class BusDeviceEntity extends TenantGenericEntity<String,String> {
 
     @ApiModelProperty(value = "是否启用,0、不启用 1、启用 ")
     private Boolean enable;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date createTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String createBy;
+
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateBy;
+
+    @TableField(fill = FieldFill.UPDATE)
+    private Date updateTime;
 }

coffee-system/src/main/java/com/coffee/bus/entity/BusDeviceHistoryEntity.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.coffee.bus.enums.DeviceAlarmEnum;
 import com.coffee.bus.enums.DeviceEnum;
 import com.coffee.bus.enums.DeviceStatusEnum;
-import com.coffee.common.config.mybatis.DateToBigIntHandler;
 import com.coffee.common.entity.TenantGenericEntity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
@@ -186,7 +185,6 @@ public class BusDeviceHistoryEntity extends TenantGenericEntity<String,String> {
     private DeviceEnum type;
 
     @ApiModelProperty(value = "数据上传时间",readOnly = true,hidden = true)
-    @TableField(typeHandler = DateToBigIntHandler.class)
     @JsonIgnoreProperties(allowSetters = true)
     private Date uploadTime;
 

coffee-system/src/main/java/com/coffee/bus/entity/BusDeviceRunningEntity.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.coffee.bus.enums.DeviceAlarmEnum;
 import com.coffee.bus.enums.DeviceEnum;
 import com.coffee.bus.enums.DeviceStatusEnum;
-import com.coffee.common.config.mybatis.DateToBigIntHandler;
 import com.coffee.common.entity.TenantGenericEntity;
 import com.coffee.common.enums.SexEnum;
 import com.fasterxml.jackson.annotation.*;
@@ -188,7 +187,6 @@ public class BusDeviceRunningEntity extends TenantGenericEntity<String,String> {
     private Boolean warnLowBattery;
 
     @ApiModelProperty(value = "输注开始时间,即本次运行开机时间",readOnly = true)
-    @TableField(typeHandler = DateToBigIntHandler.class)
     private Date startTime;
 
     @ApiModelProperty(value = "是否已撤泵,0、未撤泵1、已撤泵")
@@ -215,7 +213,6 @@ public class BusDeviceRunningEntity extends TenantGenericEntity<String,String> {
     private DeviceEnum type;
 
     @ApiModelProperty(value = "数据上传时间",readOnly = true,hidden = true)
-    @TableField(typeHandler = DateToBigIntHandler.class)
     @JsonIgnoreProperties(allowSetters = true)
     private Date uploadTime;
 }

coffee-system/src/main/java/com/coffee/bus/entity/BusEvaluationEntity.java

@@ -1,19 +1,7 @@
 package com.coffee.bus.entity;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import java.util.Date;
-
-import com.coffee.common.config.mybatis.DateToBigIntHandler;
 import com.coffee.common.entity.TenantGenericEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonSetter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,9 +9,6 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
 /**
  * <p>
  * 
@@ -105,7 +90,6 @@ public class BusEvaluationEntity extends TenantGenericEntity<String,String> {
 
 
     @ApiModelProperty(value = "评价时间",hidden = true)
-    @TableField(typeHandler = DateToBigIntHandler.class)
     private Date evaluateTime;
 
     @ApiModelProperty(value = "评价人")

coffee-system/src/main/java/com/coffee/bus/entity/BusHospitalConfigEntity.java

@@ -44,9 +44,9 @@ public class BusHospitalConfigEntity extends TenantGenericEntity<String,String>
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
 
-    @TableField(typeHandler = DateToBigIntHandler.class,fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
-    @TableField(typeHandler = DateToBigIntHandler.class,fill = FieldFill.UPDATE)
+    @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 }

coffee-system/src/main/java/com/coffee/bus/entity/BusHospitalEntity.java

@@ -76,10 +76,10 @@ public class BusHospitalEntity implements RecordModifierEntity, RecordCreationEn
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
 
-    @TableField(typeHandler = DateToBigIntHandler.class,fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
-    @TableField(typeHandler = DateToBigIntHandler.class,fill = FieldFill.UPDATE)
+    @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @TableField(fill = FieldFill.INSERT)

coffee-system/src/main/java/com/coffee/bus/entity/BusHospitalLogEntity.java

@@ -28,8 +28,6 @@ import java.util.Date;
 @ApiModel(value="医院数据传输日志", description="医院数据传输日志")
 public class BusHospitalLogEntity extends TenantGenericEntity<String,String> {
 
-    @TableField(typeHandler = DateToBigIntHandler.class)
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "医院数据接收时间")
     private Date receiveTime;
 

coffee-system/src/main/java/com/coffee/bus/entity/BusInfusionHistoryEntity.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.coffee.bus.enums.DeviceAlarmEnum;
 import com.coffee.bus.enums.DeviceEnum;
 import com.coffee.bus.enums.DeviceStatusEnum;
-import com.coffee.common.config.mybatis.DateToBigIntHandler;
 import com.coffee.common.entity.TenantGenericEntity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
@@ -168,7 +167,6 @@ public class BusInfusionHistoryEntity extends TenantGenericEntity<String,String>
     private Boolean warnLowBattery;
 
     @ApiModelProperty(value = "输注开始时间,即本次运行开机时间",readOnly = true)
-    @TableField(typeHandler = DateToBigIntHandler.class)
     private Date startTime;
 
     @ApiModelProperty(value = "是否已撤泵,0、未撤泵1、已撤泵")
@@ -187,7 +185,6 @@ public class BusInfusionHistoryEntity extends TenantGenericEntity<String,String>
     private DeviceEnum type;
 
     @ApiModelProperty(value = "当前输注记录数据最后上传时间",readOnly = true,hidden = true)
-    @TableField(typeHandler = DateToBigIntHandler.class)
     @JsonIgnoreProperties(allowSetters = true)
     private Date lastUploadTime;
 
@@ -201,11 +198,9 @@ public class BusInfusionHistoryEntity extends TenantGenericEntity<String,String>
     private String witnesses;
 
     @ApiModelProperty(value = "撤泵时间")
-    @TableField(typeHandler = DateToBigIntHandler.class)
     private Date undoTime;
 
     @ApiModelProperty(value = "撤泵时间")
-    @TableField(typeHandler = DateToBigIntHandler.class)
     private Date clinicStartTime;
 
     public static BusInfusionHistoryEntity parseRunningInfo(BusDeviceRunningEntity running){

coffee-system/src/main/java/com/coffee/bus/entity/BusInfusionModifyEntity.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.coffee.bus.enums.DeviceEnum;
-import com.coffee.common.config.mybatis.DateToBigIntHandler;
 import com.coffee.common.entity.TenantGenericEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +13,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import org.apache.commons.collections4.map.HashedMap;
 import org.apache.ibatis.type.EnumTypeHandler;
 
 import javax.validation.constraints.DecimalMax;
@@ -149,7 +147,6 @@ public class BusInfusionModifyEntity extends TenantGenericEntity<String,String>
     private BigDecimal flowAdjustRate;
 
     @ApiModelProperty(value = "参数修改时间")
-    @TableField(typeHandler = DateToBigIntHandler.class)
     private Date modifyTime;
 
     public static BusInfusionModifyEntity parseRunningInfo(BusDeviceRunningEntity running){

coffee-system/src/main/java/com/coffee/bus/websocket/listener/DeviceInfoListener.java

@@ -494,7 +494,7 @@ public class DeviceInfoListener {
         clinic.setWard("病区："+now);
         clinic.setBedNo("床号:"+now);
         clinic.setTenantId("1505808170691784706");
-        clinic.setStartTime(new Date());
+        clinic.setStartTime(new Date(1649918680126L));
         SpringUtil.publishEvent(new HisEvent(this,Arrays.asList(clinic),clinic.getTenantId()));
 
     }

coffee-system/src/main/java/com/coffee/bus/websocket/listener/HisInfoListener.java

@@ -94,9 +94,10 @@ public class HisInfoListener {
             infusionHistoryService.update(new UpdateWrapper<BusInfusionHistoryEntity>()
                     .lambda()
                     .set(BusInfusionHistoryEntity::getClinicId,clinic.getId())
+                    .set(BusInfusionHistoryEntity::getClinicStartTime,clinic.getStartTime())
                     .eq(BusInfusionHistoryEntity::getTenantId,clinic.getTenantId())
                     .ge(BusInfusionHistoryEntity::getStartTime,clinic.getStartTime().getTime())
-                    .le(BusInfusionHistoryEntity::getClinicStartTime,clinic.getStartTime().getTime())
+                    .le(BusInfusionHistoryEntity::getClinicStartTime,clinic.getStartTime())
             );
         }else {
             clinic.setId(existClinic.getId());
@@ -164,8 +165,9 @@ public class HisInfoListener {
                 changedRunningClinic(clinic,patientOperator);
                 return;
             }else {
-                //运行临床信息不发生变化，将该次临床置为结束状态
-                clinicService.update(new UpdateWrapper<BusClinicEntity>().lambda()
+                //运行临床信息不发生变化,将该次临床置为结束状态, 进行撤泵操作 todo
+                clinicService.update(new UpdateWrapper<BusClinicEntity>()
+                        .lambda()
                         .eq(BusClinicEntity::getId,clinic.getId())
                         .set(BusClinicEntity::getFinished,true));
             }