增加时间 如果不存在获取当前时间存储

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

@@ -3,9 +3,11 @@ package com.tuoren.web;
 import com.tuoren.TuorenApplication;
 import com.tuoren.web.layer.controller.BusPatientController;
 import com.tuoren.web.layer.d0.PumpRemoveRequestDTO;
+import com.tuoren.web.layer.d0.PumpVo;
 import com.tuoren.web.layer.entity.BusPatientEntity;
 import com.tuoren.web.layer.service.IBusPatientService;
 import com.tuoren.web.layer.service.impl.BusPumpServiceImpl;
+import com.tuoren.web.layer.vo.PumpParam;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName : Test
@@ -47,6 +51,7 @@ public class Test1 {
         PumpRemoveRequestDTO pumpRemoveRequestDTO = new PumpRemoveRequestDTO();
         pumpRemoveRequestDTO.setIds(Arrays.asList("382"));
         pumpRemoveRequestDTO.setRemoveUser("admin");
+        pumpRemoveRequestDTO.setUndoTime(new Date());
         busPumpService.removePumpNew(pumpRemoveRequestDTO);
     }
 
@@ -84,4 +89,15 @@ public class Test1 {
             iBusPatientEntityService.sendPatientInfoToPump(busPatientEntity.getPatientId());
         }
     }
+
+    @Test
+    public void test4() throws Exception {
+        PumpParam pumpParam = new PumpParam();
+        pumpParam.setPumpCode("4319571630430293");
+        pumpParam.setHospitalCode("5490dd8896e54ecab824b006074361de");
+        pumpParam.setPatientId("5d892e4f-7c85-40b3-8b4d-8006f3771e2f");
+//        pumpParam.setPatientCode("436167");
+        List<PumpVo> pumpVos = busPumpService.queryPumpInfo(pumpParam);
+        System.out.println(pumpVos);
+    }
 }

pump-web/src/main/java/com/tuoren/web/layer/d0/PumpRemovePushRabbitDTO.java

@@ -43,7 +43,8 @@ public class PumpRemovePushRabbitDTO implements Serializable {
         return PumpRemovePushRabbitDTO.builder()
                 .operation(0)
                 .tableName("Pump")
-                .data(Data.of(source.getHospitalCode(),source.getPumpCode(),source.getPatientCode(),Boolean.FALSE, DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")))
+                .data(Data.of(source.getHospitalCode(),source.getPatientCode(),source.getPumpCode(),
+                        Boolean.FALSE, DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")))
                 .build();
     }
 }

pump-web/src/main/java/com/tuoren/web/layer/d0/PumpRemoveRequestDTO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -18,4 +19,6 @@ public class PumpRemoveRequestDTO {
     private List<String> ids;
     @ApiModelProperty("撤泵人")
     private String removeUser;
+    @ApiModelProperty("撤泵时间")
+    private Date undoTime;
 }

pump-web/src/main/java/com/tuoren/web/layer/d0/PumpRemoveUserPushRabbitDTO.java

@@ -1,5 +1,6 @@
 package com.tuoren.web.layer.d0;
 
+import cn.hutool.core.date.DateUtil;
 import com.tuoren.web.layer.entity.BusPumpEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -31,6 +32,7 @@ public class PumpRemoveUserPushRabbitDTO {
         private String PatientCode;
         private String UndoPerson;
         private String PumpCode;
+        private String UndoTime;
     }
 
 
@@ -38,7 +40,8 @@ public class PumpRemoveUserPushRabbitDTO {
         return PumpRemoveUserPushRabbitDTO.builder()
                 .operation(0)
                 .tableName("PatientInfo")
-                .data(Data.of(source.getHospitalCode(), source.getPatientCode(), source.getRemoveUser(), source.getPumpCode()))
+                .data(Data.of(source.getHospitalCode(), source.getPatientCode(),
+                        source.getRemoveUser(), source.getPumpCode(), DateUtil.format(source.getUndoTime(), "yyyy-MM-dd HH:mm:ss")))
                 .build();
     }
 

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import io.swagger.annotations.ApiModel;
@@ -234,5 +235,8 @@ public class BusPumpEntity implements Serializable {
     @ApiModelProperty("撤泵人")
     private String removeUser;
 
+    @ApiModelProperty("撤泵时间")
+    private Date undoTime;
+
 
 }

pump-web/src/main/java/com/tuoren/web/layer/mapper/BusPatientMapper.java

@@ -5,6 +5,7 @@ import com.tuoren.web.layer.entity.BusPatientEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,5 +28,5 @@ public interface BusPatientMapper extends BaseMapper<BusPatientEntity> {
             @Param("bedCode") String bedCode
     );
 
-    void updateUndoPeronBuPumpCode(@Param("undoPerson")String undoPerson, @Param("pumpCode")String pumpCode);
+    void updateUndoPeronBuPumpCode(@Param("undoPerson")String undoPerson, @Param("undoTime")Date undoTime, @Param("pumpCode")String pumpCode);
 }

pump-web/src/main/java/com/tuoren/web/layer/service/impl/BusPumpServiceImpl.java

@@ -27,10 +27,9 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -225,8 +224,13 @@ public class BusPumpServiceImpl extends ServiceImpl<BusPumpMapper, BusPumpEntity
         if(CollectionUtil.isEmpty(pumps)){
             return;
         }
+
+        if(requestDTO.getUndoTime() == null){
+            requestDTO.setUndoTime(new Date());
+        }
         Map<String, List<BusPumpEntity>> pumpMap = pumps.stream()
                 .peek(p->p.setRemoveUser(requestDTO.getRemoveUser()))
+                .peek(p->p.setUndoTime(requestDTO.getUndoTime()))
                 .peek(p -> p.setIsRemove(Boolean.FALSE))
                 .collect(Collectors.groupingBy(BusPumpEntity::getHospitalCode));
 
@@ -234,7 +238,7 @@ public class BusPumpServiceImpl extends ServiceImpl<BusPumpMapper, BusPumpEntity
         //更新患者信息
         pumpMap.forEach((k,v)->{
             v.forEach(p->{
-                busPatientMapper.updateUndoPeronBuPumpCode(requestDTO.getRemoveUser(),p.getPumpCode());
+                busPatientMapper.updateUndoPeronBuPumpCode(requestDTO.getRemoveUser(),requestDTO.getUndoTime(),p.getPumpCode());
             });
 
         });

pump-web/src/main/resources/mapper/BusPatientEntityMapper.xml

@@ -65,7 +65,7 @@
     <update id="updateUndoPeronBuPumpCode">
         update bus_patient
         set undo_person=#{undoPerson},
-            undo_time=now()
+            undo_time= #{undoTime}
         where pump_code=#{pumpCode}
         order by gmt_modified desc
         limit 1;