add

mqtt信息发送

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusClinicService.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.core.utils.DateCompareUtil;
 import com.nb.web.api.bean.FormulaDrugDetailDomain;
+import com.nb.web.api.bean.UndoDeviceConfig;
 import com.nb.web.api.entity.BusDeviceEntity;
 import com.nb.web.api.entity.BusEvaluationEntity;
 import com.nb.web.api.enums.ClinicManageEnum;
@@ -450,13 +451,33 @@ public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClini
 
     public void batchHandleLiquid(LiquidBatchHandleDTO source) {
         List<String> clinicIds = source.getClinicIds();
-        this.baseMapper.update(null,new LambdaUpdateWrapper<BusClinicEntity>()
-                .in(BusClinicEntity::getId,clinicIds)
-                .set(BusClinicEntity::getLiquidExecutor,source.getLiquidExecutor())
-                .set(BusClinicEntity::getLiquidChecker,source.getLiquidChecker())
-                .set(BusClinicEntity::getLiquidTime,source.getLiquidTime())
-                .set(BusClinicEntity::getLiquidMethod,source.getLiquidMethod())
-                .set(BusClinicEntity::getLiquidRemark,source.getLiquidRemark()));
+        if(ObjectUtil.isNotNull(source.getUndoTime())){
+            List<BusClinicEntity> clinics = this.baseMapper.selectBatchIds(clinicIds);
+            if(CollectionUtil.isEmpty(clinics)){
+                return;
+            }
+            for (BusClinicEntity clinic : clinics) {
+                clinic.setLiquidExecutor(source.getLiquidExecutor());
+                clinic.setLiquidChecker(source.getLiquidChecker());
+                clinic.setLiquidTime(source.getLiquidTime());
+                clinic.setLiquidMethod(source.getLiquidMethod());
+                clinic.setLiquidRemark(source.getLiquidRemark());
+                UndoDeviceConfig undoConfig = clinic.getUndoConfig();
+                if (undoConfig == null) {
+                    undoConfig = new UndoDeviceConfig();
+                }
+                undoConfig.setUndoTime(source.getUndoTime());
+            }
+            this.updateBatchById(clinics);
+        }else {
+            this.baseMapper.update(null,new LambdaUpdateWrapper<BusClinicEntity>()
+                    .in(BusClinicEntity::getId,clinicIds)
+                    .set(BusClinicEntity::getLiquidExecutor,source.getLiquidExecutor())
+                    .set(BusClinicEntity::getLiquidChecker,source.getLiquidChecker())
+                    .set(BusClinicEntity::getLiquidTime,source.getLiquidTime())
+                    .set(BusClinicEntity::getLiquidMethod,source.getLiquidMethod())
+                    .set(BusClinicEntity::getLiquidRemark,source.getLiquidRemark()));
+        }
     }
 
     public List<BusLiquidListVO> selectLiquidByIds(Collection<String> ids) {

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/LiquidBatchHandleDTO.java

@@ -31,4 +31,7 @@ public class LiquidBatchHandleDTO {
     @ApiModelProperty("废液处理备注")
     private String liquidRemark;
 
+    @ApiModelProperty("撤泵时间")
+    private Date undoTime;
+
 }