add 网络泵历史数据

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

@@ -1,11 +1,8 @@
 package com.coffee.admin;
 
-import com.coffee.bus.controller.BusHospitalController;
 import com.coffee.bus.controller.BusNetPumpController;
-import com.coffee.bus.entity.BusHospitalEntity;
 import com.coffee.bus.entity.BusNetPumpEntity;
-import com.coffee.bus.enums.NetPumpAlarmEnum;
-import com.coffee.bus.service.LocalBusHospitalService;
+import com.coffee.bus.enums.NetPumpWarnEnum;
 import com.coffee.bus.service.LocalBusNetPumpService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,7 +32,7 @@ public class BusNetpumpTest {
     public void save(){
 //        StpUtil.login();
         BusNetPumpEntity netPumpEntity = new BusNetPumpEntity();
-        netPumpEntity.setAlarm(NetPumpAlarmEnum.ComingEnd);
+        netPumpEntity.setWarn(NetPumpWarnEnum.ComingEnd);
         netPumpEntity.setAlias("1");
         netPumpEntity.setBedNo("1");
         netPumpEntity.setDeviceId("123");

coffee-common/src/main/java/com/coffee/common/config/websocket/DefaultWebSocketMsgHandler.java

@@ -85,6 +85,7 @@ public class DefaultWebSocketMsgHandler implements IWsMsgHandler {
         }
         //心跳请求 todo
         if("ping".equals(message.trim().toLowerCase())){
+            Tio.send(channelContext,WsResponse.fromText("pong","utf-8"));
             return null;
         }
         try {

coffee-common/src/main/java/com/coffee/common/entity/TenantGenericEntity.java

@@ -1,6 +1,7 @@
 package com.coffee.common.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.coffee.common.config.mybatis.TenantNameHandler;
@@ -22,7 +23,7 @@ public abstract class TenantGenericEntity<PK,TN> extends GenericEntity<PK> {
     private static final long serialVersionUID = 1L;
 
     @Getter
-    @TableField("tenant_id")
+    @TableField(value = "tenant_id",fill = FieldFill.INSERT)
     @Setter
     private TN tenantId;
 

coffee-framework/src/main/java/com/coffee/framework/config/mybatisplus/MybatisPlusConfig.java

@@ -145,13 +145,13 @@ public class MybatisPlusConfig {
                 if(url.toString().endsWith("/login")){
                     return true;
                 }
-                return true;
-//                //判断当前有用户是否为系统级用户,若是,则忽略逻辑隔离
-//                LoginUser loginUser = (LoginUser) StpUtil.getTokenSession().get(Constants.LOGIN_USER_KEY);
-//                if(1==loginUser.getIsSys()){
-//                    return true;
-//                }
-//                return CollectionUtil.isEmpty(ignoreTableName)||ignoreTableName.contains(tableName);
+//                return true;
+                //判断当前有用户是否为系统级用户,若是,则忽略逻辑隔离
+                LoginUser loginUser = (LoginUser) StpUtil.getTokenSession().get(Constants.LOGIN_USER_KEY);
+                if(1==loginUser.getIsSys()){
+                    return true;
+                }
+                return CollectionUtil.isEmpty(ignoreTableName)||ignoreTableName.contains(tableName);
             }
 
             @Override

coffee-framework/src/main/java/com/coffee/framework/config/mybatisplus/handler/CreateAndUpdateMetaObjectHandler.java

@@ -24,6 +24,8 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
     public static final String UPDATE_BY = "updateBy";
 
     public static final String IS_DELETE = "isDelete";
+
+    public static final String TENANT_ID="tenant_id";
     @Override
     public void insertFill(MetaObject metaObject) {
         try {
@@ -44,6 +46,10 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
                 LoginUser loginUser = SecurityUtil.getLoginUser();
                 this.strictUpdateFill(metaObject, UPDATE_BY, String.class, Objects.isNull(loginUser) ? null : loginUser.getSysUser().getId().toString());
             }
+            if (metaObject.hasGetter(TENANT_ID) && metaObject.getValue(TENANT_ID) == null) {
+                LoginUser loginUser = SecurityUtil.getLoginUser();
+                this.strictUpdateFill(metaObject, TENANT_ID, String.class, Objects.isNull(loginUser) ? null : loginUser.getSysUser().getTenantId());
+            }
         } catch (Exception e) {
             throw new CustomException(ResultCode.INTERNAL_SERVER_ERROR.getMessage());
         }

coffee-system/src/main/java/com/coffee/bus/bean/Script.java

@@ -15,4 +15,8 @@ import java.io.Serializable;
 public class Script implements Serializable {
     private String id;
     private String content;
+    /**
+     * json xml soap
+     */
+    private String type;
 }

coffee-system/src/main/java/com/coffee/bus/controller/BusNetPumpController.java

@@ -2,7 +2,7 @@ package com.coffee.bus.controller;
 
 import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.coffee.bus.entity.BusNetPumpEntity;
-import com.coffee.bus.enums.NetPumpAlarmEnum;
+import com.coffee.bus.enums.NetPumpWarnEnum;
 import com.coffee.bus.enums.NetPumpStatusEnum;
 import com.coffee.bus.service.LocalBusNetPumpService;
 import com.coffee.common.crud.BaseService;
@@ -32,7 +32,7 @@ public class BusNetPumpController extends BaseCrudController<BusNetPumpEntity, S
     @GetMapping("/alarm/dict")
     @Operation(summary = "网络泵报警信息枚举，无权限配置")
     public R alarm(){
-        return R.success(NetPumpAlarmEnum.values());
+        return R.success(NetPumpWarnEnum.values());
     }
 
 

coffee-system/src/main/java/com/coffee/bus/controller/BusNetPumpHistoryController.java

@@ -0,0 +1,45 @@
+package com.coffee.bus.controller;
+
+import com.baomidou.mybatisplus.core.mapper.Mapper;
+import com.coffee.bus.entity.BusNetPumpEntity;
+import com.coffee.bus.enums.NetPumpStatusEnum;
+import com.coffee.bus.enums.NetPumpWarnEnum;
+import com.coffee.bus.service.LocalBusNetPumpService;
+import com.coffee.common.crud.BaseService;
+import com.coffee.common.crud.controller.BaseCrudController;
+import com.coffee.common.result.R;
+import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName BusHospitalController.java
+ * @Description TODO
+ * @createTime 2022年03月19日 09:28:00
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/bus/netpump/history")
+@Api(tags = "网络泵历史数据管理",description = "统一权限前缀(netpump:history),netpump:history:add")
+public class BusNetPumpHistoryController extends BaseCrudController<BusNetPumpEntity, String> {
+    private final LocalBusNetPumpService netPumpService;
+
+    /**
+     * 权限控制前缀
+     * @return
+     */
+    @Override
+    public String getPermissionPrefix() {
+        return "netpump:history";
+    }
+
+    @Override
+    public BaseService<? extends Mapper<BusNetPumpEntity>, BusNetPumpEntity, String> getService() {
+        return netPumpService;
+    }
+}

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

@@ -2,7 +2,7 @@ package com.coffee.bus.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.coffee.bus.enums.NetPumpAlarmEnum;
+import com.coffee.bus.enums.NetPumpWarnEnum;
 import com.coffee.bus.enums.NetPumpStatusEnum;
 import com.coffee.common.config.mybatis.DateToBigIntHandler;
 import com.coffee.common.entity.TenantGenericEntity;
@@ -94,46 +94,46 @@ public class BusNetPumpEntity extends TenantGenericEntity<String,String> {
     @TableField(typeHandler = EnumOrdinalTypeHandler.class)
     private NetPumpStatusEnum runState;
 
-    @ApiModelProperty(value = "报警信息")
+    @ApiModelProperty(value = "提醒信息")
     @TableField(typeHandler = EnumOrdinalTypeHandler.class)
-    private NetPumpAlarmEnum alarm;
-
-    @ApiModelProperty(value = "镇痛泵状态BUF")
-    private Integer bufState1;
-
-    @ApiModelProperty(value = "镇痛泵状态BUF")
-    private Integer bufState2;
-
-    @ApiModelProperty(value = "镇痛泵状态BUF")
-    private Integer bufState3;
-
-    @ApiModelProperty(value = "镇痛泵状态BUF")
-    private Integer bufState4;
-
-    @ApiModelProperty(value = "镇痛泵状态BUF")
-    private Integer bufState5;
-
-    @ApiModelProperty(value = "镇痛泵状态BUF")
-    private Integer bufState6;
-
-    @ApiModelProperty(value = "镇痛泵状态BUF")
-    private Integer bufState7;
-
-    @ApiModelProperty(value = "镇痛泵状态BUF")
-    private Integer bufState8;
-
-    @ApiModelProperty(value = "镇痛泵状态BUF")
-    private Integer bufState9;
+    private NetPumpWarnEnum warn;
+
+//    @ApiModelProperty(value = "镇痛泵状态BUF")
+//    private Integer bufState1;
+//
+//    @ApiModelProperty(value = "镇痛泵状态BUF")
+//    private Integer bufState2;
+//
+//    @ApiModelProperty(value = "镇痛泵状态BUF")
+//    private Integer bufState3;
+//
+//    @ApiModelProperty(value = "镇痛泵状态BUF")
+//    private Integer bufState4;
+//
+//    @ApiModelProperty(value = "镇痛泵状态BUF")
+//    private Integer bufState5;
+//
+//    @ApiModelProperty(value = "镇痛泵状态BUF")
+//    private Integer bufState6;
+//
+//    @ApiModelProperty(value = "镇痛泵状态BUF")
+//    private Integer bufState7;
+//
+//    @ApiModelProperty(value = "镇痛泵状态BUF")
+//    private Integer bufState8;
+//
+//    @ApiModelProperty(value = "镇痛泵状态BUF")
+//    private Integer bufState9;
 
     @ApiModelProperty(value = "开始时间")
     @TableField(typeHandler = DateToBigIntHandler.class)
     private Date startTime;
 
-    @ApiModelProperty(value = "是否已撤泵")
-    private Boolean isRemove;
+    @ApiModelProperty(value = "是否已撤泵,0、未撤泵1、已撤泵")
+    private Boolean isUndo;
 
-    @ApiModelProperty(value = "显示状态")
-    private String viewState;
+//    @ApiModelProperty(value = "显示状态")
+//    private String viewState;
 
     @ApiModelProperty(value = "备注")
     private String remark;

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

@@ -0,0 +1,133 @@
+package com.coffee.bus.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.coffee.bus.enums.NetPumpWarnEnum;
+import com.coffee.bus.enums.NetPumpStatusEnum;
+import com.coffee.common.config.mybatis.DateToBigIntHandler;
+import com.coffee.common.entity.TenantGenericEntity;
+import com.coffee.common.enums.SexEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.apache.ibatis.type.EnumOrdinalTypeHandler;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fanfan
+ * @since 2020-07-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName(value = "bus_netpump_history",autoResultMap = true)
+@ApiModel(value="网络泵历史数据", description="")
+public class BusNetPumpHistoryEntity extends TenantGenericEntity<String,String> {
+
+    @ApiModelProperty(value = "网络泵id")
+    private String deviceId;
+
+    @ApiModelProperty(value = "临床id")
+    private String clinicId;
+
+    @ApiModelProperty(value = "病号")
+    private String patientCode;
+
+    @ApiModelProperty(value = "病人名称")
+    private String patientName;
+
+    @ApiModelProperty(value = "别名")
+    private String alias;
+
+    @ApiModelProperty(value = "病人性别")
+    @TableField(typeHandler = EnumOrdinalTypeHandler.class)
+    private SexEnum patientSex;
+
+    @ApiModelProperty(value = "科室")
+    private String dept;
+
+    @ApiModelProperty(value = "病区")
+    private String ward;
+
+    @ApiModelProperty(value = "床号")
+    private String bedNo;
+
+    @ApiModelProperty(value = "剩余量")
+    private BigDecimal remainQuantity;
+
+    @ApiModelProperty(value = "持续量")
+    private BigDecimal continueQuantity;
+
+    @ApiModelProperty(value = "自控锁时")
+    private BigDecimal selfControlLockTime;
+
+    @ApiModelProperty(value = "已输入量")
+    private BigDecimal inputQuantity;
+
+    @ApiModelProperty(value = "有效次数")
+    private Integer validTime;
+
+    @ApiModelProperty(value = "无效次数")
+    private Integer invalidTime;
+
+    @ApiModelProperty(value = "极限量")
+    private BigDecimal maxQuantity;
+
+    @ApiModelProperty(value = "首次量")
+    private Integer firstQuantity;
+
+    @ApiModelProperty(value = "追加量")
+    private BigDecimal singleQuantity;
+
+    @ApiModelProperty(value = "总量")
+    private Integer totalQuantity;
+
+    @ApiModelProperty(value = "总按次数")
+    private Integer totalCount;
+
+
+    @ApiModelProperty(value = "镇痛泵运行状态")
+    @TableField(typeHandler = EnumOrdinalTypeHandler.class)
+    private NetPumpStatusEnum runState;
+
+    @ApiModelProperty(value = "提醒信息")
+    @TableField(typeHandler = EnumOrdinalTypeHandler.class)
+    private NetPumpWarnEnum warn;
+
+    @ApiModelProperty(value = "开始时间")
+    @TableField(typeHandler = DateToBigIntHandler.class)
+    private Date startTime;
+
+    @ApiModelProperty(value = "是否已撤泵,0、未撤泵1、已撤泵")
+    private Boolean isUndo;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "最后上传时间")
+    @TableField(typeHandler = DateToBigIntHandler.class)
+    private Date lastUploadTime;
+
+    @TableField(typeHandler = DateToBigIntHandler.class)
+    private Date registerTime;
+
+    @ApiModelProperty(value = "撤泵人")
+    private String undoBy;
+
+    @ApiModelProperty(value = "销毁人")
+    private String destroyer;
+
+    @ApiModelProperty(value = "见证人")
+    private String witnesses;
+
+    @TableField(typeHandler = DateToBigIntHandler.class)
+    private Date undoTime;
+}

coffee-system/src/main/java/com/coffee/bus/enums/NetPumpStatusEnum.java

@@ -24,15 +24,19 @@ public enum NetPumpStatusEnum {
     Running(0,"正在运行",false),
     Waiting(1,"待机中",false),
     Shutdown(2,"关机",false),
+    Pause(3,"待机",false),
 
     //    以下为报警信息状态
-    Finished(3,"输液结束",true),
-    LowBattery(4,"低电量报警",true),
-    Jam(5,"堵塞报警",true),
-    Bubble(6,"气泡报警",true),
-    NoSignal(7,"不在服务区",true),
-    Machine(8,"机械故障",true),
-    NotFastened(9,"未扣合股涨",true);
+    Finished(4,"输液结束",true),
+    LowBattery(5,"低电量报警",true),
+    Jam(6,"堵塞报警",true),
+    Bubble(7,"气泡报警",true),
+    NoSignal(8,"不在服务区",true),
+    Machine(9,"机械故障",true),
+    NotFastened(10,"未扣合故障",true),
+    NotBox(11,"未装药盒报警",true),
+    Limit(12,"极限报警",true),
+    OutOfControl(13,"电机失控报警",true);
 
 
     /**

coffee-system/src/main/java/com/coffee/bus/enums/NetPumpAlarmEnum.java → coffee-system/src/main/java/com/coffee/bus/enums/NetPumpWarnEnum.java

@@ -15,7 +15,7 @@ import lombok.Getter;
  */
 @AllArgsConstructor
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-public enum  NetPumpAlarmEnum {
+public enum NetPumpWarnEnum {
     /**
      * 请在添加或修改的过程中不要改变枚举的顺序！！！！！！！！！！！！！！！
      * 如若新增,请在最后尾部新增

coffee-system/src/main/java/com/coffee/bus/listener/event/bean/DeviceAlarmEvent.java

@@ -12,6 +12,7 @@ import java.time.Clock;
  * @createTime 2022年03月21日 16:44:00
  */
 public class DeviceAlarmEvent extends ApplicationEvent {
+
     public DeviceAlarmEvent(Object source) {
         super(source);
     }

coffee-system/src/main/java/com/coffee/bus/mapper/BusNetPumpHistoryMapper.java

@@ -0,0 +1,16 @@
+package com.coffee.bus.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.coffee.bus.entity.BusNetPumpHistoryEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName BusHospitalMapper.java
+ * @Description TODO
+ * @createTime 2022年03月19日 09:15:00
+ */
+@Mapper
+public interface BusNetPumpHistoryMapper extends BaseMapper<BusNetPumpHistoryEntity> {
+}

coffee-system/src/main/java/com/coffee/bus/script/PythonParse.java

@@ -1,5 +1,6 @@
 package com.coffee.bus.script;
 
+import cn.hutool.http.webservice.SoapUtil;
 import cn.hutool.json.JSON;
 import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -7,7 +8,7 @@ import org.python.core.*;
 import org.python.util.PythonInterpreter;
 import org.springframework.stereotype.Component;
 
-import java.io.UnsupportedEncodingException;
+import javax.xml.soap.SOAPMessage;
 import java.util.Properties;
 
 /**
@@ -68,14 +69,13 @@ public class PythonParse implements ScriptParse {
 
     }
 
-    public static void main(String[] args) throws UnsupportedEncodingException {
+    public static void main(String[] args){
         Properties p = new Properties();
         p.setProperty("python.console.encoding", "UTF-8");
         PySystemState systemState = Py.getSystemState();
         PyString xml = new PyString("E:\\software\\coffee-boot\\coffee-admin\\src\\main\\resources\\python");
 //        PyString xml = new PyString("_classpath_:python");
         systemState.path.append(xml);
-
         PythonInterpreter.initialize(System.getProperties(), p, new String[] {});
         PythonInterpreter pythonInterpreter = new PythonInterpreter();
         String str = "# -*- coding: utf-8 -*-\n" +

coffee-system/src/main/java/com/coffee/bus/service/LocalBusNetPumpHistoryService.java

@@ -0,0 +1,31 @@
+package com.coffee.bus.service;
+
+import com.coffee.bus.entity.BusNetPumpHistoryEntity;
+import com.coffee.bus.mapper.BusNetPumpHistoryMapper;
+import com.coffee.common.crud.BaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName LocalBusHospitalService.java
+ * @Description TODO
+ * @createTime 2022年03月19日 09:27:00
+ */
+@Service
+public class LocalBusNetPumpHistoryService extends BaseService<BusNetPumpHistoryMapper, BusNetPumpHistoryEntity,String> {
+    @Override
+    public void validateBeforeSave(BusNetPumpHistoryEntity entity) {
+
+    }
+
+    @Override
+    public void validateBeforeUpdate(BusNetPumpHistoryEntity entity) {
+
+    }
+
+    @Override
+    public void validateBeforeDelete(String id) {
+
+    }
+}

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

@@ -3,6 +3,7 @@ package com.coffee.bus.websocket.listener;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.coffee.bus.entity.BusNetPumpEntity;
+import com.coffee.bus.listener.event.bean.DeviceAlarmEvent;
 import com.coffee.bus.listener.event.bean.DeviceInfoEvent;
 import com.coffee.bus.service.LocalBusNetPumpService;
 import com.coffee.bus.websocket.WebSocketConstant;
@@ -38,6 +39,7 @@ public class DeviceInfoListener {
     @EventListener
     public void deviceInfoDetail(DeviceInfoEvent infoEvent){
         BusNetPumpEntity pump = infoEvent.getContent();
+        //设备信息发生变化
         String topic = WebSocketConstant.getDeviceInfoDetailTopic(null, pump.getId(), pump.getTenantId());
         redisTemplate.convertAndSend(topic, pump);
     }

coffee-system/src/main/java/com/coffee/system/entity/SysUser.java

@@ -39,7 +39,7 @@ import java.util.List;
 @ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER)
 @ContentFontStyle(fontHeightInPoints = 10)
 @ExcelIgnoreUnannotated
-@TableName("sys_user")
+@TableName(value = "sys_user",autoResultMap = true)
 public class SysUser extends TenantGenericEntity<Long,Long> {
 
     private static final long serialVersionUID = 1L;
@@ -207,6 +207,6 @@ public class SysUser extends TenantGenericEntity<Long,Long> {
      * 是否为系统级别用户
      *  0、否  1、是
      **/
-    @TableField()
+    @TableField
     private Integer isSys;
 }