获取设备及统计分页列表 区分是化验室的还是连续监测的

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/BusinessController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -107,6 +108,11 @@ public class BusinessController extends BaseController {
     @GetMapping("/devicePageList")
     public TableDataInfo devicePageList(DeviceReq deviceReq){
         log.info("进入了 分页获取设备列表（通过类型区分是实验室的还是连续检测的） 接口，类型是{}", JSON.toJSONString(deviceReq));
+        String type = deviceReq.getType();
+        if(StringUtils.isBlank(type))
+            throw new RuntimeException("设备类型为必填参数");
+        if(!"1".equals(type) && !"2".equals(type))
+            throw new RuntimeException("请输入正确的设备类型");
         DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         startPage();
         List<DeviceRes> list = this.businessService.devicePageList(deviceReq);

ruoyi-system/src/main/java/com/ruoyi/business/req/DeviceReq.java

@@ -1,6 +1,7 @@
 package com.ruoyi.business.req;
 
 
+import com.ruoyi.common.annotation.Excel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -12,6 +13,9 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class DeviceReq {
 
+    /** 设备类型(1:化验室，2：连续检测) */
+    private String type;
+
     private String assayStatus;//化验状态（0：在线；1：离线；2：化验中)
 
     private String assayDate;//化验日期

ruoyi-system/src/main/resources/mapper/business/BizDeviceMapper.xml

@@ -203,7 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             biz_device bd
         INNER JOIN biz_water_work bzw
         on bd.device_works = bzw.works_id
-        WHERE bd.device_status = '0' AND bzw.del_flag = 0
+        WHERE bd.device_status = '0' AND bzw.del_flag = 0 AND bd.type = #{type}
         <if test="assayStatus != null  and assayStatus != ''"> and bd.assay_status = #{assayStatus}</if>
         <if test="worksId != null  and worksId != ''"> and bzw.works_id = #{worksId}</if>
         order by bd.device_id desc