单个数据库

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

@@ -90,19 +90,11 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://61.183.212.90:57911/weitiandi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    password: Qyy#2023.Wzh!
     druid:
-      # 主库数据源
-      master:
-        url: jdbc:mysql://61.183.212.90:57911/ruoyiwechat?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-        username: root
-        password: Qyy#2023.Wzh!
-      # 从库数据源
-      slave:
-        # 从数据源开关/默认关闭
-        enabled: true
-        url: jdbc:mysql://61.183.212.90:57911/weitiandi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-        username: root
-        password: Qyy#2023.Wzh!
+
       # 初始连接数
       initialSize: 5
       # 最小连接池数量

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

@@ -93,13 +93,6 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://61.183.212.90:57911/ruoyiwechat?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-        username: root
-        password: Qyy#2023.Wzh!
-      # 从库数据源
-      slave:
-        # 从数据源开关/默认关闭
-        enabled: true
         url: jdbc:mysql://61.183.212.90:57911/weitiandi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
         username: root
         password: Qyy#2023.Wzh!

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/websocket/**","/device/addMsg").permitAll()
+                .antMatchers("/login", "/register", "/captchaImage","/websocket/**","/device/addMsg","/device/checkVersion").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

ruoyi-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.iot.domain.TDevicePlan;
 import com.ruoyi.iot.domain.WeitiandiDeviceInfo;
 import com.ruoyi.iot.entity.param.DeviceParam;
+import com.ruoyi.iot.mapper.TDeviceRecordMapper;
 import com.ruoyi.iot.queue.MsgQueue;
 import com.ruoyi.iot.service.*;
 import com.ruoyi.iot.transdata.RpcResult;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
 
@@ -47,12 +49,20 @@ public class DeviceController {
     @Autowired
     private MsgQueue msgQueue;
 
+    @Autowired
+    private TDeviceRecordMapper tDeviceRecordMapper;
+
     @GetMapping("/testrpc")
     @Anonymous
     public RpcResult testRpc(){
         return null;
     }
-
+    @PostMapping("/checkVersion")
+    @ApiOperation("检测版本")
+    public AjaxResult checkVersion(@RequestParam("versionCode")Integer appVersionCode){
+        Map<String, Object> deviceData = tDeviceRecordMapper.getDeviceData("select * from cz_app_version order by create_time desc limit 1");
+        return AjaxResult.success(deviceData);
+    }
 
     @PostMapping("/bindDevice")
     @ApiOperation("绑定设备")

ruoyi-iot/src/main/java/com/ruoyi/iot/service/impl/TDeviceRecordServiceImpl.java

@@ -1,22 +1,11 @@
 package com.ruoyi.iot.service.impl;
 
-import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.iot.domain.vo.TDeviceRecordVO;
 import com.ruoyi.iot.entity.param.DeviceParam;
-import com.ruoyi.iot.ex.ServiceException;
 import com.ruoyi.iot.mapper.TDeviceRecordMapper;
-import com.ruoyi.iot.openfeign.MsgService;
 import com.ruoyi.iot.service.ITDeviceRecordService;
-import com.ruoyi.iot.transdata.DataParam;
-import com.ruoyi.iot.transdata.RpcResult;
-import com.ruoyi.iot.transdata.entity.MainBoard;
-import com.ruoyi.iot.transdata.entity.PortStatus;
-import com.ruoyi.iot.transdata.entity.opertype.OperEnum;
 import com.ruoyi.iot.util.SplitDataUtil;
-import com.ruoyi.iot.web.ServiceCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,7 +24,6 @@ public class TDeviceRecordServiceImpl implements ITDeviceRecordService {
     }
 
     @Override
-    @DataSource(value = DataSourceType.SLAVE)
     public JSONObject getPortDetail(DeviceParam deviceParam) {
         String deviceId = deviceParam.getDeviceId();
         String time = deviceParam.getTime();
@@ -54,7 +42,6 @@ public class TDeviceRecordServiceImpl implements ITDeviceRecordService {
 
 
     @Override
-    @DataSource(value = DataSourceType.SLAVE)
     public JSONObject getMainboardConfig(DeviceParam deviceParam) {
         String deviceId = deviceParam.getDeviceId();
         String time = deviceParam.getTime();
@@ -70,7 +57,6 @@ public class TDeviceRecordServiceImpl implements ITDeviceRecordService {
     }
 
     @Override
-    @DataSource(value = DataSourceType.SLAVE)
     public JSONObject checkStatus(DeviceParam deviceParam) {
         String deviceId = deviceParam.getDeviceId();
         String time = deviceParam.getTime();

ruoyi-iot/src/main/java/com/ruoyi/iot/service/impl/WeitiandiDeviceInfoServiceImpl.java

@@ -3,8 +3,6 @@ package com.ruoyi.iot.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.iot.domain.WeitiandiDeviceInfo;
 import com.ruoyi.iot.mapper.WeitiandiDeviceInfoMapper;
 import com.ruoyi.iot.service.IWeitiandiDeviceInfoService;
@@ -26,7 +24,6 @@ import java.util.Map;
 public class WeitiandiDeviceInfoServiceImpl extends ServiceImpl<WeitiandiDeviceInfoMapper, WeitiandiDeviceInfo> implements IWeitiandiDeviceInfoService {
 
     @Override
-    @DataSource(value = DataSourceType.SLAVE)
     public WeitiandiDeviceInfo getDeviceInfoByQrcode(String qrcode, Long userId) {
         Map<String, String> param = UrlUtil.getParam(qrcode);
         if(param != null){
@@ -40,7 +37,6 @@ public class WeitiandiDeviceInfoServiceImpl extends ServiceImpl<WeitiandiDeviceI
     }
 
     @Override
-    @DataSource(value = DataSourceType.SLAVE)
     public List<WeitiandiDeviceInfo> listDevice(Long userId) {
         LambdaQueryWrapper<WeitiandiDeviceInfo> objectLambdaQueryWrapper = Wrappers.lambdaQuery();
         objectLambdaQueryWrapper.eq(WeitiandiDeviceInfo::getUserId,userId);
@@ -50,7 +46,6 @@ public class WeitiandiDeviceInfoServiceImpl extends ServiceImpl<WeitiandiDeviceI
     }
 
     @Override
-    @DataSource(value = DataSourceType.SLAVE)
     public WeitiandiDeviceInfo bindDevice(String qrcode, Long userId) {
         LambdaQueryWrapper<WeitiandiDeviceInfo> objectLambdaQueryWrapper = Wrappers.lambdaQuery();
         objectLambdaQueryWrapper.eq(WeitiandiDeviceInfo::getQrcode,qrcode);