新增获取设备接口 之前默认的之前全部删除，由前端传获取默认当前日期 化验记录支持全部设备查询

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

@@ -372,6 +372,21 @@ public class BusinessController extends BaseController {
 
     }
 
+
+    /**
+     *
+     * 接口10：获取设备列表信息
+     */
+    @GetMapping("/deviceList")
+    public R<List<BizDevice>> deviceList(){
+        log.info("进入了 获取设备列表信息 接口");
+        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        List<BizDevice> bizWaterWorks = this.bizDeviceMapper.selectBizDeviceList(BizDevice.builder().deviceStatus("0").build());//只获取关联设备的水厂。
+        DynamicDataSourceContextHolder.clearDataSourceType();
+        return R.ok(bizWaterWorks);
+    }
+
+
     private static List<List<Object>> getLists() {
         List<List<Object>> list = new ArrayList<>();
         List<Object> data1 = new ArrayList<>();

ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusinessServiceImpl.java

@@ -60,9 +60,8 @@ public class BusinessServiceImpl implements IBusinessService {
         }
         //统计今日的化验数据
         //先获取今日的所有的化验的质控样数据 再编写通用方法，判断是否合格，再获取合格的数量
-        //todo 日期临时写死，因为数据不会同步，都是历史数据  正式以后，需要改成真实日期
-//        List<ZAssayResult> zAssayResults = this.zAssayResultMapper.selectZAssayResultList(ZAssayResult.builder().resultDate(DateUtils.getDate()).assayType("3").build());
-        List<ZAssayResult> zAssayResults = this.zAssayResultMapper.selectZAssayResultList(ZAssayResult.builder().resultDate("2024-08-13").assayType("3").build());
+        List<ZAssayResult> zAssayResults = this.zAssayResultMapper.selectZAssayResultList(ZAssayResult.builder().resultDate(DateUtils.getDate()).assayType("3").build());
+//        List<ZAssayResult> zAssayResults = this.zAssayResultMapper.selectZAssayResultList(ZAssayResult.builder().resultDate("2024-08-13").assayType("3").build());
         if(!CollectionUtils.isEmpty(zAssayResults)){
             int checkTotals = zAssayResults.size();
             build.setAssayTotals(checkTotals);
@@ -78,9 +77,8 @@ public class BusinessServiceImpl implements IBusinessService {
         //处理一下化验日期，如果没有，默认是今天
         String assayDate = deviceReq.getAssayDate();
         if(StringUtils.isBlank(assayDate)){
-            //todo 日期临时写死，因为数据不会同步，都是历史数据  正式以后，需要改成真实日期
-//            assayTime = DateUtils.getDate();
-            assayDate = "2024-08-13";
+            assayDate = DateUtils.getDate();
+//            assayDate = "2024-08-13";
         }
         //先获取设备列表 直接写SQL了，不使用copy
         List<DeviceRes> list =this.bizDeviceMapper.devicePageList(deviceReq);
@@ -499,9 +497,8 @@ public class BusinessServiceImpl implements IBusinessService {
         if(CollectionUtils.isEmpty(bizDevices)){
             return isPassed;//无法查询到水厂，默认合格
         }
-        //todo 日期临时写死，因为数据不会同步，都是历史数据  正式以后，需要改成真实日期
-//        Date nowDate = DateUtils.getNowDate();
-        Date nowDate = DateUtils.parseDate("2024-08-13");
+        Date nowDate = DateUtils.getNowDate();
+//        Date nowDate = DateUtils.parseDate("2024-08-13");
         Double resultConcentration = zAssayResult.getResultConcentration();//化验的真实值
         //去查询配置的标准值的范围（数据不确认，有可能是多个，获取最后一条数据）：
         List<ZQualityValue> list = this.zQualityValueMapper.selectZQualityValueList(ZQualityValue.builder().beginTime(nowDate).endTime(nowDate).deviceWorks(bizDevices.get(0).getDeviceWorks()).assayItem(zAssayResult.getAssayItem()).build());

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

@@ -178,7 +178,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             z_assay
         WHERE
-            device_no = #{deviceNo}
+            1 = 1
           AND assay_date between #{timeBegin} and #{timeEnd}
+        <if test="deviceNo != null  and deviceNo != ''"> and device_no = #{deviceNo}</if>
     </select>
 </mapper>