本地代码运行

pom.xml

@@ -11,7 +11,7 @@
         <module>yudao-dependencies</module>
         <module>yudao-framework</module>
         <!-- Server 主项目 -->
-        <module>yudao-server</module>
+        <module>randd-server</module>
         <!-- 各种 module 拓展 -->
         <module>yudao-module-system</module>
         <module>yudao-module-infra</module>
@@ -21,11 +21,11 @@
 <!--        <module>yudao-module-mp</module>-->
 <!--        <module>yudao-module-pay</module>-->
 <!--        <module>yudao-module-mall</module>-->
-        <module>yudao-module-supplier</module>
-        <module>yudao-module-pms</module>
+<!--        <module>yudao-module-supplier</module>-->
+<!--        <module>yudao-module-pms</module>-->
         <!--        <module>yudao-module-crm</module>-->
 <!--        <module>yudao-module-erp</module>-->
-        <module>yudao-module-iot</module>
+<!--        <module>yudao-module-iot</module>-->
         <!-- AI 大模型的开启，请参考 https://doc.iocoder.cn/ai/build/ 文档，对 JDK 版本要要求！ -->
 <!--        <module>yudao-module-ai</module>-->
     </modules>

yudao-server/pom.xml → randd-server/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>yudao-server</artifactId>
+    <artifactId>randd-server</artifactId>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -26,11 +26,11 @@
             <artifactId>yudao-module-system-biz</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-pms-abc</artifactId>
-            <version>2.4.2-jdk8-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.iocoder.boot</groupId>-->
+<!--            <artifactId>yudao-module-pms-abc</artifactId>-->
+<!--            <version>2.4.2-jdk8-SNAPSHOT</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-module-infra-biz</artifactId>
@@ -56,16 +56,16 @@
             <artifactId>yudao-module-bpm-biz</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-supplier-biz</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-supplier-biz</artifactId>
-            <version>${revision}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.iocoder.boot</groupId>-->
+<!--            <artifactId>yudao-module-supplier-biz</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>cn.iocoder.boot</groupId>-->
+<!--            <artifactId>yudao-module-supplier-biz</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
         <!-- 支付服务。默认注释，保证编译速度 -->
 <!--        <dependency>-->
 <!--            <groupId>cn.iocoder.boot</groupId>-->
@@ -123,11 +123,11 @@
 <!--        </dependency>-->
 
         <!-- IoT 物联网相关模块。默认注释，保证编译速度 -->
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-iot-biz</artifactId>
-            <version>${revision}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.iocoder.boot</groupId>-->
+<!--            <artifactId>yudao-module-iot-biz</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
 
         <!-- spring boot 配置所需依赖 -->
         <dependency>

yudao-server/src/main/resources/application-prod.yaml → randd-server/src/main/resources/application-prod.yaml

@@ -1,5 +1,5 @@
 server:
-  port: 48080
+  port: 38080
 
 --- #################### 数据库相关配置 ####################
 
@@ -47,25 +47,25 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:mysql://172.21.20.20:3306/rqiot?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://172.21.20.20:3306/rqrd?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
           username: ruiqi
           password: .N_Mdq!BR1W4
-        slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
-          lazy: true # 开启懒加载，保证启动速度
+        #slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
+          #lazy: true # 开启懒加载，保证启动速度
           #          url: jdbc:mysql://1.94.244.160:3306/rqiot?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
-          url: jdbc:mysql://172.21.20.20:3306/yanfan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-          username: ruiqi
-          password: .N_Mdq!BR1W4
-        yanfan:
-          url: jdbc:mysql://172.21.20.20:3306/yanfan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-          username: ruiqi
-          password: .N_Mdq!BR1W4
-        tdengine:
-          enabled: true
-          url: jdbc:TAOS-RS://172.21.10.65:6041/iot_log?allowMultiQueries=true
-          username: root
-          password: taosdata
-          driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+          #url: jdbc:mysql://172.21.20.20:3306/yanfan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          #username: ruiqi
+          #password: .N_Mdq!BR1W4
+        #yanfan:
+          #url: jdbc:mysql://172.21.20.20:3306/yanfan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          #username: ruiqi
+          #password: .N_Mdq!BR1W4
+        #tdengine:
+          #enabled: true
+          #url: jdbc:TAOS-RS://172.21.10.65:6041/iot_log?allowMultiQueries=true
+          #username: root
+          #password: taosdata
+          #driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
 #  redis:
 #    host: localhost # 地址
@@ -76,9 +76,13 @@ spring:
   redis:
     host: localhost # 地址
     port: 6379 # 端口
-    database: 0  # 数据库索引
+    database: 10  # 数据库索引
     password: 123456
 
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+
 --- #################### 定时任务相关配置 ####################
 
 # Quartz 配置项，对应 QuartzProperties 配置类
