添加实体类和查询接口

pump-web/src/main/java/com/tuoren/web/layer/controller/BusLoginController.java

@@ -56,7 +56,8 @@ public class BusLoginController {
     public CommonResult login(@RequestBody UserLoginParam userLoginParam) throws Exception{
         Subject subject = SecurityUtils.getSubject();
         String device = WebUtils.getUserAgent();
-        String pwd  = AESUtils.aesDecrypt(userLoginParam.getPassword(), ConstastUtils.KEYS);
+//        String pwd  = AESUtils.aesDecrypt(userLoginParam.getPassword(), ConstastUtils.KEYS);
+        String pwd  = userLoginParam.getPassword();
         AuthenticationToken token = new UsernamePasswordToken(userLoginParam.getUsername(),pwd);
         Serializable tokenId = subject.getSession().getId();
         try {

pump-web/src/main/java/com/tuoren/web/layer/controller/BusReceiveRecordController.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import com.tuoren.web.layer.entity.BusReceiveRecordCopyEntity;
+import com.tuoren.web.layer.service.IBusReceiveRecordCopyService;
 import com.tuoren.web.layer.vo.ReceiveRecordParam;
 import com.tuoren.web.layer.entity.BusPatientEntity;
 import com.tuoren.web.layer.service.IBusPatientService;
@@ -38,6 +40,9 @@ import org.springframework.web.bind.annotation.RestController;
 public class BusReceiveRecordController{
     @Autowired
     public IBusReceiveRecordService iBusReceiveRecordEntityService;
+    @Autowired
+    public IBusReceiveRecordCopyService iBusReceiveRecordEntityCopyService;
+
 
     @Autowired
     public IBusPatientService iBusPatientService;
@@ -59,6 +64,24 @@ public class BusReceiveRecordController{
         return CommonResult.success(this.iBusReceiveRecordEntityService.page(page, wrapper));
     }
 
+    /**
+     * 分页查询所有数据
+     *
+     * @param pageNo 页码
+     * @param pageSize 条数
+     * @param busReceiveRecordCopyEntity 查询实体
+     * @return 所有数据
+     */
+    @ApiOperation("分页查询所有数据")
+    @PostMapping("/list")
+    public CommonResult selectCopyAll(Integer pageNo, Integer pageSize, BusReceiveRecordCopyEntity busReceiveRecordCopyEntity) {
+        IPage<BusReceiveRecordCopyEntity> page = new Page<>(pageNo,pageSize);
+        QueryWrapper<BusReceiveRecordCopyEntity> wrapper = new QueryWrapper<>(busReceiveRecordCopyEntity);
+        wrapper.orderByDesc("last_upload_time");
+        return CommonResult.success(this.iBusReceiveRecordEntityCopyService.page(page, wrapper));
+    }
+
+
     /**
      * 通过主键查询单条数据
      *
@@ -71,6 +94,20 @@ public class BusReceiveRecordController{
         return CommonResult.success(this.iBusReceiveRecordEntityService.getById(id));
     }
 
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @ApiOperation("通过主键查询单条数据")
+    @GetMapping("/copy/{id}")
+    public CommonResult selectCopyOne(@PathVariable Serializable id) {
+        return CommonResult.success(this.iBusReceiveRecordEntityCopyService.getById(id));
+    }
+
+
     /**
      * 新增数据
      *

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

@@ -0,0 +1,201 @@
+package com.tuoren.web.layer.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fanfan
+ * @since 2020-07-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bus_receive_record_copy")
+@ApiModel(value="BusReceiveRecordCopyEntity对象", description="")
+public class BusReceiveRecordCopyEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键",hidden = true)
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "注液泵编码")
+    private String pumpCode;
+
+    @ApiModelProperty(value = "产品编码")
+    private String productCode;
+
+    @ApiModelProperty(value = "医院编码")
+    private String hospitalCode;
+
+    @ApiModelProperty(value = "住院号")
+    private String patientCode;
+
+    @ApiModelProperty(value = "剩余量")
+    private BigDecimal remainQuantity;
+
+    @ApiModelProperty(value = "持续量")
+    private BigDecimal continueQuantity;
+
+    @ApiModelProperty(value = "自控量")
+    private BigDecimal selfControlQuantity;
+
+    @ApiModelProperty(value = "锁定时间")
+    private Integer lockTime;
+
+    @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 = "脉冲量")
+    private BigDecimal pulseQuantity;
+
+    @ApiModelProperty(value = "脉冲锁时")
+    private Integer pulseLockTime;
+
+    @ApiModelProperty(value = "首次量锁时")
+    private Integer firstLockTime;
+
+    @ApiModelProperty(value = "上限")
+    private BigDecimal upperLimit;
+
+    @ApiModelProperty(value = "下限")
+    private BigDecimal lowerLimit;
+
+    @ApiModelProperty(value = "自调比例")
+    private Integer customScate;
+
+    @ApiModelProperty(value = "加档有效次数")
+    private Integer addValidTime;
+
+    @ApiModelProperty(value = "镇痛泵运行状态")
+    private Integer runState;
+
+    @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 = "镇痛评分")
+    private Integer score;
+
+    @ApiModelProperty(value = "加档周期")
+    private BigDecimal addCycle;
+
+    @ApiModelProperty(value = "减档周期")
+    private BigDecimal reduceCycle;
+
+    @ApiModelProperty(value = "呼叫标记")
+    private Integer callFlag;
+
+    @ApiModelProperty(value = "开始时间")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(value = "是否可见")
+    private Boolean isRemove;
+
+    @ApiModelProperty(value = "状态标记")
+    private Integer stateFlag;
+
+    @ApiModelProperty(value = "是否在服务区")
+    private Integer noSignal;
+
+    @ApiModelProperty(value = "显示状态")
+    private String viewState;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "最后上传时间")
+    private LocalDateTime lastUploadTime;
+
+    @ApiModelProperty(value = "创建时间",hidden = true)
+    private LocalDateTime gmtCreate;
+
+    @ApiModelProperty(value = "更新时间",hidden = true)
+    private LocalDateTime gmtModified;
+
+    @ApiModelProperty("电机运行时采集的压力数据")
+    private String number1;
+
+    @ApiModelProperty("电机非运行时采集的压力数据")
+    private String number2;
+
+    @ApiModelProperty("电机状态")
+    private String numberStatus;
+
+    private String number3;
+
+    private String number4;
+
+    private String number5;
+
+    private String number6;
+
+    private String number7;
+
+    private String number8;
+
+    private String MotorCode;
+
+    private String dataVersion;
+
+
+}

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

@@ -0,0 +1,21 @@
+package com.tuoren.web.layer.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.tuoren.web.layer.entity.BusReceiveRecordCopyEntity;
+import com.tuoren.web.layer.entity.BusReceiveRecordEntity;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author fanfan
+ * @since 2020-07-03
+ */
+public interface BusReceiveRecordCopyMapper extends BaseMapper<BusReceiveRecordCopyEntity> {
+
+}

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

@@ -26,6 +26,9 @@ public interface IBusPumpService extends IService<BusPumpEntity> {
 	 */
 	void pumpRabbitHandle(BusPumpEntity record);
 
+
+    void pumpRabbitCopyHandle(BusPumpEntity record);
+
     IPage<BusPumpEntity> queryPumpList(Integer pageNo, Integer pageSize, BusPumpEntity resources);
 
     /**
@@ -52,4 +55,7 @@ public interface IBusPumpService extends IService<BusPumpEntity> {
      * @return
      */
     List<PumpVo> queryPumpInfo(PumpParam pumpParam);
+
+
+
 }

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

@@ -0,0 +1,19 @@
+package com.tuoren.web.layer.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.tuoren.web.layer.entity.BusReceiveRecordCopyEntity;
+import com.tuoren.web.layer.entity.BusReceiveRecordEntity;
+import com.tuoren.web.layer.vo.ReceiveRecordParam;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author fanfan
+ * @since 2020-07-03
+ */
+public interface IBusReceiveRecordCopyService extends IService<BusReceiveRecordCopyEntity> {
+
+}

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

@@ -3,6 +3,8 @@ package com.tuoren.web.layer.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.tuoren.web.layer.entity.BusReceiveRecordCopyEntity;
+import com.tuoren.web.layer.mapper.BusReceiveRecordCopyMapper;
 import com.tuoren.web.layer.vo.PumpParam;
 import com.tuoren.web.layer.entity.BusPumpEntity;
 import com.tuoren.web.layer.entity.BusReceiveRecordEntity;
@@ -32,6 +34,9 @@ public class BusPumpServiceImpl extends ServiceImpl<BusPumpMapper, BusPumpEntity
 
 	@Autowired
 	BusReceiveRecordMapper busReceiveRecordMapper;
+
+    @Autowired
+    BusReceiveRecordCopyMapper busReceiveRecordCopyMapper;
 	
 	@Override
 	public void pumpRabbitHandle(BusPumpEntity record) {
@@ -56,7 +61,23 @@ public class BusPumpServiceImpl extends ServiceImpl<BusPumpMapper, BusPumpEntity
 		busReceiveRecordMapper.insert(receiveRecord);
 	}
 
-	@Override
+    @Override
+    public void pumpRabbitCopyHandle(BusPumpEntity record) {
+        //更新泵信息
+        QueryWrapper<BusPumpEntity> wrapper = new QueryWrapper<BusPumpEntity>();
+        wrapper.eq("pump_code", record.getPumpCode());
+        BusPumpEntity existRecord = this.getOne(wrapper);
+        if(existRecord == null) {
+            this.save(record);
+        }
+
+        BusReceiveRecordCopyEntity receiveCopyRecord = new BusReceiveRecordCopyEntity();
+        BeanUtils.copyProperties(record, receiveCopyRecord);
+        receiveCopyRecord.setId(null);//id自增
+        busReceiveRecordCopyMapper.insert(receiveCopyRecord);
+    }
+
+    @Override
     public IPage<BusPumpEntity> queryPumpList(Integer pageNo, Integer pageSize, BusPumpEntity resources) {
         IPage<BusPumpEntity> page = new Page<>(pageNo,pageSize);
         QueryWrapper<BusPumpEntity> wrapper = new QueryWrapper<>();

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

@@ -0,0 +1,28 @@
+package com.tuoren.web.layer.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.tuoren.web.layer.entity.BusReceiveRecordCopyEntity;
+import com.tuoren.web.layer.entity.BusReceiveRecordEntity;
+import com.tuoren.web.layer.mapper.BusReceiveRecordCopyMapper;
+import com.tuoren.web.layer.mapper.BusReceiveRecordMapper;
+import com.tuoren.web.layer.service.IBusReceiveRecordCopyService;
+import com.tuoren.web.layer.service.IBusReceiveRecordService;
+import com.tuoren.web.layer.vo.ReceiveRecordParam;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author fanfan
+ * @since 2020-07-03
+ */
+@Service
+public class BusReceiveRecordCopyServiceImpl extends ServiceImpl<BusReceiveRecordCopyMapper, BusReceiveRecordCopyEntity> implements IBusReceiveRecordCopyService {
+
+}

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

@@ -0,0 +1,201 @@
+package com.tuoren.web.layer.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fanfan
+ * @since 2020-07-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bus_receive_record_copy")
+@ApiModel(value="BusReceiveRecordCopyEntity对象", description="")
+public class BusReceiveRecordCopyParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键",hidden = true)
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "注液泵编码")
+    private String pumpCode;
+
+    @ApiModelProperty(value = "产品编码")
+    private String productCode;
+
+    @ApiModelProperty(value = "医院编码")
+    private String hospitalCode;
+
+    @ApiModelProperty(value = "住院号")
+    private String patientCode;
+
+    @ApiModelProperty(value = "剩余量")
+    private BigDecimal remainQuantity;
+
+    @ApiModelProperty(value = "持续量")
+    private BigDecimal continueQuantity;
+
+    @ApiModelProperty(value = "自控量")
+    private BigDecimal selfControlQuantity;
+
+    @ApiModelProperty(value = "锁定时间")
+    private Integer lockTime;
+
+    @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 = "脉冲量")
+    private BigDecimal pulseQuantity;
+
+    @ApiModelProperty(value = "脉冲锁时")
+    private Integer pulseLockTime;
+
+    @ApiModelProperty(value = "首次量锁时")
+    private Integer firstLockTime;
+
+    @ApiModelProperty(value = "上限")
+    private BigDecimal upperLimit;
+
+    @ApiModelProperty(value = "下限")
+    private BigDecimal lowerLimit;
+
+    @ApiModelProperty(value = "自调比例")
+    private Integer customScate;
+
+    @ApiModelProperty(value = "加档有效次数")
+    private Integer addValidTime;
+
+    @ApiModelProperty(value = "镇痛泵运行状态")
+    private Integer runState;
+
+    @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 = "镇痛评分")
+    private Integer score;
+
+    @ApiModelProperty(value = "加档周期")
+    private BigDecimal addCycle;
+
+    @ApiModelProperty(value = "减档周期")
+    private BigDecimal reduceCycle;
+
+    @ApiModelProperty(value = "呼叫标记")
+    private Integer callFlag;
+
+    @ApiModelProperty(value = "开始时间")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(value = "是否可见")
+    private Boolean isRemove;
+
+    @ApiModelProperty(value = "状态标记")
+    private Integer stateFlag;
+
+    @ApiModelProperty(value = "是否在服务区")
+    private Integer noSignal;
+
+    @ApiModelProperty(value = "显示状态")
+    private String viewState;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "最后上传时间")
+    private LocalDateTime lastUploadTime;
+
+    @ApiModelProperty(value = "创建时间",hidden = true)
+    private LocalDateTime gmtCreate;
+
+    @ApiModelProperty(value = "更新时间",hidden = true)
+    private LocalDateTime gmtModified;
+
+    @ApiModelProperty("电机运行时采集的压力数据")
+    private String number1;
+
+    @ApiModelProperty("电机非运行时采集的压力数据")
+    private String number2;
+
+    @ApiModelProperty("电机状态")
+    private String numberStatus;
+
+    private String number3;
+
+    private String number4;
+
+    private String number5;
+
+    private String number6;
+
+    private String number7;
+
+    private String number8;
+
+    private String MotorCode;
+
+    private String dataVersion;
+
+
+}

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

@@ -177,6 +177,7 @@ public class RabbitHandle {
 			record.setIsFamily(false);
 			if(data.containsKey("number8")){
 				//todo
+				iBusPumpService.pumpRabbitCopyHandle(record);
 			}else {
 				iBusPumpService.pumpRabbitHandle(record);
 				pushInfo.pushErrorInfo(record.getStateFlag(), record.getBufState9(), record.getPumpCode(), record.getProductCode());