init

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

@@ -0,0 +1,48 @@
+package com.tuoren.web.layer.d0;
+
+import cn.hutool.json.JSONUtil;
+import com.tuoren.web.layer.entity.BusPumpEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName : PumpRemovePushRabbitDTO
+ * @Description :
+ * @Author : LF
+ * @Date: 2025年06月04日
+ */
+@ApiModel("撤泵数据下发")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class PumpRemovePushRabbitDTO implements Serializable {
+    private Integer operation;
+    private String tableName;
+    private String patientCode;
+    private Data data;
+
+    @lombok.Data
+    @AllArgsConstructor(staticName = "of")
+    private static class Data{
+        private String SysHospital_ID;
+        private String PumpCode;
+        private Boolean Visible;
+        private Date LastUploadTime;
+    }
+
+
+    public static PumpRemovePushRabbitDTO parse(BusPumpEntity source){
+        return PumpRemovePushRabbitDTO.builder()
+                .operation(1)
+                .tableName("Pump")
+                .data(Data.of(source.getHospitalCode(),source.getPumpCode(),Boolean.FALSE,new Date()))
+                .build();
+    }
+}

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

@@ -41,7 +41,8 @@ public interface BusPumpMapper extends BaseMapper<BusPumpEntity> {
             @Param("upAndDown") Boolean upAndDown,
             @Param("bufState9") Integer bufState9,
             @Param("hospitalCode") String hospitalCode,
-            @Param("productCode") String productCode
+            @Param("productCode") String productCode,
+            @Param("isRemove") Integer isRemove
     );
 
     List<PumpVo> queryPumpInfo(

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

@@ -2,6 +2,7 @@ package com.tuoren.web.layer.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tuoren.web.layer.entity.BusReceiveRecordCopyEntity;
@@ -38,8 +39,8 @@ import java.util.stream.Collectors;
 @Service
 public class BusPumpServiceImpl extends ServiceImpl<BusPumpMapper, BusPumpEntity> implements IBusPumpService {
 
-	@Autowired
-	BusReceiveRecordMapper busReceiveRecordMapper;
+    @Autowired
+    BusReceiveRecordMapper busReceiveRecordMapper;
 
     @Autowired
     BusReceiveRecordCopyMapper busReceiveRecordCopyMapper;
@@ -48,28 +49,28 @@ public class BusPumpServiceImpl extends ServiceImpl<BusPumpMapper, BusPumpEntity
     @Lazy
     private RabbitHandle rabbitHandle;
 
-	@Override
-	public void pumpRabbitHandle(BusPumpEntity record) {
-		// TODO Auto-generated method stub
-		//更新泵信息
-		QueryWrapper<BusPumpEntity> wrapper = new QueryWrapper<BusPumpEntity>();
-		wrapper.eq("pump_code", record.getPumpCode());
-		BusPumpEntity existRecord = this.getOne(wrapper);
-		if(existRecord == null) {
-			this.save(record);
-		}else {
+    @Override
+    public void pumpRabbitHandle(BusPumpEntity record) {
+        // TODO Auto-generated method stub
+        //更新泵信息
+        QueryWrapper<BusPumpEntity> wrapper = new QueryWrapper<BusPumpEntity>();
+        wrapper.eq("pump_code", record.getPumpCode());
+        BusPumpEntity existRecord = this.getOne(wrapper);
+        if(existRecord == null) {
+            this.save(record);
+        }else {
             if(record.getLastUploadTime().compareTo(existRecord.getLastUploadTime()) < 0){
                 return;
             }
-			record.setId(existRecord.getId());
-			this.updateById(record);
-		}
-		//增加记录
-		BusReceiveRecordEntity receiveRecord = new BusReceiveRecordEntity();
-		BeanUtils.copyProperties(record, receiveRecord);
-		receiveRecord.setId(null);//id自增
-		busReceiveRecordMapper.insert(receiveRecord);
-	}
+            record.setId(existRecord.getId());
+            this.updateById(record);
+        }
+        //增加记录
+        BusReceiveRecordEntity receiveRecord = new BusReceiveRecordEntity();
+        BeanUtils.copyProperties(record, receiveRecord);
+        receiveRecord.setId(null);//id自增
+        busReceiveRecordMapper.insert(receiveRecord);
+    }
 
     @Override
     public void pumpRabbitCopyHandle(BusPumpEntity record) {
@@ -103,7 +104,7 @@ public class BusPumpServiceImpl extends ServiceImpl<BusPumpMapper, BusPumpEntity
                 .eq(resources.getStateFlag()!=null,BusPumpEntity::getStateFlag,resources.getStateFlag())
                 .eq(StrUtil.isNotEmpty(resources.getProductCode()),BusPumpEntity::getProductCode,resources.getProductCode())
                 .like(StrUtil.isNotEmpty(resources.getPatientCode()),BusPumpEntity::getPatientCode,resources.getPatientCode())
-        .orderByDesc(BusPumpEntity::getLastUploadTime);
+                .orderByDesc(BusPumpEntity::getLastUploadTime);
         return page(page,wrapper);
     }
 
@@ -140,7 +141,8 @@ public class BusPumpServiceImpl extends ServiceImpl<BusPumpMapper, BusPumpEntity
                 pumpParam.getUpAndDown(),
                 pumpParam.getBufState9(),
                 pumpParam.getHospitalCode(),
-                pumpParam.getProductCode()
+                pumpParam.getProductCode(),
+                pumpParam.getIsRemove()
         );
 //        List<PumpVo> listPumpVos = new ArrayList<>();
 //        for (PumpVo d0 : list) {
@@ -180,7 +182,8 @@ public class BusPumpServiceImpl extends ServiceImpl<BusPumpMapper, BusPumpEntity
         if(CollectionUtil.isEmpty(ids)){
             return;
         }
-        Collection<BusPumpEntity> pumps = this.listByIds(ids);
+        Collection<BusPumpEntity> pumps = this.list(new LambdaQueryWrapper<BusPumpEntity>()
+                .in(BusPumpEntity::getId,ids));
         if(CollectionUtil.isEmpty(pumps)){
             return;
         }

pump-web/src/main/java/com/tuoren/web/layer/vo/PumpParam.java

@@ -51,4 +51,6 @@ public class PumpParam {
     private Integer bufState9;
     @ApiModelProperty(value = "接口: getPumpListByUser | 运行状态")
     private Integer runState;
+    @ApiModelProperty(value = "接口: getPumpListByUser | 是否撤泵，0 已撤泵 1未撤泵")
+    private Integer isRemove;
 }

pump-web/src/main/java/com/tuoren/web/rabbit/RabbitHandle.java

@@ -14,6 +14,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
+import com.tuoren.web.layer.d0.PumpRemovePushRabbitDTO;
 import com.tuoren.web.layer.entity.*;
 import com.tuoren.web.layer.service.*;
 
@@ -272,8 +273,12 @@ public class RabbitHandle {
 	}
 
 	public void sendRemovePump(Map<String, List<BusPumpEntity>> removePumpMap) {
-		removePumpMap.forEach((k,v)->{
-			rabbitTemplate.convertAndSend("removePump", k,JSONUtil.toJsonStr(v.stream().map(BusPumpEntity::getPumpCode).collect(Collectors.toList())));
+		removePumpMap
+				.forEach((k,v)->{
+					v.stream()
+							.map(PumpRemovePushRabbitDTO::parse)
+							.forEach(pump-> rabbitTemplate.convertAndSend("removePump", k,JSONUtil.toJsonStr(pump)));
+			;
 		});
 	}
 }