@@ -175,16 +179,16 @@ dingtalk:
   URL_GET_USERINFO_BYMOBILE: https://oapi.dingtalk.com/topapi/v2/user/getbymobile # 根据用户手机号获取钉钉用户信息 url
 
 --- #################### SAP相关配置 ####################
-sap:
-  jco:
-    ashost: 172.17.25.120
-    sysnr: 00
-    client: 901
-    user: ZPMS
-    passwd: Kr2024.0
-    lang: zh
-    pool_capacity: 10
-    peak_limit: 20
+#sap:
+  #jco:
+    #ashost: 172.17.25.120
+    #sysnr: 00
+    #client: 901
+    #user: ZPMS
+    #passwd: Kr2024.0
+    #lang: zh
+    #pool_capacity: 10
+    #peak_limit: 20
 
 --- #################### 微信公众号相关配置 ####################
 wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
@@ -248,49 +252,49 @@ justauth:
 
 
 --- #################### iot相关配置 TODO 芋艿：再瞅瞅 ####################
-iot:
-  emq:
+#iot:
+  #emq:
     # 账号
-    username: anhaohao
+    #username: anhaohao
     # 密码
-    password: ahh@123456
+    #password: ahh@123456
     # 主机地址
-    hostUrl: tcp://chaojiniu.top:1883
+    #hostUrl: tcp://chaojiniu.top:1883
     # 客户端Id，不能相同，采用随机数 ${random.value}
-    client-id: ${random.int}
+    #client-id: ${random.int}
     # 默认主题
-    default-topic: test
+    #default-topic: test
     # 保持连接
-    keepalive: 60
+    #keepalive: 60
     # 清除会话(设置为false,断开连接，重连后使用原来的会话 保留订阅的主题，能接收离线期间的消息)
-    clearSession: true
+    #clearSession: true
 
-yanfan:
-  url: http://172.21.10.65
+#yanfan:
+  #url: http://172.21.10.65
 # 插件配置
 pf4j:
   pluginsDir: ${user.home}/plugins # 插件目录
 system:
-  url: https://aims.deepoil.cc/
+  url: https://rdm.deepoil.cc/
 
-portal:
-  secret: cc99d802-ce5c-5f62-b037-9a00726e7109
+#portal:
+  #secret: cc99d802-ce5c-5f62-b037-9a00726e7109
 
-oa:
-  register: https://172.17.25.231/api/ec/dev/auth/regist
-  gettoken: https://172.17.25.231/api/ec/dev/auth/applytoken
-  outMaintain: https://172.17.25.231/api/workflow/paService/doCreateRequest
-  companyUrl: https://172.17.25.231/api/hrm/resful/getHrmsubcompanyWithPage
-  departmentUrl: https://172.17.25.231/api/hrm/resful/getHrmdepartmentWithPage
-  userUrl: https://172.17.25.231/api/hrm/resful/getHrmUserInfoWithPage
-  workflowId: "640"
-  requestName: "设备委外维修申请流程"
+#oa:
+  #register: https://172.17.25.231/api/ec/dev/auth/regist
+  #gettoken: https://172.17.25.231/api/ec/dev/auth/applytoken
+  #outMaintain: https://172.17.25.231/api/workflow/paService/doCreateRequest
+  #companyUrl: https://172.17.25.231/api/hrm/resful/getHrmsubcompanyWithPage
+  #departmentUrl: https://172.17.25.231/api/hrm/resful/getHrmdepartmentWithPage
+  #userUrl: https://172.17.25.231/api/hrm/resful/getHrmUserInfoWithPage
+  #workflowId: "640"
+  #requestName: "设备委外维修申请流程"
   #  appid: EEAA5436-7577-4BE0-8C6C-89E9D88805EE
   #  appid: EEAA5436-7577-4BE0-8C6C-89E9D88805E1
