1.多数据源配置关闭 2.统计功能不再查询slave数据源 3.设备信息更新的时候去掉版本字段

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

@@ -92,13 +92,13 @@ public class BusinessController extends BaseController {
      */
     @GetMapping("/testSlaveDB")
     public String testSlaveDB(){
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         BizDevice bizDevice = this.bizDeviceMapper.selectBizDeviceByDeviceId(10L);
         BizWaterWork bizWaterWork = bizWaterWorkMapper.selectBizWaterWorkByWorksId(212L);
         ZAssay zAssay = this.zAssayMapper.selectZAssayByAssayId(8L);
         ZAssayResult zAssayResult = this.zAssayResultMapper.selectZAssayResultByResultId(4L);
         ZQualityValue zQualityValue = this.zQualityValueMapper.selectZQualityValueByValueId(1L);
-        DynamicDataSourceContextHolder.clearDataSourceType();
+        // DynamicDataSourceContextHolder.clearDataSourceType();
         return JSON.toJSONString(bizDevice);
     }
 
@@ -113,9 +113,9 @@ public class BusinessController extends BaseController {
     @GetMapping("/homeCountsInfo")
     public R<HomeCountsRes> homeCountsInfo(@RequestParam(value = "type" ,required = false) String type){
         log.info("进入了 获取首页的统计信息（通过类型区分是实验室的还是连续检测的） 接口，类型是{}", type);
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         HomeCountsRes homeCountsRes = this.businessService.homeCountsInfo(type);
-        DynamicDataSourceContextHolder.clearDataSourceType();
+        // DynamicDataSourceContextHolder.clearDataSourceType();
         return R.ok(homeCountsRes);
     }
 
@@ -127,9 +127,9 @@ public class BusinessController extends BaseController {
     @GetMapping("/waterWorkerList")
     public R<List<BizWaterWork>> waterWorkerList(){
         log.info("进入了 获取水厂列表信息 接口");
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         List<BizWaterWork> bizWaterWorks = this.bizWaterWorkMapper.selectBizWaterWorkList(BizWaterWork.builder().delFlag("0").worksStatus("0").build());//只获取关联设备的水厂。
-        DynamicDataSourceContextHolder.clearDataSourceType();
+        // DynamicDataSourceContextHolder.clearDataSourceType();
         return R.ok(bizWaterWorks);
     }
 
@@ -147,10 +147,10 @@ public class BusinessController extends BaseController {
             throw new RuntimeException("设备类型为必填参数");
         if(!"1".equals(type) && !"2".equals(type))
             throw new RuntimeException("请输入正确的设备类型");*/
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         startPage();
         List<DeviceRes> list = this.businessService.devicePageList(deviceReq);
-        DynamicDataSourceContextHolder.clearDataSourceType();
+        // DynamicDataSourceContextHolder.clearDataSourceType();
         return getDataTable(list);
     }
 
@@ -162,10 +162,10 @@ public class BusinessController extends BaseController {
     @GetMapping("/assayPageListByDeviceNoAndDate")
     public TableDataInfo assayPageListByDeviceNoAndDate(AssayReq assayReq){
         log.info("进入了 通过设备编号和日期获取质控样的化验记录的明细和各个指标的偏差度等 接口，请求参数是{}", JSON.toJSONString(assayReq));
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         startPage();
         List<AssayDetailRes> list = this.businessService.assayPageListByDeviceNoAndDate(assayReq);
-        DynamicDataSourceContextHolder.clearDataSourceType();
+        // DynamicDataSourceContextHolder.clearDataSourceType();
         return getDataTable(list);
     }
 
@@ -177,9 +177,9 @@ public class BusinessController extends BaseController {
     public ResponseEntity<InputStreamResource> exportAssayPageListByDeviceNoAndDate(HttpServletResponse response, AssayReq assayReq)
     {
         log.info("进入了 导出 通过设备编号和日期获取质控样的化验记录的明细和各个指标的偏差度等到Excel 接口，请求参数是{}", JSON.toJSONString(assayReq));
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         List<AssayDetailRes> list = this.businessService.assayPageListByDeviceNoAndDate(assayReq);
-        DynamicDataSourceContextHolder.clearDataSourceType();
+        // DynamicDataSourceContextHolder.clearDataSourceType();
         // 模板文件路径
 //        String templateFilePath = this.getClass().getClassLoader().getResource("").getPath() + "/assay-record.xlsx";
 //        String templateFilePath = "classpath:/assay-record.xlsx";
@@ -239,9 +239,9 @@ public class BusinessController extends BaseController {
     @GetMapping("/assayCountListByDates")
     public R<List<AssayQualityDetailRes>> assayCountListByDates(AssayReq assayReq){
         log.info("进入了 通过日期获取的化验室质控样的报表统计信息 接口，请求参数是{}", JSON.toJSONString(assayReq));
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         List<AssayQualityDetailRes> list = this.businessService.assayCountListByDates(assayReq);
-        DynamicDataSourceContextHolder.clearDataSourceType();
+        // DynamicDataSourceContextHolder.clearDataSourceType();
         return R.ok(list);
     }
 
@@ -254,9 +254,9 @@ public class BusinessController extends BaseController {
     public ResponseEntity<InputStreamResource> exportAssayCountListByDates(HttpServletResponse response, AssayReq assayReq)
     {
         log.info("进入了 导出 通过日期获取的化验室质控样的报表统计信息到Excel 接口，请求参数是{}", JSON.toJSONString(assayReq));
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         List<AssayQualityDetailRes> list = this.businessService.assayCountListByDates(assayReq);
-        DynamicDataSourceContextHolder.clearDataSourceType();
+        // DynamicDataSourceContextHolder.clearDataSourceType();
         // 模板文件路径
 //        String templateFilePath = this.getClass().getClassLoader().getResource("").getPath() + "/assay-count.xlsx";
 //        String templateFilePath = "classpath:/assay-record.xlsx";
@@ -316,9 +316,9 @@ public class BusinessController extends BaseController {
     @GetMapping("/continuousAssayCountByDates")
     public R<Map<String, Map<String, List<ContinuousAssayResultRes>>>> continuousAssayCountByDates(AssayReq assayReq){
         log.info("进入了 通过日期范围加水厂（可选）获取连续监测的报表统计信息 接口，请求参数是{}", JSON.toJSONString(assayReq));
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         Map<String, Map<String, List<ContinuousAssayResultRes>>> map = this.businessService.continuousAssayCountByDates(assayReq);
-        DynamicDataSourceContextHolder.clearDataSourceType();
+        // DynamicDataSourceContextHolder.clearDataSourceType();
         return R.ok(map);
     }
 
@@ -331,9 +331,9 @@ public class BusinessController extends BaseController {
     public ResponseEntity<InputStreamResource> exportContinuousAssayCountByDates(HttpServletResponse response, AssayReq assayReq)
     {
         log.info("进入了 导出 通过日期范围加水厂（可选）获取连续监测的报表统计信息到Excel 接口，请求参数是{}", JSON.toJSONString(assayReq));
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         Map<String, Map<String, List<ContinuousAssayResultRes>>> map = this.businessService.continuousAssayCountByDates(assayReq);
-        DynamicDataSourceContextHolder.clearDataSourceType();
+        // DynamicDataSourceContextHolder.clearDataSourceType();
         // 输出文件路径
         log.info("配置的输出文件路径及名称是{}", continuousCountDir);
 
@@ -540,9 +540,9 @@ public class BusinessController extends BaseController {
     @GetMapping("/deviceList")
     public R<List<BizDevice>> deviceList(@RequestParam(value = "type" ,required = false) String type){
         log.info("进入了 获取设备列表信息 接口");
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         List<BizDevice> bizWaterWorks = this.bizDeviceMapper.selectBizDeviceList(BizDevice.builder().deviceStatus("0").type(type).build());//只获取关联设备的水厂。
-        DynamicDataSourceContextHolder.clearDataSourceType();
+        // DynamicDataSourceContextHolder.clearDataSourceType();
         return R.ok(bizWaterWorks);
     }
 
@@ -554,9 +554,9 @@ public class BusinessController extends BaseController {
     @GetMapping("/continuousAssayCountByDatesNew")
     public R<Map<String, ContinuousAssayResultResNew>> continuousAssayCountByDatesNew(AssayReq assayReq){
         log.info("进入了 通过日期范围加水厂（可选）获取连续监测的报表统计信息（没有点位的信息了） 接口，请求参数是{}", JSON.toJSONString(assayReq));
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         Map<String, ContinuousAssayResultResNew> map = this.businessService.continuousAssayCountByDatesNew(assayReq);
-        DynamicDataSourceContextHolder.clearDataSourceType();
+        // DynamicDataSourceContextHolder.clearDataSourceType();
         return R.ok(map);
     }
 
@@ -568,9 +568,9 @@ public class BusinessController extends BaseController {
     @GetMapping("/exportContinuousAssayCountByDatesNew")
     public ResponseEntity<InputStreamResource> exportContinuousAssayCountByDatesNew(AssayReq assayReq){
         log.info("进入了 通过日期范围加水厂（可选）获取连续监测的报表统计信息（没有点位的信息了）导出Excel 接口，请求参数是{}", JSON.toJSONString(assayReq));
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
+        // DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.SLAVE.name());
         Map<String, ContinuousAssayResultResNew> map = this.businessService.continuousAssayCountByDatesNew(assayReq);
-        DynamicDataSourceContextHolder.clearDataSourceType();
+        // DynamicDataSourceContextHolder.clearDataSourceType();
 
         // 输出文件路径
         log.info("配置的输出文件路径及名称是{}", continuousCountDir);

ruoyi-admin/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ spring:
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
-                enabled: true
+                enabled: false
                 driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
 #                url: jdbc:sqlserver://10.0.0.20:1433;DatabaseName=HS_TEST
                 url: jdbc:sqlserver://10.0.0.20:1433;DatabaseName=Water

ruoyi-admin/src/main/resources/application-local.yml

@@ -13,7 +13,7 @@ spring:
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
-                enabled: true
+                enabled: false
                 driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
                 url: jdbc:sqlserver://10.0.0.20:1433;DatabaseName=Water
                 username: sa

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

@@ -189,11 +189,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
 
     <delete id="deleteBizDeviceByDeviceId" parameterType="Long">
-        update biz_device set del_flag = 2,revision = revision + 1 where del_flag = 0 and device_id = #{deviceId}
+        update biz_device set del_flag = 2 where del_flag = 0 and device_id = #{deviceId}
     </delete>
 
     <delete id="deleteBizDeviceByDeviceIds" parameterType="String">
-        update biz_device set del_flag = 2,revision = revision + 1 where del_flag = 0 and device_id in
+        update biz_device set del_flag = 2 where del_flag = 0 and device_id in
         <foreach item="deviceId" collection="array" open="(" separator="," close=")">
             #{deviceId}
         </foreach>