添加实体类和查询接口

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

@@ -8,6 +8,8 @@ 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.BusReceiveRecordCopyParam;
+import com.tuoren.web.layer.vo.ReceiveRecordCopyParam;
 import com.tuoren.web.layer.vo.ReceiveRecordParam;
 import com.tuoren.web.layer.entity.BusPatientEntity;
 import com.tuoren.web.layer.service.IBusPatientService;
@@ -69,16 +71,13 @@ public class BusReceiveRecordController{
      *
      * @param pageNo 页码
      * @param pageSize 条数
-     * @param busReceiveRecordCopyEntity 查询实体
+     * @param busReceiveRecordCopyParam 查询实体
      * @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));
+    public CommonResult<IPage<BusReceiveRecordCopyEntity>>selectCopyAll(Integer pageNo, Integer pageSize, BusReceiveRecordCopyParam busReceiveRecordCopyParam) {
+        return CommonResult.success(iBusReceiveRecordEntityCopyService.selectCopyAll(pageNo, pageSize, busReceiveRecordCopyParam));
     }
 
 
@@ -103,8 +102,8 @@ public class BusReceiveRecordController{
      */
     @ApiOperation("通过主键查询单条数据")
     @GetMapping("/copy/{id}")
-    public CommonResult selectCopyOne(@PathVariable Serializable id) {
-        return CommonResult.success(this.iBusReceiveRecordEntityCopyService.getById(id));
+    public CommonResult<BusReceiveRecordCopyParam> selectCopyOne(@PathVariable Serializable id) {
+        return CommonResult.success(iBusReceiveRecordEntityCopyService.selectCopyById(id));
     }
 
 
@@ -203,9 +202,7 @@ public class BusReceiveRecordController{
      */
     @ApiOperation("模糊查询记录 住院号 patientCode | 泵号 pumpCode | 产品编码类型 productCode | 医院 hospitalCode | 状态信息 viewState")
     @PostMapping("/getFuzzyHistory")
-    public CommonResult getFuzzyHistory(
-            @RequestBody ReceiveRecordParam receiveRecordParam
-    ) {
+    public CommonResult getFuzzyHistory(@RequestBody ReceiveRecordParam receiveRecordParam) {
         try{
             IPage<BusReceiveRecordEntity> iPage = iBusReceiveRecordEntityService.queryFuzzyHistory(receiveRecordParam);
             if( iPage.getRecords().size() > 0 ){
@@ -219,5 +216,27 @@ public class BusReceiveRecordController{
     }
 
 
+    /**
+     * 模糊查询
+     *
+     * @param receiveRecordCopyParam 参数
+     * @return 数据
+     */
+    @ApiOperation("模糊查询记录 住院号 patientCode | 泵号 pumpCode | 产品编码类型 productCode | 医院 hospitalCode | 状态信息 viewState")
+    @PostMapping("/query/getFuzzyHistory")
+    public CommonResult getFuzzyHistoryCopy(@RequestBody ReceiveRecordCopyParam receiveRecordCopyParam) {
+        try{
+            IPage<BusReceiveRecordCopyEntity> iPage = iBusReceiveRecordEntityCopyService.queryFuzzyHistoryCopy(receiveRecordCopyParam);
+            if( iPage.getRecords().size() > 0 ){
+                return CommonResult.success(iPage);
+            }
+            return CommonResult.noData();
+        } catch (Exception e) {
+            log.error("出现错误, {}",e.getMessage());
+            return CommonResult.failed("查询失败");
+        }
+    }
+
+
 
 }

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

@@ -4,8 +4,10 @@ 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 com.tuoren.web.layer.vo.BusReceiveRecordCopyParam;
 import org.apache.ibatis.annotations.Param;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -18,4 +20,10 @@ import java.util.List;
  */
 public interface BusReceiveRecordCopyMapper extends BaseMapper<BusReceiveRecordCopyEntity> {
 
+    BusReceiveRecordCopyParam selectReceiveAndHosipital(IPage<BusReceiveRecordCopyEntity> page, @Param("param")BusReceiveRecordCopyParam busReceiveRecordCopyParam);
+
+    BusReceiveRecordCopyParam selectReceiveAndHosipitalById(Serializable id);
+
+    List<BusReceiveRecordCopyEntity> queryFuzzyHistoryCopy(IPage<BusReceiveRecordCopyEntity> iPage, String hospitalCode, String patientCode, String pumpCode, String productCode, String viewState);
+
 }

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

@@ -4,8 +4,12 @@ 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.BusReceiveRecordCopyParam;
+import com.tuoren.web.layer.vo.ReceiveRecordCopyParam;
 import com.tuoren.web.layer.vo.ReceiveRecordParam;
 
+import java.io.Serializable;
+
 /**
  * <p>
  *  服务类
@@ -16,4 +20,10 @@ import com.tuoren.web.layer.vo.ReceiveRecordParam;
  */
 public interface IBusReceiveRecordCopyService extends IService<BusReceiveRecordCopyEntity> {
 
+
+    IPage<BusReceiveRecordCopyEntity> selectCopyAll(Integer pageNo, Integer pageSize, BusReceiveRecordCopyParam busReceiveRecordCopyParam);
+
+    BusReceiveRecordCopyParam selectCopyById(Serializable id);
+
+    IPage<BusReceiveRecordCopyEntity> queryFuzzyHistoryCopy(ReceiveRecordCopyParam receiveRecordCopyParam);
 }

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

@@ -1,5 +1,6 @@
 package com.tuoren.web.layer.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,9 +10,13 @@ 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.BusReceiveRecordCopyParam;
+import com.tuoren.web.layer.vo.ReceiveRecordCopyParam;
 import com.tuoren.web.layer.vo.ReceiveRecordParam;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -25,4 +30,36 @@ import java.util.List;
 @Service
 public class BusReceiveRecordCopyServiceImpl extends ServiceImpl<BusReceiveRecordCopyMapper, BusReceiveRecordCopyEntity> implements IBusReceiveRecordCopyService {
 
+    @Autowired
+    private BusReceiveRecordCopyMapper busReceiveRecordCopyMapper;
+    @Override
+    public IPage<BusReceiveRecordCopyEntity> selectCopyAll(Integer pageNo, Integer pageSize, BusReceiveRecordCopyParam busReceiveRecordCopyParam) {
+        IPage<BusReceiveRecordCopyEntity> page = new Page<>(pageNo,pageSize);
+        busReceiveRecordCopyMapper.selectReceiveAndHosipital(page,busReceiveRecordCopyParam);
+        return page;
+    }
+
+    @Override
+    public BusReceiveRecordCopyParam selectCopyById(Serializable id) {
+        return busReceiveRecordCopyMapper.selectReceiveAndHosipitalById(id);
+    }
+
+    @Override
+    public IPage<BusReceiveRecordCopyEntity> queryFuzzyHistoryCopy(ReceiveRecordCopyParam receiveRecordCopyParam) {
+
+        IPage<BusReceiveRecordCopyEntity> iPage = new Page<>(receiveRecordCopyParam.getPageNo(), receiveRecordCopyParam.getPageSize());
+        List<BusReceiveRecordCopyEntity> list = this.getBaseMapper().queryFuzzyHistoryCopy(
+                iPage,
+                receiveRecordCopyParam.getHospitalCode(),
+                receiveRecordCopyParam.getPatientCode(),
+                receiveRecordCopyParam.getPumpCode(),
+                receiveRecordCopyParam.getProductCode(),
+                receiveRecordCopyParam.getViewState()
+        );
+        iPage.setRecords(list);
+
+        return iPage;
+    }
+
+
 }

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

@@ -43,6 +43,9 @@ public class BusReceiveRecordCopyParam implements Serializable {
     @ApiModelProperty(value = "医院编码")
     private String hospitalCode;
 
+    @ApiModelProperty(value = "医院名称")
+    private String hospitalName;
+
     @ApiModelProperty(value = "住院号")
     private String patientCode;
 

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

@@ -0,0 +1,33 @@
+package com.tuoren.web.layer.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Create by fanfan
+ * Date: 2020-04-14 17:07
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "ReceiveRecordCopyParam", description = "字段: 接口: 接口名称 | 接口名称 | 注释")
+public class ReceiveRecordCopyParam {
+    @ApiModelProperty(value = "接口: null | 第几页")
+    private Integer pageNo=1;
+    @ApiModelProperty(value = "接口: null | 条数")
+    private Integer pageSize=10;
+    @ApiModelProperty(value = "接口: selectRevRecordByPatient | 病人ID")
+    private String patientId;
+    @ApiModelProperty(value = "接口: queryFuzzyHistory| 住院号")
+    private String patientCode;
+    @ApiModelProperty(value = "接口: selectRevRecordByPatient | queryFuzzyHistory | 泵Code")
+    private String pumpCode;
+    @ApiModelProperty(value = "接口: queryFuzzyHistory | 产品ID")
+    private String productCode;
+    @ApiModelProperty(value = "接口: selectRevRecordByPatient | queryFuzzyHistory | 医院ID ")
+    private String hospitalCode;
+    @ApiModelProperty(value = "接口: queryFuzzyHistory | 状态信息 ")
+    private String viewState;
+}

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

@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tuoren.web.layer.mapper.BusReceiveRecordCopyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.tuoren.web.layer.vo.BusReceiveRecordCopyParam">
+        <id column="id" property="id" />
+        <result column="pump_code" property="pumpCode" />
+        <result column="product_code" property="productCode" />
+        <result column="hospital_code" property="hospitalCode" />
+        <result column="hospital_name" property="hospitalName" />
+        <result column="patient_code" property="patientCode" />
+        <result column="remain_quantity" property="remainQuantity" />
+        <result column="continue_quantity" property="continueQuantity" />
+        <result column="self_control_quantity" property="selfControlQuantity" />
+        <result column="lock_time" property="lockTime" />
+        <result column="input_quantity" property="inputQuantity" />
+        <result column="valid_time" property="validTime" />
+        <result column="invalid_time" property="invalidTime" />
+        <result column="max_quantity" property="maxQuantity" />
+        <result column="first_quantity" property="firstQuantity" />
+        <result column="single_quantity" property="singleQuantity" />
+        <result column="total_quantity" property="totalQuantity" />
+        <result column="total_count" property="totalCount" />
+        <result column="pulse_quantity" property="pulseQuantity" />
+        <result column="pulse_lock_time" property="pulseLockTime" />
+        <result column="first_lock_time" property="firstLockTime" />
+        <result column="upper_limit" property="upperLimit" />
+        <result column="lower_limit" property="lowerLimit" />
+        <result column="custom_scate" property="customScate" />
+        <result column="add_valid_time" property="addValidTime" />
+        <result column="run_state" property="runState" />
+        <result column="buf_state1" property="bufState1" />
+        <result column="buf_state2" property="bufState2" />
+        <result column="buf_state3" property="bufState3" />
+        <result column="buf_state4" property="bufState4" />
+        <result column="buf_state5" property="bufState5" />
+        <result column="buf_state6" property="bufState6" />
+        <result column="buf_state7" property="bufState7" />
+        <result column="buf_state8" property="bufState8" />
+        <result column="buf_state9" property="bufState9" />
+        <result column="score" property="score" />
+        <result column="add_cycle" property="addCycle" />
+        <result column="reduce_cycle" property="reduceCycle" />
+        <result column="call_flag" property="callFlag" />
+        <result column="start_time" property="startTime" />
+        <result column="is_remove" property="isRemove" />
+        <result column="state_flag" property="stateFlag" />
+        <result column="no_signal" property="noSignal" />
+        <result column="view_state" property="viewState" />
+        <result column="remark" property="remark" />
+        <result column="last_upload_time" property="lastUploadTime" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="number1" property="number1" />
+        <result column="number2" property="number2" />
+        <result column="number_status" property="numberStatus" />
+        <result column="number3" property="number3" />
+        <result column="number4" property="number4" />
+        <result column="number5" property="number5" />
+        <result column="number6" property="number6" />
+        <result column="number7" property="number7" />
+        <result column="number8" property="number8" />
+        <result column="motor_code" property="motorCode" />
+        <result column="data_version" property="dataVersion" />
+    </resultMap>
+    <select id="queryFuzzyHistoryCopy" parameterType="com.tuoren.web.layer.entity.BusReceiveRecordEntity"  resultType="com.tuoren.web.layer.entity.BusReceiveRecordCopyEntity">
+        select  * from bus_receive_record where
+        <if test="viewState!=null">
+            view_state like '%${viewState}%'
+        </if>
+        <if test="stateFlag!=null">
+            state_flag= #{stateFlag}
+        </if>
+        <if test="pumpCode!=null">
+            pump_code like '%${pumpCode}%'
+        </if>
+        <if test="hospitalCode!=null">
+            hospital_code like '%${hospitalCode}%'
+        </if>
+        <if test="patientCode!=null">
+            patient_code like '%${patientCode}%'
+        </if>
+        <if test="productCode!=null">
+            product_code like '%${productCode}%'
+        </if>
+        order by last_upload_time desc;
+    </select>
+
+    <select id="selectReceiveAndHosipital" resultMap="BaseResultMap">
+        SELECT
+            brrc.id,
+            brrc.pump_code as pumpCode,
+            brrc.product_code as productCode,
+            brrc.hospital_code as hospitalCode,
+            bh.hosptial_name as hospitalName,
+            brrc.patient_code as patientCode,
+            brrc.remain_quantity as remainQuantity,
+            brrc.continue_quantity as continueQuantity,
+            brrc.self_control_quantity as selfControlQuantity,
+            brrc.lock_time as lockTime,
+            brrc.input_quantity as inputQuantity,
+            brrc.valid_time as validTime,
+            brrc.invalid_time as invalidTime,
+            brrc.max_quantity as maxQuantity,
+            brrc.first_quantity as firstQuantity,
+            brrc.single_quantity as singleQuantity,
+            brrc.total_count as totalCount,
+            brrc.pulse_quantity as pulseQuantity,
+            brrc.pulse_lock_time as pulseLockTime,
+            brrc.first_lock_time as firstLockTime,
+            brrc.upper_limit as upperLimit,
+            brrc.lower_limit as lowerLimit,
+            brrc.custom_scate as customScate,
+            brrc.add_valid_time as addValidTime,
+            brrc.run_state as runState,
+            brrc.buf_state1 as bufState1,
+            brrc.buf_state2 as bufState2,
+            brrc.buf_state3 as bufState3,
+            brrc.buf_state4 as bufState4,
+            brrc.buf_state5 as bufState5,
+            brrc.buf_state6 as bufState6,
+            brrc.buf_state7 as bufState7,
+            brrc.buf_state8 as bufState8,
+            brrc.buf_state9 as bufState9,
+            brrc.score as score,
+            brrc.add_cycle as addCycle,
+            brrc.reduce_cycle as reduceCycle,
+            brrc.call_flag as callFlag,
+            brrc.start_time as startTime,
+            brrc.is_remove as isRemove,
+            brrc.state_flag as stateFlag,
+            brrc.no_signal as noSignal,
+            brrc.view_state as viewState,
+            brrc.remark as remark,
+            brrc.last_upload_time as lastUploadTime,
+            brrc.gmt_create as gmtCreate,
+            brrc.gmt_modified as gmtModified,
+            brrc.number1 as number1,
+            brrc.number2 as number2,
+            brrc.number3 as number3,
+            brrc.number4 as number4,
+            brrc.number5 as number5,
+            brrc.number6 as number6,
+            brrc.number7 as number7,
+            brrc.number8 as number8,
+            brrc.data_version as dataVersion,
+            brrc.motor_code as motorCode
+        from bus_receive_record_copy brrc
+        INNER JOIN bus_hospital bh on bh.hospital_code = brrc.hospital_code
+        order by last_upload_time desc
+
+    </select>
+
+    <select id="selectReceiveAndHosipitalById" resultMap="BaseResultMap">
+        SELECT
+            brrc.id,
+            brrc.pump_code as pumpCode,
+            brrc.product_code as productCode,
+            brrc.hospital_code as hospitalCode,
+            bh.hosptial_name as hospitalName,
+            brrc.patient_code as patientCode,
+            brrc.remain_quantity as remainQuantity,
+            brrc.continue_quantity as continueQuantity,
+            brrc.self_control_quantity as selfControlQuantity,
+            brrc.lock_time as lockTime,
+            brrc.input_quantity as inputQuantity,
+            brrc.valid_time as validTime,
+            brrc.invalid_time as invalidTime,
+            brrc.max_quantity as maxQuantity,
+            brrc.first_quantity as firstQuantity,
+            brrc.single_quantity as singleQuantity,
+            brrc.total_count as totalCount,
+            brrc.pulse_quantity as pulseQuantity,
+            brrc.pulse_lock_time as pulseLockTime,
+            brrc.first_lock_time as firstLockTime,
+            brrc.upper_limit as upperLimit,
+            brrc.lower_limit as lowerLimit,
+            brrc.custom_scate as customScate,
+            brrc.add_valid_time as addValidTime,
+            brrc.run_state as runState,
+            brrc.buf_state1 as bufState1,
+            brrc.buf_state2 as bufState2,
+            brrc.buf_state3 as bufState3,
+            brrc.buf_state4 as bufState4,
+            brrc.buf_state5 as bufState5,
+            brrc.buf_state6 as bufState6,
+            brrc.buf_state7 as bufState7,
+            brrc.buf_state8 as bufState8,
+            brrc.buf_state9 as bufState9,
+            brrc.score as score,
+            brrc.add_cycle as addCycle,
+            brrc.reduce_cycle as reduceCycle,
+            brrc.call_flag as callFlag,
+            brrc.start_time as startTime,
+            brrc.is_remove as isRemove,
+            brrc.state_flag as stateFlag,
+            brrc.no_signal as noSignal,
+            brrc.view_state as viewState,
+            brrc.remark as remark,
+            brrc.last_upload_time as lastUploadTime,
+            brrc.gmt_create as gmtCreate,
+            brrc.gmt_modified as gmtModified,
+            brrc.number1 as number1,
+            brrc.number2 as number2,
+            brrc.number3 as number3,
+            brrc.number4 as number4,
+            brrc.number5 as number5,
+            brrc.number6 as number6,
+            brrc.number7 as number7,
+            brrc.number8 as number8,
+            brrc.data_version as dataVersion,
+            brrc.motor_code as motorCode
+        from bus_receive_record_copy brrc
+        INNER JOIN bus_hospital bh on bh.hospital_code = brrc.hospital_code
+        <where>
+            and brrc.id = #{id}
+        </where>
+    </select>
+</mapper>