-  appid: tw
-  cpk: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApmtQUp9M82/z22P7am5owQCknjQnjF4U4ckEh7XVtJVQZrZx7d1lCPfoYrwOKEM4DEV7khW6++4Zv5caJ/9nqPn4QFwCqJWVmCEm9vC1BA6i2yfa4bmTxdR1/oeU/Af9pDFlvv5GC9XyilO7CIKu19Ce50v7aN6h1Tjix+h5Ba8e12XAEpEZk9pFroEYfR4lrecvi1pQOwRw8YzDRC4lhGNOo5Cen1rGjk7dwzzgs4uEv9ZyPZoVJnty5P9JE/ctboEf3x4jbqIliuCRgOyXYsLlp+N282CKcWZ35URkGw2orKyG1U6L1hNoj7kkpvAo8Zagf97SdZ0nYdRBIHv6PQIDAQAB
-  oaSecret: kryfoa20250905@szh
-  user: OAuser
-  userid: cLPEaFs9moW6b3xZMl1kNNWAAo7bp61ZRRTKmpiJUe56hSxQvrC2vWtY5ogj7g5FAnUOlzYjYg9MRktKXcseh/nsvZCQGa3BAlYixlDJruV19y4Omx5dYnqu/qv2rJAqTzUS71sOwuB1M2nKlLVsphw1GF74UhGP4xsjpZP7mC8=
+  #appid: tw
+  #cpk: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApmtQUp9M82/z22P7am5owQCknjQnjF4U4ckEh7XVtJVQZrZx7d1lCPfoYrwOKEM4DEV7khW6++4Zv5caJ/9nqPn4QFwCqJWVmCEm9vC1BA6i2yfa4bmTxdR1/oeU/Af9pDFlvv5GC9XyilO7CIKu19Ce50v7aN6h1Tjix+h5Ba8e12XAEpEZk9pFroEYfR4lrecvi1pQOwRw8YzDRC4lhGNOo5Cen1rGjk7dwzzgs4uEv9ZyPZoVJnty5P9JE/ctboEf3x4jbqIliuCRgOyXYsLlp+N282CKcWZ35URkGw2orKyG1U6L1hNoj7kkpvAo8Zagf97SdZ0nYdRBIHv6PQIDAQAB
+  #oaSecret: kryfoa20250905@szh
+  #user: OAuser
+  #userid: cLPEaFs9moW6b3xZMl1kNNWAAo7bp61ZRRTKmpiJUe56hSxQvrC2vWtY5ogj7g5FAnUOlzYjYg9MRktKXcseh/nsvZCQGa3BAlYixlDJruV19y4Omx5dYnqu/qv2rJAqTzUS71sOwuB1M2nKlLVsphw1GF74UhGP4xsjpZP7mC8=
 file:
-  upload-path: /iotfiles
+  upload-path: /rdfiles

yudao-server/src/main/resources/application.yaml → randd-server/src/main/resources/application.yaml

@@ -1,25 +1,25 @@
 spring:
   application:
-    name: yudao-server
+    name: randd-server
 
   profiles:
     active: dev
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
-  mqtt:
+  #mqtt:
     # MQTT 服务端地址（对应前端 wss://aims.deepoil.cc/mqtt）
-    host: wss://aims.deepoil.cc/mqtt
+    #host: wss://aims.deepoil.cc/mqtt
     # 前端配置的用户名/密码
-    username: yanfan
-    password: eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjY0YmM2NjJlLWZhMjQtNGY1Ny1hOTk1LWZiMGM2YjNhYzI4OCJ9.9nxoDUNGTk1szRlZHHG0AcWZctLrzJ16UA5rsBagHNcD10PC-LIMTgAr2CK1Ppafa6cW5XPdn7RqBF6iZjHtww
+    #username: yanfan
+    #password: eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjY0YmM2NjJlLWZhMjQtNGY1Ny1hOTk1LWZiMGM2YjNhYzI4OCJ9.9nxoDUNGTk1szRlZHHG0AcWZctLrzJ16UA5rsBagHNcD10PC-LIMTgAr2CK1Ppafa6cW5XPdn7RqBF6iZjHtww
     # 客户端ID（前端为随机生成）
-    client-id-prefix: web-
+    #client-id-prefix: web-
     # 连接配置
-    clean-session: true
-    reconnect-period: 5000
-    connect-timeout: 10000
-    qos: 0
+    #clean-session: true
+    #reconnect-period: 5000
+    #connect-timeout: 10000
+    #qos: 0
   # Servlet 配置
   servlet:
     # 文件上传相关配置项
@@ -291,8 +291,6 @@ yudao:
   tenant: # 多租户相关配置项
     enable: true
     ignore-urls:
-      - /admin-api/rq/iot-device/init
-      - /admin-api/rq/iot-device/td/test
       - /admin-api/system/tenant/get-id-by-name # 基于名字获取租户，不许带租户编号
       - /admin-api/system/tenant/get-by-website # 基于域名获取租户，不许带租户编号
       - /admin-api/system/tenant/simple-list # 获取租户列表，不许带租户编号
@@ -305,15 +303,10 @@ yudao:
       - /admin-api/mp/open/** # 微信公众号开放平台，微信回调接口，无法携带租户编号
       - /admin-api/system/auth/social-login
       - /admin-api/system/dict-data/page
-      - /admin-api/rq/iot-tree/simple-list
       - /system/auth/social-login
       - /admin-api/zlmhook/*
       - /system/auth/appSocialLogin
       - /system/auth/h5SocialLogin
-      - /admin-api/rq/deviceTD/runningTsData #查询时序数据库设备参数
-      - /admin-api/rq/deviceTD/runningSpanData #查询时序数据库设备参数
-      - /admin-api/pms/iot-main-work-order/timeoutDeviceMainDistances #以公司为维度 统计所有超时保养的设备
-      - /admin-api/pms/iot-main-work-order/deviceMainTimeoutList #以公司为维度 统计所有超时保养的设备
     ignore-tables:
       - system_tenant
       - system_tenant_package
@@ -358,7 +351,6 @@ yudao:
       - rep_demo_jianpiao
       - tmp_report_data_1
       - tmp_report_data_income
-      - device_* #时序数据库表名称
     ignore-caches:
       - user_role_ids
       - permission_menu_ids
@@ -367,8 +359,6 @@ yudao:
       - mail_account
       - mail_template
       - sms_template
-      - iot:device
-      - iot:thing_model_list
   sms-code: # 短信验证码相关的配置项
     expire-times: 10m
     send-frequency: 1m
@@ -400,12 +390,12 @@ debug: false
 pf4j:
   pluginsDir: /Users/anhaohao/code/gitee/ruoyi-vue-pro/plugins # 插件目录
 
-yanfan:
-  name: yanfan         # 名称
-  version: 3.8.5            # 版本
-  copyrightYear: 2023-2024       # 版权年份
-  demoEnabled: true         # 实例演示开关
+#yanfan:
+  #name: yanfan         # 名称
+  #version: 3.8.5            # 版本
+  #copyrightYear: 2023-2024       # 版权年份
+  #demoEnabled: true         # 实例演示开关
   # 文件路径，以uploadPath结尾 示例（ Windows配置 D:/uploadPath，Linux配置 /uploadPath）
-  profile: /uploadPath
-  addressEnabled: true      # 获取ip地址开关
-  captchaType: math
+  #profile: /uploadPath
+  #addressEnabled: true      # 获取ip地址开关
+  #captchaType: math

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java

@@ -4,8 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.security.config.SecurityProperties;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
@@ -28,7 +26,6 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -68,11 +65,11 @@ public class AuthController {
     private SecurityProperties securityProperties;
     @Resource
     private SocialUserService socialUserService;
-    @Value("${oa.oaSecret}")
+    /* @Value("${oa.oaSecret}")
     private String oaSecret;
 
     @Value("${portal.secret}")
-    private String portalSecret;
+    private String portalSecret; */
 
     @PostMapping("/login")
     @PermitAll
@@ -92,9 +89,9 @@ public class AuthController {
     @PermitAll
     @TenantIgnore
     public CommonResult<AuthLoginRespVO> oaLogin(@RequestHeader("oa-secret") String secret) {
-        if (!oaSecret.equals(secret)){
+        /* if (!oaSecret.equals(secret)){
             throw new ServiceException(new ErrorCode(100, "验证失败"));
-        }
+        } */
         return success(authService.oaLogin());
     }
 
@@ -222,9 +219,9 @@ public class AuthController {
     @PermitAll
     @TenantIgnore
     public CommonResult<AuthLoginRespVO> portalLogin(@RequestHeader("portal-secret") String secret, @RequestBody AuthPortalLoginReqVO reqVO) {
-        if (!portalSecret.equals(secret)){
+        /* if (!portalSecret.equals(secret)){
             throw new ServiceException(new ErrorCode(100, "验证失败"));
-        }
+        } */
         return success(authService.portalLogin(reqVO));
     }
 
@@ -240,9 +237,9 @@ public class AuthController {
     @TenantIgnore
     @Operation(summary = "第三方应用获取随机码 用于请求真正的token", description = "")
     public CommonResult<String> getToken(@RequestBody AuthPortalLoginReqVO reqVO) {
-        if (!portalSecret.equals(reqVO.getAppid())) {
+        /* if (!portalSecret.equals(reqVO.getAppid())) {
             throw new ServiceException(new ErrorCode(100, "验证失败"));
-        }
+        } */
         return success(authService.ssoGetToken(reqVO));
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java

@@ -85,8 +85,8 @@ public class AdminAuthServiceImpl implements AdminAuthService {
     private SmsCodeApi smsCodeApi;
     @Resource
     private SocialUserBindMapper socialUserBindMapper;
-    @Value("${oa.user}")
-    private String oaUser;
+    /* @Value("${oa.user}")
+    private String oaUser; */
     /**
      * 验证码的开关，默认为 true
      */
@@ -129,8 +129,8 @@ public class AdminAuthServiceImpl implements AdminAuthService {
 
     @Override
     public AuthLoginRespVO oaLogin() {
-        AdminUserDO user = userService.getUserByUsername(oaUser);
-        return createTokenAfterLoginSuccess(user.getId(), user.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME);
+        /* AdminUserDO user = userService.getUserByUsername(oaUser); */
+        return null;/* createTokenAfterLoginSuccess(user.getId(), user.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME); */
     }
 
     @Override